Date: Thu, 25 May 2006 17:54:46 -0300 From: "Alejandro Pulver" <alepulver@FreeBSD.org> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/97931: [UPDATE] games/quake3-q3base: move to games/q3base and misc changes Message-ID: <1148590486.51665@phobos.mars.bsd> Resent-Message-ID: <200605252100.k4PL0bx5079712@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 97931
>Category: ports
>Synopsis: [UPDATE] games/quake3-q3base: move to games/q3base and misc changes
>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: Thu May 25 21:00:37 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Alejandro Pulver
>Release: FreeBSD 6.0-RELEASE-p6 i386
>Organization:
>Environment:
System: FreeBSD 6.0-RELEASE-p6 #0: Tue Apr 4 22:29:05 ART 2006
ale@phobos.mars.bsd:/usr/src/sys/i386/compile/ATHLON-PHOBOS
>Description:
The port should be moved to games/q3base because the "quake3-" prefix is used by ports that require Quake III (mods, addons, data, etc), and not by Quake III engines (it's like the php5-, py-, p5-, etc prefixes), so it is very confusing.
The diff has the following changes:
- Remove PKGNAMEPREFIX.
- Remove CONFLICTS with quake3. Install libraries in lib/q3base.
- Remove ONLY_FOR_ARCHS (builds and works on other archs).
- Integrate with quake3-data (remove pkg-message, etc).
- Avoid creating a botlib.log file in the current directory.
>How-To-Repeat:
>Fix:
--- quake3-q3base.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/games/quake3-q3base/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile 16 Jan 2006 06:41:05 -0000 1.2
+++ Makefile 25 May 2006 13:30:36 -0000
@@ -9,25 +9,15 @@
PORTVERSION= 0.1
CATEGORIES= games
MASTER_SITES= http://quake3.quakesrc.org/files/quake3/q3base/
-PKGNAMEPREFIX= quake3-
MAINTAINER= ed@fxq.nl
COMMENT= Quake III Arena fork using SDL
-BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
-
USE_BZIP2= yes
USE_SDL= sdl net
-ONLY_FOR_ARCHS= i386
-
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= SDL_CONFIG=${SDL_CONFIG}
CONFIGURE_TARGET=
-CONFLICTS= q3server-1.32* quake3-[0-9]*
-
-SUB_FILES= pkg-message
-PKGMESSAGE= ${WRKSRC}/pkg-message
.if defined(WITHOUT_X11)
CONFIGURE_ARGS= --disable-client
@@ -38,9 +28,15 @@
.include <bsd.port.pre.mk>
-post-install:
- @${MKDIR} ${PREFIX}/share/quake3/baseq3
- @${MKDIR} ${PREFIX}/share/quake3/missionpack
- @${CAT} ${PKGMESSAGE}
+.if ${ARCH} == "i386"
+BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|\($${exec_prefix}/lib\)/quake3|\1/q3base|' \
+ ${WRKSRC}/src/Makefile.in
+ @${REINPLACE_CMD} -e 's|botlib\.log|/dev/null|' \
+ ${WRKSRC}/src/botlib/be_interface.c
+.include "${.CURDIR}/../quake3-data/Makefile.include"
.include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/games/quake3-q3base/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist 22 Jan 2006 02:11:10 -0000 1.2
+++ pkg-plist 25 May 2006 13:30:36 -0000
@@ -1,14 +1,10 @@
bin/q3base
-lib/quake3/baseq3/cgame.so
-lib/quake3/baseq3/qagame.so
-lib/quake3/baseq3/ui.so
-lib/quake3/missionpack/cgame.so
-lib/quake3/missionpack/qagame.so
-lib/quake3/missionpack/ui.so
-@dirrm lib/quake3/baseq3
-@dirrm lib/quake3/missionpack
-@dirrmtry lib/quake3
-@dirrmtry share/quake3/q3base
-@dirrmtry share/quake3/missionpack
-@dirrmtry share/quake3/baseq3
-@dirrmtry share/quake3
+lib/q3base/baseq3/cgame.so
+lib/q3base/baseq3/qagame.so
+lib/q3base/baseq3/ui.so
+lib/q3base/missionpack/cgame.so
+lib/q3base/missionpack/qagame.so
+lib/q3base/missionpack/ui.so
+@dirrm lib/q3base/baseq3
+@dirrm lib/q3base/missionpack
+@dirrm lib/q3base
Index: files/pkg-message.in
===================================================================
RCS file: files/pkg-message.in
diff -N files/pkg-message.in
--- files/pkg-message.in 30 Dec 2005 04:18:26 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-========================================================================
-
-In order to play Quake III Arena or Quake III Team Arena, you need to
-copy the non-free data-files from the CD to:
-
- %%PREFIX%%/share/quake3
-
-For Quake III Arena, you need to have pak0.pk3 to pak8.pk3 stored in the
-'baseq3' directory. Quake III Team Arena also needs pak0.pk3 stored in
-the 'missionpack' directory.
-
-Below is a list of pk3 files, including their MD5 checksums:
-
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak0.pk3) = 1197ca3df1e65f3c380f8abc10ca43bf
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak1.pk3) = 48911719d91be25adb957f2d325db4a0
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak2.pk3) = d550ce896130c47166ca44b53f8a670a
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak3.pk3) = 968dfd0f30dad67056115c8e92344ddc
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak4.pk3) = 24bb1f4fcabd95f6e320c0e2f62f19ca
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak5.pk3) = 734dcd06d2cbc7a16432ff6697f1c5ba
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak6.pk3) = 873888a73055c023f6c38b8ca3f2ce05
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak7.pk3) = 8fd38c53ed814b64f6ab03b5290965e4
-MD5 (%%PREFIX%%/share/quake3/baseq3/pak8.pk3) = d8b96d429ca4a9c289071cb7e77e14d2
-MD5 (%%PREFIX%%/share/quake3/missionpack/pak0.pk3) = e8ba9e3bf06210930bc0e7fdbcdd01c2
-
-========================================================================
--- quake3-q3base.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1148590486.51665>