ports/90145: [MAINTAINER UPDATE] games/quake-data: redesign, patch dependant ports

[Alejandro Pulver]

>Number:         90145
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] games/quake-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:00:11 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 quake-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:


--- quake_all.diff begins here ---
diff -urN /usr/ports/games/quake-data/Makefile quake-data/Makefile
--- /usr/ports/games/quake-data/Makefile	Mon Oct 31 14:18:52 2005
+++ quake-data/Makefile	Thu Dec  8 11:53:12 2005
@@ -9,6 +9,7 @@
 PORTVERSION=	1.0.6
 CATEGORIES=	games
 MASTER_SITES=	http://www.libsdl.org/projects/quake/data/:qs
+PKGNAMEPREFIX=	${Q1PKGNAMEPREFIX}
 DISTNAME=	quakesw-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:qs
 DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
@@ -25,6 +26,8 @@
 OPTIONS=	FULL "Install full version" off \
 		QUAKEWORLD "Install QuakeWorld data" on \
 		QUAKEWORLD_SKINS "Install QuakeWorld skins" on
+
+DATADIR=	${Q1DIR}
 
 PROGFILE=	qwsv-2.30-glibc-i386-unknown-linux2.0.tar.gz
 SKINFILES=	skinbase.zip qw_skins.zip
diff -urN /usr/ports/games/quake-data/Makefile.include quake-data/Makefile.include
--- /usr/ports/games/quake-data/Makefile.include	Sun Oct 16 02:36:25 2005
+++ quake-data/Makefile.include	Thu Dec  8 12:32:45 2005
@@ -1,39 +1,18 @@
 # Makefile for defining variables used by other Quake related ports.
 
-# Determine if the port is a Quake engine.
+# Set variables.
 
-Q1ENGINES=	quakeforge darkplaces fuhquake tenebrae
+Q1PKGNAMEPREFIX?=quake-
+Q1DIR?=		${LOCALBASE}/share/quake
 
-.for f in ${Q1ENGINES}
-.   if ${PORTNAME} == ${f}
-ENGINE=		yes
-.   endif
-.endfor
+# Add them to the environment.
 
-# Package name prefix.
+MAKE_ENV+=	Q1DIR="${Q1DIR}"
+PLIST_SUB+=	Q1DIR="${Q1DIR:S/${LOCALBASE}\///}"
+SUB_LIST+=	Q1DIR="${Q1DIR}"
 
-Q1PKGNAMEPREFIX=quake-
-
-.if !defined(ENGINE)
-PKGNAMEPREFIX?=	${Q1PKGNAMEPREFIX}
-.endif
-
-# Dependency to "games/quake-data".
+# Add the dependency.
 
 .if ${PORTNAME} != "data"
 RUN_DEPENDS+=	${Q1DIR}/id1/pak0.pak:${PORTSDIR}/games/quake-data
 .endif
-
-# Installation directories.
-
-Q1DIR=		${LOCALBASE}/share/quake
-
-.if defined(ENGINE) || ${PORTNAME} == "data"
-DATADIR?=	${Q1DIR}
-.else
-DATADIR?=	${Q1DIR}/${PORTNAME}
-.endif
-
-DOCSDIR?=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-
-PLIST_SUB+=	Q1DIR="${Q1DIR}"
diff -urN /usr/ports/games/quake-dpmod/Makefile quake-dpmod/Makefile
--- /usr/ports/games/quake-dpmod/Makefile	Sun Oct 16 02:51:51 2005
+++ quake-dpmod/Makefile	Thu Dec  8 11:42:21 2005
@@ -9,6 +9,7 @@
 PORTVERSION=	20050818
 CATEGORIES=	games
 MASTER_SITES=	http://offload1.icculus.org/twilight/darkplaces/files/
+PKGNAMEPREFIX=	${Q1PKGNAMEPREFIX}
 DISTNAME=	darkplacesmod${PORTVERSION}
 
 MAINTAINER=	alejandro at varnet.biz
@@ -19,6 +20,8 @@
 USE_ZIP=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
+
+DATDAIR=	${Q1DIR}/${PORTNAME}
 
 post-extract:
 # Remove CVS directories
diff -urN /usr/ports/games/quake-reaper/Makefile quake-reaper/Makefile
--- /usr/ports/games/quake-reaper/Makefile	Sun Oct 16 02:41:06 2005
+++ quake-reaper/Makefile	Thu Dec  8 11:42:58 2005
@@ -9,6 +9,7 @@
 PORTVERSION=	0.81
 CATEGORIES=	games
 MASTER_SITES=	http://www.mindspring.com/~win32ch/
+PKGNAMEPREFIX=	${Q1PKGNAMEPREFIX}
 DISTNAME=	reaprb81
 
 MAINTAINER=	alejandro at varnet.biz
@@ -18,6 +19,8 @@
 USE_REINPLACE=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
+
+DATADIR=	${Q1DIR}/${PORTNAME}
 
 do-install:
 	@${MKDIR} ${DATADIR}
diff -urN /usr/ports/games/fuhquake/Makefile fuhquake/Makefile
--- /usr/ports/games/fuhquake/Makefile	Thu Nov 17 09:17:11 2005
+++ fuhquake/Makefile	Thu Dec  8 11:28:14 2005
@@ -39,6 +39,8 @@
 		X86_ASM "Enable x86 assembly code" on \
 		XMMS "Enable MP3 Player feature" off
 
+DATADIR=	${Q1DIR}
+
 .include "${.CURDIR}/../quake-data/Makefile.include"
 
 .include <bsd.port.pre.mk>
diff -urN /usr/ports/games/tenebrae/Makefile tenebrae/Makefile
--- /usr/ports/games/tenebrae/Makefile	Thu Nov 17 08:50:32 2005
+++ tenebrae/Makefile	Thu Dec  8 11:51:42 2005
@@ -26,6 +26,8 @@
 USE_REINPLACE=	yes
 ONLY_FOR_ARCHS=	i386
 
+DATADIR=	${Q1DIR}
+
 WRKSRC=		${WRKDIR}/${PORTNAME}_0
 BUILD_WRKSRC=	${WRKSRC}/linux
 MAKE_ENV=	DATADIR="${DATADIR}" \
--- quake_all.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: