86186 – [UPDATE] games/q3server: integrate with "quake3-data", rename to "linux-quake3"

Bug 86186 - [UPDATE] games/q3server: integrate with "quake3-data", rename to "linux-quake3"

Summary: [UPDATE] games/q3server: integrate with "quake3-data", rename to "linux-quake3"

Status:	Closed FIXED

Alias:	None

Product:	Ports & Packages
Classification:	Unclassified
Component:	Individual Port(s) (show other bugs)
Version:	Latest
Hardware:	Any Any

Importance:	Normal Affects Only Me
Assignee:	Edwin Groothuis

URL:
Keywords:

Depends on:
Blocks:

Reported:	2005-09-15 23:00 UTC by Alejandro Pulver
Modified:	2005-11-22 06:52 UTC (History)
CC List:	0 users

See Also:

Attachments
linux-quake3.diff (17.98 KB, patch) 2005-09-15 23:00 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 23:00:31 UTC


Changes:
* Rename to "linux-quake3" (also rename the port directory).
* Integrate with "quake3-data".
* Clean-up/rewrite.
* Take maintainership.

Comment 1 Mark Linimon freebsd_committer

2005-09-18 00:51:39 UTC

Responsible Changed
From-To: freebsd-ports-bugs->pat

Over to maintainer.

Comment 2 Alejandro Pulver 2005-09-19 18:14:33 UTC

>Submitter-Id:	current-users 
>Originator:	Alejandro Pulver 
>Organization:	 
>Confidential:	no 
>Synopsis:	Re: ports/86186: [UPDATE] games/q3server: integrate with "quake3-data", rename to "linux-quake3" 
>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:
* Do not take maintainership.
* Use a subdirectory under "libexec".
* Use the same DIST_SUBDIR as "quake3-data" (becauses they use a common file).


>How-To-Repeat:





>Fix:


--- new.diff begins here ---
--- pkgd/sent/linux-quake3.diff	Thu Sep 15 16:31:08 2005
+++ linux-quake3.diff	Mon Sep 19 14:09:16 2005
@@ -1,7 +1,7 @@
 diff -urN /usr/ports/games/q3server/Makefile linux-quake3/Makefile
 --- /usr/ports/games/q3server/Makefile	Wed Jul 27 18:15:49 2005
-+++ linux-quake3/Makefile	Thu Sep 15 16:30:54 2005
-@@ -5,97 +5,85 @@
++++ linux-quake3/Makefile	Mon Sep 19 13:51:00 2005
+@@ -5,97 +5,87 @@
  # $FreeBSD: ports/games/q3server/Makefile,v 1.14 2005/06/17 22:59:11 netchild Exp $
  #
  
@@ -18,10 +18,10 @@
 +PKGNAMEPREFIX=	linux-
 +DISTNAME=	linuxq3apoint-${DISTVERSION}.x86
  EXTRACT_SUFX=	.run
++DIST_SUBDIR=	${Q3PKGNAMEPREFIX}data
  
--MAINTAINER=	pat@FreeBSD.org
+ MAINTAINER=	pat@FreeBSD.org
 -COMMENT=	Quake III Arena Dedicated Server for Linux
-+MAINTAINER=	alejandro@varnet.biz
 +COMMENT=	Quake III Arena for Linux
  
  ONLY_FOR_ARCHS=	i386
@@ -77,7 +77,8 @@
 -	@${INSTALL_DATA} ${WRKSRC}/pb/${pb} ${PREFIX}/${Q3DIR}/pb
 -.endfor
 +.include <bsd.port.pre.mk>
-+
+ 
+-post-install:
 +PROGS=		q3ded
 +SCRIPTS=	linux-q3ded
 +
@@ -102,12 +103,12 @@
 +.else
 +PLIST_SUB+=	SMP="@comment "
 +.endif
- 
--post-install:
++
 +do-install:
++	@${MKDIR} ${PREFIX}/libexec/linux-quake3
 +.for f in ${PROGS}
 +	@${INSTALL_PROGRAM} ${WRKSRC}/bin/Linux/x86/${f} \
-+		${PREFIX}/libexec/linux-${f:R}
++		${PREFIX}/libexec/linux-quake3/${f:R}
 +.endfor
 +.for f in ${SCRIPTS}
 +	@${INSTALL_SCRIPT} ${WRKDIR}/${f} ${PREFIX}/bin
@@ -154,10 +155,10 @@
 +	@${MKDIR} ${DOCSDIR}
 +	@${INSTALL_DATA} ${WRKSRC}/README-linux.txt ${DOCSDIR}
 +	@${CP} -Rp ${WRKSRC}/Docs/LinuxFAQ ${DOCSDIR}
-+.if defined(WITH_PUNKBUSTER)
++.   if defined(WITH_PUNKBUSTER)
 +	@${CP} -Rp ${WRKSRC}/Docs/PunkBuster ${DOCSDIR}
 +	@${INSTALL_DATA} ${WRKSRC}/pb/PB_EULA.txt ${DOCSDIR}/PunkBuster
-+.endif
++.   endif
  .endif
 -	@${CAT} ${PKGMESSAGE}
  
@@ -165,7 +166,7 @@
 +.include <bsd.port.post.mk>
 diff -urN /usr/ports/games/q3server/distinfo linux-quake3/distinfo
 --- /usr/ports/games/q3server/distinfo	Wed Mar 17 23:27:36 2004
-+++ linux-quake3/distinfo	Tue Sep  6 21:57:51 2005
++++ linux-quake3/distinfo	Mon Sep 19 13:39:59 2005
 @@ -1,2 +1,2 @@
 -MD5 (linuxq3apoint-1.32b.x86.run) = c6afb977ca0357de39db6871c8a3cd37
 -SIZE (linuxq3apoint-1.32b.x86.run) = 31478345
@@ -173,34 +174,34 @@
 +SIZE (quake3-data/linuxq3apoint-1.32b-3.x86.run) = 30923961
 diff -urN /usr/ports/games/q3server/files/linux-q3ded.in linux-quake3/files/linux-q3ded.in
 --- /usr/ports/games/q3server/files/linux-q3ded.in	Wed Dec 31 21:00:00 1969
-+++ linux-quake3/files/linux-q3ded.in	Tue Sep  6 18:55:27 2005
++++ linux-quake3/files/linux-q3ded.in	Mon Sep 19 13:58:32 2005
 @@ -0,0 +1,5 @@
 +#!/bin/sh
 +
 +cd %%DATADIR%% || exit 1
 +
-+exec %%PREFIX%%/libexec/linux-q3ded
++exec %%PREFIX%%/libexec/linux-quake3/q3ded
 diff -urN /usr/ports/games/q3server/files/linux-quake3-smp.in linux-quake3/files/linux-quake3-smp.in
 --- /usr/ports/games/q3server/files/linux-quake3-smp.in	Wed Dec 31 21:00:00 1969
-+++ linux-quake3/files/linux-quake3-smp.in	Tue Sep  6 18:56:53 2005
++++ linux-quake3/files/linux-quake3-smp.in	Mon Sep 19 13:58:32 2005
 @@ -0,0 +1,5 @@
 +#!/bin/sh
 +
 +cd %%DATADIR%% || exit 1
 +
-+exec %%PREFIX%%/libexec/linux-quake3-smp
++exec %%PREFIX%%/libexec/linux-quake3/quake3-smp
 diff -urN /usr/ports/games/q3server/files/linux-quake3.in linux-quake3/files/linux-quake3.in
 --- /usr/ports/games/q3server/files/linux-quake3.in	Wed Dec 31 21:00:00 1969
-+++ linux-quake3/files/linux-quake3.in	Tue Sep  6 18:57:00 2005
++++ linux-quake3/files/linux-quake3.in	Mon Sep 19 13:58:32 2005
 @@ -0,0 +1,5 @@
 +#!/bin/sh
 +
 +cd %%DATADIR%% || exit 1
 +
-+exec %%PREFIX%%/libexec/linux-quake3
++exec %%PREFIX%%/libexec/linux-quake3/quake3
 diff -urN /usr/ports/games/q3server/pkg-descr linux-quake3/pkg-descr
 --- /usr/ports/games/q3server/pkg-descr	Thu Nov 15 00:58:25 2001
-+++ linux-quake3/pkg-descr	Tue Sep  6 22:01:43 2005
++++ linux-quake3/pkg-descr	Mon Sep 19 13:39:59 2005
 @@ -1,9 +1,6 @@
 -This package contains all of the items you'll need to run a
 -Quake III Arena dedicated server under FreeBSD with Linux
@@ -230,8 +231,8 @@
 -------------------------------------------------------------
 diff -urN /usr/ports/games/q3server/pkg-plist linux-quake3/pkg-plist
 --- /usr/ports/games/q3server/pkg-plist	Wed Jul 27 18:15:49 2005
-+++ linux-quake3/pkg-plist	Tue Sep  6 21:44:37 2005
-@@ -1,99 +1,81 @@
++++ linux-quake3/pkg-plist	Mon Sep 19 13:50:24 2005
+@@ -1,99 +1,82 @@
 -%%PORTDOCS%%%%Q3DIR%%CHANGES-1.32.txt
 -%%PORTDOCS%%%%Q3DIR%%Docs/LinuxFAQ/INSTALL
 -%%PORTDOCS%%%%Q3DIR%%Docs/LinuxFAQ/index.html
@@ -334,9 +335,9 @@
 +bin/linux-q3ded
 +%%CLIENT%%bin/linux-quake3
 +%%SMP%%bin/linux-quake3-smp
