Date: Thu, 18 Apr 2013 07:55:27 +0000 (UTC) From: Alex Kozlov <ak@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316024 - head/games/uqm Message-ID: <201304180755.r3I7tRIv059305@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ak Date: Thu Apr 18 07:55:27 2013 New Revision: 316024 URL: http://svnweb.freebsd.org/changeset/ports/316024 Log: - Install the music and voice addons into the right place [1] - Add Remix Packs addons [2] PR: ports/176986 Submitted by: Christoph Mallon <christoph.mallon@gmx.de> [1], Sender Ghost <lightside@gmx.com> [2] Approved by: maintainer timeout (4 weeks) Feature safe: yes Modified: head/games/uqm/Makefile (contents, props changed) head/games/uqm/distinfo (contents, props changed) head/games/uqm/pkg-plist (contents, props changed) Modified: head/games/uqm/Makefile ============================================================================== --- head/games/uqm/Makefile Thu Apr 18 07:02:42 2013 (r316023) +++ head/games/uqm/Makefile Thu Apr 18 07:55:27 2013 (r316024) @@ -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 @@ DATAVERSION= 0.7.0 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,43 +52,58 @@ PLIST_SUB+= MUSICADDON="@comment " 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 - @${ECHO_MSG} CHOICE_graphics_VALUE=\'opengl\' >> ${WRKSRC}/config.state + @${ECHO_CMD} CHOICE_debug_VALUE=\'nodebug\' > ${WRKSRC}/config.state + @${ECHO_CMD} CHOICE_graphics_VALUE=\'opengl\' >> ${WRKSRC}/config.state .if ${PORT_OPTIONS:MOPENAL} - @${ECHO_MSG} CHOICE_sound_VALUE=\'openal\' >> ${WRKSRC}/config.state + @${ECHO_CMD} CHOICE_sound_VALUE=\'openal\' >> ${WRKSRC}/config.state .else - @${ECHO_MSG} CHOICE_sound_VALUE=\'mixsdl\' >> ${WRKSRC}/config.state + @${ECHO_CMD} CHOICE_sound_VALUE=\'mixsdl\' >> ${WRKSRC}/config.state .endif - @${ECHO_MSG} CHOICE_mikmod_VALUE=\'external\' >> ${WRKSRC}/config.state - @${ECHO_MSG} CHOICE_ovcodec_VALUE=\'standard\' >> ${WRKSRC}/config.state + @${ECHO_CMD} CHOICE_mikmod_VALUE=\'external\' >> ${WRKSRC}/config.state + @${ECHO_CMD} CHOICE_ovcodec_VALUE=\'standard\' >> ${WRKSRC}/config.state .ifdef(NO_INET6) - @${ECHO_MSG} CHOICE_netplay_VALUE=\'full\' >> ${WRKSRC}/config.state + @${ECHO_CMD} CHOICE_netplay_VALUE=\'full\' >> ${WRKSRC}/config.state .else - @${ECHO_MSG} CHOICE_netplay_VALUE=\'ipv4\' >> ${WRKSRC}/config.state + @${ECHO_CMD} CHOICE_netplay_VALUE=\'ipv4\' >> ${WRKSRC}/config.state .endif - @${ECHO_MSG} CHOICE_joystick_VALUE=\'enabled\' >> ${WRKSRC}/config.state - @${ECHO_MSG} CHOICE_ioformat_VALUE=\'stdio_zip\' >> ${WRKSRC}/config.state + @${ECHO_CMD} CHOICE_joystick_VALUE=\'enabled\' >> ${WRKSRC}/config.state + @${ECHO_CMD} CHOICE_ioformat_VALUE=\'stdio_zip\' >> ${WRKSRC}/config.state .if ${ARCH} == "i386" - @${ECHO_MSG} CHOICE_accel_VALUE=\'asm\' >> ${WRKSRC}/config.state + @${ECHO_CMD} CHOICE_accel_VALUE=\'asm\' >> ${WRKSRC}/config.state .else - @${ECHO_MSG} CHOICE_accel_VALUE=\'plainc\' >> ${WRKSRC}/config.state + @${ECHO_CMD} CHOICE_accel_VALUE=\'plainc\' >> ${WRKSRC}/config.state .endif - @${ECHO_MSG} CHOICE_threadlib_VALUE=\'sdl\' >> ${WRKSRC}/config.state - @${ECHO_MSG} INPUT_install_prefix_VALUE=\'${PREFIX}\' >> ${WRKSRC}/config.state - @${ECHO_MSG} INPUT_install_bindir_VALUE=\''$$prefix/bin'\' >> ${WRKSRC}/config.state - @${ECHO_MSG} INPUT_install_libdir_VALUE=\''$$prefix/lib'\' >> ${WRKSRC}/config.state - @${ECHO_MSG} INPUT_install_sharedir_VALUE=\''$$prefix/share'\' >> ${WRKSRC}/config.state + @${ECHO_CMD} CHOICE_threadlib_VALUE=\'sdl\' >> ${WRKSRC}/config.state + @${ECHO_CMD} INPUT_install_prefix_VALUE=\'${PREFIX}\' >> ${WRKSRC}/config.state + @${ECHO_CMD} INPUT_install_bindir_VALUE=\''$$prefix/bin'\' >> ${WRKSRC}/config.state + @${ECHO_CMD} INPUT_install_libdir_VALUE=\''$$prefix/lib'\' >> ${WRKSRC}/config.state + @${ECHO_CMD} INPUT_install_sharedir_VALUE=\''$$prefix/share'\' >> ${WRKSRC}/config.state cd ${WRKSRC} && ${SETENV} LOCALBASE=${LOCALBASE} PREFIX=${PREFIX} ./build.sh uqm config do-build: Modified: head/games/uqm/distinfo ============================================================================== --- head/games/uqm/distinfo Thu Apr 18 07:02:42 2013 (r316023) +++ head/games/uqm/distinfo Thu Apr 18 07:55:27 2013 (r316024) @@ -6,3 +6,11 @@ SHA256 (uqm-0.7.0-voice.uqm) = bcccf801b 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 Modified: head/games/uqm/pkg-plist ============================================================================== --- head/games/uqm/pkg-plist Thu Apr 18 07:02:42 2013 (r316023) +++ head/games/uqm/pkg-plist Thu Apr 18 07:55:27 2013 (r316024) @@ -2,9 +2,14 @@ bin/uqm 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304180755.r3I7tRIv059305>