Bug 86185 - [UPDATE] games/q3-paks: rewrite and rename to "quake3-data"
Summary: [UPDATE] games/q3-paks: rewrite and rename to "quake3-data"
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Edwin Groothuis
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-09-15 22:50 UTC by Alejandro Pulver
Modified: 2005-10-16 07:36 UTC (History)
0 users

See Also:

Attachments
quake3-data.diff (6.17 KB, patch)
2005-09-15 22:50 UTC, Alejandro Pulver 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Alejandro Pulver 2005-09-15 22:50:10 UTC 

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).
Comment 1 Mark Linimon freebsd_committer freebsd_triage 2005-09-18 00:48:34 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->nik

Over to maintainer.
Comment 2 Alejandro Pulver 2005-09-19 18:19:31 UTC 
>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 ---
Comment 3 Alejandro Pulver 2005-09-19 19:29:25 UTC 
>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 ---
Comment 4 Alejandro Pulver 2005-09-19 20:06:05 UTC 
>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 ---
Comment 5 Mark Linimon freebsd_committer freebsd_triage 2005-10-10 06:21:28 UTC 
Responsible Changed
From-To: nik->freebsd-ports-bugs

Maintainer was reset at his request.
Comment 6 Edwin Groothuis freebsd_committer freebsd_triage 2005-10-16 06:52:56 UTC 
State Changed
From-To: open->repocopy

Let's start with the first part: copy to games/quake3-data
Comment 7 Edwin Groothuis freebsd_committer freebsd_triage 2005-10-16 06:52:56 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->portmgr

Let's start with the first part: copy to games/quake3-data
Comment 8 Joe Marcus Clarke freebsd_committer freebsd_triage 2005-10-16 07:13:50 UTC 
State Changed
From-To: repocopy->open

Repocopy completed.
Comment 9 Joe Marcus Clarke freebsd_committer freebsd_triage 2005-10-16 07:13:50 UTC 
Responsible Changed
From-To: portmgr->edwin

Repocopy completed.
Comment 10 Edwin Groothuis freebsd_committer freebsd_triage 2005-10-16 07:36:50 UTC 
State Changed
From-To: open->closed

Committed, thanks!