ports/90147: [MAINTAINER UPDATE] games/quake2-data: redesign, patch dependant ports

[Alejandro Pulver]

>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:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 09 16:10:03 GMT 2005
>Closed-Date:
>Last-Modified:
>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 at 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:
>Unformatted: