Date: Tue, 8 Jan 2013 17:32:14 GMT From: Sender Ghost <lightside@gmx.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/175141: [PATCH] games/uqm: Update to 0.7.0 Message-ID: <201301081732.r08HWE8v057339@red.freebsd.org> Resent-Message-ID: <201301081740.r08He0UJ023291@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 175141 >Category: ports >Synopsis: [PATCH] games/uqm: Update to 0.7.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Jan 08 17:40:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Sender Ghost >Release: FreeBSD 9.1-RELEASE >Organization: >Environment: >Description: Patch to update games/uqm port to 0.7.0 version. Look following link for changes: http://sourceforge.net/projects/sc2/files/UQM/0.7/ Also the patch adds license information and converts Makefile to OptionsNG. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN uqm.orig/Makefile uqm/Makefile --- uqm.orig/Makefile 2012-11-17 09:57:55.000000000 +0400 +++ uqm/Makefile 2013-01-08 21:19:23.000000000 +0400 @@ -13,97 +13,100 @@ # PORTNAME= uqm -PORTVERSION= 0.6.2 -PORTREVISION= 13 +PORTVERSION= 0.7.0 +PORTREVISION= 0 CATEGORIES= games -MASTER_SITES= SF/sc2/UQM/${PORTVERSION} +MASTER_SITES= SF/sc2/UQM/0.7 DISTFILES= ${PORTNAME}-${PORTVERSION}-source.tgz ${PORTNAME}-${DATAVERSION}-content.uqm EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}-source.tgz MAINTAINER= benlutz@datacomm.ch COMMENT= A port of the original Star Control 2 for 3DO consoles -LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \ - mikmod.2:${PORTSDIR}/audio/libmikmod +LICENSE= GPLv2 + +LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \ + mikmod:${PORTSDIR}/audio/libmikmod USE_GMAKE= yes USE_SDL= image sdl NO_INSTALL_MANPAGES= yes -DATAVERSION= 0.6.0 +DATAVERSION= 0.7.0 -OPTIONS= VOICE "Voice add-on (110MB)" Off \ - MUSIC "Music add-on (18MB)" Off \ - OPENAL "OpenAL support (experimental)" Off +OPTIONS_DEFINE= VOICE MUSIC OPENAL DOCS +MUSIC_DESC= Music add-on (18MB) +VOICE_DESC= Voice add-on (110MB) -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> -.ifdef(WITH_VOICE) +.if ${PORT_OPTIONS:MVOICE} DISTFILES+= ${PORTNAME}-${DATAVERSION}-voice.uqm PLIST_SUB+= VOICEADDON="" .else PLIST_SUB+= VOICEADDON="@comment " .endif -.ifdef(WITH_MUSIC) +.if ${PORT_OPTIONS:MMUSIC} DISTFILES+= ${PORTNAME}-${DATAVERSION}-3domusic.uqm PLIST_SUB+= MUSICADDON="" .else PLIST_SUB+= MUSICADDON="@comment " .endif -.ifdef(WITH_OPENAL) +.if ${PORT_OPTIONS:MOPENAL} USE_OPENAL= al .endif post-extract: - ${MKDIR} ${WRKSRC}/sc2/content/packages - ${CP} ${DISTDIR}/${PORTNAME}-${DATAVERSION}-content.uqm ${WRKSRC}/sc2/content/packages/ + ${MKDIR} ${WRKSRC}/content/packages + ${CP} ${DISTDIR}/${PORTNAME}-${DATAVERSION}-content.uqm ${WRKSRC}/content/packages/ .ifdef(WITH_VOICE) - ${CP} ${DISTDIR}/${PORTNAME}-${DATAVERSION}-voice.uqm ${WRKSRC}/sc2/content/packages/ + ${CP} ${DISTDIR}/${PORTNAME}-${DATAVERSION}-voice.uqm ${WRKSRC}/content/packages/ .endif .ifdef(WITH_MUSIC) - ${CP} ${DISTDIR}/${PORTNAME}-${DATAVERSION}-3domusic.uqm ${WRKSRC}/sc2/content/packages/ + ${CP} ${DISTDIR}/${PORTNAME}-${DATAVERSION}-3domusic.uqm ${WRKSRC}/content/packages/ .endif do-configure: - @${ECHO_MSG} CHOICE_debug_VALUE=\'nodebug\' > ${WRKSRC}/sc2/config.state - @${ECHO_MSG} CHOICE_graphics_VALUE=\'opengl\' >> ${WRKSRC}/sc2/config.state -.ifdef(WITH_OPENAL) - @${ECHO_MSG} CHOICE_sound_VALUE=\'openal\' >> ${WRKSRC}/sc2/config.state + @${ECHO_MSG} CHOICE_debug_VALUE=\'nodebug\' > ${WRKSRC}/config.state + @${ECHO_MSG} CHOICE_graphics_VALUE=\'opengl\' >> ${WRKSRC}/config.state +.if ${PORT_OPTIONS:MOPENAL} + @${ECHO_MSG} CHOICE_sound_VALUE=\'openal\' >> ${WRKSRC}/config.state .else - @${ECHO_MSG} CHOICE_sound_VALUE=\'mixsdl\' >> ${WRKSRC}/sc2/config.state + @${ECHO_MSG} CHOICE_sound_VALUE=\'mixsdl\' >> ${WRKSRC}/config.state .endif - @${ECHO_MSG} CHOICE_mikmod_VALUE=\'external\' >> ${WRKSRC}/sc2/config.state - @${ECHO_MSG} CHOICE_ovcodec_VALUE=\'standard\' >> ${WRKSRC}/sc2/config.state + @${ECHO_MSG} CHOICE_mikmod_VALUE=\'external\' >> ${WRKSRC}/config.state + @${ECHO_MSG} CHOICE_ovcodec_VALUE=\'standard\' >> ${WRKSRC}/config.state .ifdef(NO_INET6) - @${ECHO_MSG} CHOICE_netplay_VALUE=\'full\' >> ${WRKSRC}/sc2/config.state + @${ECHO_MSG} CHOICE_netplay_VALUE=\'full\' >> ${WRKSRC}/config.state .else - @${ECHO_MSG} CHOICE_netplay_VALUE=\'ipv4\' >> ${WRKSRC}/sc2/config.state + @${ECHO_MSG} CHOICE_netplay_VALUE=\'ipv4\' >> ${WRKSRC}/config.state .endif - @${ECHO_MSG} CHOICE_joystick_VALUE=\'enabled\' >> ${WRKSRC}/sc2/config.state - @${ECHO_MSG} CHOICE_ioformat_VALUE=\'stdio_zip\' >> ${WRKSRC}/sc2/config.state + @${ECHO_MSG} CHOICE_joystick_VALUE=\'enabled\' >> ${WRKSRC}/config.state + @${ECHO_MSG} CHOICE_ioformat_VALUE=\'stdio_zip\' >> ${WRKSRC}/config.state .if ${ARCH} == "i386" - @${ECHO_MSG} CHOICE_accel_VALUE=\'asm\' >> ${WRKSRC}/sc2/config.state + @${ECHO_MSG} CHOICE_accel_VALUE=\'asm\' >> ${WRKSRC}/config.state .else - @${ECHO_MSG} CHOICE_accel_VALUE=\'plainc\' >> ${WRKSRC}/sc2/config.state + @${ECHO_MSG} CHOICE_accel_VALUE=\'plainc\' >> ${WRKSRC}/config.state .endif - @${ECHO_MSG} INPUT_install_prefix_VALUE=\'${PREFIX}\' >> ${WRKSRC}/sc2/config.state - @${ECHO_MSG} INPUT_install_bindir_VALUE=\''$$prefix/bin'\' >> ${WRKSRC}/sc2/config.state - @${ECHO_MSG} INPUT_install_libdir_VALUE=\''$$prefix/lib'\' >> ${WRKSRC}/sc2/config.state - @${ECHO_MSG} INPUT_install_sharedir_VALUE=\''$$prefix/share'\' >> ${WRKSRC}/sc2/config.state - cd ${WRKSRC}/sc2 && ${SETENV} LOCALBASE=${LOCALBASE} PREFIX=${PREFIX} ./build.sh uqm config + @${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 + cd ${WRKSRC} && ${SETENV} LOCALBASE=${LOCALBASE} PREFIX=${PREFIX} ./build.sh uqm config do-build: - cd ${WRKSRC}/sc2 && ./build.sh uqm + cd ${WRKSRC} && ./build.sh uqm do-install: - cd ${WRKSRC}/sc2 && ./build.sh uqm install + cd ${WRKSRC} && ./build.sh uqm install post-install: ${STRIP_CMD} ${PREFIX}/lib/uqm/uqm -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/sc2/doc/users/manual.txt ${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/doc/users/manual.txt ${DOCSDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -ruN uqm.orig/distinfo uqm/distinfo --- uqm.orig/distinfo 2011-07-03 18:25:12.000000000 +0400 +++ uqm/distinfo 2013-01-08 19:35:35.000000000 +0400 @@ -1,8 +1,8 @@ -SHA256 (uqm-0.6.2-source.tgz) = d8d5e15b8eae2b4859eeee82edfca811fadef204c8c6e2112b8fe6aa4a396ea1 -SIZE (uqm-0.6.2-source.tgz) = 1497342 -SHA256 (uqm-0.6.0-content.uqm) = 727679a66351d435c1a3c53ca3d2e87079f1f05c09fa0748035ed68fff1cd63d -SIZE (uqm-0.6.0-content.uqm) = 11580000 -SHA256 (uqm-0.6.0-voice.uqm) = ee84c90873a996771ddfa2154640620e374366fffb51e18dfdfb4236050bc27a -SIZE (uqm-0.6.0-voice.uqm) = 114823409 -SHA256 (uqm-0.6.0-3domusic.uqm) = c3e72569720d1e17ab2d08301d9dc90f2c4ab272811c488e18f878f38b84cac8 -SIZE (uqm-0.6.0-3domusic.uqm) = 18980071 +SHA256 (uqm-0.7.0-source.tgz) = a3695c5f7f0be7ec9c0f80ec569907b382023a1fee6e635532bd53b7b53bb221 +SIZE (uqm-0.7.0-source.tgz) = 1562003 +SHA256 (uqm-0.7.0-content.uqm) = b8f6db8ba29f0628fb1d5c233830896b19f441aee3744bda671ea264b44da3bf +SIZE (uqm-0.7.0-content.uqm) = 11538533 +SHA256 (uqm-0.7.0-voice.uqm) = bcccf801b4ba37594ff6217b292744ea586ee2d447e927804842ccae8b73c979 +SIZE (uqm-0.7.0-voice.uqm) = 115143439 +SHA256 (uqm-0.7.0-3domusic.uqm) = c57085e64dad4bddf8a679a9aa2adf63f2156d5f6cbabe63af80519033dbcb82 +SIZE (uqm-0.7.0-3domusic.uqm) = 18980671 diff -ruN uqm.orig/files/patch-build-unix-build_functions uqm/files/patch-build-unix-build_functions --- uqm.orig/files/patch-build-unix-build_functions 2006-12-30 22:43:30.000000000 +0300 +++ uqm/files/patch-build-unix-build_functions 2013-01-08 19:55:48.000000000 +0400 @@ -1,11 +1,11 @@ ---- sc2/build/unix/build_functions.orig Tue Dec 26 21:05:30 2006 -+++ sc2/build/unix/build_functions Tue Dec 26 21:05:38 2006 +--- build/unix/build_functions.orig 2011-05-20 23:25:22.000000000 +0400 ++++ build/unix/build_functions 2013-01-08 19:54:57.000000000 +0400 @@ -56,7 +56,7 @@ eval "${TARGET}_requirements" eval "${TARGET}_prepare_config" eval "${TARGET}_load_config" - eval "${TARGET}_do_config" -+ #eval "${TARGET}_do_config" ++# eval "${TARGET}_do_config" eval "${TARGET}_save_config" } diff -ruN uqm.orig/files/patch-build-unix-config_proginfo_host uqm/files/patch-build-unix-config_proginfo_host --- uqm.orig/files/patch-build-unix-config_proginfo_host 2008-04-19 21:49:33.000000000 +0400 +++ uqm/files/patch-build-unix-config_proginfo_host 2013-01-08 19:52:35.000000000 +0400 @@ -1,28 +1,15 @@ ---- sc2/build/unix/config_proginfo_host.orig Tue Dec 26 21:07:45 2006 -+++ sc2/build/unix/config_proginfo_host Tue Dec 26 21:09:26 2006 -@@ -55,9 +55,9 @@ - LIB_SDL_NAME="Simple DirectMedia Layer" - case "$HOST_SYSTEM" in - FreeBSD) -- LIB_SDL_CFLAGS='$(sdl11-config --cflags)' -- LIB_SDL_LDFLAGS='$(sdl11-config --libs)' -- LIB_SDL_VERSION='$(sdl11-config --version)' -+ LIB_SDL_CFLAGS='$(sdl-config --cflags)' -+ LIB_SDL_LDFLAGS='$(sdl-config --libs)' -+ LIB_SDL_VERSION='$(sdl-config --version)' - ;; - Darwin) - LIB_SDL_CFLAGS='' -@@ -102,7 +102,7 @@ +--- build/unix/config_proginfo_host.orig 2011-05-20 23:25:22.000000000 +0400 ++++ build/unix/config_proginfo_host 2013-01-08 19:49:40.000000000 +0400 +@@ -115,7 +115,7 @@ LIB_openal_CFLAGS="" case "$HOST_SYSTEM" in FreeBSD|OpenBSD) - LIB_openal_LDFLAGS="-L/usr/local/lib -pthread -lopenal" + LIB_openal_LDFLAGS="-L${LOCALBASE}/lib -pthread -lopenal" ;; - MINGW32*|CYGWIN*) + MINGW32*|CYGWIN*|cegcc) LIB_openal_LDFLAGS="-lopenal32" -@@ -124,8 +124,8 @@ +@@ -144,8 +144,8 @@ LIB_opengl_NAME="OpenGL" case "$HOST_SYSTEM" in FreeBSD|OpenBSD) @@ -31,9 +18,9 @@ + LIB_opengl_CFLAGS="-I${LOCALBASE}/include -D_THREAD_SAFE" + LIB_opengl_LDFLAGS="-L${LOCALBASE}/lib -lX11 -lXext -pthread -lGL" ;; - MINGW32*|CYGWIN*) + MINGW32*|CYGWIN*|cegcc) LIB_opengl_CFLAGS="" -@@ -154,8 +154,8 @@ +@@ -182,8 +182,8 @@ LIB_vorbisfile_NAME="vorbisfile" case "$HOST_SYSTEM" in FreeBSD|OpenBSD) @@ -42,9 +29,9 @@ + LIB_vorbisfile_CFLAGS="-I${LOCALBASE}/include" + LIB_vorbisfile_LDFLAGS="-L${LOCALBASE}/lib -lvorbisfile -lvorbis" ;; - MINGW32*|CYGWIN*) + MINGW32*|CYGWIN*|cegcc) LIB_vorbisfile_CFLAGS="" -@@ -183,8 +183,8 @@ +@@ -221,8 +221,8 @@ LIB_tremor_NAME="tremor" case "$HOST_SYSTEM" in FreeBSD|OpenBSD) diff -ruN uqm.orig/pkg-plist uqm/pkg-plist --- uqm.orig/pkg-plist 2006-12-30 22:43:29.000000000 +0300 +++ uqm/pkg-plist 2013-01-08 20:04:15.000000000 +0400 @@ -1,9 +1,9 @@ bin/uqm lib/uqm/uqm -%%DATADIR%%/content/packages/uqm-0.6.0-content.uqm +%%DATADIR%%/content/packages/uqm-0.7.0-content.uqm %%DATADIR%%/content/version -%%VOICEADDON%%%%DATADIR%%/content/packages/uqm-0.6.0-voice.uqm -%%MUSICADDON%%%%DATADIR%%/content/packages/uqm-0.6.0-3domusic.uqm +%%VOICEADDON%%%%DATADIR%%/content/packages/uqm-0.7.0-voice.uqm +%%MUSICADDON%%%%DATADIR%%/content/packages/uqm-0.7.0-3domusic.uqm @dirrm %%DATADIR%%/content/packages @dirrm %%DATADIR%%/content @dirrm %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301081732.r08HWE8v057339>