- Switch to options helpers

- Drop @dirrm* from plist

2 files changed, 55 insertions, 71 deletions

diff --git a/games/alephone-data/Makefile b/games/alephone-data/Makefile
index bebd23e4d07c..5278e4dc4c01 100644
--- a/games/alephone-data/Makefile
+++ b/games/alephone-data/Makefile
@@ -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 for the Aleph One port
 
 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 <bsd.port.options.mk>
-
-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
+AO_DESC=		Data package selection
+
+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 <bsd.port.mk>
diff --git a/games/alephone-data/pkg-plist b/games/alephone-data/pkg-plist
index d91e7f7bbef0..10be22fd2a6b 100644
--- a/games/alephone-data/pkg-plist
+++ b/games/alephone-data/pkg-plist
@@ -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