Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 5 Jul 2014 21:24:09 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r360821 - head/games/alephone-scenarios
Message-ID:  <201407052124.s65LO9QJ080861@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
 
+.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 <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407052124.s65LO9QJ080861>