Attachment 59349 Details for Bug 89330 – quake3.diff

[patch] quake3.diff

quake3.diff (text/plain), 5.67 KB, created by Alejandro Pulver on 2005-11-20 22:10:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alejandro Pulver

Created: 2005-11-20 22:10:15 UTC

Size: 5.67 KB

patch

obsolete

>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 <bsd.port.mk>
>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

Actions: View | Diff

Attachments on bug 89330: 59349