From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Dec 8 23:00:26 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B524616A41F for ; Thu, 8 Dec 2005 23:00:26 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8D21D43D78 for ; Thu, 8 Dec 2005 23:00:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id jB8N0Hf5005996 for ; Thu, 8 Dec 2005 23:00:17 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id jB8N0HQ1005995; Thu, 8 Dec 2005 23:00:17 GMT (envelope-from gnats) Resent-Date: Thu, 8 Dec 2005 23:00:17 GMT Resent-Message-Id: <200512082300.jB8N0HQ1005995@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Alejandro Pulver" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 46D5E16A41F for ; Thu, 8 Dec 2005 22:52:13 +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 6596843D72 for ; Thu, 8 Dec 2005 22:52:11 +0000 (GMT) (envelope-from alejandro@varnet.biz) Received: (qmail 2703 invoked from network); 8 Dec 2005 22:52:08 -0000 Received: from unknown (HELO phobos.mars.bsd) (unknown) by unknown with SMTP; 8 Dec 2005 22:52:08 -0000 Message-Id: <1134082376.0@phobos.mars.bsd> Date: Thu, 8 Dec 2005 19:52:56 -0300 From: "Alejandro Pulver" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.6 Cc: Subject: ports/90123: [MAINTAINER UPDATE] games/doom-data: redesign, patch dependant ports X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Dec 2005 23:00:26 -0000 >Number: 90123 >Category: ports >Synopsis: [MAINTAINER UPDATE] games/doom-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: Thu Dec 08 23:00:17 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@ale.varnet.bsd:/usr/src/sys/i386/compile/ATHLON-ALE >Description: I have changed doom-data/Makefile.include to be more similar to bsd.*.mk files, also it doesn't override port's variables. >How-To-Repeat: >Fix: --- doom_all.diff begins here --- Common subdirectories: /usr/ports/games/deng/files and deng/files diff -urN /usr/ports/games/doom-data/Makefile doom-data/Makefile --- /usr/ports/games/doom-data/Makefile Sat Nov 19 09:06:43 2005 +++ doom-data/Makefile Thu Dec 8 11:05:07 2005 @@ -9,6 +9,7 @@ PORTVERSION= 1.0 CATEGORIES= games MASTER_SITES= http://www.ijs.si/~lesi/distfiles/doom/ +PKGNAMEPREFIX= ${DMPKGNAMEPREFIX} EXTRACT_SUFX= .bz2 DISTFILES= # DIST_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME} diff -urN /usr/ports/games/doom-data/Makefile.include doom-data/Makefile.include --- /usr/ports/games/doom-data/Makefile.include Thu Nov 17 08:28:33 2005 +++ doom-data/Makefile.include Thu Dec 8 16:22:15 2005 @@ -1,42 +1,33 @@ # Makefile for defining variables used by other Doom related ports. -# Determine if the port is a Doom engine. +# Set variables. -DMENGINES= deng doom doomlegacy prboom vavoom +DMPKGNAMEPREFIX?=doom- +DMDIR?= ${LOCALBASE}/share/doom -.for f in ${DMENGINES} -. if ${PORTNAME} == ${f} -ENGINE= yes -. endif -.endfor - -# Package name prefix. - -DMPKGNAMEPREFIX=doom- +# Add them to the environment. -.if !defined(ENGINE) -PKGNAMEPREFIX?= ${DMPKGNAMEPREFIX} -.endif +MAKE_ENV+= DMDIR="${DMDIR}" +PLIST_SUB+= DMDIR="${DMDIR:S/${LOCALBASE}\///}" +SUB_LIST+= DMDIR="${DMDIR}" -# Dependency to "games/doom-data". +# Add the dependency. .if ${PORTNAME} != "data" RUN_DEPENDS+= ${DMDIR}:${PORTSDIR}/games/doom-data .endif -# Installation directories. - -DMDIR= ${PREFIX}/share/doom +# DOS to Unix text conversion. -.if ${PORTNAME} == "data" -DATADIR?= ${DMDIR} -.endif - -.if ${PORTNAME} != "data" && !defined(ENGINE) -DATADIR?= ${DMDIR}/${PORTNAME} +.if defined(USE_CRLF) +. if defined(USE_ZIP) +EXTRACT_BEFORE_ARGS= -aqo +. else +USE_REINPLACE= yes +pre-patch: + @${FIND} ${WRKDIR} -type f -print0 | \ + ${XARGS} -0 ${FILE} | ${GREP} 'CRLF' | \ + ${SED} -e "s/:.*//" | ${SED} -e 's/ /\\ /g' | \ + ${XARGS} ${REINPLACE_CMD} -i "" -e "s/`${PRINTF} '\r'`$$//" +. endif .endif - -DOCSDIR?= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} - -PLIST_SUB+= DMDIR="${DMDIR:S/${PREFIX}\///}" -SUB_LIST+= DMDIR="${DMDIR}" diff -urN /usr/ports/games/doom-freedoom/Makefile doom-freedoom/Makefile --- /usr/ports/games/doom-freedoom/Makefile Thu Nov 24 07:04:34 2005 +++ doom-freedoom/Makefile Thu Dec 8 11:06:54 2005 @@ -10,6 +10,7 @@ CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} +PKGNAMEPREFIX= ${DMPKGNAMEPREFIX} DISTNAME= ${PORTNAME}-iwad-${PORTVERSION} MAINTAINER= alejandro@varnet.biz @@ -18,6 +19,8 @@ USE_ZIP= yes NO_BUILD= yes +DATADIR= ${DMDIR}/${PORTNAME} + PLIST_FILES= %%DATADIR%%/doom2.wad PLIST_DIRS= %%DATADIR%% @@ -25,6 +28,6 @@ @${MKDIR} ${DATADIR} @${INSTALL_DATA} ${WRKSRC}/doom2.wad ${DATADIR} -.include "${.CURDIR}/../../games/doom-data/Makefile.include" +.include "${.CURDIR}/../doom-data/Makefile.include" .include diff -urN /usr/ports/games/doom-hacx/Makefile doom-hacx/Makefile --- /usr/ports/games/doom-hacx/Makefile Thu Nov 17 08:35:23 2005 +++ doom-hacx/Makefile Thu Dec 8 11:18:29 2005 @@ -9,6 +9,7 @@ PORTVERSION= 1.0 CATEGORIES= games MASTER_SITES= http://www.ijs.si/~lesi/distfiles/doom/ +PKGNAMEPREFIX= ${DMPKGNAMEPREFIX} DISTNAME= ${PORTNAME}.wad EXTRACT_SUFX= .bz2 @@ -18,6 +19,8 @@ USE_BZIP2= yes NO_BUILD= yes NO_WRKSUBDIR= yes + +DATADIR= ${DMDIR}/${PORTNAME} PLIST_FILES= %%DATADIR%%/${DISTNAME} PLIST_DIRS= %%DATADIR%% diff -urN /usr/ports/games/doom-hr/Makefile doom-hr/Makefile --- /usr/ports/games/doom-hr/Makefile Thu Nov 17 08:31:34 2005 +++ doom-hr/Makefile Thu Dec 8 16:22:44 2005 @@ -13,6 +13,7 @@ ftp://ftp.ntua.gr/pub/vendors/idgames/themes/hr/ \ http://ftp.sunet.se/pub/pc/games/idgames/themes/hr/ \ ftp://3darchives.in-span.net/pub/idgames/themes/hr/ +PKGNAMEPREFIX= ${DMPKGNAMEPREFIX} DISTFILES= ${PORTNAME}${EXTRACT_SUFX} DIST_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME} @@ -20,12 +21,14 @@ COMMENT= Hell Revealed is a megawad, a 32-level replacement for DooM II USE_ZIP= yes -EXTRACT_BEFORE_ARGS= -aqo +USE_CRLF= yes NO_BUILD= yes NO_WRKSUBDIR= yes OPTIONS= DEMO_NM "Install demos with -nomonsters" on \ DEMO_UV "Install Ultra-Violence demos" on + +DATADIR= ${DMDIR}/${PORTNAME} post-extract: @(cd ${WRKDIR} && ${SH} ${SCRIPTDIR}/lowercase.sh) diff -urN /usr/ports/games/doom-hr2/Makefile doom-hr2/Makefile --- /usr/ports/games/doom-hr2/Makefile Thu Nov 17 08:32:17 2005 +++ doom-hr2/Makefile Thu Dec 8 16:22:56 2005 @@ -9,15 +9,18 @@ PORTVERSION= 1.0 CATEGORIES= games MASTER_SITES= http://www.doomworld.com/hr2/ +PKGNAMEPREFIX= ${DMPKGNAMEPREFIX} DISTNAME= hr2final MAINTAINER= alejandro@varnet.biz COMMENT= Hell Revealed II is a megawad, a 32-level replacement for DooM II USE_ZIP= yes -EXTRACT_BEFORE_ARGS= -aqo +USE_CRLF= yes NO_BUILD= yes NO_WRKSUBDIR= yes + +DATADIR= ${DMDIR}/${PORTNAME} PLIST_FILES= %%DATADIR%%/hr2final.wad PLIST_DIRS= %%DATADIR%% diff -urN /usr/ports/games/doom-wolfendoom/Makefile doom-wolfendoom/Makefile --- /usr/ports/games/doom-wolfendoom/Makefile Thu Nov 17 08:32:59 2005 +++ doom-wolfendoom/Makefile Thu Dec 8 11:26:35 2005 @@ -9,6 +9,7 @@ PORTVERSION= 1.0 CATEGORIES= games MASTER_SITES= http://www.ijs.si/~lesi/distfiles/doom/ +PKGNAMEPREFIX= ${DMPKGNAMEPREFIX} DISTNAME= ${PORTNAME} MAINTAINER= alejandro@varnet.biz @@ -17,6 +18,8 @@ USE_BZIP2= yes NO_BUILD= yes NO_WRKSUBDIR= yes + +DATADIR= ${DMDIR}/${PORTNAME} .include "${.CURDIR}/../doom-data/Makefile.include" Common subdirectories: /usr/ports/games/doom/files and doom/files Common subdirectories: /usr/ports/games/doomlegacy/files and doomlegacy/files Common subdirectories: /usr/ports/games/prboom/files and prboom/files Common subdirectories: /usr/ports/games/vavoom/files and vavoom/files --- doom_all.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: