From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Jan 26 05:10:01 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9D49D96F for ; Sun, 26 Jan 2014 05:10:01 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7D51B184A for ; Sun, 26 Jan 2014 05:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s0Q5A17s055308 for ; Sun, 26 Jan 2014 05:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id s0Q5A1ha055307; Sun, 26 Jan 2014 05:10:01 GMT (envelope-from gnats) Date: Sun, 26 Jan 2014 05:10:01 GMT Message-Id: <201401260510.s0Q5A1ha055307@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org Cc: From: Alex Kozlov Subject: Re: ports/186109: [maintainer-patch] converting games/doom-data to OPTIONS_MULTI X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: Alex Kozlov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Jan 2014 05:10:01 -0000 The following reply was made to PR ports/186109; it has been noted by GNATS. From: Alex Kozlov To: Jakub Lach Cc: bug-followup@FreeBSD.org Subject: Re: ports/186109: [maintainer-patch] converting games/doom-data to OPTIONS_MULTI Date: Sun, 26 Jan 2014 07:00:16 +0200 --1yeeQ81UyVL57Vl7 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, Jakub Can you please review the attached patch? Thanks. -- Alex --1yeeQ81UyVL57Vl7 Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" - Switch to OPTIONS_MULTI - Use options helpers - Support STAGEDIR Index: games/doom-data/Makefile =================================================================== --- games/doom-data/Makefile (revision 341154) +++ games/doom-data/Makefile (working copy) @@ -7,18 +7,20 @@ CATEGORIES= games MASTER_SITES= http://www.ijs.si/~lesi/distfiles/doom/ PKGNAMEPREFIX= ${DMPKGNAMEPREFIX} -EXTRACT_SUFX= .bz2 DIST_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME} MAINTAINER= jakub_lach@mailplus.pl COMMENT= Shareware data files for Doom, Doom II, Hexen, Heretic, and Strife -USE_BZIP2= yes NO_BUILD= yes NO_WRKSUBDIR= yes -OPTIONS_DEFINE= DOOM HERETIC HEXEN STRIFE +OPTIONS_SUB= yes + +OPTIONS_MULTI= WADS +OPTIONS_MULTI_WADS= DOOM HERETIC HEXEN STRIFE OPTIONS_DEFAULT= DOOM + DOOM_DESC= Install Doom shareware data HERETIC_DESC= Install Heretic shareware data HEXEN_DESC= Install Hexen shareware data @@ -29,49 +31,24 @@ LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME} DATADIR= ${DMDIR} -DOOM_WAD= doom1.wad -HERETIC_WAD= heretic1.wad -HEXEN_WAD= hexen.wad -STRIFE_WAD= strife0.wad +DOOM_DISTFILES= doom1.wad.bz2 +HERETIC_DISTFILES= heretic1.wad.bz2 +HEXEN_DISTFILES= hexen.wad.bz2 +STRIFE_DISTFILES= strife0.wad.bz2 -NO_STAGE= yes .include "Makefile.include" - .include -.for f in ${OPTIONS_DEFINE} -.if ${PORT_OPTIONS:M${f}} -DISTFILES+= ${${f}_WAD}${EXTRACT_SUFX} -PLIST_SUB+= ${f}="" -. else -PLIST_SUB+= ${f}="@comment " -. endif -.endfor - -.if ${DISTFILES} == "" -. undef DIST_SUBDIR -.endif - do-extract: @${MKDIR} ${WRKDIR} -.for f in ${OPTIONS_DEFINE} -. if ${PORT_OPTIONS:M${f}} - @${BZIP2_CMD} -dc ${_DISTDIR}/${${f}_WAD}${EXTRACT_SUFX} > \ - ${WRKDIR}/${${f}_WAD} -. endif +.for f in ${DISTFILES} + @${BZIP2_CMD} -dc ${_DISTDIR}/${f} > ${WRKDIR}/${f:S/.bz2$//} .endfor do-install: - @${MKDIR} ${DATADIR} -.for f in ${OPTIONS_DEFINE} -. if ${PORT_OPTIONS:M${f}} - ${INSTALL_DATA} ${WRKSRC}/${${f}_WAD} ${DATADIR} -. endif + @${MKDIR} ${STAGEDIR}${DATADIR} +.for f in ${DISTFILES} + ${INSTALL_DATA} ${WRKSRC}/${f:S/.bz2$//} ${STAGEDIR}${DATADIR}/ .endfor -post-install: - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} - .include --1yeeQ81UyVL57Vl7--