Date: Sat, 16 Mar 2013 08:40:01 GMT From: Sender Ghost <lightside@gmx.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/176986: [PATCH] games/uqm: Install the music and voice addons into the right place. Message-ID: <201303160840.r2G8e1QT069752@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/176986; it has been noted by GNATS. From: Sender Ghost <lightside@gmx.com> To: bug-followup@FreeBSD.org Cc: christoph.mallon@gmx.de, benlutz@datacomm.ch Subject: Re: ports/176986: [PATCH] games/uqm: Install the music and voice addons into the right place. Date: Sat, 16 Mar 2013 12:36:56 +0400 This is a multi-part message in MIME format. --------------080103060705000601070901 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hello, Christoph Mallon. > The game looks for the music and voice data in the directory addons/, not packages/. True. Thanks for pointing this out. I checked your patch and it works (e.g. debug messages for add-ons directory). From my side, I also added Remix Packs add-ons to the patch, from: http://sourceforge.net/projects/sc2/files/UQM%20Remix%20Packs/ --------------080103060705000601070901 Content-Type: text/plain; charset=UTF-8; name="patch.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch.txt" diff -ruN uqm.orig/Makefile uqm/Makefile --- uqm.orig/Makefile 2013-02-17 01:54:49.000000000 +0400 +++ uqm/Makefile 2013-03-16 12:18:36.000000000 +0400 @@ -3,6 +3,7 @@ PORTNAME= uqm PORTVERSION= 0.7.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/sc2/UQM/${PORTVERSION:R} DISTFILES= ${PORTNAME}-${PORTVERSION}-source.tgz ${PORTNAME}-${DATAVERSION}-content.uqm @@ -24,6 +25,12 @@ OPTIONS_DEFINE= VOICE MUSIC OPENAL DOCS MUSIC_DESC= Music add-on VOICE_DESC= Voice add-on +OPTIONS_GROUP= REMIXES +REMIX_PACKS= 1 2 3 4 +.for i in ${REMIX_PACKS} +OPTIONS_GROUP_REMIXES+=REMIXPACK${i} +REMIXPACK${i}_DESC= UQM Remix Pack ${i} add-on +.endfor .include <bsd.port.options.mk> @@ -45,15 +52,30 @@ USE_OPENAL= al .endif +.for i in ${REMIX_PACKS} +. if ${PORT_OPTIONS:MREMIXPACK${i}} +MASTER_SITES+= SF/sc2/UQM%20Remix%20Packs/UQM%20Remix%20Pack%20${i}:remixpack${i} +DISTFILES+= ${PORTNAME}-remix-disc${i}.uqm:remixpack${i} +PLIST_SUB+= REMIXPACK${i}ADDON="" +. else +PLIST_SUB+= REMIXPACK${i}ADDON="@comment " +. endif +.endfor + post-extract: - ${MKDIR} ${WRKSRC}/content/packages + ${MKDIR} ${WRKSRC}/content/addons ${WRKSRC}/content/packages ${CP} ${DISTDIR}/${PORTNAME}-${DATAVERSION}-content.uqm ${WRKSRC}/content/packages/ .ifdef(WITH_VOICE) - ${CP} ${DISTDIR}/${PORTNAME}-${DATAVERSION}-voice.uqm ${WRKSRC}/content/packages/ + ${CP} ${DISTDIR}/${PORTNAME}-${DATAVERSION}-voice.uqm ${WRKSRC}/content/addons/ .endif .ifdef(WITH_MUSIC) - ${CP} ${DISTDIR}/${PORTNAME}-${DATAVERSION}-3domusic.uqm ${WRKSRC}/content/packages/ + ${CP} ${DISTDIR}/${PORTNAME}-${DATAVERSION}-3domusic.uqm ${WRKSRC}/content/addons/ .endif +.for i in ${REMIX_PACKS} +. if ${PORT_OPTIONS:MREMIXPACK${i}} + ${CP} ${DISTDIR}/${PORTNAME}-remix-disc${i}.uqm ${WRKSRC}/content/addons/ +. endif +.endfor do-configure: @${ECHO_MSG} CHOICE_debug_VALUE=\'nodebug\' > ${WRKSRC}/config.state diff -ruN uqm.orig/distinfo uqm/distinfo --- uqm.orig/distinfo 2013-02-17 01:54:49.000000000 +0400 +++ uqm/distinfo 2013-03-16 12:03:14.000000000 +0400 @@ -6,3 +6,11 @@ SIZE (uqm-0.7.0-voice.uqm) = 115143439 SHA256 (uqm-0.7.0-3domusic.uqm) = c57085e64dad4bddf8a679a9aa2adf63f2156d5f6cbabe63af80519033dbcb82 SIZE (uqm-0.7.0-3domusic.uqm) = 18980671 +SHA256 (uqm-remix-disc1.uqm) = b697694745d939311e8ebffdd5edf692e010c25d7966e1481074940a4d0487e8 +SIZE (uqm-remix-disc1.uqm) = 50188876 +SHA256 (uqm-remix-disc2.uqm) = 7fbb4744102e31273e4459b01a156da052ec537c128fe91793643e348bc1bade +SIZE (uqm-remix-disc2.uqm) = 60282662 +SHA256 (uqm-remix-disc3.uqm) = e6d89f8f66cf1df1cb278fca1e92261b1776ee670dff26132e33f14dbd31e91d +SIZE (uqm-remix-disc3.uqm) = 39924875 +SHA256 (uqm-remix-disc4.uqm) = a4c8197712a5b72a81c7ef7a2a33ea7d3ac90ab063c929dd68e7328a559a86d0 +SIZE (uqm-remix-disc4.uqm) = 86545760 diff -ruN uqm.orig/pkg-plist uqm/pkg-plist --- uqm.orig/pkg-plist 2013-02-17 01:54:49.000000000 +0400 +++ uqm/pkg-plist 2013-03-16 11:47:57.000000000 +0400 @@ -2,9 +2,14 @@ lib/uqm/uqm %%DATADIR%%/content/packages/uqm-0.7.0-content.uqm %%DATADIR%%/content/version -%%VOICEADDON%%%%DATADIR%%/content/packages/uqm-0.7.0-voice.uqm -%%MUSICADDON%%%%DATADIR%%/content/packages/uqm-0.7.0-3domusic.uqm +%%VOICEADDON%%%%DATADIR%%/content/addons/uqm-0.7.0-voice.uqm +%%MUSICADDON%%%%DATADIR%%/content/addons/uqm-0.7.0-3domusic.uqm +%%REMIXPACK1ADDON%%%%DATADIR%%/content/addons/uqm-remix-disc1.uqm +%%REMIXPACK2ADDON%%%%DATADIR%%/content/addons/uqm-remix-disc2.uqm +%%REMIXPACK3ADDON%%%%DATADIR%%/content/addons/uqm-remix-disc3.uqm +%%REMIXPACK4ADDON%%%%DATADIR%%/content/addons/uqm-remix-disc4.uqm @dirrm %%DATADIR%%/content/packages +@dirrm %%DATADIR%%/content/addons @dirrm %%DATADIR%%/content @dirrm %%DATADIR%% @dirrm lib/uqm --------------080103060705000601070901--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303160840.r2G8e1QT069752>