From alejandro@varnet.biz  Fri Dec  9 16:03:37 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 80E9116A422
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  9 Dec 2005 16:03:37 +0000 (GMT)
	(envelope-from alejandro@varnet.biz)
Received: from relay03.pair.com (relay03.pair.com [209.68.5.17])
	by mx1.FreeBSD.org (Postfix) with SMTP id 7A61943D66
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  9 Dec 2005 16:03:36 +0000 (GMT)
	(envelope-from alejandro@varnet.biz)
Received: (qmail 49163 invoked from network); 9 Dec 2005 16:03:34 -0000
Received: from unknown (HELO phobos.mars.bsd) (unknown)
  by unknown with SMTP; 9 Dec 2005 16:03:34 -0000
Message-Id: <1134144263.0@phobos.mars.bsd>
Date: Fri, 9 Dec 2005 13:04:23 -0300
From: "Alejandro Pulver" <alejandro@varnet.biz>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: [MAINTAINER UPDATE] games/quake2-data: redesign, patch dependant ports
X-Send-Pr-Version: gtk-send-pr 0.4.6 
X-GNATS-Notify:

>Number:         90147
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] games/quake2-data: redesign, patch dependant ports
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 09 16:10:03 GMT 2005
>Closed-Date:    Wed Dec 28 21:16:08 GMT 2005
>Last-Modified:  Wed Dec 28 21:16:08 GMT 2005
>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 quake2-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:


--- quake2_all.diff begins here ---
diff -urN /usr/ports/games/quake2-data/Makefile quake2-data/Makefile
--- /usr/ports/games/quake2-data/Makefile	Thu Nov  3 02:14:42 2005
+++ quake2-data/Makefile	Thu Dec  8 11:53:47 2005
@@ -11,6 +11,7 @@
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/quake2/ \
 		ftp://ftp.fasta.fh-dortmund.de/mirror/idstuff/quake2/
+PKGNAMEPREFIX=	${Q2PKGNAMEPREFIX}
 DISTFILES=	${Q2FULL}
 DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
 
@@ -24,6 +25,8 @@
 
 OPTIONS=	CTF "Install the Capture The Flag mod data" on \
 		SHAREWARE "Install demo version game data" off
+
+DATADIR=	${Q2DIR}
 
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
 
diff -urN /usr/ports/games/quake2-data/Makefile.include quake2-data/Makefile.include
--- /usr/ports/games/quake2-data/Makefile.include	Sun Oct 16 19:31:37 2005
+++ quake2-data/Makefile.include	Thu Dec  8 12:34:28 2005
@@ -1,39 +1,18 @@
 # Makefile for defining variables used by other Quake II related ports.
 
-# Determine if the port is a Quake II engine.
+# Set variables.
 
-Q2ENGINES=	quake2forge quake2lnx
+Q2PKGNAMEPREFIX?=quake2-
+Q2DIR?=		${LOCALBASE}/share/quake2
 
-.for f in ${Q2ENGINES}
-.   if ${PORTNAME} == ${f}
-ENGINE=		yes
-.   endif
-.endfor
+# Add them to the environment.
 
-# Package name prefix.
+MAKE_ENV+=	Q2DIR="${Q2DIR}"
+PLIST_SUB+=	Q2DIR="${Q2DIR:S/${LOCALBASE}\///}"
+SUB_LIST+=	Q2DIR="${Q2DIR}"
 
-Q2PKGNAMEPREFIX=quake2-
-
-.if !defined(ENGINE)
-PKGNAMEPREFIX?=	${Q2PKGNAMEPREFIX}
-.endif
-
-# Dependency to "games/quake2-data".
+# Add the dependency.
 
 .if ${PORTNAME} != "data"
 RUN_DEPENDS+=	${Q2DIR}:${PORTSDIR}/games/quake2-data
 .endif
-
-# Installation directories.
-
-Q2DIR=		${LOCALBASE}/share/quake2
-
-.if defined(ENGINE) || ${PORTNAME} == "data"
-DATADIR?=	${Q2DIR}
-.else
-DATADIR?=	${Q2DIR}/${PORTNAME}
-.endif
-
-DOCSDIR?=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-
-PLIST_SUB+=	Q2DIR="${Q2DIR:S/${PREFIX}\///}"
diff -urN /usr/ports/games/quake2lnx/Makefile quake2lnx/Makefile
--- /usr/ports/games/quake2lnx/Makefile	Fri Nov 18 07:02:24 2005
+++ quake2lnx/Makefile	Thu Dec  8 11:46:22 2005
@@ -45,6 +45,8 @@
 		X11		"Build X11 software driver" on \
 		X86_ASM		"Enable use of x86 assembly code" on
 
