Date: Mon, 4 Jul 2005 15:03:48 +0200 (CEST) From: Benjamin Lutz <benlutz@datacomm.ch> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/83043: [maintainer update] games/uqm 0.3 -> 0.4.0 Message-ID: <20050704130348.CDAE6F08@maxlor.mine.nu> Resent-Message-ID: <200507060110.j661A58X055211@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 83043 >Category: ports >Synopsis: [maintainer update] games/uqm 0.3 -> 0.4.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: Wed Jul 06 01:10:04 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Benjamin Lutz >Release: FreeBSD 5.4-RELEASE-p2 i386 >Organization: >Environment: System: FreeBSD merlin 5.4-RELEASE-p2 FreeBSD 5.4-RELEASE-p2 #0: Fri Jun 10 00:20:11 CEST 2005 maxlor@merlin:/usr/obj/usr/src/sys/MERLIN i386 >Description: Update Ur-Quan Masters from 0.3 to 0.4.0. Changelog: http://sc2.sourceforge.net/WhatsNew While here, simplify the patches somewhat. Committer: please remove the existing patch files, and instead add the ones below. Thanks. >How-To-Repeat: >Fix: --- uqm.diff begins here --- diff -ru games/uqm.orig/Makefile games/uqm/Makefile --- games/uqm.orig/Makefile Wed Mar 17 23:36:08 2004 +++ games/uqm/Makefile Mon Jul 4 00:41:32 2005 @@ -13,19 +13,16 @@ # PORTNAME= uqm -PORTVERSION= 0.3 -PORTREVISION= 4 +PORTVERSION= 0.4.0 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= sc2 -DISTFILES= ${PORTNAME}-${PORTVERSION}-source.tgz ${PORTNAME}-${PORTVERSION}-content.zip -EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}-source.tgz +DISTFILES= ${PORTNAME}-${PORTVERSION}-source.tar.gz ${PORTNAME}-${PORTVERSION}-content.uqm +EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}-source.tar.gz MAINTAINER= benlutz@datacomm.ch COMMENT= A port of the original Star Control 2 for 3DO consoles -ONLY_FOR_ARCHS= i386 - LIB_DEPENDS= vorbis.3:${PORTSDIR}/audio/libvorbis USE_XLIB= yes @@ -34,15 +31,17 @@ USE_REINPLACE= yes NO_INSTALL_MANPAGES= yes +ONLY_FOR_ARCHS= i386 + .ifdef(VOICEADDON) -DISTFILES+= ${PORTNAME}-${PORTVERSION}-voice.zip +DISTFILES+= ${PORTNAME}-${PORTVERSION}-voice.uqm PLIST_SUB+= VOICEADDON="" .else PLIST_SUB+= VOICEADDON="@comment " .endif .ifdef(MUSICADDON) -DISTFILES+= ${PORTNAME}-${PORTVERSION}-3domusic.zip +DISTFILES+= ${PORTNAME}-${PORTVERSION}-3domusic.uqm PLIST_SUB+= MUSICADDON="" .else PLIST_SUB+= MUSICADDON="@comment " @@ -67,9 +66,24 @@ .endif post-extract: - ${CP} ${DISTDIR}/${PORTNAME}-${PORTVERSION}-content.zip ${WRKSRC}/content/packages/ + ${MKDIR} ${WRKSRC}/content/packages + ${CP} ${DISTDIR}/${PORTNAME}-${PORTVERSION}-content.uqm ${WRKSRC}/content/packages/ +.ifdef(VOICEADDON) + ${CP} ${DISTDIR}/${PORTNAME}-${PORTVERSION}-voice.uqm ${WRKSRC}/content/packages/ +.endif +.ifdef(MUSICADDON) + ${CP} ${DISTDIR}/${PORTNAME}-${PORTVERSION}-3domusic.uqm ${WRKSRC}/content/packages/ +.endif do-configure: + @${ECHO_MSG} CHOICE_debug_VALUE=\'nodebug\' > ${WRKSRC}/config.state + @${ECHO_MSG} CHOICE_graphics_VALUE=\'opengl\' >> ${WRKSRC}/config.state + @${ECHO_MSG} CHOICE_sound_VALUE=\'mixsdl\' >> ${WRKSRC}/config.state + @${ECHO_MSG} CHOICE_ioformat_VALUE=\'stdio_zip\' >> ${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: @@ -77,16 +91,6 @@ do-install: cd ${WRKSRC} && ./build.sh uqm install -.ifdef(VOICEADDON) - ${MKDIR} ${PREFIX}/share/uqm/content/packages/addons/voice - ${CP} ${DISTDIR}/${PORTNAME}-${PORTVERSION}-voice.zip ${PREFIX}/share/uqm/content/packages/addons/voice - ${REINPLACE_CMD} -e "s/\"$$\@\"/--addon voice \"$$\@\"/" ${PREFIX}/bin/uqm -.endif -.ifdef(MUSICADDON) - ${MKDIR} ${PREFIX}/share/uqm/content/packages/addons/3domusic - ${CP} ${DISTDIR}/${PORTNAME}-${PORTVERSION}-3domusic.zip ${PREFIX}/share/uqm/content/packages/addons/3domusic - ${REINPLACE_CMD} -e "s/\"$$\@\"/--addon 3domusic \"$$\@\"/" ${PREFIX}/bin/uqm -.endif post-install: ${STRIP_CMD} ${PREFIX}/lib/uqm/uqm diff -ru games/uqm.orig/distinfo games/uqm/distinfo --- games/uqm.orig/distinfo Fri Apr 2 16:47:32 2004 +++ games/uqm/distinfo Sun Jul 3 17:09:42 2005 @@ -1,8 +1,8 @@ -MD5 (uqm-0.3-source.tgz) = 6abcdc3caf7efd3bd978332743ee7568 -SIZE (uqm-0.3-source.tgz) = 906653 -MD5 (uqm-0.3-content.zip) = b17bb7b54df03b2d0ae3a23b91382b27 -SIZE (uqm-0.3-content.zip) = 12554418 -MD5 (uqm-0.3-voice.zip) = 9a44f0037d05c453b9e570b88b12595f -SIZE (uqm-0.3-voice.zip) = 114985054 -MD5 (uqm-0.3-3domusic.zip) = 9073251b0d96393441f0b40016010576 -SIZE (uqm-0.3-3domusic.zip) = 18980505 +MD5 (uqm-0.4.0-source.tar.gz) = 5f92d7307b3b2e32f4384e29131ecbc5 +SIZE (uqm-0.4.0-source.tar.gz) = 1198714 +MD5 (uqm-0.4.0-content.uqm) = f8daed517466d68805393e02a12fd642 +SIZE (uqm-0.4.0-content.uqm) = 11695898 +MD5 (uqm-0.4.0-voice.uqm) = 52a084cfaa0bc7fcc63a295feb8cbd28 +SIZE (uqm-0.4.0-voice.uqm) = 114823413 +MD5 (uqm-0.4.0-3domusic.uqm) = 9073251b0d96393441f0b40016010576 +SIZE (uqm-0.4.0-3domusic.uqm) = 18980505 Only in games/uqm/files: patch-build-unix-build_functions Only in games/uqm/files: patch-build-unix-config_proginfo_host Only in games/uqm.orig/files: patch-build::unix::build.config Only in games/uqm.orig/files: patch-build::unix::config_proginfo diff -ru games/uqm.orig/pkg-plist games/uqm/pkg-plist --- games/uqm.orig/pkg-plist Sat Oct 11 21:59:21 2003 +++ games/uqm/pkg-plist Mon Jul 4 00:22:54 2005 @@ -1,12 +1,9 @@ bin/uqm lib/uqm/uqm -share/uqm/content/packages/uqm-0.3-content.zip +share/uqm/content/packages/uqm-0.4.0-content.uqm share/uqm/content/version -%%VOICEADDON%%share/uqm/content/packages/addons/voice/uqm-0.3-voice.zip -%%MUSICADDON%%share/uqm/content/packages/addons/3domusic/uqm-0.3-3domusic.zip -%%VOICEADDON%%@dirrm share/uqm/content/packages/addons/voice -%%MUSICADDON%%@dirrm share/uqm/content/packages/addons/3domusic -@dirrm share/uqm/content/packages/addons +%%VOICEADDON%%share/uqm/content/packages/uqm-0.4.0-voice.uqm +%%MUSICADDON%%share/uqm/content/packages/uqm-0.4.0-3domusic.uqm @dirrm share/uqm/content/packages @dirrm share/uqm/content @dirrm share/uqm --- uqm.diff ends here --- --- patch-build-unix-build_functions starts here --- --- 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 @@ eval "${TARGET}_requirements" eval "${TARGET}_prepare_config" eval "${TARGET}_load_config" - eval "${TARGET}_do_config" + #eval "${TARGET}_do_config" eval "${TARGET}_save_config" } --- patch-build-unix-build_functions ends here --- --- patch-build-unix-config_proginfo_host starts here --- --- build/unix/config_proginfo_host.orig Sun Jul 3 17:23:50 2005 +++ build/unix/config_proginfo_host Sun Jul 3 17:24:43 2005 @@ -80,7 +80,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*) LIB_openal_LDFLAGS="-lopenal32" @@ -132,8 +132,8 @@ LIB_vorbisfile_NAME="vorbisfile" case "$HOST_SYSTEM" in FreeBSD|OpenBSD) - LIB_vorbisfile_CFLAGS="-I/usr/local/include" - LIB_vorbisfile_LDFLAGS="-L/usr/local/lib -lvorbisfile -lvorbis" + LIB_vorbisfile_CFLAGS="-I${LOCALBASE}/include" + LIB_vorbisfile_LDFLAGS="-L${LOCALBASE}/lib -lvorbisfile -lvorbis" ;; MINGW32*) LIB_vorbisfile_CFLAGS="" --- patch-build-unix-config_proginfo_host ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050704130348.CDAE6F08>