Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 May 2014 20:34:59 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r355449 - head/games/daimonin-music
Message-ID:  <201405262034.s4QKYxOF056190@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon May 26 20:34:59 2014
New Revision: 355449
URL: http://svnweb.freebsd.org/changeset/ports/355449
QAT: https://qat.redports.org/buildarchive/r355449/

Log:
  - Fix conflict with games/daimonin
  
  MFH:		2014Q2

Modified:
  head/games/daimonin-music/Makefile
  head/games/daimonin-music/pkg-plist

Modified: head/games/daimonin-music/Makefile
==============================================================================
--- head/games/daimonin-music/Makefile	Mon May 26 20:31:28 2014	(r355448)
+++ head/games/daimonin-music/Makefile	Mon May 26 20:34:59 2014	(r355449)
@@ -3,6 +3,7 @@
 
 PORTNAME=	daimonin-music
 PORTVERSION=	20120402
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/daimonin/Addon%20packs/Music/
 DISTNAME=	AllMusic
@@ -13,11 +14,16 @@ COMMENT=	Music for daimonin client
 
 NO_BUILD=	true
 USES=		zip:infozip
+NO_ARCH=	yes
 
 MYDATADIR=	${PREFIX}/share/daimonin
 
 EXTRACT_BEFORE_ARGS=	-aqo
 
+post-extract:
+	@${MV} ${WRKDIR}/media/media.txt ${WRKDIR}/media/media-music.txt
+	@${RM} -f ${WRKDIR}/media/orchestral.ogg
+
 do-install:
 	${MKDIR} ${STAGEDIR}${MYDATADIR}
 	cd ${WRKDIR} && ${COPYTREE_SHARE} media ${STAGEDIR}${MYDATADIR}/

Modified: head/games/daimonin-music/pkg-plist
==============================================================================
--- head/games/daimonin-music/pkg-plist	Mon May 26 20:31:28 2014	(r355448)
+++ head/games/daimonin-music/pkg-plist	Mon May 26 20:34:59 2014	(r355449)
@@ -64,14 +64,13 @@ share/daimonin/media/frozen.ogg
 share/daimonin/media/ghost.ogg
 share/daimonin/media/jungle1.ogg
 share/daimonin/media/landing.ogg
-share/daimonin/media/media.txt
+share/daimonin/media/media-music.txt
 share/daimonin/media/ocean.ogg
-share/daimonin/media/orchestral.ogg
 share/daimonin/media/rainthunder.ogg
 share/daimonin/media/raspy.ogg
 share/daimonin/media/rubberfreak.ogg
 share/daimonin/media/spokyspace.ogg
 share/daimonin/media/swamp.ogg
 share/daimonin/media/thonkdonk.ogg
-@dirrm share/daimonin/media
-@dirrm share/daimonin
+@dirrmtry share/daimonin/media
+@dirrmtry share/daimonin



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405262034.s4QKYxOF056190>