From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Nov 20 22:10:17 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5757016A41F for ; Sun, 20 Nov 2005 22:10:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B71E143D4C for ; Sun, 20 Nov 2005 22:10:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jAKMAFrx072515 for ; Sun, 20 Nov 2005 22:10:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jAKMAFVG072514; Sun, 20 Nov 2005 22:10:15 GMT (envelope-from gnats) Resent-Date: Sun, 20 Nov 2005 22:10:15 GMT Resent-Message-Id: <200511202210.jAKMAFVG072514@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Alejandro Pulver" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E42E116A425 for ; Sun, 20 Nov 2005 22:00:54 +0000 (GMT) (envelope-from alejandro@varnet.biz) Received: from relay03.pair.com (relay03.pair.com [209.68.5.17]) by mx1.FreeBSD.org (Postfix) with SMTP id 7481943D45 for ; Sun, 20 Nov 2005 22:00:54 +0000 (GMT) (envelope-from alejandro@varnet.biz) Received: (qmail 12312 invoked from network); 20 Nov 2005 22:00:53 -0000 Received: from unknown (HELO phobos.mars.bsd) (unknown) by unknown with SMTP; 20 Nov 2005 22:00:53 -0000 Message-Id: <1132524093.0@phobos.mars.bsd> Date: Sun, 20 Nov 2005 19:01:33 -0300 From: "Alejandro Pulver" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.6 Cc: Subject: ports/89330: [UPDATE] games/quake3: integrate with quake3-data X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Nov 2005 22:10:17 -0000 >Number: 89330 >Category: ports >Synopsis: [UPDATE] games/quake3: integrate with quake3-data >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: Sun Nov 20 22:10:15 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Alejandro Pulver >Release: FreeBSD 5.4-RELEASE i386 >Organization: >Environment: System: FreeBSD 5.4-RELEASE #0: Sat May 21 12:14:47 ART 2005 root@ale.varnet.bsd:/usr/src/sys/i386/compile/ATHLON-ALE >Description: Changes: * Don't build install QVM's and shared libraries (QVM's are provided in the PAK files). * Look for data in the same directory as linux-quake3. * Add mirror. * Remove pkg-message and pkg-plist (not needed anymore). >How-To-Repeat: >Fix: --- quake3.diff begins here --- diff -urN /usr/ports/games/quake3/Makefile quake3/Makefile --- /usr/ports/games/quake3/Makefile Thu Nov 17 07:35:03 2005 +++ quake3/Makefile Sun Nov 20 18:54:17 2005 @@ -8,59 +8,39 @@ PORTNAME= quake3 PORTVERSION= 1.32b CATEGORIES= games -MASTER_SITES= ftp://ftp.idsoftware.com/idstuff/source/ -EXTRACT_SUFX= -source.zip -EXTRACT_ONLY= +MASTER_SITES= ftp://ftp.idsoftware.com/idstuff/source/ \ + ftp://ftp.fasta.fh-dortmund.de/mirror/idstuff/source/ +DISTFILES= ${DISTNAME}-source${EXTRACT_SUFX} MAINTAINER= shirshegsm@gmail.com COMMENT= Quake III Arena -- first person shooter (native build) -EXTRACT_DEPENDS= unzip:${PORTSDIR}/archivers/unzip -BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm +BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm -USE_GMAKE= yes -USE_PERL5_BUILD= yes -USE_GL= yes -USE_REINPLACE= yes -CONFLICTS= q3server-1.32* - -# We need that -a flag -do-extract: - ${MKDIR} ${WRKDIR} && \ - cd ${WRKDIR} && \ - ${UNZIP_CMD} -aqx ${DISTDIR}/${PORTNAME}-${PORTVERSION}-source.zip +USE_ZIP= yes +USE_GMAKE= yes +USE_REINPLACE= yes +USE_PERL5_BUILD=yes +USE_GL= yes + +PLIST_FILES= bin/q3ded bin/quake3 post-patch: - @${REINPLACE_CMD} -e 's|##PREFIX##|${PREFIX}|g' ${WRKSRC}/code/unix/unix_shared.c + @${REINPLACE_CMD} -e 's|%%Q3DIR%%|"${Q3DIR}"|' \ + ${WRKSRC}/code/unix/unix_shared.c pre-build: - ${MKDIR} ${WRKSRC}/lcc/build + ${MKDIR} ${WRKSRC}/lcc/build do-build: - cd ${WRKSRC}/code && \ - ${PERL} unix/cons - ${MV} ${WRKSRC}/code/install/linuxq3ded ${WRKSRC}/code/install/q3ded - ${MV} ${WRKSRC}/code/install/linuxquake3 ${WRKSRC}/code/install/quake3 + cd ${WRKSRC}/code && ${PERL} unix/cons do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/code/install/q3ded ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/code/install/quake3 ${PREFIX}/bin - ${MKDIR} ${PREFIX}/lib/quake3/baseq3/vm - ${CP} ${WRKSRC}/code/install/baseq3/cgamei386.so ${PREFIX}/lib/quake3/baseq3 - ${CP} ${WRKSRC}/code/install/baseq3/qagamei386.so ${PREFIX}/lib/quake3/baseq3 - ${CP} ${WRKSRC}/code/install/baseq3/uii386.so ${PREFIX}/lib/quake3/baseq3 - ${CP} ${WRKSRC}/code/install/baseq3/vm/cgame.qvm ${PREFIX}/lib/quake3/baseq3/vm - ${CP} ${WRKSRC}/code/install/baseq3/vm/qagame.qvm ${PREFIX}/lib/quake3/baseq3/vm - ${CP} ${WRKSRC}/code/install/baseq3/vm/ui.qvm ${PREFIX}/lib/quake3/baseq3/vm - ${MKDIR} ${PREFIX}/lib/quake3/missionpack/vm - ${CP} ${WRKSRC}/code/install/missionpack/cgamei386.so ${PREFIX}/lib/quake3/missionpack - ${CP} ${WRKSRC}/code/install/missionpack/qagamei386.so ${PREFIX}/lib/quake3/missionpack - ${CP} ${WRKSRC}/code/install/missionpack/uii386.so ${PREFIX}/lib/quake3/missionpack - ${CP} ${WRKSRC}/code/install/missionpack/vm/cgame.qvm ${PREFIX}/lib/quake3/missionpack/vm - ${CP} ${WRKSRC}/code/install/missionpack/vm/qagame.qvm ${PREFIX}/lib/quake3/missionpack/vm - ${CP} ${WRKSRC}/code/install/missionpack/vm/ui.qvm ${PREFIX}/lib/quake3/missionpack/vm + ${INSTALL_PROGRAM} ${WRKSRC}/code/install/linuxq3ded \ + ${PREFIX}/bin/q3ded + ${INSTALL_PROGRAM} ${WRKSRC}/code/install/linuxquake3 \ + ${PREFIX}/bin/quake3 -post-install: - ${CAT} pkg-message +.include "${.CURDIR}/../quake3-data/Makefile.include" .include diff -urN /usr/ports/games/quake3/files/patch-code-unix-Makefile quake3/files/patch-code-unix-Makefile --- /usr/ports/games/quake3/files/patch-code-unix-Makefile Thu Nov 17 07:35:03 2005 +++ quake3/files/patch-code-unix-Makefile Sun Nov 20 18:48:53 2005 @@ -1,5 +1,5 @@ ---- code/unix/Makefile Sun May 5 12:21:10 2002 -+++ ../../work/quake3-1.32b/code/unix/Makefile Sun Aug 28 23:16:03 2005 +--- code/unix/Makefile.orig Sun May 5 07:21:10 2002 ++++ code/unix/Makefile Sun Nov 20 18:48:48 2005 @@ -136,7 +136,7 @@ ifeq ($(ARCH),ppc) NEWPGCC=/loki/global/ppc/bin/gcc diff -urN /usr/ports/games/quake3/files/patch-code-unix-unix_shared.c quake3/files/patch-code-unix-unix_shared.c --- /usr/ports/games/quake3/files/patch-code-unix-unix_shared.c Thu Nov 17 07:35:03 2005 +++ quake3/files/patch-code-unix-unix_shared.c Sun Nov 20 18:51:13 2005 @@ -1,11 +1,11 @@ ---- code/unix/unix_shared.c Tue Aug 16 02:10:07 2005 -+++ ../../work/quake3-1.32b/code/unix/unix_shared.c Mon Aug 29 00:37:41 2005 +--- code/unix/unix_shared.c.orig Mon Aug 15 20:10:07 2005 ++++ code/unix/unix_shared.c Sun Nov 20 18:41:22 2005 @@ -38,7 +38,7 @@ static char cdPath[MAX_OSPATH]; // Used to determine local installation path -static char installPath[MAX_OSPATH]; -+static char installPath[MAX_OSPATH] = "##PREFIX##/lib/quake3"; // FreeBSD ++static char installPath[MAX_OSPATH] = %%Q3DIR%%; // Used to determine where to store user-specific files static char homePath[MAX_OSPATH]; diff -urN /usr/ports/games/quake3/pkg-message quake3/pkg-message --- /usr/ports/games/quake3/pkg-message Thu Nov 17 07:35:03 2005 +++ quake3/pkg-message Wed Dec 31 21:00:00 1969 @@ -1,7 +0,0 @@ ------ -Quake III client is installed in bin/quake3 and -Quake III dedicated server in bin/q3ded. - -No .pak3's are installed, you need to copy/link them to -~/.q3a/baseq3 ------ diff -urN /usr/ports/games/quake3/pkg-plist quake3/pkg-plist --- /usr/ports/games/quake3/pkg-plist Thu Nov 17 07:35:03 2005 +++ quake3/pkg-plist Wed Dec 31 21:00:00 1969 @@ -1,19 +0,0 @@ -bin/q3ded -bin/quake3 -lib/quake3/baseq3/cgamei386.so -lib/quake3/baseq3/qagamei386.so -lib/quake3/baseq3/uii386.so -lib/quake3/baseq3/vm/cgame.qvm -lib/quake3/baseq3/vm/qagame.qvm -lib/quake3/baseq3/vm/ui.qvm -lib/quake3/missionpack/cgamei386.so -lib/quake3/missionpack/qagamei386.so -lib/quake3/missionpack/uii386.so -lib/quake3/missionpack/vm/cgame.qvm -lib/quake3/missionpack/vm/qagame.qvm -lib/quake3/missionpack/vm/ui.qvm -@dirrm lib/quake3/baseq3/vm -@dirrm lib/quake3/baseq3 -@dirrm lib/quake3/missionpack/vm -@dirrm lib/quake3/missionpack -@dirrm lib/quake3 --- quake3.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: