From alejandro@varnet.biz  Thu Sep 15 21:47:24 2005
Return-Path: <alejandro@varnet.biz>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3CB7A16A420
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 15 Sep 2005 21:47:24 +0000 (GMT)
	(envelope-from alejandro@varnet.biz)
Received: from relay.pair.com (relay.pair.com [209.68.1.20])
	by mx1.FreeBSD.org (Postfix) with SMTP id 8A20643D49
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 15 Sep 2005 21:47:23 +0000 (GMT)
	(envelope-from alejandro@varnet.biz)
Received: (qmail 59823 invoked from network); 15 Sep 2005 21:47:21 -0000
Received: from unknown (HELO phobos.mars.bsd) (unknown)
  by unknown with SMTP; 15 Sep 2005 21:47:21 -0000
Message-Id: <1126820848.0@phobos.mars.bsd>
Date: Thu, 15 Sep 2005 18:47:28 -0300
From: "Alejandro Pulver" <alejandro@varnet.biz>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: [UPDATE] games/q3-paks: rewrite and rename to "quake3-data"
X-Send-Pr-Version: gtk-send-pr 0.4.6 
X-GNATS-Notify:

>Number:         86185
>Category:       ports
>Synopsis:       [UPDATE] games/q3-paks: rewrite and rename to "quake3-data"
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    edwin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 15 21:50:10 GMT 2005
>Closed-Date:    Sun Oct 16 06:36:53 GMT 2005
>Last-Modified:  Sun Oct 16 06:36:53 GMT 2005
>Originator:     Alejandro Pulver
>Release:        FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:





>Description:


Changes:
* Rename to "quake3-data" (also rename port directory).
* Install Quake III Arena and Quake III Team Arena updates and ask to put the 2 files from the original CDROM to complete the installation.
* Has an includable Makefile to set variables for other mods/clients.
* Take maintainership (this is a complete rewrite).


>How-To-Repeat:





>Fix:


--- quake3-data.diff begins here ---
diff -urN /usr/ports/games/q3-paks/Makefile quake3-data/Makefile
--- /usr/ports/games/q3-paks/Makefile	Wed Jun  2 04:05:07 2004
+++ quake3-data/Makefile	Thu Sep 15 16:06:59 2005
@@ -5,45 +5,52 @@
 # $FreeBSD: ports/games/q3-paks/Makefile,v 1.5 2004/06/02 07:05:07 demon Exp $
 #
 
-PORTNAME=	q3-paks
-PORTVERSION=	1.0
-CATEGORIES=	games linux
-MASTER_SITES=	#
-DISTFILES=	pak0.pk3
-DIST_SUBDIR=	q3-paks
-IGNOREFILES=	${ALLFILES}
-
-MAINTAINER=	nik@FreeBSD.org
-COMMENT=	Quake 3 for Linux .pk3 files
-
-# Make this a BUILD_ rather than a RUN_DEPEND so that it can create the
-# directory hierarchy for us.
-RUN_DEPENDS=	${LINUXBASE}/usr/games/quake3/q3ded:${PORTSDIR}/games/q3server
-
-PLIST_FILES=	usr/games/quake3/baseq3/pak0.pk3
-ONLY_FOR_ARCHS=	i386
-USE_LINUX_PREFIX=	yes
-EXTRACT_ONLY=	# Don't extract anything
-STRIP=
+PORTNAME=	data
+DISTVERSION=	1.32b-3
+CATEGORIES=	games
+MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/quake3/linux/
+DISTNAME=	linuxq3apoint-${DISTVERSION}.x86
+EXTRACT_SUFX=	.run
+
+MAINTAINER=	alejandro@varnet.biz
+COMMENT=	Quake III Arena data files
+
+NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
+
+OPTIONS=	TEAMARENA "Install Quake III Team Arena data files" on
+
+SUB_FILES=	pkg-message
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
+do-extract:
+	@${RM} -rf ${WRKDIR}
+	@${MKDIR} ${WRKDIR}
+	@cd ${WRKDIR} && ${TAIL} +356 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
+		${TAR} zxf - >/dev/null
 
-GAMEDIR=	${PREFIX}/usr/games/quake3/
+.include "Makefile.include"
 
 .include <bsd.port.pre.mk>
 
-.for file in ${DISTFILES}
-.if !exists(${DISTDIR}/q3-paks/${file})
-IGNORE=You must manually copy all the .pk3 files from the baseq3/ directory of an installed version of the game to the ${DISTDIR}/q3-paks directory and then run make again.
+.if defined(WITH_TEAMARENA)
+PLIST_SUB+=	TEAMARENA=""
+.else
+PLIST_SUB+=	TEAMARENA="@comment "
 .endif
-.endfor
-
-# Do nothing for the build.  Don't set NO_BUILD because of the earlier
-# BUILD_DEPENDS
-do-build:
 
 do-install:
-	${MKDIR} ${GAMEDIR}/baseq3
-.for file in ${DISTFILES}
-	${INSTALL_DATA} ${DISTDIR}/q3-paks/${file} ${GAMEDIR}/baseq3
-.endfor
+	@${MKDIR} ${DATADIR}
+	@${CP} -R ${WRKSRC}/baseq3 ${DATADIR}
+	@${MKDIR} ${PREFIX}/share/pixmaps
+	@${INSTALL_DATA} ${WRKSRC}/quake3.xpm ${PREFIX}/share/pixmaps
+.if defined(WITH_TEAMARENA)
+	@${CP} -R ${WRKSRC}/missionpack ${DATADIR}
+.endif
+
+post-install:
+	@${ECHO_CMD}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_CMD}
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/games/q3-paks/Makefile.include quake3-data/Makefile.include
--- /usr/ports/games/q3-paks/Makefile.include	Wed Dec 31 21:00:00 1969
+++ quake3-data/Makefile.include	Wed Sep 14 19:21:50 2005
@@ -0,0 +1,44 @@
+# Makefile for defining variables used by other Quake III Arena related ports.
+
+# Package name prefix.
+
+Q3PKGNAMEPREFIX=quake3-
+
+.if ${PORTNAME} != "quake3"
+PKGNAMEPREFIX?=	${Q3PKGNAMEPREFIX}
+.endif
+
+# Dependency to "games/quake3-data".
+
+.if ${PORTNAME} != "data"
+RUN_DEPENDS+=	${Q3DIR}/baseq3/pak0.pk3:${PORTSDIR}/games/quake3-data
+.endif
+
+# Installation directories.
+
+PREFIX=		${LOCALBASE}
+Q3DIR=		${PREFIX}/share/quake3
+
+.if ${PORTNAME} == "data" || ${PORTNAME} == "quake3"
+DATADIR?=	${Q3DIR}
+.else
+DATADIR?=	${Q3DIR}/${PORTNAME}
+.endif
+
+DOCSDIR?=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+
+PLIST_SUB+=	Q3DIR="${Q3DIR:S/${PREFIX}\///}"
+
+# Convert "dos" text files to "unix".
+
+.if defined(USE_ZIP)
+EXTRACT_BEFORE_ARGS=	-aqo
+.else
+USE_REINPLACE=	yes
+
+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'`$$||" {} \;
+.endif
diff -urN /usr/ports/games/q3-paks/distinfo quake3-data/distinfo
--- /usr/ports/games/q3-paks/distinfo	Wed Dec 31 21:00:00 1969
+++ quake3-data/distinfo	Thu Sep 15 16:15:13 2005
@@ -0,0 +1,2 @@
+MD5 (linuxq3apoint-1.32b-3.x86.run) = c71fdddccb20e8fc393d846e9c61d685
+SIZE (linuxq3apoint-1.32b-3.x86.run) = 30923961
diff -urN /usr/ports/games/q3-paks/files/pkg-message.in quake3-data/files/pkg-message.in
--- /usr/ports/games/q3-paks/files/pkg-message.in	Wed Dec 31 21:00:00 1969
+++ quake3-data/files/pkg-message.in	Thu Sep 15 16:17:36 2005
@@ -0,0 +1,11 @@
+====================================================================
+
+To complete the installation of this port you need to copy the file
+"baseq3/pak0.pk3" from the original Quake III Arena distribution to
+"%%DATADIR%%/baseq3".
+
+If you have the expansion pack then you have to copy the file
+"missionpack/pak0.pk3" from the original Quake III Team Arena
+distribution to "%%DATADIR%%/missionpack".
+
+====================================================================
diff -urN /usr/ports/games/q3-paks/pkg-descr quake3-data/pkg-descr
--- /usr/ports/games/q3-paks/pkg-descr	Sat Mar  2 19:17:36 2002
+++ quake3-data/pkg-descr	Tue Sep  6 20:24:57 2005
@@ -1,7 +1,7 @@
-Quake 3 for Linux .pk3 files
+Quake III Arena data files.
 
-This port encapsulates the .pk3 files for Quake 3 that are used to complete
-the installation of the game (including the dedicated server).
+This port installs the data files needed to run Quake III Arena. It also uses
+the update, and has an option to install Quake III Team Arena data files.
 
 You still need to have a legitimate copy of the game in order to obtain
 the .pk3 files.
diff -urN /usr/ports/games/q3-paks/pkg-plist quake3-data/pkg-plist
--- /usr/ports/games/q3-paks/pkg-plist	Wed Dec 31 21:00:00 1969
+++ quake3-data/pkg-plist	Thu Sep 15 16:09:41 2005
@@ -0,0 +1,16 @@
+%%DATADIR%%/baseq3/pak1.pk3
+%%DATADIR%%/baseq3/pak2.pk3
+%%DATADIR%%/baseq3/pak3.pk3
+%%DATADIR%%/baseq3/pak4.pk3
+%%DATADIR%%/baseq3/pak5.pk3
+%%DATADIR%%/baseq3/pak6.pk3
+%%DATADIR%%/baseq3/pak7.pk3
+%%DATADIR%%/baseq3/pak8.pk3
+%%TEAMARENA%%%%DATADIR%%/missionpack/pak1.pk3
+%%TEAMARENA%%%%DATADIR%%/missionpack/pak2.pk3
+%%TEAMARENA%%%%DATADIR%%/missionpack/pak3.pk3
+share/pixmaps/quake3.xpm
+@unexec rmdir %D/share/pixmaps 2>/dev/null || true
+%%TEAMARENA%%@unexec rmdir %D/%%DATADIR%%/missionpack 2>/dev/null || true
+@dirrm %%DATADIR%%/baseq3
+@unexec rmdir %D/%%DATADIR%% >/dev/null 2>&1 || echo "If you are permanently removing this port, you should remove any configuration files, data files, and mods left in %D/%%DATADIR%%." | fmt
--- quake3-data.diff ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->nik 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sat Sep 17 23:48:34 GMT 2005 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86185 

From: "Alejandro Pulver" <alejandro@varnet.biz>
To: "FreeBSD gnats submit" <bug-followup@freebsd.org>
Cc:  
Subject: Re: ports/86185: [UPDATE] games/q3-paks: rewrite and rename to "quake3-data"
Date: Mon, 19 Sep 2005 14:19:31 -0300

 >Submitter-Id:	current-users 
 >Originator:	Alejandro Pulver 
 >Organization:	 
 >Confidential:	no 
 >Synopsis:	Re: ports/86185: [UPDATE] games/q3-paks: rewrite and rename to "quake3-data" 
 >Severity:	non-critical 
 >Priority:	low 
 >Category:	ports 
 >Class:		update 
 >Release:	FreeBSD 5.4-RELEASE i386 
 >Environment:
 
 
 
 
 
 >Description:
 
 
 This patch has to be applied to the previous patch.
 
 Changes:
 * Don't override PREFIX.
 * Change dependency from "pak0.pk3" to "pak1.pk3".
 * Add REINPLACE_ARGS=-i "".
 
 
 >How-To-Repeat:
 
 
 
 
 
 >Fix:
 
 
 --- new.diff begins here ---
 --- pkgd/sent/quake3-data.diff	Thu Sep 15 18:39:24 2005
 +++ quake3-data.diff	Mon Sep 19 14:16:05 2005
 @@ -1,6 +1,6 @@
  diff -urN /usr/ports/games/q3-paks/Makefile quake3-data/Makefile
  --- /usr/ports/games/q3-paks/Makefile	Wed Jun  2 04:05:07 2004
 -+++ quake3-data/Makefile	Thu Sep 15 16:06:59 2005
 ++++ quake3-data/Makefile	Mon Sep 19 13:39:18 2005
  @@ -5,45 +5,52 @@
   # $FreeBSD: ports/games/q3-paks/Makefile,v 1.5 2004/06/02 07:05:07 demon Exp $
   #
 @@ -89,7 +89,7 @@
   .include <bsd.port.post.mk>
  diff -urN /usr/ports/games/q3-paks/Makefile.include quake3-data/Makefile.include
  --- /usr/ports/games/q3-paks/Makefile.include	Wed Dec 31 21:00:00 1969
 -+++ quake3-data/Makefile.include	Wed Sep 14 19:21:50 2005
 ++++ quake3-data/Makefile.include	Mon Sep 19 14:15:36 2005
  @@ -0,0 +1,44 @@
  +# Makefile for defining variables used by other Quake III Arena related ports.
  +
 @@ -104,13 +104,12 @@
  +# Dependency to "games/quake3-data".
  +
  +.if ${PORTNAME} != "data"
 -+RUN_DEPENDS+=	${Q3DIR}/baseq3/pak0.pk3:${PORTSDIR}/games/quake3-data
 ++RUN_DEPENDS+=	${Q3DIR}/baseq3/pak1.pk3:${PORTSDIR}/games/quake3-data
  +.endif
  +
  +# Installation directories.
  +
 -+PREFIX=		${LOCALBASE}
 -+Q3DIR=		${PREFIX}/share/quake3
 ++Q3DIR=		${LOCALBASE}/share/quake3
  +
  +.if ${PORTNAME} == "data" || ${PORTNAME} == "quake3"
  +DATADIR?=	${Q3DIR}
 @@ -120,7 +119,7 @@
  +
  +DOCSDIR?=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
  +
 -+PLIST_SUB+=	Q3DIR="${Q3DIR:S/${PREFIX}\///}"
 ++SUB_LIST+=	Q3DIR="${Q3DIR}"
  +
  +# Convert "dos" text files to "unix".
  +
 @@ -128,6 +127,7 @@
  +EXTRACT_BEFORE_ARGS=	-aqo
  +.else
  +USE_REINPLACE=	yes
 ++REINPLACE_ARGS=	-i ""
  +
  +pre-patch:
  +# remove trailing ^M
 @@ -137,13 +137,13 @@
  +.endif
  diff -urN /usr/ports/games/q3-paks/distinfo quake3-data/distinfo
  --- /usr/ports/games/q3-paks/distinfo	Wed Dec 31 21:00:00 1969
 -+++ quake3-data/distinfo	Thu Sep 15 16:15:13 2005
 ++++ quake3-data/distinfo	Mon Sep 19 13:39:18 2005
  @@ -0,0 +1,2 @@
  +MD5 (linuxq3apoint-1.32b-3.x86.run) = c71fdddccb20e8fc393d846e9c61d685
  +SIZE (linuxq3apoint-1.32b-3.x86.run) = 30923961
  diff -urN /usr/ports/games/q3-paks/files/pkg-message.in quake3-data/files/pkg-message.in
  --- /usr/ports/games/q3-paks/files/pkg-message.in	Wed Dec 31 21:00:00 1969
 -+++ quake3-data/files/pkg-message.in	Thu Sep 15 16:17:36 2005
 ++++ quake3-data/files/pkg-message.in	Mon Sep 19 13:39:18 2005
  @@ -0,0 +1,11 @@
  +====================================================================
  +
 @@ -158,7 +158,7 @@
  +====================================================================
  diff -urN /usr/ports/games/q3-paks/pkg-descr quake3-data/pkg-descr
  --- /usr/ports/games/q3-paks/pkg-descr	Sat Mar  2 19:17:36 2002
 -+++ quake3-data/pkg-descr	Tue Sep  6 20:24:57 2005
 ++++ quake3-data/pkg-descr	Mon Sep 19 13:39:18 2005
  @@ -1,7 +1,7 @@
  -Quake 3 for Linux .pk3 files
  +Quake III Arena data files.
 @@ -172,7 +172,7 @@
   the .pk3 files.
  diff -urN /usr/ports/games/q3-paks/pkg-plist quake3-data/pkg-plist
  --- /usr/ports/games/q3-paks/pkg-plist	Wed Dec 31 21:00:00 1969
 -+++ quake3-data/pkg-plist	Thu Sep 15 16:09:41 2005
 ++++ quake3-data/pkg-plist	Mon Sep 19 13:39:18 2005
  @@ -0,0 +1,16 @@
  +%%DATADIR%%/baseq3/pak1.pk3
  +%%DATADIR%%/baseq3/pak2.pk3
 --- new.diff ends here ---
 
 
 

From: "Alejandro Pulver" <alejandro@varnet.biz>
To: "FreeBSD gnats submit" <bug-followup@freebsd.org>
Cc:  
Subject: Re: ports/86185: [UPDATE] games/q3-paks: rewrite and rename to "quake3-data"
Date: Mon, 19 Sep 2005 15:29:25 -0300

 >Submitter-Id:	current-users 
 >Originator:	Alejandro Pulver 
 >Organization:	 
 >Confidential:	no 
 >Synopsis:	Re: ports/86185: [UPDATE] games/q3-paks: rewrite and rename to "quake3-data" 
 >Severity:	non-critical 
 >Priority:	low 
 >Category:	ports 
 >Class:		update 
 >Release:	FreeBSD 5.4-RELEASE i386 
 >Environment:
 
 
 
 
 
 >Description:
 
 
 This patch replaces the previous one (to be applied to the first one).
 
 Changes:
 * Ignore if the directory "baseq3" can't be removed (a warning message is printed).
 
 
 >How-To-Repeat:
 
 
 
 
 
 >Fix:
 
 
 --- new2.diff begins here ---
 --- pkgd/sent/quake3-data.diff	Thu Sep 15 18:39:24 2005
 +++ quake3-data.diff	Mon Sep 19 15:24:49 2005
 @@ -1,6 +1,6 @@
  diff -urN /usr/ports/games/q3-paks/Makefile quake3-data/Makefile
  --- /usr/ports/games/q3-paks/Makefile	Wed Jun  2 04:05:07 2004
 -+++ quake3-data/Makefile	Thu Sep 15 16:06:59 2005
 ++++ quake3-data/Makefile	Mon Sep 19 13:39:18 2005
  @@ -5,45 +5,52 @@
   # $FreeBSD: ports/games/q3-paks/Makefile,v 1.5 2004/06/02 07:05:07 demon Exp $
   #
 @@ -89,7 +89,7 @@
   .include <bsd.port.post.mk>
  diff -urN /usr/ports/games/q3-paks/Makefile.include quake3-data/Makefile.include
  --- /usr/ports/games/q3-paks/Makefile.include	Wed Dec 31 21:00:00 1969
 -+++ quake3-data/Makefile.include	Wed Sep 14 19:21:50 2005
 ++++ quake3-data/Makefile.include	Mon Sep 19 14:15:36 2005
  @@ -0,0 +1,44 @@
  +# Makefile for defining variables used by other Quake III Arena related ports.
  +
 @@ -104,13 +104,12 @@
  +# Dependency to "games/quake3-data".
  +
  +.if ${PORTNAME} != "data"
 -+RUN_DEPENDS+=	${Q3DIR}/baseq3/pak0.pk3:${PORTSDIR}/games/quake3-data
 ++RUN_DEPENDS+=	${Q3DIR}/baseq3/pak1.pk3:${PORTSDIR}/games/quake3-data
  +.endif
  +
  +# Installation directories.
  +
 -+PREFIX=		${LOCALBASE}
 -+Q3DIR=		${PREFIX}/share/quake3
 ++Q3DIR=		${LOCALBASE}/share/quake3
  +
  +.if ${PORTNAME} == "data" || ${PORTNAME} == "quake3"
  +DATADIR?=	${Q3DIR}
 @@ -120,7 +119,7 @@
  +
  +DOCSDIR?=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
  +
 -+PLIST_SUB+=	Q3DIR="${Q3DIR:S/${PREFIX}\///}"
 ++SUB_LIST+=	Q3DIR="${Q3DIR}"
  +
  +# Convert "dos" text files to "unix".
  +
 @@ -128,6 +127,7 @@
  +EXTRACT_BEFORE_ARGS=	-aqo
  +.else
  +USE_REINPLACE=	yes
 ++REINPLACE_ARGS=	-i ""
  +
  +pre-patch:
  +# remove trailing ^M
 @@ -137,13 +137,13 @@
  +.endif
  diff -urN /usr/ports/games/q3-paks/distinfo quake3-data/distinfo
  --- /usr/ports/games/q3-paks/distinfo	Wed Dec 31 21:00:00 1969
 -+++ quake3-data/distinfo	Thu Sep 15 16:15:13 2005
 ++++ quake3-data/distinfo	Mon Sep 19 13:39:18 2005
  @@ -0,0 +1,2 @@
  +MD5 (linuxq3apoint-1.32b-3.x86.run) = c71fdddccb20e8fc393d846e9c61d685
  +SIZE (linuxq3apoint-1.32b-3.x86.run) = 30923961
  diff -urN /usr/ports/games/q3-paks/files/pkg-message.in quake3-data/files/pkg-message.in
  --- /usr/ports/games/q3-paks/files/pkg-message.in	Wed Dec 31 21:00:00 1969
 -+++ quake3-data/files/pkg-message.in	Thu Sep 15 16:17:36 2005
 ++++ quake3-data/files/pkg-message.in	Mon Sep 19 13:39:18 2005
  @@ -0,0 +1,11 @@
  +====================================================================
  +
 @@ -158,7 +158,7 @@
  +====================================================================
  diff -urN /usr/ports/games/q3-paks/pkg-descr quake3-data/pkg-descr
  --- /usr/ports/games/q3-paks/pkg-descr	Sat Mar  2 19:17:36 2002
 -+++ quake3-data/pkg-descr	Tue Sep  6 20:24:57 2005
 ++++ quake3-data/pkg-descr	Mon Sep 19 13:39:18 2005
  @@ -1,7 +1,7 @@
  -Quake 3 for Linux .pk3 files
  +Quake III Arena data files.
 @@ -172,7 +172,7 @@
   the .pk3 files.
  diff -urN /usr/ports/games/q3-paks/pkg-plist quake3-data/pkg-plist
  --- /usr/ports/games/q3-paks/pkg-plist	Wed Dec 31 21:00:00 1969
 -+++ quake3-data/pkg-plist	Thu Sep 15 16:09:41 2005
 ++++ quake3-data/pkg-plist	Mon Sep 19 15:23:05 2005
  @@ -0,0 +1,16 @@
  +%%DATADIR%%/baseq3/pak1.pk3
  +%%DATADIR%%/baseq3/pak2.pk3
 @@ -188,5 +188,5 @@
  +share/pixmaps/quake3.xpm
  +@unexec rmdir %D/share/pixmaps 2>/dev/null || true
  +%%TEAMARENA%%@unexec rmdir %D/%%DATADIR%%/missionpack 2>/dev/null || true
 -+@dirrm %%DATADIR%%/baseq3
 ++@unexec rmdir %D/%%DATADIR%%/baseq3 2>/dev/null || true
  +@unexec rmdir %D/%%DATADIR%% >/dev/null 2>&1 || echo "If you are permanently removing this port, you should remove any configuration files, data files, and mods left in %D/%%DATADIR%%." | fmt
 --- new2.diff ends here ---
 
 
 

From: "Alejandro Pulver" <alejandro@varnet.biz>
To: "FreeBSD gnats submit" <bug-followup@freebsd.org>
Cc:  
Subject: Re: ports/86185: [UPDATE] games/q3-paks: rewrite and rename to "quake3-data"
Date: Mon, 19 Sep 2005 16:06:05 -0300

 >Submitter-Id:	current-users 
 >Originator:	Alejandro Pulver 
 >Organization:	 
 >Confidential:	no 
 >Synopsis:	Re: ports/86185: [UPDATE] games/q3-paks: rewrite and rename to "quake3-data" 
 >Severity:	non-critical 
 >Priority:	low 
 >Category:	ports 
 >Class:		update 
 >Release:	FreeBSD 5.4-RELEASE i386 
 >Environment:
 
 
 
 
 
 >Description:
 
 
 This patch replaces the 2 previous ones (that have to be applied to the first).
 
 Changes:
 * Change "SUB_LIST" into "PLIST_SUB".
 
 
 >How-To-Repeat:
 
 
 
 
 
 >Fix:
 
 
 --- new3.diff begins here ---
 --- pkgd/sent/quake3-data.diff	Thu Sep 15 18:39:24 2005
 +++ quake3-data.diff	Mon Sep 19 16:03:23 2005
 @@ -1,6 +1,7 @@
 -diff -urN /usr/ports/games/q3-paks/Makefile quake3-data/Makefile
 +Binary files /usr/ports/games/q3-paks/.Makefile.include.swp and committed/q3/quake3-data/.Makefile.include.swp differ
 +diff -urN /usr/ports/games/q3-paks/Makefile committed/q3/quake3-data/Makefile
  --- /usr/ports/games/q3-paks/Makefile	Wed Jun  2 04:05:07 2004
 -+++ quake3-data/Makefile	Thu Sep 15 16:06:59 2005
 ++++ committed/q3/quake3-data/Makefile	Mon Sep 19 13:39:18 2005
  @@ -5,45 +5,52 @@
   # $FreeBSD: ports/games/q3-paks/Makefile,v 1.5 2004/06/02 07:05:07 demon Exp $
   #
 @@ -87,9 +88,9 @@
  +	@${ECHO_CMD}
   
   .include <bsd.port.post.mk>
 -diff -urN /usr/ports/games/q3-paks/Makefile.include quake3-data/Makefile.include
 +diff -urN /usr/ports/games/q3-paks/Makefile.include committed/q3/quake3-data/Makefile.include
  --- /usr/ports/games/q3-paks/Makefile.include	Wed Dec 31 21:00:00 1969
 -+++ quake3-data/Makefile.include	Wed Sep 14 19:21:50 2005
 ++++ committed/q3/quake3-data/Makefile.include	Mon Sep 19 16:02:01 2005
  @@ -0,0 +1,44 @@
  +# Makefile for defining variables used by other Quake III Arena related ports.
  +
 @@ -104,13 +105,12 @@
  +# Dependency to "games/quake3-data".
  +
  +.if ${PORTNAME} != "data"
 -+RUN_DEPENDS+=	${Q3DIR}/baseq3/pak0.pk3:${PORTSDIR}/games/quake3-data
 ++RUN_DEPENDS+=	${Q3DIR}/baseq3/pak1.pk3:${PORTSDIR}/games/quake3-data
  +.endif
  +
  +# Installation directories.
  +
 -+PREFIX=		${LOCALBASE}
 -+Q3DIR=		${PREFIX}/share/quake3
 ++Q3DIR=		${LOCALBASE}/share/quake3
  +
  +.if ${PORTNAME} == "data" || ${PORTNAME} == "quake3"
  +DATADIR?=	${Q3DIR}
 @@ -128,6 +128,7 @@
  +EXTRACT_BEFORE_ARGS=	-aqo
  +.else
  +USE_REINPLACE=	yes
 ++REINPLACE_ARGS=	-i ""
  +
  +pre-patch:
  +# remove trailing ^M
 @@ -135,15 +136,15 @@
  +		-iregex ".*\.(bat|cfg|gam|htm|html|inf|ini|lst|sc|scr|txt|url)" \
  +		-exec ${REINPLACE_CMD} -e "s|`${ECHO_CMD} -e '\r'`$$||" {} \;
  +.endif
 -diff -urN /usr/ports/games/q3-paks/distinfo quake3-data/distinfo
 +diff -urN /usr/ports/games/q3-paks/distinfo committed/q3/quake3-data/distinfo
  --- /usr/ports/games/q3-paks/distinfo	Wed Dec 31 21:00:00 1969
 -+++ quake3-data/distinfo	Thu Sep 15 16:15:13 2005
 ++++ committed/q3/quake3-data/distinfo	Mon Sep 19 13:39:18 2005
  @@ -0,0 +1,2 @@
  +MD5 (linuxq3apoint-1.32b-3.x86.run) = c71fdddccb20e8fc393d846e9c61d685
  +SIZE (linuxq3apoint-1.32b-3.x86.run) = 30923961
 -diff -urN /usr/ports/games/q3-paks/files/pkg-message.in quake3-data/files/pkg-message.in
 +diff -urN /usr/ports/games/q3-paks/files/pkg-message.in committed/q3/quake3-data/files/pkg-message.in
  --- /usr/ports/games/q3-paks/files/pkg-message.in	Wed Dec 31 21:00:00 1969
 -+++ quake3-data/files/pkg-message.in	Thu Sep 15 16:17:36 2005
 ++++ committed/q3/quake3-data/files/pkg-message.in	Mon Sep 19 13:39:18 2005
  @@ -0,0 +1,11 @@
  +====================================================================
  +
 @@ -156,9 +157,9 @@
  +distribution to "%%DATADIR%%/missionpack".
  +
  +====================================================================
 -diff -urN /usr/ports/games/q3-paks/pkg-descr quake3-data/pkg-descr
 +diff -urN /usr/ports/games/q3-paks/pkg-descr committed/q3/quake3-data/pkg-descr
  --- /usr/ports/games/q3-paks/pkg-descr	Sat Mar  2 19:17:36 2002
 -+++ quake3-data/pkg-descr	Tue Sep  6 20:24:57 2005
 ++++ committed/q3/quake3-data/pkg-descr	Mon Sep 19 13:39:18 2005
  @@ -1,7 +1,7 @@
  -Quake 3 for Linux .pk3 files
  +Quake III Arena data files.
 @@ -170,9 +171,9 @@
   
   You still need to have a legitimate copy of the game in order to obtain
   the .pk3 files.
 -diff -urN /usr/ports/games/q3-paks/pkg-plist quake3-data/pkg-plist
 +diff -urN /usr/ports/games/q3-paks/pkg-plist committed/q3/quake3-data/pkg-plist
  --- /usr/ports/games/q3-paks/pkg-plist	Wed Dec 31 21:00:00 1969
 -+++ quake3-data/pkg-plist	Thu Sep 15 16:09:41 2005
 ++++ committed/q3/quake3-data/pkg-plist	Mon Sep 19 15:23:05 2005
  @@ -0,0 +1,16 @@
  +%%DATADIR%%/baseq3/pak1.pk3
  +%%DATADIR%%/baseq3/pak2.pk3
 @@ -188,5 +189,5 @@
  +share/pixmaps/quake3.xpm
  +@unexec rmdir %D/share/pixmaps 2>/dev/null || true
  +%%TEAMARENA%%@unexec rmdir %D/%%DATADIR%%/missionpack 2>/dev/null || true
 -+@dirrm %%DATADIR%%/baseq3
 ++@unexec rmdir %D/%%DATADIR%%/baseq3 2>/dev/null || true
  +@unexec rmdir %D/%%DATADIR%% >/dev/null 2>&1 || echo "If you are permanently removing this port, you should remove any configuration files, data files, and mods left in %D/%%DATADIR%%." | fmt
 --- new3.diff ends here ---
 
 
 
Responsible-Changed-From-To: nik->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Mon Oct 10 05:21:28 GMT 2005 
Responsible-Changed-Why:  
Maintainer was reset at his request. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86185 
State-Changed-From-To: open->repocopy 
State-Changed-By: edwin 
State-Changed-When: Sun Oct 16 05:52:56 GMT 2005 
State-Changed-Why:  
Let's start with the first part: copy to games/quake3-data 


Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sun Oct 16 05:52:56 GMT 2005 
Responsible-Changed-Why:  
Let's start with the first part: copy to games/quake3-data 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86185 
State-Changed-From-To: repocopy->open 
State-Changed-By: marcus 
State-Changed-When: Sun Oct 16 06:13:50 GMT 2005 
State-Changed-Why:  
Repocopy completed. 


Responsible-Changed-From-To: portmgr->edwin 
Responsible-Changed-By: marcus 
Responsible-Changed-When: Sun Oct 16 06:13:50 GMT 2005 
Responsible-Changed-Why:  
Repocopy completed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86185 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Sun Oct 16 06:36:50 GMT 2005 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86185 
>Unformatted:
