Date: Tue, 7 Feb 2006 04:52:11 +0100 (CET) From: Benjamin Lutz <benlutz@datacomm.ch> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/92941: Update Ur-Quan Masters (games/uqm) to 0.5.0 Message-ID: <20060207035212.00C292E03D@maxlor.mine.nu> Resent-Message-ID: <200602070400.k1740LSt052253@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92941 >Category: ports >Synopsis: Update Ur-Quan Masters (games/uqm) to 0.5.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Feb 07 04:00:20 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Benjamin Lutz >Release: FreeBSD 5.4-RELEASE-p10 i386 >Organization: >Environment: System: FreeBSD merlin 5.4-RELEASE-p10 FreeBSD 5.4-RELEASE-p10 #3: Wed Jan 25 18:23:49 CET 2006 maxlor@merlin:/usr/obj/usr/src/sys/MERLIN i386 >Description: Update Ur-Quan Masters to version 0.5.0. The changelog is here: http://sc2.sourceforge.net/WhatsNew >How-To-Repeat: >Fix: --- uqm.patch begins here --- diff -ruN games/uqm.old/Makefile games/uqm/Makefile --- games/uqm.old/Makefile Tue Feb 7 03:20:32 2006 +++ games/uqm/Makefile Tue Feb 7 04:42:15 2006 @@ -13,7 +13,7 @@ # PORTNAME= uqm -PORTVERSION= 0.4.0 +PORTVERSION= 0.5.0 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= sc2 @@ -28,7 +28,6 @@ USE_XLIB= yes USE_GMAKE= yes USE_SDL= image sdl -USE_REINPLACE= yes NO_INSTALL_MANPAGES= yes ONLY_FOR_ARCHS= i386 @@ -58,29 +57,12 @@ .endif .if ${OSVERSION} < 500000 -BROKEN= "does not compile" -.endif - -pre-everything:: -.ifdef(!WITH_VOICE || !WITH_MUSIC) - @${ECHO_MSG} "" - @${ECHO_MSG} "You may specify the following options:" -.endif -.ifdef(!WITH_VOICE) - @${ECHO_MSG} "" - @${ECHO_MSG} "-DWITH_VOICE" - @${ECHO_MSG} " Installs the voice add-on (110MB)." -.endif -.ifdef(!WITH_MUSIC) - @${ECHO_MSG} "" - @${ECHO_MSG} "-DWITH_MUSIC" - @${ECHO_MSG} " Installs the music add-on (18MB) containing the original" - @${ECHO_MSG} " 3do music files. Note that there is music without this" - @${ECHO_MSG} " add-on, but it's of lower quality." +BROKEN= does not compile .endif post-extract: ${MKDIR} ${WRKSRC}/content/packages + ${RM} -rf ${WRKSRC}/content/CVS # seems to have erroneously slipped into release tarball ${CP} ${DISTDIR}/${PORTNAME}-${PORTVERSION}-content.uqm ${WRKSRC}/content/packages/ .ifdef(WITH_VOICE) ${CP} ${DISTDIR}/${PORTNAME}-${PORTVERSION}-voice.uqm ${WRKSRC}/content/packages/ @@ -97,7 +79,9 @@ .else @${ECHO_MSG} CHOICE_sound_VALUE=\'mixsdl\' >> ${WRKSRC}/config.state .endif + @${ECHO_MSG} CHOICE_ovcodec_VALUE=\'standard\' >> ${WRKSRC}/config.state @${ECHO_MSG} CHOICE_ioformat_VALUE=\'stdio_zip\' >> ${WRKSRC}/config.state + @${ECHO_MSG} CHOICE_accel_VALUE=\'asm\' >> ${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 diff -ruN games/uqm.old/distinfo games/uqm/distinfo --- games/uqm.old/distinfo Tue Feb 7 03:20:32 2006 +++ games/uqm/distinfo Tue Feb 7 03:29:26 2006 @@ -1,12 +1,12 @@ -MD5 (uqm-0.4.0-source.tar.gz) = 5f92d7307b3b2e32f4384e29131ecbc5 -SHA256 (uqm-0.4.0-source.tar.gz) = 9c5d4c96237caec6d7f8418cbcb5e80f9a63536ab9278204a1fca4c01e136e15 -SIZE (uqm-0.4.0-source.tar.gz) = 1198714 -MD5 (uqm-0.4.0-content.uqm) = f8daed517466d68805393e02a12fd642 -SHA256 (uqm-0.4.0-content.uqm) = 5c71608caa09692224aba83e1d1dbb1cacd38fd53f3d95867e88847ffc164283 -SIZE (uqm-0.4.0-content.uqm) = 11695898 -MD5 (uqm-0.4.0-voice.uqm) = 52a084cfaa0bc7fcc63a295feb8cbd28 -SHA256 (uqm-0.4.0-voice.uqm) = 8ddbfe831cc20eac78c8153d1c706516fe97126612f9384f02d31be90480ae0c -SIZE (uqm-0.4.0-voice.uqm) = 114823413 -MD5 (uqm-0.4.0-3domusic.uqm) = 9073251b0d96393441f0b40016010576 -SHA256 (uqm-0.4.0-3domusic.uqm) = 2b1b3aa81b699d914d16cd77e32a99c3ea5a97fdf8a958e3afd6e6786c333de9 -SIZE (uqm-0.4.0-3domusic.uqm) = 18980505 +MD5 (uqm-0.5.0-source.tar.gz) = 9002b1bc2de9285588dd97b618a867a7 +SHA256 (uqm-0.5.0-source.tar.gz) = bdb715784bf0c94825cf40f97c60a5ec83fd3e17e9e186a78cd145781c4d9804 +SIZE (uqm-0.5.0-source.tar.gz) = 1267039 +MD5 (uqm-0.5.0-content.uqm) = 1d03864b141a2626a7284bc7cfdefb47 +SHA256 (uqm-0.5.0-content.uqm) = 060a0da6aedc231c11714a7a2174831f0cd6345075c80e682a8ff50f1f6cedc6 +SIZE (uqm-0.5.0-content.uqm) = 11584345 +MD5 (uqm-0.5.0-voice.uqm) = 52a084cfaa0bc7fcc63a295feb8cbd28 +SHA256 (uqm-0.5.0-voice.uqm) = 8ddbfe831cc20eac78c8153d1c706516fe97126612f9384f02d31be90480ae0c +SIZE (uqm-0.5.0-voice.uqm) = 114823413 +MD5 (uqm-0.5.0-3domusic.uqm) = a20cacc8e66f5ff1fdf5e1d3a3b93fd2 +SHA256 (uqm-0.5.0-3domusic.uqm) = c3e72569720d1e17ab2d08301d9dc90f2c4ab272811c488e18f878f38b84cac8 +SIZE (uqm-0.5.0-3domusic.uqm) = 18980071 diff -ruN games/uqm.old/files/patch-build-unix-build_functions games/uqm/files/patch-build-unix-build_functions --- games/uqm.old/files/patch-build-unix-build_functions Tue Feb 7 03:20:32 2006 +++ games/uqm/files/patch-build-unix-build_functions Tue Feb 7 03:49:16 2006 @@ -1,6 +1,6 @@ ---- build/unix/build_functions.orig Mon May 16 01:28:22 2005 -+++ build/unix/build_functions Sun Jul 3 18:00:10 2005 -@@ -145,7 +145,7 @@ +--- build/unix/build_functions.orig Tue Feb 7 03:43:34 2006 ++++ build/unix/build_functions Tue Feb 7 03:44:25 2006 +@@ -55,7 +55,7 @@ eval "${TARGET}_requirements" eval "${TARGET}_prepare_config" eval "${TARGET}_load_config" diff -ruN games/uqm.old/files/patch-build-unix-config_proginfo_host games/uqm/files/patch-build-unix-config_proginfo_host --- games/uqm.old/files/patch-build-unix-config_proginfo_host Tue Feb 7 03:20:32 2006 +++ games/uqm/files/patch-build-unix-config_proginfo_host Tue Feb 7 03:49:42 2006 @@ -1,25 +1,15 @@ ---- build/unix/config_proginfo_host.orig Fri May 13 17:22:09 2005 -+++ build/unix/config_proginfo_host Mon Oct 24 23:26:50 2005 -@@ -80,7 +80,7 @@ +--- build/unix/config_proginfo_host.orig Tue Feb 7 03:45:58 2006 ++++ build/unix/config_proginfo_host Tue Feb 7 03:48:21 2006 +@@ -102,7 +102,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*) + MINGW32*|CYGWIN*) LIB_openal_LDFLAGS="-lopenal32" -@@ -94,16 +94,16 @@ - ;; - esac - LIB_openal_VERSION="" --LIB_openal_DETECT="try_pkgconfig_lib openal openal" --LIB_openal_DEPEND_DETECT_BIN="pkgconfig" -+#LIB_openal_DETECT="try_pkgconfig_lib openal openal" -+#LIB_openal_DEPEND_DETECT_BIN="pkgconfig" - - - ### OpenGL ### +@@ -124,8 +124,8 @@ LIB_opengl_NAME="OpenGL" case "$HOST_SYSTEM" in FreeBSD|OpenBSD) @@ -28,9 +18,9 @@ + LIB_opengl_CFLAGS="-I${X11BASE}/include -D_THREAD_SAFE" + LIB_opengl_LDFLAGS="-L${X11BASE}/lib -lX11 -lXext -pthread -lGL" ;; - MINGW32*) + MINGW32*|CYGWIN*) LIB_opengl_CFLAGS="" -@@ -132,8 +132,8 @@ +@@ -154,8 +154,8 @@ LIB_vorbisfile_NAME="vorbisfile" case "$HOST_SYSTEM" in FreeBSD|OpenBSD) @@ -39,5 +29,16 @@ + LIB_vorbisfile_CFLAGS="-I${LOCALBASE}/include" + LIB_vorbisfile_LDFLAGS="-L${LOCALBASE}/lib -lvorbisfile -lvorbis" ;; - MINGW32*) + MINGW32*|CYGWIN*) LIB_vorbisfile_CFLAGS="" +@@ -183,8 +183,8 @@ + LIB_tremor_NAME="tremor" + case "$HOST_SYSTEM" in + FreeBSD|OpenBSD) +- LIB_tremor_CFLAGS="-I/usr/local/include" +- LIB_tremor_LDFLAGS="-L/usr/local/lib -lvorbisidec" ++ LIB_tremor_CFLAGS="-I${LOCALBASE}/include" ++ LIB_tremor_LDFLAGS="-L${LOCALBASE}/lib -lvorbisidec" + ;; + Darwin) + # Assumed values - please let me know if you can verify this. diff -ruN games/uqm.old/pkg-plist games/uqm/pkg-plist --- games/uqm.old/pkg-plist Tue Feb 7 03:20:32 2006 +++ games/uqm/pkg-plist Tue Feb 7 03:58:25 2006 @@ -1,9 +1,9 @@ bin/uqm lib/uqm/uqm -%%DATADIR%%/content/packages/uqm-0.4.0-content.uqm +%%DATADIR%%/content/packages/uqm-0.5.0-content.uqm %%DATADIR%%/content/version -%%VOICEADDON%%%%DATADIR%%/content/packages/uqm-0.4.0-voice.uqm -%%MUSICADDON%%%%DATADIR%%/content/packages/uqm-0.4.0-3domusic.uqm +%%VOICEADDON%%%%DATADIR%%/content/packages/uqm-0.5.0-voice.uqm +%%MUSICADDON%%%%DATADIR%%/content/packages/uqm-0.5.0-3domusic.uqm @dirrm %%DATADIR%%/content/packages @dirrm %%DATADIR%%/content @dirrm %%DATADIR%% --- uqm.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060207035212.00C292E03D>