From trevor@FreeBSD.org  Sun Mar  7 05:19:02 2004
Return-Path: <trevor@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D903516A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  7 Mar 2004 05:19:02 -0800 (PST)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C3A6C43D39
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  7 Mar 2004 05:19:02 -0800 (PST)
	(envelope-from trevor@FreeBSD.org)
Received: from freefall.freebsd.org (trevor@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.10/8.12.10) with ESMTP id i27DJ2bv053496
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 7 Mar 2004 05:19:02 -0800 (PST)
	(envelope-from trevor@freefall.freebsd.org)
Received: (from trevor@localhost)
	by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i27DJ28T053495;
	Sun, 7 Mar 2004 05:19:02 -0800 (PST)
	(envelope-from trevor)
Message-Id: <200403071319.i27DJ28T053495@freefall.freebsd.org>
Date: Sun, 7 Mar 2004 05:19:02 -0800 (PST)
From: Trevor Johnson <trevor@FreeBSD.org>
Reply-To: Trevor Johnson <trevor@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: patch for games/fuhquake and games/quake2lnx
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         63872
>Category:       ports
>Synopsis:       patch for games/fuhquake and games/quake2lnx
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 07 05:20:19 PST 2004
>Closed-Date:    Sat May 08 12:03:52 PDT 2004
>Last-Modified:  Sat May 08 12:03:52 PDT 2004
>Originator:     Trevor Johnson
>Release:        
>Organization:
>Environment:
ports collection as of 2004-03-02 PST
>Description:
	The two ports download files with the same name (pak0.pak)
	to the same directory.  The quake2lnx port has an incorrect
	SIZE datum.
>How-To-Repeat:
	make checksum
>Fix:
also available from
<URL:http://people.freebsd.org/~trevor/ports/fuhquake-quake2lnx.diff>

- add DIST_SUBDIR so the two ports don't clobber each other's pak0.pak files
- fix size listing for quake2-r0.15.tar.gz

