Date: Fri, 9 Dec 2005 13:15:31 -0300 From: "Alejandro Pulver" <alejandro@varnet.biz> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/90149: [MAINTAINER UPDATE] games/quake3-data: redesign, change dependant ports Message-ID: <1134144931.0@phobos.mars.bsd> Resent-Message-ID: <200512091620.jB9GK2eO051935@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 90149
>Category: ports
>Synopsis: [MAINTAINER UPDATE] games/quake3-data: redesign, change dependant ports
>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: Fri Dec 09 16:20:02 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:
- Changed quake3-data/Makefile.include to be more similar to bsd.*.mk files, also it doesn't override port's variables.
- Change dependant ports.
>How-To-Repeat:
>Fix:
--- quake3_all.diff begins here ---
diff -urN /usr/ports/games/quake3-data/Makefile quake3-data/Makefile
--- /usr/ports/games/quake3-data/Makefile Mon Oct 31 14:20:07 2005
+++ quake3-data/Makefile Thu Dec 8 11:54:17 2005
@@ -10,6 +10,7 @@
CATEGORIES= games
MASTER_SITES= ftp://ftp.idsoftware.com/idstuff/quake3/linux/ \
ftp://ftp.fasta.fh-dortmund.de/mirror/idstuff/quake3/linux/
+PKGNAMEPREFIX= ${Q3PKGNAMEPREFIX}
DISTNAME= linuxq3apoint-${DISTVERSION}.x86
EXTRACT_SUFX= .run
@@ -20,6 +21,8 @@
NO_WRKSUBDIR= yes
OPTIONS= TEAMARENA "Install Quake III Team Arena data files" on
+
+DATADIR= ${Q3DIR}
SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
diff -urN /usr/ports/games/quake3-data/Makefile.include quake3-data/Makefile.include
--- /usr/ports/games/quake3-data/Makefile.include Sun Oct 16 03:36:46 2005
+++ quake3-data/Makefile.include Thu Dec 8 16:16:39 2005
@@ -1,44 +1,33 @@
-# Makefile for defining variables used by other Quake III Arena related ports.
+# Makefile for defining variables used by other Doom related ports.
-# Package name prefix.
+# Set variables.
-Q3PKGNAMEPREFIX=quake3-
+Q3PKGNAMEPREFIX?=quake3-
+Q3DIR?= ${LOCALBASE}/share/quake3
-.if ${PORTNAME} != "quake3"
-PKGNAMEPREFIX?= ${Q3PKGNAMEPREFIX}
-.endif
+# Add them to the environment.
+
+MAKE_ENV+= Q3DIR="${Q3DIR}"
+PLIST_SUB+= Q3DIR="${Q3DIR:S/${LOCALBASE}\///}"
+SUB_LIST+= Q3DIR="${Q3DIR}"
-# Dependency to "games/quake3-data".
+# Add the dependency.
.if ${PORTNAME} != "data"
RUN_DEPENDS+= ${Q3DIR}/baseq3/pak1.pk3:${PORTSDIR}/games/quake3-data
.endif
-# Installation directories.
-
-Q3DIR= ${LOCALBASE}/share/quake3
-
-.if ${PORTNAME} == "data" || ${PORTNAME} == "quake3"
-DATADIR?= ${Q3DIR}
-.else
-DATADIR?= ${Q3DIR}/${PORTNAME}
-.endif
+# DOS to Unix text conversion.
-DOCSDIR?= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-
-PLIST_SUB+= Q3DIR="${Q3DIR:S/${PREFIX}\///}"
-
-# Convert "dos" text files to "unix".
-
-.if defined(USE_ZIP)
+.if defined(USE_CRLF)
+. if defined(USE_ZIP)
EXTRACT_BEFORE_ARGS= -aqo
-.else
+. else
USE_REINPLACE= yes
-REINPLACE_ARGS= -i ""
-
pre-patch:
-# remove trailing ^M
- @${FIND} -E ${WRKSRC} -type f \
- -iregex ".*\.(bat|cfg|gam|htm|html|inf|ini|lst|sc|scr|txt|url)" \
- -exec ${REINPLACE_CMD} -e "s|`${ECHO_CMD} -e '\r'`$$||" {} \;
+ @${FIND} ${WRKDIR} -type f -print0 | \
+ ${XARGS} -0 ${FILE} | ${GREP} 'CRLF' | \
+ ${SED} -e "s/:.*//" | ${SED} -e 's/ /\\ /g' | \
+ ${XARGS} ${REINPLACE_CMD} -i "" -e "s/`${PRINTF} '\r'`$$//"
+. endif
.endif
diff -urN /usr/ports/games/quake3-excessive/Makefile quake3-excessive/Makefile
--- /usr/ports/games/quake3-excessive/Makefile Tue Nov 22 02:55:16 2005
+++ quake3-excessive/Makefile Thu Dec 8 16:19:21 2005
@@ -10,6 +10,7 @@
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= pat
+PKGNAMEPREFIX= ${Q3PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}_q3_server_${PORTVERSION}
MAINTAINER= pat@FreeBSD.org
@@ -18,7 +19,10 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_ZIP= yes
+USE_CRLF= yes
NO_BUILD= yes
+
+DATADIR= ${Q3DIR}/${PORTNAME}
post-extract:
@(cd ${WRKSRC}; ${UNZIP_CMD} description.pk3)
diff -urN /usr/ports/games/quake3-freezetag/Makefile quake3-freezetag/Makefile
--- /usr/ports/games/quake3-freezetag/Makefile Tue Nov 22 02:56:07 2005
+++ quake3-freezetag/Makefile Thu Dec 8 16:19:29 2005
@@ -10,6 +10,7 @@
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= pat
+PKGNAMEPREFIX= ${Q3PKGNAMEPREFIX}
DISTNAME= q3freeze${PORTVERSION:S/.//}
MAINTAINER= pat@FreeBSD.org
@@ -18,7 +19,10 @@
WRKSRC= ${WRKDIR}/freeze
USE_ZIP= yes
+USE_CRLF= yes
NO_BUILD= yes
+
+DATADIR= ${Q3DIR}/${PORTNAME}
.include "${.CURDIR}/../quake3-data/Makefile.include"
diff -urN /usr/ports/games/quake3-osp/Makefile quake3-osp/Makefile
--- /usr/ports/games/quake3-osp/Makefile Tue Nov 22 03:09:58 2005
+++ quake3-osp/Makefile Thu Dec 8 16:19:40 2005
@@ -10,6 +10,7 @@
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GENTOO}
MASTER_SITE_SUBDIR= distfiles
+PKGNAMEPREFIX= ${Q3PKGNAMEPREFIX}
DISTNAME= osp-Quake3-${PORTVERSION}_full
MAINTAINER= pat@FreeBSD.org
@@ -18,7 +19,10 @@
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_ZIP= yes
+USE_CRLF= yes
NO_BUILD= yes
+
+DATADIR= ${Q3DIR}/${PORTNAME}
do-install:
@${MKDIR} ${DATADIR}
diff -urN /usr/ports/games/quake3-ra3/Makefile quake3-ra3/Makefile
--- /usr/ports/games/quake3-ra3/Makefile Tue Nov 22 03:23:44 2005
+++ quake3-ra3/Makefile Thu Dec 8 16:19:50 2005
@@ -10,6 +10,7 @@
CATEGORIES= games
MASTER_SITES= ftp.clanbase.com/pub/ \
ftp.mirrors.degnet.de/pub/misc/PlanetQuake3.net/modifications/rocketarena3/
+PKGNAMEPREFIX= ${Q3PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}
MAINTAINER= pat@FreeBSD.org
@@ -18,7 +19,10 @@
WRKSRC= ${WRKDIR}/arena
USE_ZIP= yes
+USE_CRLF= yes
NO_BUILD= yes
+
+DATADIR= ${Q3DIR}/${PORTNAME}
do-install:
@${MKDIR} ${DATADIR}
diff -urN /usr/ports/games/quake3-ut/Makefile quake3-ut/Makefile
--- /usr/ports/games/quake3-ut/Makefile Tue Nov 22 06:27:23 2005
+++ quake3-ut/Makefile Thu Dec 8 16:20:01 2005
@@ -9,14 +9,18 @@
PORTVERSION= 3.7
CATEGORIES= games
MASTER_SITES= ftp://ftp.snt.utwente.nl/pub/games/urbanterror/
+PKGNAMEPREFIX= ${Q3PKGNAMEPREFIX}
DISTNAME= urbanTerror${PORTVERSION:S/.//}_full
MAINTAINER= pat@FreeBSD.org
COMMENT= Quake III Arena Mod: Urban Terror
USE_ZIP= yes
+USE_CRLF= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
+
+DATADIR= ${Q3DIR}/${PORTNAME}
do-install:
@${MKDIR} ${DATADIR}
diff -urN /usr/ports/games/quake3-wfa/Makefile quake3-wfa/Makefile
--- /usr/ports/games/quake3-wfa/Makefile Tue Nov 22 04:22:14 2005
+++ quake3-wfa/Makefile Thu Dec 8 16:20:09 2005
@@ -9,6 +9,7 @@
PORTVERSION= 3.5b
CATEGORIES= games
MASTER_SITES= http://www.ijs.si/~lesi/distfiles/
+PKGNAMEPREFIX= ${Q3PKGNAMEPREFIX}
DISTFILES= WFA35Engine.zip WFA35MapPack1.zip WFA35MapPack2.zip \
WFA_v35b.zip 35b_mappack1.zip
DIST_SUBDIR= ${PORTNAME}
@@ -17,8 +18,11 @@
COMMENT= Quake III Arena Mod: Weapons Factory Arena
USE_ZIP= yes
+USE_CRLF= yes
NO_BUILD= yes
NO_WRKSUBDIR= yes
+
+DATADIR= ${Q3DIR}/${PORTNAME}
post-extract:
@${RM} ${WRKSRC}/help/BobWFACfgV236.exe
diff -urN /usr/ports/games/quake3/Makefile quake3/Makefile
--- /usr/ports/games/quake3/Makefile Mon Nov 28 09:04:12 2005
+++ quake3/Makefile Fri Dec 9 13:09:45 2005
@@ -23,6 +23,7 @@
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
USE_ZIP= yes
+USE_CRLF= yes
USE_GMAKE= yes
USE_REINPLACE= yes
USE_PERL5_BUILD=yes
--- quake3_all.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?1134144931.0>