Date: Thu, 4 May 2006 18:06:14 GMT From: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/96789: [MAINTAINER] games/linux-quake4: update to 1.2.1 Message-ID: <200605041806.k44I6Eil026664@www.freebsd.org> Resent-Message-ID: <200605041810.k44IAHvS079162@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 96789 >Category: ports >Synopsis: [MAINTAINER] games/linux-quake4: update to 1.2.1 >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: Thu May 04 18:10:16 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jose Alonso Cardenas Marquez >Release: FreeBSD 6.1-RC i386 >Organization: BSDPeru (http://www.bsd.org.pe) >Environment: FreeBSD aqp.tabernaclegranite.net 6.1-RC FreeBSD 6.1-RC #0: Tue May 2 14:06:13 PET >Description: - Update to 1.2.1 - Added new options (SMP and GERMANY support) - This ports install libSDL-1.2.id.so.0 and libstdc++.so.6. It's neccesary for correct running of linux-quake4. - Other tiny modifications Added file(s): - pkg-deinstall >How-To-Repeat: >Fix: diff -ruN --exclude=CVS /usr/ports/games/linux-quake4/Makefile /usr/ports/games/linux-quake4-new/Makefile --- /usr/ports/games/linux-quake4/Makefile Sat Apr 8 16:59:59 2006 +++ /usr/ports/games/linux-quake4-new/Makefile Thu May 4 12:51:18 2006 @@ -6,8 +6,7 @@ # PORTNAME= quake4 -PORTVERSION= 1.1 -PORTEPOCH= 1 +PORTVERSION= 1.2.1 CATEGORIES= games linux MASTER_SITES= ${MASTER_SITE_IDSOFTWARE:S|$|quake4/linux/old/|} \ ${MASTER_SITE_GENTOO} @@ -25,10 +24,22 @@ USE_X_PREFIX= yes USE_LINUX= yes NO_WRKSUBDIR= yes -Q4DIR= lib/${PORTNAME}/ -PLIST_SUB+= Q4DIR="${Q4DIR}" +Q4DIR= lib/${PORTNAME} +PLIST_SUB+= Q4DIR="${Q4DIR}" \ + LINUXBASE="${LINUXBASE}" SUB_FILES= pkg-message +OPTIONS= SMP "Install threaded version" on \ + GERMANY "Germany version" off + +.include <bsd.port.pre.mk> + +.if !defined(WITHOUT_SMP) +PLIST_SUB+= SMP="" +.else +PLIST_SUB+= SMP="@comment " +.endif + do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} @@ -36,24 +47,34 @@ ${TAR} zxf - do-build: -.for i in quake4 q4ded - ${BRANDELF} -t Linux ${WRKSRC}/bin/FreeBSD/x86/$i.x86 +.for FILE in quake4 q4ded quake4smp + ${BRANDELF} -t Linux ${WRKSRC}/bin/FreeBSD/x86/${FILE}.x86 # Startup scripts @${SED} \ -e 's|@Q4DIR@|${PREFIX}/${Q4DIR}|' \ - -e 's|@APP@|$i.x86|' \ - ${FILESDIR}/run.sh.in > ${WRKSRC}/$i.sh + -e 's|@APP@|${FILE}.x86|' \ + ${FILESDIR}/run.sh.in > ${WRKSRC}/${FILE}.sh .endfor do-install: # Executables @${MKDIR} ${PREFIX}/${Q4DIR} -.for i in quake4 q4ded - ${INSTALL_SCRIPT} ${WRKSRC}/$i.sh ${PREFIX}/bin/$i - ${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD/x86/$i.x86 ${PREFIX}/${Q4DIR}/ +.for FILE in quake4 q4ded + ${INSTALL_SCRIPT} ${WRKSRC}/${FILE}.sh ${PREFIX}/bin/${FILE} + ${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD/x86/${FILE}.x86 ${PREFIX}/${Q4DIR} .endfor +.if !defined(WITHOUT_SMP) + ${INSTALL_SCRIPT} ${WRKSRC}/quake4smp.sh ${PREFIX}/bin/quake4smp + ${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD/x86/quake4smp.x86 ${PREFIX}/${Q4DIR} +.endif + # Libraries +.for FILE in libSDL-1.2.id.so.0 libstdc++.so.6 + ${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD/x86/${FILE} ${LINUXBASE}/usr/local/lib +.endfor + ${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD/x86/libgcc_s.so.1 ${LINUXBASE}/usr/lib + # Punkbuster @${MKDIR} ${PREFIX}/${Q4DIR}/pb/htm @${MKDIR} ${PREFIX}/${Q4DIR}/q4base @@ -67,6 +88,17 @@ ${FIND} -E q4base -type f -iregex ".*\.(cfg|scriptcfg|pk4)" \ -exec ${INSTALL_DATA} "{}" "${PREFIX}/${Q4DIR}/{}" \; + # All version (except germany) or only germany version +.if defined(WITH_GERMANY) + @cd ${WRKSRC}/germany && \ + ${FIND} -E q4base -type f -iregex ".*\.(pk4)" \ + -exec ${INSTALL_DATA} "{}" "${PREFIX}/${Q4DIR}/{}" \; +.else + @cd ${WRKSRC}/us && \ + ${FIND} -E q4base -type f -iregex ".*\.(pk4)" \ + -exec ${INSTALL_DATA} "{}" "${PREFIX}/${Q4DIR}/{}" \; +.endif + # Documentation .if !defined (NOPORTDOCS) @cd ${WRKSRC}/Docs && \ @@ -80,4 +112,4 @@ post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -ruN --exclude=CVS /usr/ports/games/linux-quake4/distinfo /usr/ports/games/linux-quake4-new/distinfo --- /usr/ports/games/linux-quake4/distinfo Sat Apr 8 16:59:59 2006 +++ /usr/ports/games/linux-quake4-new/distinfo Thu May 4 12:51:18 2006 @@ -1,3 +1,3 @@ -MD5 (quake4-linux-1.1.x86.run) = 33c94890738d251042bd4b71e1370ba7 -SHA256 (quake4-linux-1.1.x86.run) = 2dd920b8415fb6cf538960eafe3cb30cbb0cd7f2807c54652a5edc93854a979b -SIZE (quake4-linux-1.1.x86.run) = 120035724 +MD5 (quake4-linux-1.2.1.x86.run) = ed9ecbddf8d3e5cf4e7d5330303c3610 +SHA256 (quake4-linux-1.2.1.x86.run) = 1e23a3f509a3d3ce86519c3ad0a29677eb05e2cc28f773dca1971ad025032622 +SIZE (quake4-linux-1.2.1.x86.run) = 123174709 diff -ruN --exclude=CVS /usr/ports/games/linux-quake4/pkg-deinstall /usr/ports/games/linux-quake4-new/pkg-deinstall --- /usr/ports/games/linux-quake4/pkg-deinstall Wed Dec 31 19:00:00 1969 +++ /usr/ports/games/linux-quake4-new/pkg-deinstall Thu May 4 12:51:18 2006 @@ -0,0 +1,6 @@ +if [ ! "$2" = "POST-DEINSTALL" ]; then + rm /compat/linux/usr/local/lib/libSDL-1.2.id.so.0 + rm /compat/linux/usr/local/lib/libstdc++.so.6 + rm /compat/linux/usr/lib/libgcc_s.so.1 +fi +exit 0 diff -ruN --exclude=CVS /usr/ports/games/linux-quake4/pkg-plist /usr/ports/games/linux-quake4-new/pkg-plist --- /usr/ports/games/linux-quake4/pkg-plist Sat Apr 8 16:59:59 2006 +++ /usr/ports/games/linux-quake4-new/pkg-plist Thu May 4 12:51:18 2006 @@ -1,40 +1,45 @@ +%%SMP%%bin/quake4smp bin/q4ded bin/quake4 -%%Q4DIR%%pb/htm/la001307.htm -%%Q4DIR%%pb/htm/lc001095.htm -%%Q4DIR%%pb/htm/ma001307.htm -%%Q4DIR%%pb/htm/mc001095.htm -%%Q4DIR%%pb/htm/wa001307.htm -%%Q4DIR%%pb/htm/wc001095.htm -%%Q4DIR%%pb/pbag.so -%%Q4DIR%%pb/pbags.so -%%Q4DIR%%pb/pbcl.so -%%Q4DIR%%pb/pbcls.so -%%Q4DIR%%pb/pbsv.so -%%Q4DIR%%q4base/arena_ctf.cfg -%%Q4DIR%%q4base/ctf.cfg -%%Q4DIR%%q4base/dm.cfg -%%Q4DIR%%q4base/game000.pk4 -%%Q4DIR%%q4base/game100.pk4 -%%Q4DIR%%q4base/game200.pk4 -%%Q4DIR%%q4base/mapcycle-mp1.scriptcfg -%%Q4DIR%%q4base/mapcycle-mp2.scriptcfg -%%Q4DIR%%q4base/mapcycle.scriptcfg -%%Q4DIR%%q4base/pak013.pk4 -%%Q4DIR%%q4base/pak014.pk4 -%%Q4DIR%%q4base/pak016.pk4 -%%Q4DIR%%q4base/teamdm.cfg -%%Q4DIR%%q4base/tourney.cfg -%%Q4DIR%%q4base/zpak_english_01.pk4 -%%Q4DIR%%q4base/zpak_english_02.pk4 -%%Q4DIR%%q4base/zpak_french_01.pk4 -%%Q4DIR%%q4base/zpak_french_02.pk4 -%%Q4DIR%%q4base/zpak_italian_01.pk4 -%%Q4DIR%%q4base/zpak_italian_02.pk4 -%%Q4DIR%%q4base/zpak_spanish_01.pk4 -%%Q4DIR%%q4base/zpak_spanish_02.pk4 -%%Q4DIR%%q4ded.x86 -%%Q4DIR%%quake4.x86 +%%Q4DIR%%/pb/htm/la001307.htm +%%Q4DIR%%/pb/htm/lc001095.htm +%%Q4DIR%%/pb/htm/ma001307.htm +%%Q4DIR%%/pb/htm/mc001095.htm +%%Q4DIR%%/pb/htm/wa001307.htm +%%Q4DIR%%/pb/htm/wc001095.htm +%%Q4DIR%%/pb/pbag.so +%%Q4DIR%%/pb/pbags.so +%%Q4DIR%%/pb/pbcl.so +%%Q4DIR%%/pb/pbcls.so +%%Q4DIR%%/pb/pbsv.so +%%Q4DIR%%/q4base/arena_ctf.cfg +%%Q4DIR%%/q4base/ctf.cfg +%%Q4DIR%%/q4base/dm.cfg +%%Q4DIR%%/q4base/game000.pk4 +%%Q4DIR%%/q4base/game100.pk4 +%%Q4DIR%%/q4base/game200.pk4 +%%Q4DIR%%/q4base/mapcycle-mp1.scriptcfg +%%Q4DIR%%/q4base/mapcycle-mp2.scriptcfg +%%Q4DIR%%/q4base/mapcycle.scriptcfg +%%Q4DIR%%/q4base/pak013.pk4 +%%Q4DIR%%/q4base/pak014.pk4 +%%Q4DIR%%/q4base/pak015.pk4 +%%Q4DIR%%/q4base/pak016.pk4 +%%Q4DIR%%/q4base/pak017.pk4 +%%Q4DIR%%/q4base/pak018.pk4 +%%Q4DIR%%/q4base/teamdm.cfg +%%Q4DIR%%/q4base/tourney.cfg +%%Q4DIR%%/q4base/zpak_english_01.pk4 +%%Q4DIR%%/q4base/zpak_english_02.pk4 +%%Q4DIR%%/q4base/zpak_french_01.pk4 +%%Q4DIR%%/q4base/zpak_french_02.pk4 +%%Q4DIR%%/q4base/zpak_italian_01.pk4 +%%Q4DIR%%/q4base/zpak_italian_02.pk4 +%%Q4DIR%%/q4base/zpak_spanish_01.pk4 +%%Q4DIR%%/q4base/zpak_spanish_02.pk4 +%%SMP%%%%Q4DIR%%/quake4smp.x86 +%%Q4DIR%%/q4ded.x86 +%%Q4DIR%%/quake4.x86 %%PORTDOCS%%%%DOCSDIR%%/ENG/License.txt %%PORTDOCS%%%%DOCSDIR%%/ENG/MSR.txt %%PORTDOCS%%%%DOCSDIR%%/ENG/PBEULA.txt @@ -388,9 +393,9 @@ %%PORTDOCS%%%%DOCSDIR%%/LICENSE %%PORTDOCS%%%%DOCSDIR%%/PBEULA %%PORTDOCS%%%%DOCSDIR%%/README -@dirrm %%Q4DIR%%pb/htm -@dirrm %%Q4DIR%%pb -@dirrmtry %%Q4DIR%%q4base +@dirrm %%Q4DIR%%/pb/htm +@dirrm %%Q4DIR%%/pb +@dirrmtry %%Q4DIR%%/q4base @unexec rmdir %D/%%Q4DIR%% 2>/dev/null || echo "Note: %D/%%Q4DIR%% not empty -- not deleted!" %%PORTDOCS%%@dirrm %%DOCSDIR%%/ENG/htm %%PORTDOCS%%@dirrm %%DOCSDIR%%/ENG/images --- linux-quake4-1.2.1.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?200605041806.k44I6Eil026664>