On Tue, January 13, 2015 06:11, Anthony J. Bentley wrote:
> Hi,
>
> This patch adds the newest remix package and reorganizes the Makefile
> to be easier to understand (-65+45).
>
> ok?
Hi.
Great job! Packages well for me. OK kirby@
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/uqm/Makefile,v
> retrieving revision 1.39
> diff -u -p -u -p -r1.39 Makefile
> --- Makefile 11 Mar 2013 11:07:41 -0000 1.39
> +++ Makefile 13 Jan 2015 02:45:20 -0000
> @@ -5,39 +5,43 @@ COMMENT-content= ur-quan masters: game c
> COMMENT-remix1= ur-quan masters: remix pack number one
> COMMENT-remix2= ur-quan masters: remix pack number two
> COMMENT-remix3= ur-quan masters: remix pack number three
> +COMMENT-remix4= ur-quan masters: remix pack number three
> COMMENT-threedomusic= ur-quan masters: 3DO music content
> COMMENT-voice= ur-quan masters: speech content
>
> -VER = 0.7.0
> +V = 0.7.0
> EPOCH= 0# N.B. in RUN_DEPENDS
> -DISTNAME = uqm-${VER}
> +DISTNAME = uqm-$V
> CATEGORIES= games x11
> -PDIST= ${DISTNAME}-source.tgz
> -CDIST = ${DISTNAME}-content.uqm
> -MDIST = ${DISTNAME}-3domusic.uqm
> -VDIST = ${DISTNAME}-voice.uqm
> -RM1DIST = uqm-remix-disc1.uqm
> -RM2DIST = uqm-remix-disc2.uqm
> -RM3DIST = uqm-remix-disc3.uqm
> -DISTFILES= ${PDIST} ${CDIST}
> -SUPDISTFILES= ${MDIST} ${VDIST} ${RM1DIST} ${RM2DIST}
> ${RM3DIST}
> +uqm_source = uqm-$V-source.tgz
> +uqm_packages = uqm-$V-content.uqm
> +uqm_addons = uqm-$V-3domusic.uqm \
> + uqm-$V-voice.uqm \
> + uqm-remix-disc1.uqm \
> + uqm-remix-disc2.uqm \
> + uqm-remix-disc3.uqm \
> + uqm-remix-disc4.uqm
> +DISTFILES = ${uqm_source} \
> + ${uqm_packages} \
> + ${uqm_addons}
> DIST_SUBDIR= uqm
> CATEGORIES= games x11
> -PKGNAME-main= uqm-${VER}
> -PKGNAME-content= uqm-content-${VER}
> -PKGNAME-remix1= uqm-remix1-${VER}
> -PKGNAME-remix2= uqm-remix2-${VER}
> -PKGNAME-remix3= uqm-remix3-${VER}
> -PKGNAME-threedomusic= uqm-threedomusic-${VER}
> -PKGNAME-voice= uqm-voice-${VER}
> -REVISION-main= 1
> -REVISION-content= 1
> -REVISION-remix1= 1
> -REVISION-remix2= 1
> -REVISION-remix3= 1
> -REVISION-threedomusic= 1
> -REVISION-voice= 1
> -EXTRACT_ONLY= ${PDIST}
> +PKGNAME-main = uqm-$V
> +PKGNAME-content = uqm-content-$V
> +PKGNAME-remix1 = uqm-remix1-$V
> +PKGNAME-remix2 = uqm-remix2-$V
> +PKGNAME-remix3 = uqm-remix3-$V
> +PKGNAME-remix4 = uqm-remix4-$V
> +PKGNAME-threedomusic = uqm-threedomusic-$V
> +PKGNAME-voice = uqm-voice-$V
> +REVISION-main = 2
> +REVISION-content = 2
> +REVISION-remix1 = 2
> +REVISION-remix2 = 2
> +REVISION-remix3 = 2
> +REVISION-threedomusic = 2
> +REVISION-voice = 2
> +EXTRACT_ONLY = ${uqm_source}
> MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sc2/}
>
> HOMEPAGE= http://sc2.sourceforge.net/
> @@ -67,29 +71,17 @@ WANTLIB-main= c m pthread z SDL mikmod>
> NO_TEST= Yes
> USE_GMAKE= Yes
>
> -PSEUDO_FLAVORS= no_remix1 no_remix2 no_remix3 no_threedomusic no_voice
> -FLAVOR?=
> -
> -MULTI_PACKAGES= -main -content -remix1 -remix2 -remix3 -threedomusic -voice
> +MULTI_PACKAGES = -main \
> + -content \
> + -remix1 \
> + -remix2 \
> + -remix3 \
> + -remix4 \
> + -threedomusic \
> + -voice
>
> .include <bsd.port.arch.mk>
>
> -.if ${BUILD_PACKAGES:M-remix1}
> -DISTFILES+= ${RM1DIST}
> -.endif
> -.if ${BUILD_PACKAGES:M-remix2}
> -DISTFILES+= ${RM2DIST}
> -.endif
> -.if ${BUILD_PACKAGES:M-remix3}
> -DISTFILES+= ${RM3DIST}
> -.endif
> -.if ${BUILD_PACKAGES:M-threedomusic}
> -DISTFILES+= ${MDIST}
> -.endif
> -.if ${BUILD_PACKAGES:M-voice}
> -DISTFILES+= ${VDIST}
> -.endif
> -
> do-configure:
> .if ${PROPERTIES:Mle}
> @sed -e "s|@PREFIX@|${PREFIX}|g ; s|@ENDIAN@|undef|g" \
> @@ -114,28 +106,14 @@ do-install:
> ${PREFIX}/share/doc/uqm
> ${INSTALL_DATA} ${WRKBUILD}/content/version \
> ${PREFIX}/share/uqm/content
> - ${INSTALL_DATA} ${FULLDISTDIR}/${CDIST} \
> + ${INSTALL_PROGRAM} ${WRKBUILD}/uqm ${PREFIX}/bin
> +.for package in ${uqm_packages}
> + ${INSTALL_DATA} ${FULLDISTDIR}/${package} \
> ${PREFIX}/share/uqm/content/packages
> -.if ${BUILD_PACKAGES:M-remix1}
> - ${INSTALL_DATA} ${FULLDISTDIR}/${RM1DIST} \
> - ${PREFIX}/share/uqm/content/addons
> -.endif
> -.if ${BUILD_PACKAGES:M-remix2}
> - ${INSTALL_DATA} ${FULLDISTDIR}/${RM2DIST} \
> - ${PREFIX}/share/uqm/content/addons
> -.endif
> -.if ${BUILD_PACKAGES:M-remix3}
> - ${INSTALL_DATA} ${FULLDISTDIR}/${RM3DIST} \
> - ${PREFIX}/share/uqm/content/addons
> -.endif
> -.if ${BUILD_PACKAGES:M-threedomusic}
> - ${INSTALL_DATA} ${FULLDISTDIR}/${MDIST} \
> +.endfor
> +.for addon in ${uqm_addons}
> + ${INSTALL_DATA} ${FULLDISTDIR}/${addon} \
> ${PREFIX}/share/uqm/content/addons
> -.endif
> -.if ${BUILD_PACKAGES:M-voice}
> - ${INSTALL_DATA} ${FULLDISTDIR}/${VDIST} \
> - ${PREFIX}/share/uqm/content/addons
> -.endif
> - ${INSTALL_PROGRAM} ${WRKBUILD}/uqm ${PREFIX}/bin
> +.endfor
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/uqm/distinfo,v
> retrieving revision 1.14
> diff -u -p -u -p -r1.14 distinfo
> --- distinfo 18 May 2012 05:22:47 -0000 1.14
> +++ distinfo 13 Jan 2015 02:45:20 -0000
> @@ -1,24 +1,3 @@
> -MD5 (uqm/uqm-0.7.0-3domusic.uqm) = hqXjdtm3aIit0dEIGPCrnw==
> -MD5 (uqm/uqm-0.7.0-content.uqm) = LzbcsVJ027y14mby7YTVsg==
> -MD5 (uqm/uqm-0.7.0-source.tgz) = +QGOoEk9faxqnhAGsAr33w==
> -MD5 (uqm/uqm-0.7.0-voice.uqm) = t44GBjJYEPny6ex4YZHAGw==
> -MD5 (uqm/uqm-remix-disc1.uqm) = CfJC2NchZtHVzL09mck+fQ==
> -MD5 (uqm/uqm-remix-disc2.uqm) = +8i9y3CZOdVZ2MchatFcwg==
> -MD5 (uqm/uqm-remix-disc3.uqm) = XMxtSsMBrpjhcqxoNdzerQ==
> -RMD160 (uqm/uqm-0.7.0-3domusic.uqm) = 9koZaUjERlUwlqETfrb82ECQ0FQ=
> -RMD160 (uqm/uqm-0.7.0-content.uqm) = ktDmveRx/TxrkUchHwkmPBqUgvc=
> -RMD160 (uqm/uqm-0.7.0-source.tgz) = t2CtJWB15OIl5E5ac4oBOppeZIM=
> -RMD160 (uqm/uqm-0.7.0-voice.uqm) = ruJaFUQPgQMBY4074ErMYw0DP8Y=
> -RMD160 (uqm/uqm-remix-disc1.uqm) = CrxrnL7SNXrdK2OakyjMfg0mok8=
> -RMD160 (uqm/uqm-remix-disc2.uqm) = s7vwhkeg0QEuJb/oy7c6NAVFx6A=
> -RMD160 (uqm/uqm-remix-disc3.uqm) = NDIAEJSzI9Zsg/1n5tkh/4S1V+Y=
> -SHA1 (uqm/uqm-0.7.0-3domusic.uqm) = kDMPM1hx3ScosiMvWyh3NLt54S4=
> -SHA1 (uqm/uqm-0.7.0-content.uqm) = LeoHOQcIeQd5riWIbpMxtesL32g=
> -SHA1 (uqm/uqm-0.7.0-source.tgz) = VeUldpBlDmPxMQJKuP393c9WJ7w=
> -SHA1 (uqm/uqm-0.7.0-voice.uqm) = cAFF0CPRDJqqe7+MUarKdSVEU8U=
> -SHA1 (uqm/uqm-remix-disc1.uqm) = 8R9hJo8PC5+QOMiivHo9JHIcMWg=
> -SHA1 (uqm/uqm-remix-disc2.uqm) = Skn+L1CY+L+7Sx4uXsCz1A3dIfw=
> -SHA1 (uqm/uqm-remix-disc3.uqm) = OvoyQq4xb28DSkrfp3qz2TMF2Hs=
> SHA256 (uqm/uqm-0.7.0-3domusic.uqm) =
> xXCF5k2tS934pnmpqirfY/IVbV9sur5jr4BRkDPby4I=
> SHA256 (uqm/uqm-0.7.0-content.uqm) =
> uPbbi6KfBij7HVwjODCJaxn0Qa7jdEvaZx6iZLRNo78=
> SHA256 (uqm/uqm-0.7.0-source.tgz) =
> o2lcX38L5+ycD4DsVpkHs4ICOh/ubmNVMr1Tt7U7siE=
> @@ -26,6 +5,7 @@ SHA256 (uqm/uqm-0.7.0-voice.uqm) = vMz4A
> SHA256 (uqm/uqm-remix-disc1.uqm) =
> tpdpR0XZOTEejr/91e32kuAQwl15ZuFIEHSUCk0Eh+g=
> SHA256 (uqm/uqm-remix-disc2.uqm) =
> f7tHRBAuMSc+RFmwGhVtoFLsU3wSj+kXk2Q+NIvBut4=
> SHA256 (uqm/uqm-remix-disc3.uqm) =
> 5tifj2bPHfHLJ4/KHpImGxd27mcN/yYTLjPxTb0x6R0=
> +SHA256 (uqm/uqm-remix-disc4.uqm) =
> pMgZdxKltyqBx+96KjPqfTrJCrBjySndaOcyilWahtA=
> SIZE (uqm/uqm-0.7.0-3domusic.uqm) = 18980671
> SIZE (uqm/uqm-0.7.0-content.uqm) = 11538533
> SIZE (uqm/uqm-0.7.0-source.tgz) = 1562003
> @@ -33,3 +13,4 @@ SIZE (uqm/uqm-0.7.0-voice.uqm) = 1151434
> SIZE (uqm/uqm-remix-disc1.uqm) = 50188876
> SIZE (uqm/uqm-remix-disc2.uqm) = 60282662
> SIZE (uqm/uqm-remix-disc3.uqm) = 39924875
> +SIZE (uqm/uqm-remix-disc4.uqm) = 86545760
> Index: pkg/DESCR-remix4
> ===================================================================
> RCS file: pkg/DESCR-remix4
> diff -N pkg/DESCR-remix4
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ pkg/DESCR-remix4 13 Jan 2015 02:45:20 -0000
> @@ -0,0 +1,3 @@
> +Optional remix package #4 for The Ur-Quan Masters.
> +
> +Go to "Sound Options" in the Setup menu to enable the remixed music.
> Index: pkg/PLIST-content
> ===================================================================
> RCS file: /cvs/ports/games/uqm/pkg/PLIST-content,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 PLIST-content
> --- pkg/PLIST-content 18 May 2012 05:22:48 -0000 1.5
> +++ pkg/PLIST-content 13 Jan 2015 02:45:20 -0000
> @@ -1,7 +1,7 @@
> @comment $OpenBSD: PLIST-content,v 1.5 2012/05/18 05:22:48 bentley Exp $
> share/uqm/
> share/uqm/content/
> -share/uqm/content/packages/
> share/uqm/content/addons/
> +share/uqm/content/packages/
> share/uqm/content/packages/uqm-0.7.0-content.uqm
> share/uqm/content/version
> Index: pkg/PLIST-remix1
> ===================================================================
> RCS file: /cvs/ports/games/uqm/pkg/PLIST-remix1,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 PLIST-remix1
> --- pkg/PLIST-remix1 18 May 2012 05:22:49 -0000 1.3
> +++ pkg/PLIST-remix1 13 Jan 2015 02:45:20 -0000
> @@ -1,3 +1,2 @@
> @comment $OpenBSD: PLIST-remix1,v 1.3 2012/05/18 05:22:49 bentley Exp $
> -share/uqm/content/addons/
> share/uqm/content/addons/uqm-remix-disc1.uqm
> Index: pkg/PLIST-remix2
> ===================================================================
> RCS file: /cvs/ports/games/uqm/pkg/PLIST-remix2,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 PLIST-remix2
> --- pkg/PLIST-remix2 18 May 2012 05:22:49 -0000 1.3
> +++ pkg/PLIST-remix2 13 Jan 2015 02:45:20 -0000
> @@ -1,3 +1,2 @@
> @comment $OpenBSD: PLIST-remix2,v 1.3 2012/05/18 05:22:49 bentley Exp $
> -share/uqm/content/addons/
> share/uqm/content/addons/uqm-remix-disc2.uqm
> Index: pkg/PLIST-remix3
> ===================================================================
> RCS file: /cvs/ports/games/uqm/pkg/PLIST-remix3,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 PLIST-remix3
> --- pkg/PLIST-remix3 18 May 2012 05:22:49 -0000 1.3
> +++ pkg/PLIST-remix3 13 Jan 2015 02:45:20 -0000
> @@ -1,3 +1,2 @@
> @comment $OpenBSD: PLIST-remix3,v 1.3 2012/05/18 05:22:49 bentley Exp $
> -share/uqm/content/addons/
> share/uqm/content/addons/uqm-remix-disc3.uqm
> Index: pkg/PLIST-remix4
> ===================================================================
> RCS file: pkg/PLIST-remix4
> diff -N pkg/PLIST-remix4
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ pkg/PLIST-remix4 13 Jan 2015 02:45:20 -0000
> @@ -0,0 +1,2 @@
> +@comment $OpenBSD: PLIST-remix3,v 1.3 2012/05/18 05:22:49 bentley Exp $
> +share/uqm/content/addons/uqm-remix-disc4.uqm
> Index: pkg/PLIST-threedomusic
> ===================================================================
> RCS file: /cvs/ports/games/uqm/pkg/PLIST-threedomusic,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 PLIST-threedomusic
> --- pkg/PLIST-threedomusic 18 May 2012 05:22:49 -0000 1.5
> +++ pkg/PLIST-threedomusic 13 Jan 2015 02:45:20 -0000
> @@ -1,3 +1,2 @@
> @comment $OpenBSD: PLIST-threedomusic,v 1.5 2012/05/18 05:22:49 bentley Exp $
> -share/uqm/content/addons/
> share/uqm/content/addons/uqm-0.7.0-3domusic.uqm
> Index: pkg/PLIST-voice
> ===================================================================
> RCS file: /cvs/ports/games/uqm/pkg/PLIST-voice,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 PLIST-voice
> --- pkg/PLIST-voice 18 May 2012 05:22:49 -0000 1.6
> +++ pkg/PLIST-voice 13 Jan 2015 02:45:20 -0000
> @@ -1,3 +1,2 @@
> @comment $OpenBSD: PLIST-voice,v 1.6 2012/05/18 05:22:49 bentley Exp $
> -share/uqm/content/addons/
> share/uqm/content/addons/uqm-0.7.0-voice.uqm
>
>
