From 3fd4c984b2ea6369299f8b39926eadfa0177cdfc Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Mon, 26 May 2014 21:57:16 +0000 Subject: MFH: r355449 - Fix conflict with games/daimonin Approved by: portmgr --- games/daimonin-music/Makefile | 6 ++++++ games/daimonin-music/pkg-plist | 7 +++---- 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 -- cgit v1.2.3