From owner-svn-ports-head@freebsd.org Mon Dec 28 00:44:18 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 88C2DA53FBC; Mon, 28 Dec 2015 00:44:18 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 4689B1B17; Mon, 28 Dec 2015 00:44:18 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBS0iHVa068237; Mon, 28 Dec 2015 00:44:17 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBS0iHCq068235; Mon, 28 Dec 2015 00:44:17 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201512280044.tBS0iHCq068235@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 28 Dec 2015 00:44:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404610 - head/games/alephone-data X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Dec 2015 00:44:18 -0000 Author: amdmi3 Date: Mon Dec 28 00:44:17 2015 New Revision: 404610 URL: https://svnweb.freebsd.org/changeset/ports/404610 Log: - Switch to options helpers - Drop @dirrm* from plist Modified: head/games/alephone-data/Makefile head/games/alephone-data/pkg-plist Modified: head/games/alephone-data/Makefile ============================================================================== --- head/games/alephone-data/Makefile Mon Dec 28 00:41:50 2015 (r404609) +++ head/games/alephone-data/Makefile Mon Dec 28 00:44:17 2015 (r404610) @@ -7,7 +7,7 @@ PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://files3.bungie.org/trilogy/ PKGNAMEPREFIX= alephone- -DISTFILES= # +DISTFILES= # empty by default DIST_SUBDIR= alephone MAINTAINER= ports@FreeBSD.org @@ -15,69 +15,71 @@ COMMENT= Released Marathon data files fo RUN_DEPENDS= alephone:${PORTSDIR}/games/alephone -USES= zip NO_ARCH= yes NO_BUILD= yes -NO_WRKSUBDIR= yes + NO_CDROM= Bungie/Microsoft do not allow charging for Marathon data files +NO_WRKSUBDIR= yes + +USES= zip + +SUB_FILES= wrapper + +DATADIR= ${PREFIX}/share/AlephOne OPTIONS_MULTI= AO OPTIONS_MULTI_AO= MARATHON DURANDAL INFINITY OPTIONS_DEFAULT= MARATHON DURANDAL INFINITY OPTIONS_SUB= yes -MARATHON_DESC= Install Marathon data -DURANDAL_DESC= Install Marathon 2: Durandal data -INFINITY_DESC= Install Marathon Infinity data - -SUB_FILES= wrapper - -.include +AO_DESC= Data package selection -DATADIR!= cd ${PORTSDIR}/games/alephone && ${MAKE} -V DATADIR - -.if ${PORT_OPTIONS:MMARATHON} -DISTFILES+= M1A1${EXTRACT_SUFX} -AO_PACKS+= marathon -DESKTOP_ENTRIES+="Marathon" "" "" "alephone-marathon" \ - "Game;ActionGame;" false -.endif - -.if ${PORT_OPTIONS:MDURANDAL} -DISTFILES+= Marathon2${EXTRACT_SUFX} -AO_PACKS+= durandal -DESKTOP_ENTRIES+="Marathon 2: Durandal" "" "" "alephone-durandal" \ - "Game;ActionGame;" false -.endif - -.if ${PORT_OPTIONS:MINFINITY} -DISTFILES+= MarathonInfinity${EXTRACT_SUFX} -AO_PACKS+= infinity -DESKTOP_ENTRIES+="Marathon Infinity" "" "" "alephone-infinity" \ - "Game;ActionGame;" false -.endif - -post-extract: -.if ${PORT_OPTIONS:MMARATHON} - @cd ${WRKSRC} && ${MV} M1A1 marathon -.endif -.if ${PORT_OPTIONS:MDURANDAL} - @cd ${WRKSRC} && ${MV} "Marathon 2" durandal -.endif -.if ${PORT_OPTIONS:MINFINITY} - @cd ${WRKSRC} && ${MV} "Marathon Infinity" infinity -.endif - -pre-install: -.for f in ${AO_PACKS} - @cd ${WRKDIR} && ${SED} -e 's|%%GAMEDIR%%|${f}|' wrapper > alephone-${f} -.endfor +MARATHON_DESC= Install Marathon data +MARATHON_DISTFILES= M1A1${EXTRACT_SUFX} +MARATHON_DESKTOP_ENTRIES= \ + "Marathon" \ + "" \ + "" \ + "alephone-marathon" \ + "Game;ActionGame;" \ + false + +DURANDAL_DESC= Install Marathon 2: Durandal data +DURANDAL_DISTFILES= Marathon2${EXTRACT_SUFX} +DURANDAL_DESKTOP_ENTRIES= \ + "Marathon 2: Durandal" \ + "" \ + "" \ + "alephone-durandal" \ + "Game;ActionGame;" \ + false + +INFINITY_DESC= Install Marathon Infinity data +INFINITY_DISTFILES= MarathonInfinity${EXTRACT_SUFX} +INFINITY_DESKTOP_ENTRIES= \ + "Marathon Infinity" \ + "" \ + "" \ + "alephone-infinity" \ + "Game;ActionGame;" \ + false do-install: @${MKDIR} ${STAGEDIR}${DATADIR} -.for f in ${AO_PACKS} - ${INSTALL_SCRIPT} ${WRKDIR}/alephone-${f} ${STAGEDIR}${PREFIX}/bin - ${CP} -R ${WRKSRC}/${f} ${STAGEDIR}${DATADIR} -.endfor + +do-install-MARATHON-on: + @cd ${WRKSRC}/M1A1 && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/marathon + @${SED} -e 's|%%GAMEDIR%%|marathon|' ${WRKDIR}/wrapper > ${STAGEDIR}${PREFIX}/bin/alephone-marathon + +do-install-DURANDAL-on: + @cd "${WRKSRC}/Marathon 2" && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/durandal + @${SED} -e 's|%%GAMEDIR%%|durandal|' ${WRKDIR}/wrapper > ${STAGEDIR}${PREFIX}/bin/alephone-durandal + +do-install-INFINITY-on: + @cd "${WRKSRC}/Marathon Infinity" && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/infinity + @${SED} -e 's|%%GAMEDIR%%|infinity|' ${WRKDIR}/wrapper > ${STAGEDIR}${PREFIX}/bin/alephone-infinity + +post-install: + @${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/* .include Modified: head/games/alephone-data/pkg-plist ============================================================================== --- head/games/alephone-data/pkg-plist Mon Dec 28 00:41:50 2015 (r404609) +++ head/games/alephone-data/pkg-plist Mon Dec 28 00:44:17 2015 (r404610) @@ -213,21 +213,3 @@ %%INFINITY%%%%DATADIR%%/infinity/Themes/Default/tiny_button_c.bmp %%INFINITY%%%%DATADIR%%/infinity/Themes/Default/tiny_button_l.bmp %%INFINITY%%%%DATADIR%%/infinity/Themes/Default/tiny_button_r.bmp -%%MARATHON%%@dirrm %%DATADIR%%/marathon/Tracks -%%MARATHON%%@dirrm %%DATADIR%%/marathon/Themes/Default/CVS -%%MARATHON%%@dirrm %%DATADIR%%/marathon/Themes/Default -%%MARATHON%%@dirrm %%DATADIR%%/marathon/Themes -%%MARATHON%%@dirrm %%DATADIR%%/marathon/Scripts -%%MARATHON%%@dirrm %%DATADIR%%/marathon -%%DURANDAL%%@dirrm %%DATADIR%%/durandal/Themes/Default/CVS -%%DURANDAL%%@dirrm %%DATADIR%%/durandal/Themes/Default -%%DURANDAL%%@dirrm %%DATADIR%%/durandal/Themes -%%DURANDAL%%@dirrm %%DATADIR%%/durandal/Scripts -%%DURANDAL%%@dirrm %%DATADIR%%/durandal/Physics Models -%%DURANDAL%%@dirrm %%DATADIR%%/durandal -%%INFINITY%%@dirrm %%DATADIR%%/infinity/Themes/Default/CVS -%%INFINITY%%@dirrm %%DATADIR%%/infinity/Themes/Default -%%INFINITY%%@dirrm %%DATADIR%%/infinity/Themes -%%INFINITY%%@dirrm %%DATADIR%%/infinity/Scripts -%%INFINITY%%@dirrm %%DATADIR%%/infinity/Physics Models -%%INFINITY%%@dirrm %%DATADIR%%/infinity