- Switch manual enforcement of selecting at least one language to OPTIONS_MULTI

- Simplify installlation
- Drop @dirrm* from plist

2 files changed, 5 insertions, 43 deletions

diff --git a/games/pysycache-lang/Makefile b/games/pysycache-lang/Makefile
index 497e8aca0760..fe3aef75bc72 100644
--- a/games/pysycache-lang/Makefile
+++ b/games/pysycache-lang/Makefile
@@ -20,21 +20,21 @@ NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
 DATADIR=	${PREFIX}/share/${DIST_SUBDIR}
 
-OPTIONS_DEFINE=	FRENCH GERMAN ITALIAN PORTUGUESE SPANISH
+OPTIONS_MULTI=	LANG
+OPTIONS_MULTI_LANG=	FRENCH GERMAN ITALIAN PORTUGUESE SPANISH
+OPTIONS_DEFAULT=	FRENCH GERMAN ITALIAN PORTUGUESE SPANISH
+
 FRENCH_DESC=	French language support
 GERMAN_DESC=	German language support
 ITALIAN_DESC=	Italian language support
 PORTUGUESE_DESC=	Portuguese language support
 SPANISH_DESC=	Spanish language support
 
-OPTIONS_DEFAULT=	FRENCH GERMAN ITALIAN PORTUGUESE SPANISH
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFRENCH}
 DISTFILES+=	pysycache-lang-fr-${PORTVERSION}.zip
 PLIST_SUB+=	FRENCH=""
-FLAG_LANG=	true
 HAVE_LANG+=	fr
 .else
 PLIST_SUB+=	FRENCH="@comment "
@@ -43,7 +43,6 @@ PLIST_SUB+=	FRENCH="@comment "
 .if ${PORT_OPTIONS:MGERMAN}
 DISTFILES+=	pysycache-lang-de-${PORTVERSION}.zip
 PLIST_SUB+=	GERMAN=""
-FLAG_LANG=	true
 HAVE_LANG+=	de
 .else
 PLIST_SUB+=	GERMAN="@comment "
@@ -52,7 +51,6 @@ PLIST_SUB+=	GERMAN="@comment "
 .if ${PORT_OPTIONS:MITALIAN}
 DISTFILES+=	pysycache-lang-it-${PORTVERSION}.zip
 PLIST_SUB+=	ITALIAN=""
-FLAG_LANG=	true
 HAVE_LANG+=	it
 .else
 PLIST_SUB+=	ITALIAN="@comment "
@@ -61,7 +59,6 @@ PLIST_SUB+=	ITALIAN="@comment "
 .if ${PORT_OPTIONS:MPORTUGUESE}
 DISTFILES+=	pysycache-lang-pt-${PORTVERSION}.zip
 PLIST_SUB+=	PORTUGUESE=""
-FLAG_LANG=	true
 HAVE_LANG+=	pt
 .else
 PLIST_SUB+=	PORTUGUESE="@comment "
@@ -70,24 +67,11 @@ PLIST_SUB+=	PORTUGUESE="@comment "
 .if ${PORT_OPTIONS:MSPANISH}
 DISTFILES+=	pysycache-lang-es-${PORTVERSION}.zip
 PLIST_SUB+=	SPANISH=""
-FLAG_LANG=	true
 HAVE_LANG+=	es
 .else
 PLIST_SUB+=	SPANISH="@comment "
 .endif
 
-pre-fetch:
-.if defined(FLAG_LANG)
-	@${TRUE}
-.else
-	@${ECHO} "################################"
-	@${ECHO} "#                              #"
-	@${ECHO} "# No language support selected #"
-	@${ECHO} "#                              #"
-	@${ECHO} "################################"
-	@${FALSE}
-.endif
-
 do-extract:
 	@${MKDIR} ${WRKSRC}
 .for OPT in ${HAVE_LANG}
@@ -95,8 +79,6 @@ do-extract:
 .endfor
 
 do-install:
-	@cd ${WRKSRC} && \
-		${FIND} * -type d -exec ${MKDIR} "${STAGEDIR}${DATADIR}/{}" \; && \
-		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${STAGEDIR}${DATADIR}/{}" \;
+	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/games/pysycache-lang/pkg-plist b/games/pysycache-lang/pkg-plist
index 32c2d2aa3296..312e79df28ed 100644
--- a/games/pysycache-lang/pkg-plist
+++ b/games/pysycache-lang/pkg-plist
@@ -1038,23 +1038,3 @@
 %%SPANISH%%%%DATADIR%%/themes-move/alphabet-es/z000.dfg
 %%SPANISH%%%%DATADIR%%/themes-move/alphabet-es/w000.jpeg
 %%SPANISH%%%%DATADIR%%/themes-move/alphabet-es/w000.dfg
-%%FRENCH%%@dirrm %%DATADIR%%/themes-move/number-fr/cache
-%%FRENCH%%@dirrm %%DATADIR%%/themes-move/number-fr
-%%FRENCH%%@dirrm %%DATADIR%%/themes-move/alphabet-fr/cache
-%%FRENCH%%@dirrm %%DATADIR%%/themes-move/alphabet-fr
-%%GERMAN%%@dirrm %%DATADIR%%/themes-move/number-de/cache
-%%GERMAN%%@dirrm %%DATADIR%%/themes-move/number-de
-%%GERMAN%%@dirrm %%DATADIR%%/themes-move/alphabet-de/cache
-%%GERMAN%%@dirrm %%DATADIR%%/themes-move/alphabet-de
-%%ITALIAN%%@dirrm %%DATADIR%%/themes-move/number-it/cache
-%%ITALIAN%%@dirrm %%DATADIR%%/themes-move/number-it
-%%ITALIAN%%@dirrm %%DATADIR%%/themes-move/alphabet-it/cache
-%%ITALIAN%%@dirrm %%DATADIR%%/themes-move/alphabet-it
-%%PORTUGUESE%%@dirrm %%DATADIR%%/themes-move/number-pt/cache
-%%PORTUGUESE%%@dirrm %%DATADIR%%/themes-move/number-pt
-%%PORTUGUESE%%@dirrm %%DATADIR%%/themes-move/alphabet-pt/cache
-%%PORTUGUESE%%@dirrm %%DATADIR%%/themes-move/alphabet-pt
-%%SPANISH%%@dirrm %%DATADIR%%/themes-move/number-es/cache
-%%SPANISH%%@dirrm %%DATADIR%%/themes-move/number-es
-%%SPANISH%%@dirrm %%DATADIR%%/themes-move/alphabet-es/cache
-%%SPANISH%%@dirrm %%DATADIR%%/themes-move/alphabet-es