Index: fuhquake/Makefile
===================================================================
RCS file: /home/ncvs/ports/games/fuhquake/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- fuhquake/Makefile	17 Sep 2003 23:44:10 -0000	1.4
+++ fuhquake/Makefile	7 Mar 2004 12:58:13 -0000
@@ -16,6 +16,9 @@
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src \
 		${PORTNAME}-linux-v${PORTVERSION}${EXTRACT_SUFX}:dat \
 		pak0.pak:pak
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}-linux-v${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	danfe@regency.nsu.ru
 COMMENT=	An excellent QuakeWorld client
@@ -26,9 +29,6 @@
 .else
 PLIST_SUB+=	SHAREWARE="@comment "
 .endif
-
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
-		${PORTNAME}-linux-v${PORTVERSION}${EXTRACT_SUFX}
 
 .if exists(${LOCALBASE}/lib/libvga.so.1)
 WITH_SVGA=	yes
Index: fuhquake/distinfo
===================================================================
RCS file: /home/ncvs/ports/games/fuhquake/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- fuhquake/distinfo	1 Sep 2003 11:52:05 -0000	1.2
+++ fuhquake/distinfo	7 Mar 2004 13:09:09 -0000
@@ -1,4 +1,4 @@
-MD5 (fuhquake-source-v0.28.zip) = 7e77a97a1e1524b289ffa6978ce5377e
-MD5 (fuhquake-linux-v0.28.zip) = 72e99f8df1baab11e0492b7cee93fdd3
-MD5 (pak0.pak) = 2fa37c49cb1d3902d97cb82a1c96115a
-MD5 (q1-shareware-pak0.pak) = 5906e5998fc3d896ddaf5e6a62e03abb
+MD5 (fuhquake/fuhquake-source-v0.28.zip) = 7e77a97a1e1524b289ffa6978ce5377e
+MD5 (fuhquake/fuhquake-linux-v0.28.zip) = 72e99f8df1baab11e0492b7cee93fdd3
+MD5 (fuhquake/pak0.pak) = 2fa37c49cb1d3902d97cb82a1c96115a
+MD5 (fuhquake/q1-shareware-pak0.pak) = 5906e5998fc3d896ddaf5e6a62e03abb
Index: quake2lnx/Makefile
===================================================================
RCS file: /home/ncvs/ports/games/quake2lnx/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- quake2lnx/Makefile	4 Feb 2004 05:20:38 -0000	1.6
+++ quake2lnx/Makefile	7 Mar 2004 12:56:39 -0000
@@ -20,6 +20,7 @@
 DISTFILES+=	pak0.pak:pak \
 		players.tgz:pak
 .endif
+DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	danfe@regency.nsu.ru
Index: quake2lnx/distinfo
===================================================================
RCS file: /home/ncvs/ports/games/quake2lnx/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- quake2lnx/distinfo	29 Feb 2004 20:50:28 -0000	1.2
+++ quake2lnx/distinfo	7 Mar 2004 13:07:53 -0000
@@ -1,8 +1,8 @@
-MD5 (quake2-r0.15.tar.gz) = 9e16f29db33715f2f9420b5bb31e6263
-SIZE (quake2-r0.15.tar.gz) = 101376
-MD5 (maxpak.pak) = 5207a493edd1d359f5b7312fa028343b
-SIZE (maxpak.pak) = 3365391
-MD5 (pak0.pak) = 27d77240466ec4f3253256832b54db8a
-SIZE (pak0.pak) = 49951322
-MD5 (players.tgz) = c20ee0e8ee77fb615cae61ad5f8f5347
-SIZE (players.tgz) = 1097559
+MD5 (quake2lnx/quake2-r0.15.tar.gz) = 9e16f29db33715f2f9420b5bb31e6263
+SIZE (quake2lnx/quake2-r0.15.tar.gz) = 2660511
+MD5 (quake2lnx/maxpak.pak) = 5207a493edd1d359f5b7312fa028343b
+SIZE (quake2lnx/maxpak.pak) = 3365391
+MD5 (quake2lnx/pak0.pak) = 27d77240466ec4f3253256832b54db8a
+SIZE (quake2lnx/pak0.pak) = 49951322
+MD5 (quake2lnx/players.tgz) = c20ee0e8ee77fb615cae61ad5f8f5347
+SIZE (quake2lnx/players.tgz) = 1097559
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback  
State-Changed-By: krion 
State-Changed-When: Wed Mar 10 08:11:05 PST 2004 
State-Changed-Why:  
Asked for maintainer's feedback. 

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

From: Kirill Ponomarew <krion@FreeBSD.org>
To: danfe@regency.nsu.ru
Cc: FreeBSD-gnats-submit@FreeBSD.org
Subject: Re: ports/63872: patch for games/fuhquake and games/quake2lnx
Date: Wed, 10 Mar 2004 17:10:58 +0100

 --ZRLamLUCLuRJXeX8
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 Content-Transfer-Encoding: quoted-printable
 
 Hi,
 
 On Sun, Mar 07, 2004 at 05:19:02AM -0800, Trevor Johnson wrote:
 >=20
 > >Number:         63872
 > >Category:       ports
 > >Synopsis:       patch for games/fuhquake and games/quake2lnx
 > >Confidential:   no
 > >Severity:       non-critical
 > >Priority:       low
 > >Responsible:    freebsd-ports-bugs
 > >State:          open
 
 Here is a gift for you, could you please review it ?
 
 http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dports/63872
 
 -Kirill
 
 --ZRLamLUCLuRJXeX8
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (FreeBSD)
 
 iD8DBQFATz4SQC1G6a60JuURAqG7AKCURmyjQjMTpPCgSN2tcIH9K+US2gCffEgr
 VHommL8jYPIu+sza24+jsmM=
 =H/iu
 -----END PGP SIGNATURE-----
 
 --ZRLamLUCLuRJXeX8--

From: Alexey Dokuchaev <danfe@nsu.ru>
To: freebsd-gnats-submit@FreeBSD.org, trevor@FreeBSD.org,
	krion@freebsd.org
Cc:  
Subject: Re: ports/63872: patch for games/fuhquake and games/quake2lnx
Date: Mon, 26 Apr 2004 11:21:16 +0700

 Sorry for belated reply guys.  So here's a deal:
 
     * FuhQuake: DIST_SUBDIR issue already addressed in my new PR 
 ports/65929,
       together with unbreaking and updating this port to most recent 
 version;
       I mentioned in there this might be a good candidate for portmgr@'s 
 app-
       roval for 4.10-R since it unbreaks the port in question
 
     * Quake2LNX: Please do it (Kirill?)
 
 Thank you.
State-Changed-From-To: feedback->closed 
State-Changed-By: vs 
State-Changed-When: Sat May 8 12:01:42 PDT 2004 
State-Changed-Why:  
games/quake2lnx-part committed, games/fuhquake will be committed 
with ports/65929. 

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