From owner-svn-ports-all@FreeBSD.ORG Sat Jul 5 21:24:09 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 599E160E; Sat, 5 Jul 2014 21:24:09 +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 3A2C92ED0; Sat, 5 Jul 2014 21:24:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s65LO9Qh080862; Sat, 5 Jul 2014 21:24:09 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s65LO9QJ080861; Sat, 5 Jul 2014 21:24:09 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201407052124.s65LO9QJ080861@svn.freebsd.org> From: Pawel Pekala Date: Sat, 5 Jul 2014 21:24:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360821 - head/games/alephone-scenarios 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.18 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: Sat, 05 Jul 2014 21:24:09 -0000 Author: pawel Date: Sat Jul 5 21:24:08 2014 New Revision: 360821 URL: http://svnweb.freebsd.org/changeset/ports/360821 QAT: https://qat.redports.org/buildarchive/r360821/ Log: - Add staging support, allow it as regular user - Use options sub - Rephrase option descriptions to current standards - On 10+ libarchive is having problems with some of the distfiles, workaround this by using unzip and gtar from ports Modified: head/games/alephone-scenarios/Makefile Modified: head/games/alephone-scenarios/Makefile ============================================================================== --- head/games/alephone-scenarios/Makefile Sat Jul 5 21:23:51 2014 (r360820) +++ head/games/alephone-scenarios/Makefile Sat Jul 5 21:24:08 2014 (r360821) @@ -28,96 +28,86 @@ NO_WRKSUBDIR= yes OPTIONS_MULTI= PACKS OPTIONS_MULTI_PACKS= EMR ETERNAL EVIL RED RUBICON TI GRAY OPTIONS_DEFAULT= EVIL RED -EMR_DESC= Install Excalibur: Morgana's Revenge data -ETERNAL_DESC= Install Eternal X data -EVIL_DESC= Install Marathon Evil data -RED_DESC= Install Marathon Red data -RUBICON_DESC= Install Rubicon X data -TI_DESC= Install Tempus Irae data -GRAY_DESC= Install The gray incident data +OPTIONS_SUB= yes + +EMR_DESC= Excalibur: Morgana's Revenge data +ETERNAL_DESC= Eternal X data +EVIL_DESC= Marathon Evil data +RED_DESC= Marathon Red data +RUBICON_DESC= Rubicon X data +TI_DESC= Tempus Irae data +GRAY_DESC= The Gray Incident data SUB_FILES= wrapper -NO_STAGE= yes .include +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 +. if ${PORT_OPTIONS:METERNAL} || ${PORT_OPTIONS:MRUBICON} +USES= zip:infozip +. endif +.endif + DATADIR!= cd ${PORTSDIR}/games/alephone && ${MAKE} -V DATADIR .if ${PORT_OPTIONS:MEMR} +. if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 +EXTRACT_DEPENDS=gtar:${PORTSDIR}/archivers/gtar +TAR= ${LOCALBASE}/bin/gtar +. endif EMR_FILE= emr-3.0-0602.tgz DISTFILES+= ${EMR_FILE}:emr -PLIST_SUB+= EMR="" AO_PACKS+= emr DESKTOP_ENTRIES+="Excalibur: Morgana's Revenge" "" "" "alephone-emr" \ "Game;ActionGame;" false -.else -PLIST_SUB+= EMR="@comment " .endif .if ${PORT_OPTIONS:METERNAL} DISTFILES+= EternalXv103Full${EXTRACT_SUFX}:eternal EXTRACT_ONLY+= EternalXv103Full${EXTRACT_SUFX} -PLIST_SUB+= ETERNAL="" AO_PACKS+= eternal DESKTOP_ENTRIES+="Eternal X" "" "" "alephone-eternal" \ "Game;ActionGame;" false -.else -PLIST_SUB+= ETERNAL="@comment " .endif .if ${PORT_OPTIONS:MEVIL} DISTFILES+= MarathonEvil${EXTRACT_SUFX}:bungie EXTRACT_ONLY+= MarathonEvil${EXTRACT_SUFX} -PLIST_SUB+= EVIL="" AO_PACKS+= evil DESKTOP_ENTRIES+="Evil" "" "" "alephone-evil" \ "Game;ActionGame;" false -.else -PLIST_SUB+= EVIL="@comment " .endif .if ${PORT_OPTIONS:MRED} DISTFILES+= MarathonRED${EXTRACT_SUFX}:bungie EXTRACT_ONLY+= MarathonRED${EXTRACT_SUFX} -PLIST_SUB+= RED="" AO_PACKS+= red DESKTOP_ENTRIES+="Marathon Red" "" "" "alephone-red" \ "Game;ActionGame;" false -.else -PLIST_SUB+= RED="@comment " .endif .if ${PORT_OPTIONS:MRUBICON} DISTFILES+= marathonRubiconX${EXTRACT_SUFX}:rubicon EXTRACT_ONLY+= marathonRubiconX${EXTRACT_SUFX} -PLIST_SUB+= RUBICON="" AO_PACKS+= rubicon DESKTOP_ENTRIES+="Rubicon X" "" "" "alephone-rubicon" \ "Game;ActionGame;" false -.else -PLIST_SUB+= RUBICON="@comment " .endif .if ${PORT_OPTIONS:MTI} DISTFILES+= Tempus_Irae${EXTRACT_SUFX}:nardofiles EXTRACT_ONLY+= Tempus_Irae${EXTRACT_SUFX} -PLIST_SUB+= TI="" AO_PACKS+= tempus_irae DESKTOP_ENTRIES+="Tempus Irae" "" "" "alephone-tempus_irae" \ "Game;ActionGame;" false -.else -PLIST_SUB+= TI="@comment " .endif .if ${PORT_OPTIONS:MGRAY} DISTFILES+= tgi${EXTRACT_SUFX}:gray EXTRACT_ONLY+= tgi${EXTRACT_SUFX} -PLIST_SUB+= GRAY="" AO_PACKS+= gray DESKTOP_ENTRIES+="The Gray Incident" "" "" "alephone-gray" \ "Game;ActionGame;" false -.else -PLIST_SUB+= GRAY="@comment " .endif post-extract: @@ -131,9 +121,6 @@ post-extract: .endif .if ${PORT_OPTIONS:METERNAL} @cd ${WRKSRC} && ${MV} "Eternal X 1.0.3" eternal - @cd ${WRKSRC}/eternal && \ - ${FIND} . -type d -print0 | ${XARGS} -0 ${CHMOD} 755 && \ - ${FIND} . -type f -print0 | ${XARGS} -0 ${CHMOD} 644 .endif .if ${PORT_OPTIONS:MEVIL} @cd ${WRKSRC} && ${MV} "Marathon EVIL" evil @@ -146,9 +133,6 @@ post-extract: .endif .if ${PORT_OPTIONS:MTI} @cd ${WRKSRC} && ${MV} Tempus_Irae tempus_irae - @cd ${WRKSRC}/tempus_irae && \ - ${FIND} . -type d -print0 | ${XARGS} -0 ${CHMOD} 755 && \ - ${FIND} . -type f -print0 | ${XARGS} -0 ${CHMOD} 644 .endif .if ${PORT_OPTIONS:MGRAY} @cd ${WRKSRC} && ${MV} "The Gray Incident" gray @@ -158,22 +142,19 @@ pre-install: .for f in ${AO_PACKS} @cd ${WRKSRC} && ${SED} -e 's|%%GAMEDIR%%|${f}|' wrapper > alephone-${f} .endfor + @cd ${WRKSRC} && \ + ${FIND} . -type d -print0 | ${XARGS} -0 ${CHMOD} 755 do-install: + @${MKDIR} ${STAGEDIR}${DATADIR} .for f in ${AO_PACKS} - ${INSTALL_SCRIPT} ${WRKDIR}/alephone-${f} ${PREFIX}/bin - ${CP} -R ${WRKSRC}/${f} ${DATADIR} - @cd ${DATADIR}/${f} && \ - ${FIND} . -type d -print0 | ${XARGS} -0 ${CHMOD} ${BINMODE} && \ - ${FIND} . -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE} + ${INSTALL_SCRIPT} ${WRKDIR}/alephone-${f} ${STAGEDIR}${PREFIX}/bin + (cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${STAGEDIR}${DATADIR}) .endfor .if ${PORT_OPTIONS:MRUBICON} - @${LN} -s ${DATADIR}/[A-Z]* ${DATADIR}/rubicon +. for f in Fonts MML Themes + @${LN} -s ${DATADIR}/${f} ${STAGEDIR}${DATADIR}/rubicon +. endfor .endif -post-install: - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} - .include