Date: Fri, 21 May 2010 23:29:21 GMT From: Dominic Fandrey <kamikaze@bsdforen.de> To: freebsd-gnats-submit@FreeBSD.org Subject: misc/146810: [maintainer-update] games/ioquake3 Message-ID: <201005212329.o4LNTLCI007211@www.freebsd.org> Resent-Message-ID: <201005212330.o4LNU2PF029681@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 146810 >Category: misc >Synopsis: [maintainer-update] games/ioquake3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri May 21 23:30:02 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Dominic Fandrey >Release: RELENG_8 >Organization: private >Environment: FreeBSD mobileKamikaze.norad 8.0-STABLE FreeBSD 8.0-STABLE #0: Thu May 13 23:37:42 CEST 2010 root@mobileKamikaze.norad:/usr/obj/HP6510b-8/amd64/usr/src/sys/HP6510b-8 amd64 >Description: ioquake3 - Add mod VM compilers - Prepare for coming OpenArena slave port ioquake3-devel - Update to SVN r1784 to follow master port changes >How-To-Repeat: >Fix: Patch attached with submission follows: diff -Nur ioquake3.orig/Makefile ioquake3/Makefile --- ioquake3.orig/Makefile 2010-05-21 22:03:53.000000000 +0200 +++ ioquake3/Makefile 2010-05-22 00:11:32.000000000 +0200 @@ -7,7 +7,7 @@ PORTNAME?= ioquake3 DISTVERSION?= 1.36 -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES= games MASTER_SITES?= http://ioquake3.org/files/${DISTVERSION}/ @@ -22,7 +22,7 @@ USE_GMAKE= yes OPTIONS+= CLIENT "Build client" on \ - GAMELIBS "Build game libraries (when not mandatory)" off \ + GAMELIBS "Build game libraries" off \ DEDICATED "Build dedicated server" on \ CURL "Enable cURL for http/ftp download" on \ OPENAL "Enable OpenAL audio output" on \ @@ -43,6 +43,15 @@ LIBDIR= ${PREFIX}/lib/${PORTNAME} BUILDDIR= ${WRKSRC}/build/release-${OPSYS:L}-${ARCH} BINSUFFIX?= +Q3CLIENT?= ioquake3 +Q3SERVER?= ioq3ded +Q3TOOLS?= q3asm \ + q3cpp \ + q3lcc \ + q3rcc +Q3BASE?= baseq3 \ + missionpack +Q3INSTALL?= ONLY_FOR_ARCHS= amd64 i386 @@ -90,7 +99,7 @@ .if defined(WITH_CLIENT) || defined(WITH_SMP) MAKE_ARGS+= BUILD_CLIENT=1 PLIST_SUB+= CLIENT="" -Q3BIN+= ioquake3 +Q3BIN+= ${Q3CLIENT} .else PLIST_SUB+= CLIENT="@comment " .endif @@ -98,7 +107,7 @@ .if defined(WITH_DEDICATED) MAKE_ARGS+= BUILD_SERVER=1 PLIST_SUB+= DEDICATED="" -Q3BIN+= ioq3ded +Q3BIN+= ${Q3SERVER} .else PLIST_SUB+= DEDICATED="@comment " .endif @@ -114,18 +123,22 @@ .if defined(WITH_SMP) MAKE_ARGS+= BUILD_CLIENT_SMP=1 PLIST_SUB+= SMP="" -Q3BIN+= ioquake3-smp +Q3BIN+= ${Q3CLIENT}-smp .else PLIST_SUB+= SMP="@comment " .endif -do-install: +do-install: ${Q3INSTALL} .for bin in ${Q3BIN} ${INSTALL_PROGRAM} ${BUILDDIR}/${bin}.${ARCH} \ ${PREFIX}/bin/${bin}${BINSUFFIX} .endfor +.for bin in ${Q3TOOLS} + ${INSTALL_PROGRAM} ${BUILDDIR}/tools/${bin} \ + ${PREFIX}/bin/${bin}${BINSUFFIX} +.endfor .if defined(WITH_GAMELIBS) -.for dir in baseq3 missionpack +.for dir in ${Q3BASE} ${MKDIR} ${LIBDIR}/${dir} ${INSTALL_PROGRAM} ${BUILDDIR}/${dir}/*.so ${LIBDIR}/${dir} .endfor @@ -140,5 +153,8 @@ @${CAT} ${PKGMESSAGE} @${ECHO_CMD} +.if !defined(Q3TOTALCONV) .include "${.CURDIR}/../quake3-data/Makefile.include" +.endif + .include <bsd.port.mk> diff -Nur ioquake3.orig/pkg-plist ioquake3/pkg-plist --- ioquake3.orig/pkg-plist 2010-05-21 22:03:53.000000000 +0200 +++ ioquake3/pkg-plist 2010-05-21 23:04:23.000000000 +0200 @@ -1,6 +1,10 @@ %%DEDICATED%%bin/ioq3ded%%BINSUFFIX%% %%CLIENT%%bin/ioquake3%%BINSUFFIX%% %%SMP%%bin/ioquake3-smp%%BINSUFFIX%% +bin/q3asm%%BINSUFFIX%% +bin/q3cpp%%BINSUFFIX%% +bin/q3lcc%%BINSUFFIX%% +bin/q3rcc%%BINSUFFIX%% %%GAMELIBS%%%%LIBDIR%%/baseq3/cgame%%ARCH%%.so %%GAMELIBS%%%%LIBDIR%%/baseq3/qagame%%ARCH%%.so %%GAMELIBS%%%%LIBDIR%%/baseq3/ui%%ARCH%%.so diff -Nur ioquake3-devel.orig/Makefile ioquake3-devel/Makefile --- ioquake3-devel.orig/Makefile 2010-05-21 23:36:24.000000000 +0200 +++ ioquake3-devel/Makefile 2010-05-22 00:17:49.000000000 +0200 @@ -17,7 +17,7 @@ PLIST= ${.CURDIR}/../ioquake3/pkg-plist PATCHDIR= ${WRKDIR}/freebsd-patchset/ -SVNREVISION= 1782 +SVNREVISION= 1784 BINSUFFIX= -devel .include "${.CURDIR}/../ioquake3/Makefile" diff -Nur ioquake3-devel.orig/distinfo ioquake3-devel/distinfo --- ioquake3-devel.orig/distinfo 2010-05-21 23:36:24.000000000 +0200 +++ ioquake3-devel/distinfo 2010-05-22 00:18:28.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (ioquake3-devel-1.36_SVN1782.zip) = 7f2dc786306d5ad461d025d8704e7f85 -SHA256 (ioquake3-devel-1.36_SVN1782.zip) = 109f9082bb6ec0b00fc24551f769aac37950ccd696c49116fd434053bfba9b4c -SIZE (ioquake3-devel-1.36_SVN1782.zip) = 4930518 +MD5 (ioquake3-devel-1.36_SVN1784.zip) = 519a106119b64bc388f1c91fd0f51b5b +SHA256 (ioquake3-devel-1.36_SVN1784.zip) = daf0c428fa119e393b2a595709e4655f61fa3d639419368475411f8e636ad905 +SIZE (ioquake3-devel-1.36_SVN1784.zip) = 4930534 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005212329.o4LNTLCI007211>