-+libexec/linux-q3ded
-+%%CLIENT%%libexec/linux-quake3
-+%%SMP%%libexec/linux-quake3-smp
++libexec/linux-quake3/q3ded
++%%CLIENT%%libexec/linux-quake3/quake3
++%%SMP%%libexec/linux-quake3/quake3-smp
 +%%PORTDOCS%%%%DOCSDIR%%/LinuxFAQ/INSTALL
 +%%PORTDOCS%%%%DOCSDIR%%/LinuxFAQ/index.html
 +%%PORTDOCS%%%%DOCSDIR%%/LinuxFAQ/udp_wide_README.txt
@@ -394,20 +395,21 @@
 +%%PUNKBUSTER%%%%PORTDOCS%%%%DOCSDIR%%/PunkBuster/players/tupdating1.gif
 +%%PUNKBUSTER%%%%PORTDOCS%%%%DOCSDIR%%/PunkBuster/players/tusing1.gif
 +%%PORTDOCS%%%%DOCSDIR%%/README-linux.txt
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/la001293.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/lc000993.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/ls000993.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/ma001293.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/mc000993.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/ms000993.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/wa001293.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/wc000993.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/ws000993.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/pbag.so
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/pbcl.so
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/pbsv.so
-+%%PUNKBUSTER%%@dirrm %%Q3DIR%%/pb/htm
-+%%PUNKBUSTER%%@dirrm %%Q3DIR%%/pb
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/la001293.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/lc000993.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/ls000993.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/ma001293.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/mc000993.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/ms000993.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/wa001293.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/wc000993.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/ws000993.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/pbag.so
++%%PUNKBUSTER%%%%DATADIR%%/pb/pbcl.so
++%%PUNKBUSTER%%%%DATADIR%%/pb/pbsv.so
++@dirrm libexec/linux-quake3
++%%PUNKBUSTER%%@dirrm %%DATADIR%%/pb/htm
++%%PUNKBUSTER%%@dirrm %%DATADIR%%/pb
 +%%PUNKBUSTER%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/PunkBuster/players
 +%%PUNKBUSTER%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/PunkBuster/admins
 +%%PUNKBUSTER%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/PunkBuster
--- new.diff ends here ---

Comment 3 Alejandro Pulver 2005-09-19 19:53:58 UTC

>Submitter-Id:	current-users 
>Originator:	Alejandro Pulver 
>Organization:	 
>Confidential:	no 
>Synopsis:	Re: ports/86186: [UPDATE] games/q3server: integrate with "quake3-data", rename to "linux-quake3" 
>Severity:	non-critical 
>Priority:	low 
>Category:	ports 
>Class:		update 
>Release:	FreeBSD 5.4-RELEASE i386 
>Environment:





>Description:


This patch replaces the previous one (that has to be applied to the first),

Changes:
* Remove ".in" files and the "files" directory (build scripts in do-build).


>How-To-Repeat:





>Fix:


--- new2.diff begins here ---
--- pkgd/sent/linux-quake3.diff	Thu Sep 15 16:31:08 2005
+++ linux-quake3.diff	Mon Sep 19 15:49:02 2005
@@ -1,7 +1,7 @@
 diff -urN /usr/ports/games/q3server/Makefile linux-quake3/Makefile
 --- /usr/ports/games/q3server/Makefile	Wed Jul 27 18:15:49 2005
-+++ linux-quake3/Makefile	Thu Sep 15 16:30:54 2005
-@@ -5,97 +5,85 @@
++++ linux-quake3/Makefile	Mon Sep 19 15:45:34 2005
+@@ -5,97 +5,87 @@
  # $FreeBSD: ports/games/q3server/Makefile,v 1.14 2005/06/17 22:59:11 netchild Exp $
  #
  
@@ -18,17 +18,17 @@
 +PKGNAMEPREFIX=	linux-
 +DISTNAME=	linuxq3apoint-${DISTVERSION}.x86
  EXTRACT_SUFX=	.run
++DIST_SUBDIR=	${Q3PKGNAMEPREFIX}data
  
--MAINTAINER=	pat@FreeBSD.org
+ MAINTAINER=	pat@FreeBSD.org
 -COMMENT=	Quake III Arena Dedicated Server for Linux
-+MAINTAINER=	alejandro@varnet.biz
 +COMMENT=	Quake III Arena for Linux
  
  ONLY_FOR_ARCHS=	i386
  USE_LINUX=	yes
 -USE_PERL5=	yes
 -NO_CDROM=	"Size; the data set is much too big"
- NO_BUILD=	yes
+-NO_BUILD=	yes
  NO_WRKSUBDIR=	yes
 -Q3BASE=		games
 -Q3DIR=		${Q3BASE}/quake3/
