aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2014-05-26 21:57:16 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2014-05-26 21:57:16 +0000
commit3fd4c984b2ea6369299f8b39926eadfa0177cdfc (patch)
tree874c23e366df4b63081cb65e78c24333a6c9bd51
parentf3dba043aebc4cd5b258d7211ddd7d24fc41bf38 (diff)
downloadports-3fd4c984b2ea6369299f8b39926eadfa0177cdfc.tar.gz
ports-3fd4c984b2ea6369299f8b39926eadfa0177cdfc.zip
MFH: r355449
- Fix conflict with games/daimonin Approved by: portmgr
Notes
Notes: svn path=/branches/2014Q2/; revision=355457
-rw-r--r--games/daimonin-music/Makefile6
-rw-r--r--games/daimonin-music/pkg-plist7
2 files changed, 9 insertions, 4 deletions
diff --git a/games/daimonin-music/Makefile b/games/daimonin-music/Makefile
index a98497082b32..45452d136c05 100644
--- a/games/daimonin-music/Makefile
+++ b/games/daimonin-music/Makefile
@@ -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}/
diff --git a/games/daimonin-music/pkg-plist b/games/daimonin-music/pkg-plist
index f674da9a262c..ad56bea55afe 100644
--- a/games/daimonin-music/pkg-plist
+++ b/games/daimonin-music/pkg-plist
@@ -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