+DATADIR=	${Q2DIR}
+
 ALL_TARGET=	build_release
 MAKE_ENV=	DATADIR="${DATADIR}" LIBDIR="${LIBDIR}"
 
--- quake2_all.diff ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->garga 
Responsible-Changed-By: garga 
Responsible-Changed-When: Fri Dec 9 17:09:53 GMT 2005 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90147 
Responsible-Changed-From-To: garga->freebsd-ports-bugs 
Responsible-Changed-By: garga 
Responsible-Changed-When: Wed Dec 14 09:16:31 UTC 2005 
Responsible-Changed-Why:  
My vacation is comming and i don't have time to finnish tests 
accordingly, so, back to the pool. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90147 
Responsible-Changed-From-To: freebsd-ports-bugs->tdb 
Responsible-Changed-By: tdb 
Responsible-Changed-When: Wed Dec 14 10:01:53 UTC 2005 
Responsible-Changed-Why:  
I'll look at this. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90147 
State-Changed-From-To: open->feedback 
State-Changed-By: tdb 
State-Changed-When: Fri Dec 16 11:38:10 UTC 2005 
State-Changed-Why:  
Waiting on response from maintainer of games/quake2lnx (danfe@). 

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

From: "Alejandro Pulver" <alejandro@varnet.biz>
To: "FreeBSD gnats submit" <bug-followup@freebsd.org>
Cc:  
Subject: Re: ports/90147: [MAINTAINER UPDATE] games/quake2-data: redesign, patch dependant ports
Date: Tue, 20 Dec 2005 11:15:05 -0300

 >Submitter-Id:	current-users 
 >Originator:	Alejandro Pulver 
 >Organization:	 
 >Confidential:	no 
 >Synopsis:	Re: ports/90147: [MAINTAINER UPDATE] games/quake2-data: redesign, patch dependant ports 
 >Severity:	non-critical 
 >Priority:	low 
 >Category:	ports 
 >Class:		maintainer-update 
 >Release:	FreeBSD 5.4-RELEASE i386 
 >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:
 
 
 This patch replaces the previous one for "games/quake2lnx". The problem is that DATADIR was added to MAKE_ENV twice (the second time in quake2-data/Makefile.include).
 
 
 >How-To-Repeat:
 
 
 
 
 
 >Fix:
 
 
 --- quake2lnx.diff begins here ---
 diff -urN /usr/ports/games/quake2lnx/Makefile quake2lnx/Makefile
 --- /usr/ports/games/quake2lnx/Makefile	Fri Nov 18 07:02:24 2005
 +++ quake2lnx/Makefile	Mon Dec 12 16:18:57 2005
 @@ -45,8 +45,10 @@
  		X11		"Build X11 software driver" on \
  		X86_ASM		"Enable use of x86 assembly code" on
  
 +DATADIR=	${Q2DIR}
 +
  ALL_TARGET=	build_release
 -MAKE_ENV=	DATADIR="${DATADIR}" LIBDIR="${LIBDIR}"
 +MAKE_ENV=	LIBDIR="${LIBDIR}"
  
  PLIST_SUB+=	LIBDIR="${LIBDIR:S/${PREFIX}\///}"
  
 --- quake2lnx.diff ends here ---
 
 
 
Responsible-Changed-From-To: tdb->freebsd-ports-bugs 
Responsible-Changed-By: tdb 
Responsible-Changed-When: Wed Dec 21 12:50:26 UTC 2005 
Responsible-Changed-Why:  
I'll be mostly offline for the next couple of weeks, so returning 
this to the pool so somebody else can pick it up. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90147 
State-Changed-From-To: feedback->closed 
State-Changed-By: edwin 
State-Changed-When: Wed Dec 28 21:15:39 UTC 2005 
State-Changed-Why:  
Third time lucky! 
Committed, thanks!GNATS: Lines beginning with "GNATS:" will be deleted. 

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