@@ -39,17 +39,18 @@
 +		PUNKBUSTER "Install PunkBuster" on \
 +		SMP "Install threaded version" on
 +
-+SUB_FILES=	linux-q3ded linux-quake3 linux-quake3-smp
++BINDIR=		${PREFIX}/libexec/${PKGNAMEPREFIX}${PORTNAME}
++PLIST_SUB+=	BINDIR="${BINDIR:S/${PREFIX}\///}"
 +
 +LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
  
  do-extract:
- 	@${RM} -rf ${WRKDIR}
+-	@${RM} -rf ${WRKDIR}
  	@${MKDIR} ${WRKDIR}
 -	@cd ${WRKDIR} && ${TAIL} +266 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 -		${TAR} zxvf - >/dev/null
 +	@cd ${WRKDIR} && ${TAIL} +356 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
-+		${TAR} zxf - >/dev/null
++		${TAR} zxf -
  
 -pre-patch:
 -# remove trailing ^M
@@ -75,15 +76,12 @@
 -.endfor
 -.for pb in pbag.so pbcl.so pbsv.so
 -	@${INSTALL_DATA} ${WRKSRC}/pb/${pb} ${PREFIX}/${Q3DIR}/pb
--.endfor
 +.include <bsd.port.pre.mk>
 +
 +PROGS=		q3ded
-+SCRIPTS=	linux-q3ded
 +
 +.if defined(WITH_CLIENT)
 +PROGS+=		quake3.x86
-+SCRIPTS+=	linux-quake3
 +PLIST_SUB+=	CLIENT=""
 +.else
 +PLIST_SUB+=	CLIENT="@comment "
@@ -97,20 +95,24 @@
 +
 +.if defined(WITH_SMP)
 +PROGS+=		quake3-smp.x86
-+SCRIPTS+=	linux-quake3-smp
 +PLIST_SUB+=	SMP=""
 +.else
 +PLIST_SUB+=	SMP="@comment "
 +.endif
++
++do-build:
++.for f in ${PROGS}
++	@(${ECHO_CMD} "#!${SH}"; \
++		${ECHO_CMD} "cd ${DATADIR} || exit 1"; \
++		${ECHO_CMD} "exec ${BINDIR}/${f:R}") > ${WRKDIR}/${f:R}
+ .endfor
  
 -post-install:
 +do-install:
++	@${MKDIR} ${BINDIR}
 +.for f in ${PROGS}
-+	@${INSTALL_PROGRAM} ${WRKSRC}/bin/Linux/x86/${f} \
-+		${PREFIX}/libexec/linux-${f:R}
-+.endfor
-+.for f in ${SCRIPTS}
-+	@${INSTALL_SCRIPT} ${WRKDIR}/${f} ${PREFIX}/bin
++	@${INSTALL_PROGRAM} ${WRKSRC}/bin/Linux/x86/${f} ${BINDIR}/${f:R}
++	@${INSTALL_SCRIPT} ${WRKDIR}/${f:R} ${PREFIX}/bin/linux-${f:R}
 +.endfor
 +.if defined(WITH_PUNKBUSTER)
 +	@${CP} -Rp ${WRKSRC}/pb ${DATADIR}
@@ -154,10 +156,10 @@
 +	@${MKDIR} ${DOCSDIR}
 +	@${INSTALL_DATA} ${WRKSRC}/README-linux.txt ${DOCSDIR}
 +	@${CP} -Rp ${WRKSRC}/Docs/LinuxFAQ ${DOCSDIR}
-+.if defined(WITH_PUNKBUSTER)
++.   if defined(WITH_PUNKBUSTER)
 +	@${CP} -Rp ${WRKSRC}/Docs/PunkBuster ${DOCSDIR}
 +	@${INSTALL_DATA} ${WRKSRC}/pb/PB_EULA.txt ${DOCSDIR}/PunkBuster
-+.endif
++.   endif
  .endif
 -	@${CAT} ${PKGMESSAGE}
  
@@ -165,42 +167,15 @@
 +.include <bsd.port.post.mk>
 diff -urN /usr/ports/games/q3server/distinfo linux-quake3/distinfo
 --- /usr/ports/games/q3server/distinfo	Wed Mar 17 23:27:36 2004
-+++ linux-quake3/distinfo	Tue Sep  6 21:57:51 2005
++++ linux-quake3/distinfo	Mon Sep 19 13:39:59 2005
 @@ -1,2 +1,2 @@
 -MD5 (linuxq3apoint-1.32b.x86.run) = c6afb977ca0357de39db6871c8a3cd37
 -SIZE (linuxq3apoint-1.32b.x86.run) = 31478345
 +MD5 (quake3-data/linuxq3apoint-1.32b-3.x86.run) = c71fdddccb20e8fc393d846e9c61d685
 +SIZE (quake3-data/linuxq3apoint-1.32b-3.x86.run) = 30923961
-diff -urN /usr/ports/games/q3server/files/linux-q3ded.in linux-quake3/files/linux-q3ded.in
---- /usr/ports/games/q3server/files/linux-q3ded.in	Wed Dec 31 21:00:00 1969
-+++ linux-quake3/files/linux-q3ded.in	Tue Sep  6 18:55:27 2005
-@@ -0,0 +1,5 @@
-+#!/bin/sh
-+
-+cd %%DATADIR%% || exit 1
-+
-+exec %%PREFIX%%/libexec/linux-q3ded
-diff -urN /usr/ports/games/q3server/files/linux-quake3-smp.in linux-quake3/files/linux-quake3-smp.in
---- /usr/ports/games/q3server/files/linux-quake3-smp.in	Wed Dec 31 21:00:00 1969
-+++ linux-quake3/files/linux-quake3-smp.in	Tue Sep  6 18:56:53 2005
-@@ -0,0 +1,5 @@
-+#!/bin/sh
-+
-+cd %%DATADIR%% || exit 1
-+
-+exec %%PREFIX%%/libexec/linux-quake3-smp
-diff -urN /usr/ports/games/q3server/files/linux-quake3.in linux-quake3/files/linux-quake3.in
---- /usr/ports/games/q3server/files/linux-quake3.in	Wed Dec 31 21:00:00 1969
-+++ linux-quake3/files/linux-quake3.in	Tue Sep  6 18:57:00 2005
-@@ -0,0 +1,5 @@
-+#!/bin/sh
-+
-+cd %%DATADIR%% || exit 1
-+
-+exec %%PREFIX%%/libexec/linux-quake3
 diff -urN /usr/ports/games/q3server/pkg-descr linux-quake3/pkg-descr
 --- /usr/ports/games/q3server/pkg-descr	Thu Nov 15 00:58:25 2001
-+++ linux-quake3/pkg-descr	Tue Sep  6 22:01:43 2005
++++ linux-quake3/pkg-descr	Mon Sep 19 13:39:59 2005
 @@ -1,9 +1,6 @@
 -This package contains all of the items you'll need to run a
 -Quake III Arena dedicated server under FreeBSD with Linux
@@ -230,8 +205,8 @@
 -------------------------------------------------------------
 diff -urN /usr/ports/games/q3server/pkg-plist linux-quake3/pkg-plist
 --- /usr/ports/games/q3server/pkg-plist	Wed Jul 27 18:15:49 2005
-+++ linux-quake3/pkg-plist	Tue Sep  6 21:44:37 2005
-@@ -1,99 +1,81 @@
++++ linux-quake3/pkg-plist	Mon Sep 19 15:41:27 2005
+@@ -1,99 +1,82 @@
 -%%PORTDOCS%%%%Q3DIR%%CHANGES-1.32.txt
 -%%PORTDOCS%%%%Q3DIR%%Docs/LinuxFAQ/INSTALL
 -%%PORTDOCS%%%%Q3DIR%%Docs/LinuxFAQ/index.html
@@ -334,9 +309,9 @@
 +bin/linux-q3ded
 +%%CLIENT%%bin/linux-quake3
 +%%SMP%%bin/linux-quake3-smp
-+libexec/linux-q3ded
-+%%CLIENT%%libexec/linux-quake3
-+%%SMP%%libexec/linux-quake3-smp
++%%BINDIR%%/q3ded
++%%CLIENT%%%%BINDIR%%/quake3
++%%SMP%%%%BINDIR%%/quake3-smp
 +%%PORTDOCS%%%%DOCSDIR%%/LinuxFAQ/INSTALL
 +%%PORTDOCS%%%%DOCSDIR%%/LinuxFAQ/index.html
 +%%PORTDOCS%%%%DOCSDIR%%/LinuxFAQ/udp_wide_README.txt
@@ -394,20 +369,21 @@
 +%%PUNKBUSTER%%%%PORTDOCS%%%%DOCSDIR%%/PunkBuster/players/tupdating1.gif
 +%%PUNKBUSTER%%%%PORTDOCS%%%%DOCSDIR%%/PunkBuster/players/tusing1.gif
 +%%PORTDOCS%%%%DOCSDIR%%/README-linux.txt
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/la001293.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/lc000993.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/ls000993.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/ma001293.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/mc000993.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/ms000993.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/wa001293.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/wc000993.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/ws000993.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/pbag.so
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/pbcl.so
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/pbsv.so
-+%%PUNKBUSTER%%@dirrm %%Q3DIR%%/pb/htm
-+%%PUNKBUSTER%%@dirrm %%Q3DIR%%/pb
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/la001293.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/lc000993.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/ls000993.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/ma001293.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/mc000993.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/ms000993.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/wa001293.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/wc000993.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/ws000993.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/pbag.so
++%%PUNKBUSTER%%%%DATADIR%%/pb/pbcl.so
++%%PUNKBUSTER%%%%DATADIR%%/pb/pbsv.so
++@dirrm %%BINDIR%%
++%%PUNKBUSTER%%@dirrm %%DATADIR%%/pb/htm
++%%PUNKBUSTER%%@dirrm %%DATADIR%%/pb
 +%%PUNKBUSTER%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/PunkBuster/players
 +%%PUNKBUSTER%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/PunkBuster/admins
 +%%PUNKBUSTER%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/PunkBuster
