From owner-svn-ports-all@FreeBSD.ORG Tue Apr 22 19:16:47 2014 Return-Path: Delivered-To: svn-ports-all@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 A16EBBFA; Tue, 22 Apr 2014 19:16:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8E4C81069; Tue, 22 Apr 2014 19:16:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3MJGl2n086958; Tue, 22 Apr 2014 19:16:47 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3MJGlgD086957; Tue, 22 Apr 2014 19:16:47 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201404221916.s3MJGlgD086957@svn.freebsd.org> From: Pawel Pekala Date: Tue, 22 Apr 2014 19:16:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351874 - head/games/uhexen2-extras X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Apr 2014 19:16:47 -0000 Author: pawel Date: Tue Apr 22 19:16:47 2014 New Revision: 351874 URL: http://svnweb.freebsd.org/changeset/ports/351874 QAT: https://qat.redports.org/buildarchive/r351874/ Log: - Add staging support - Use options helpers, subs Modified: head/games/uhexen2-extras/Makefile Modified: head/games/uhexen2-extras/Makefile ============================================================================== --- head/games/uhexen2-extras/Makefile Tue Apr 22 18:48:20 2014 (r351873) +++ head/games/uhexen2-extras/Makefile Tue Apr 22 19:16:47 2014 (r351874) @@ -5,7 +5,9 @@ PORTNAME= uhexen2 PORTVERSION= 1.4.1 PORTREVISION= 2 CATEGORIES= games -MASTER_SITES= SF/${PORTNAME}/HoT%20-%20Other%20content/extra%20data +MASTER_SITES= SF/${PORTNAME}/HoT%20-%20Other%20content/extra%20data \ + SF/${PORTNAME}/HoT%20-%20Other%20content/hexen2%20mods:mods \ + SF/${PORTNAME}/HoT%20-%20Other%20content/hexenworld%20mods:hw_mods PKGNAMESUFFIX= -extras EXTRACT_SUFX= .tgz DISTFILES= # @@ -21,69 +23,46 @@ NO_BUILD= yes OPTIONS_MULTI= EXTRA OPTIONS_MULTI_EXTRA= HEXEN2_DEMOS HEXEN2_LITS HEXEN2_MODS HW_MODS OPTIONS_DEFAULT= HEXEN2_DEMOS HEXEN2_LITS HEXEN2_MODS HW_MODS +OPTIONS_SUB= yes + HEXEN2_DEMOS_DESC= Install pre-recorded demos for Hexen II +HEXEN2_DEMOS_DISTFILES= hexen2-demos${EXTRACT_SUFX} + HEXEN2_LITS_DESC= Install colored light data for Hexen II +HEXEN2_LITS_DISTFILES= hexen2-lit_files${EXTRACT_SUFX} + HEXEN2_MODS_DESC= Install several mods for Hexen II -HW_MODS_DESC= Install several mods for HexenWorld +HEXEN2_MODS_DISTFILES= apocbot-0.2.0${EXTRACT_SUFX}:mods \ + fo4d${EXTRACT_SUFX}:mods \ + hcbots-1.0.4${EXTRACT_SUFX}:mods + +HW_MODS_DESC= Install several mods for HexenWorld +HW_MODS_DISTFILES= dungeonbreak${EXTRACT_SUFX}:hw_mods \ + hexarena${EXTRACT_SUFX}:hw_mods \ + hwctf${EXTRACT_SUFX}:hw_mods \ + rivalkingdoms${EXTRACT_SUFX}:hw_mods \ + siege${EXTRACT_SUFX}:hw_mods -NO_STAGE= yes .include -.if ${PORT_OPTIONS:MHEXEN2_DEMOS} -DISTFILES+= hexen2-demos${EXTRACT_SUFX} -PLIST_SUB+= HEXEN2_DEMOS="" -.else -PLIST_SUB+= HEXEN2_DEMOS="@comment " -.endif - -.if ${PORT_OPTIONS:MHEXEN2_LITS} -DISTFILES+= hexen2-lit_files${EXTRACT_SUFX} -PLIST_SUB+= HEXEN2_LITS="" -.else -PLIST_SUB+= HEXEN2_LITS="@comment " -.endif - -.if ${PORT_OPTIONS:MHEXEN2_MODS} -MASTER_SITES+= SF/${PORTNAME}/HoT%20-%20Other%20content/hexen2%20mods:mods -DISTFILES+= apocbot-0.2.0${EXTRACT_SUFX}:mods \ - fo4d${EXTRACT_SUFX}:mods \ - hcbots-1.0.4${EXTRACT_SUFX}:mods -PLIST_SUB+= HEXEN2_MODS="" -.else -PLIST_SUB+= HEXEN2_MODS="@comment " -.endif - -.if ${PORT_OPTIONS:MHW_MODS} -MASTER_SITES+= SF/${PORTNAME}/HoT%20-%20Other%20content/hexenworld%20mods:hw_mods -DISTFILES+= dungeonbreak${EXTRACT_SUFX}:hw_mods \ - hexarena${EXTRACT_SUFX}:hw_mods \ - hwctf${EXTRACT_SUFX}:hw_mods \ - rivalkingdoms${EXTRACT_SUFX}:hw_mods \ - siege${EXTRACT_SUFX}:hw_mods -PLIST_SUB+= HW_MODS="" -.else -PLIST_SUB+= HW_MODS="@comment " -.endif - do-install: + @${MKDIR} ${STAGEDIR}${DATADIR}/data1 .if ${PORT_OPTIONS:MHEXEN2_DEMOS} - ${INSTALL_DATA} ${WRKDIR}/data1/*demo* ${DATADIR}/data1 + ${INSTALL_DATA} ${WRKDIR}/data1/*demo* ${STAGEDIR}${DATADIR}/data1 .endif .if ${PORT_OPTIONS:MHEXEN2_LITS} - ${MKDIR} ${DATADIR}/data1/maps - ${INSTALL_DATA} ${WRKDIR}/data1/maps/*.lit ${DATADIR}/data1/maps + @${MKDIR} ${STAGEDIR}${DATADIR}/data1/maps + ${INSTALL_DATA} ${WRKDIR}/data1/maps/*.lit ${STAGEDIR}${DATADIR}/data1/maps .endif .if ${PORT_OPTIONS:MHEXEN2_MODS} -.for f in apocbot fo4d hcbots - @(cd ${WRKDIR} && ${COPYTREE_SHARE} ${f} ${DATADIR}) -.endfor + (cd ${WRKDIR} && ${COPYTREE_SHARE} "apocbot fo4d hcbots" \ + ${STAGEDIR}${DATADIR}) .endif .if ${PORT_OPTIONS:MHW_MODS} -.for f in db hexarena hwctf rk siege - @(cd ${WRKDIR} && ${COPYTREE_SHARE} ${f} ${DATADIR}) -.endfor + (cd ${WRKDIR} && ${COPYTREE_SHARE} "db hexarena hwctf rk siege" \ + ${STAGEDIR}${DATADIR}) .for f in hexarena hwctf rk siege - ${INSTALL_DATA} ${WRKDIR}/data1/${f}.cfg ${DATADIR}/data1 + ${INSTALL_DATA} ${WRKDIR}/data1/${f}.cfg ${STAGEDIR}${DATADIR}/data1 .endfor .endif