--- new2.diff ends here ---

Comment 4 Alejandro Pulver 2005-09-22 20:53:15 UTC

>Submitter-Id:	current-users 
>Originator:	Alejandro Pulver 
>Organization:	 
>Confidential:	no 
>Synopsis:	Re: ports/86186: [UPDATE] games/q3server: integrate with "quake3-data", rename to "linux-quake3" 
>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 one).

Changes:
* Fix the wrapper scripts (weren't passing their arguments to the real binaries).


>How-To-Repeat:





>Fix:


--- new3.diff begins here ---
--- pkgd/sent/linux-quake3.diff	Thu Sep 15 16:31:08 2005
+++ linux-quake3.diff	Thu Sep 22 16:46:29 2005
@@ -1,7 +1,8 @@
+Binary files /usr/ports/games/q3server/.Makefile.swp and linux-quake3/.Makefile.swp differ
 diff -urN /usr/ports/games/q3server/Makefile linux-quake3/Makefile
 --- /usr/ports/games/q3server/Makefile	Wed Jul 27 18:15:49 2005
-+++ linux-quake3/Makefile	Thu Sep 15 16:30:54 2005
-@@ -5,97 +5,85 @@
++++ linux-quake3/Makefile	Thu Sep 22 16:32:51 2005
+@@ -5,97 +5,87 @@
  # $FreeBSD: ports/games/q3server/Makefile,v 1.14 2005/06/17 22:59:11 netchild Exp $
  #
  
@@ -18,17 +19,17 @@
 +PKGNAMEPREFIX=	linux-
 +DISTNAME=	linuxq3apoint-${DISTVERSION}.x86
  EXTRACT_SUFX=	.run
++DIST_SUBDIR=	${Q3PKGNAMEPREFIX}data
  
--MAINTAINER=	pat@FreeBSD.org
+ MAINTAINER=	pat@FreeBSD.org
 -COMMENT=	Quake III Arena Dedicated Server for Linux
-+MAINTAINER=	alejandro@varnet.biz
 +COMMENT=	Quake III Arena for Linux
  
  ONLY_FOR_ARCHS=	i386
  USE_LINUX=	yes
 -USE_PERL5=	yes
 -NO_CDROM=	"Size; the data set is much too big"
- NO_BUILD=	yes
+-NO_BUILD=	yes
  NO_WRKSUBDIR=	yes
 -Q3BASE=		games
 -Q3DIR=		${Q3BASE}/quake3/
@@ -39,17 +40,18 @@
 +		PUNKBUSTER "Install PunkBuster" on \
 +		SMP "Install threaded version" on
 +
-+SUB_FILES=	linux-q3ded linux-quake3 linux-quake3-smp
++BINDIR=		${PREFIX}/libexec/${PKGNAMEPREFIX}${PORTNAME}
++PLIST_SUB+=	BINDIR="${BINDIR:S/${PREFIX}\///}"
 +
 +LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
  
  do-extract:
- 	@${RM} -rf ${WRKDIR}
+-	@${RM} -rf ${WRKDIR}
  	@${MKDIR} ${WRKDIR}
 -	@cd ${WRKDIR} && ${TAIL} +266 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
 -		${TAR} zxvf - >/dev/null
 +	@cd ${WRKDIR} && ${TAIL} +356 ${_DISTDIR}/${DISTNAME}${EXTRACT_SUFX} | \
-+		${TAR} zxf - >/dev/null
++		${TAR} zxf -
  
 -pre-patch:
 -# remove trailing ^M
@@ -75,15 +77,12 @@
 -.endfor
 -.for pb in pbag.so pbcl.so pbsv.so
 -	@${INSTALL_DATA} ${WRKSRC}/pb/${pb} ${PREFIX}/${Q3DIR}/pb
--.endfor
 +.include <bsd.port.pre.mk>
 +
 +PROGS=		q3ded
-+SCRIPTS=	linux-q3ded
 +
 +.if defined(WITH_CLIENT)
 +PROGS+=		quake3.x86
-+SCRIPTS+=	linux-quake3
 +PLIST_SUB+=	CLIENT=""
 +.else
 +PLIST_SUB+=	CLIENT="@comment "
@@ -97,20 +96,24 @@
 +
 +.if defined(WITH_SMP)
 +PROGS+=		quake3-smp.x86
-+SCRIPTS+=	linux-quake3-smp
 +PLIST_SUB+=	SMP=""
 +.else
 +PLIST_SUB+=	SMP="@comment "
 +.endif
++
++do-build:
++.for f in ${PROGS}
++	@(${ECHO_CMD} "#!${SH}"; \
++		${ECHO_CMD} "cd ${DATADIR} || exit 1"; \
++		${ECHO_CMD} "exec ${BINDIR}/${f:R} \"$$@\"") > ${WRKDIR}/${f:R}
+ .endfor
  
 -post-install:
 +do-install:
++	@${MKDIR} ${BINDIR}
 +.for f in ${PROGS}
-+	@${INSTALL_PROGRAM} ${WRKSRC}/bin/Linux/x86/${f} \
-+		${PREFIX}/libexec/linux-${f:R}
-+.endfor
-+.for f in ${SCRIPTS}
-+	@${INSTALL_SCRIPT} ${WRKDIR}/${f} ${PREFIX}/bin
++	@${INSTALL_PROGRAM} ${WRKSRC}/bin/Linux/x86/${f} ${BINDIR}/${f:R}
++	@${INSTALL_SCRIPT} ${WRKDIR}/${f:R} ${PREFIX}/bin/linux-${f:R}
 +.endfor
 +.if defined(WITH_PUNKBUSTER)
 +	@${CP} -Rp ${WRKSRC}/pb ${DATADIR}
@@ -154,10 +157,10 @@
 +	@${MKDIR} ${DOCSDIR}
 +	@${INSTALL_DATA} ${WRKSRC}/README-linux.txt ${DOCSDIR}
 +	@${CP} -Rp ${WRKSRC}/Docs/LinuxFAQ ${DOCSDIR}
-+.if defined(WITH_PUNKBUSTER)
++.   if defined(WITH_PUNKBUSTER)
 +	@${CP} -Rp ${WRKSRC}/Docs/PunkBuster ${DOCSDIR}
 +	@${INSTALL_DATA} ${WRKSRC}/pb/PB_EULA.txt ${DOCSDIR}/PunkBuster
-+.endif
++.   endif
  .endif
 -	@${CAT} ${PKGMESSAGE}
  
@@ -165,42 +168,15 @@
 +.include <bsd.port.post.mk>
 diff -urN /usr/ports/games/q3server/distinfo linux-quake3/distinfo
 --- /usr/ports/games/q3server/distinfo	Wed Mar 17 23:27:36 2004
-+++ linux-quake3/distinfo	Tue Sep  6 21:57:51 2005
++++ linux-quake3/distinfo	Mon Sep 19 13:39:59 2005
 @@ -1,2 +1,2 @@
 -MD5 (linuxq3apoint-1.32b.x86.run) = c6afb977ca0357de39db6871c8a3cd37
 -SIZE (linuxq3apoint-1.32b.x86.run) = 31478345
 +MD5 (quake3-data/linuxq3apoint-1.32b-3.x86.run) = c71fdddccb20e8fc393d846e9c61d685
 +SIZE (quake3-data/linuxq3apoint-1.32b-3.x86.run) = 30923961
-diff -urN /usr/ports/games/q3server/files/linux-q3ded.in linux-quake3/files/linux-q3ded.in
---- /usr/ports/games/q3server/files/linux-q3ded.in	Wed Dec 31 21:00:00 1969
-+++ linux-quake3/files/linux-q3ded.in	Tue Sep  6 18:55:27 2005
-@@ -0,0 +1,5 @@
-+#!/bin/sh
-+
-+cd %%DATADIR%% || exit 1
-+
-+exec %%PREFIX%%/libexec/linux-q3ded
-diff -urN /usr/ports/games/q3server/files/linux-quake3-smp.in linux-quake3/files/linux-quake3-smp.in
---- /usr/ports/games/q3server/files/linux-quake3-smp.in	Wed Dec 31 21:00:00 1969
-+++ linux-quake3/files/linux-quake3-smp.in	Tue Sep  6 18:56:53 2005
-@@ -0,0 +1,5 @@
-+#!/bin/sh
-+
-+cd %%DATADIR%% || exit 1
-+
-+exec %%PREFIX%%/libexec/linux-quake3-smp
-diff -urN /usr/ports/games/q3server/files/linux-quake3.in linux-quake3/files/linux-quake3.in
---- /usr/ports/games/q3server/files/linux-quake3.in	Wed Dec 31 21:00:00 1969
-+++ linux-quake3/files/linux-quake3.in	Tue Sep  6 18:57:00 2005
-@@ -0,0 +1,5 @@
-+#!/bin/sh
-+
-+cd %%DATADIR%% || exit 1
-+
-+exec %%PREFIX%%/libexec/linux-quake3
 diff -urN /usr/ports/games/q3server/pkg-descr linux-quake3/pkg-descr
 --- /usr/ports/games/q3server/pkg-descr	Thu Nov 15 00:58:25 2001
-+++ linux-quake3/pkg-descr	Tue Sep  6 22:01:43 2005
++++ linux-quake3/pkg-descr	Mon Sep 19 13:39:59 2005
 @@ -1,9 +1,6 @@
 -This package contains all of the items you'll need to run a
 -Quake III Arena dedicated server under FreeBSD with Linux
@@ -230,8 +206,8 @@
 -------------------------------------------------------------
 diff -urN /usr/ports/games/q3server/pkg-plist linux-quake3/pkg-plist
 --- /usr/ports/games/q3server/pkg-plist	Wed Jul 27 18:15:49 2005
-+++ linux-quake3/pkg-plist	Tue Sep  6 21:44:37 2005
-@@ -1,99 +1,81 @@
++++ linux-quake3/pkg-plist	Mon Sep 19 15:41:27 2005
+@@ -1,99 +1,82 @@
 -%%PORTDOCS%%%%Q3DIR%%CHANGES-1.32.txt
 -%%PORTDOCS%%%%Q3DIR%%Docs/LinuxFAQ/INSTALL
 -%%PORTDOCS%%%%Q3DIR%%Docs/LinuxFAQ/index.html
@@ -334,9 +310,9 @@
 +bin/linux-q3ded
 +%%CLIENT%%bin/linux-quake3
 +%%SMP%%bin/linux-quake3-smp
-+libexec/linux-q3ded
-+%%CLIENT%%libexec/linux-quake3
-+%%SMP%%libexec/linux-quake3-smp
++%%BINDIR%%/q3ded
++%%CLIENT%%%%BINDIR%%/quake3
++%%SMP%%%%BINDIR%%/quake3-smp
 +%%PORTDOCS%%%%DOCSDIR%%/LinuxFAQ/INSTALL
 +%%PORTDOCS%%%%DOCSDIR%%/LinuxFAQ/index.html
 +%%PORTDOCS%%%%DOCSDIR%%/LinuxFAQ/udp_wide_README.txt
@@ -394,20 +370,21 @@
 +%%PUNKBUSTER%%%%PORTDOCS%%%%DOCSDIR%%/PunkBuster/players/tupdating1.gif
 +%%PUNKBUSTER%%%%PORTDOCS%%%%DOCSDIR%%/PunkBuster/players/tusing1.gif
 +%%PORTDOCS%%%%DOCSDIR%%/README-linux.txt
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/la001293.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/lc000993.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/ls000993.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/ma001293.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/mc000993.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/ms000993.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/wa001293.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/wc000993.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/htm/ws000993.htm
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/pbag.so
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/pbcl.so
-+%%PUNKBUSTER%%%%Q3DIR%%/pb/pbsv.so
-+%%PUNKBUSTER%%@dirrm %%Q3DIR%%/pb/htm
-+%%PUNKBUSTER%%@dirrm %%Q3DIR%%/pb
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/la001293.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/lc000993.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/ls000993.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/ma001293.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/mc000993.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/ms000993.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/wa001293.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/wc000993.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/htm/ws000993.htm
++%%PUNKBUSTER%%%%DATADIR%%/pb/pbag.so
++%%PUNKBUSTER%%%%DATADIR%%/pb/pbcl.so
++%%PUNKBUSTER%%%%DATADIR%%/pb/pbsv.so
++@dirrm %%BINDIR%%
++%%PUNKBUSTER%%@dirrm %%DATADIR%%/pb/htm
++%%PUNKBUSTER%%@dirrm %%DATADIR%%/pb
 +%%PUNKBUSTER%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/PunkBuster/players
 +%%PUNKBUSTER%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/PunkBuster/admins
 +%%PUNKBUSTER%%%%PORTDOCS%%@dirrm %%DOCSDIR%%/PunkBuster
--- new3.diff ends here ---

Comment 5 Edwin Groothuis freebsd_committer

2005-11-17 12:31:59 UTC

State Changed
From-To: open->repocopy

repocopy request: 

games/q3server -> games/linux-quake3

Comment 6 Edwin Groothuis freebsd_committer

2005-11-17 12:31:59 UTC

Responsible Changed
From-To: pat->portmgr

portmgr does do repocopies

Comment 7 Joe Marcus Clarke freebsd_committer

2005-11-19 17:32:29 UTC

State Changed
From-To: repocopy->open

Repocopy completed.

Comment 8 Joe Marcus Clarke freebsd_committer

2005-11-19 17:32:29 UTC

Responsible Changed
From-To: portmgr->edwin

Repocopy completed.

Comment 9 Edwin Groothuis freebsd_committer

2005-11-22 06:52:12 UTC

State Changed
From-To: open->closed

Committed, thanks!