Date: Fri, 12 Dec 2014 11:24:03 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374580 - head/games/pysycache-lang Message-ID: <201412121124.sBCBO32K094492@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Fri Dec 12 11:24:02 2014 New Revision: 374580 URL: https://svnweb.freebsd.org/changeset/ports/374580 QAT: https://qat.redports.org/buildarchive/r374580/ Log: - Switch manual enforcement of selecting at least one language to OPTIONS_MULTI - Simplify installlation - Drop @dirrm* from plist Modified: head/games/pysycache-lang/Makefile head/games/pysycache-lang/pkg-plist Modified: head/games/pysycache-lang/Makefile ============================================================================== --- head/games/pysycache-lang/Makefile Fri Dec 12 11:23:47 2014 (r374579) +++ head/games/pysycache-lang/Makefile Fri Dec 12 11:24:02 2014 (r374580) @@ -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> Modified: head/games/pysycache-lang/pkg-plist ============================================================================== --- head/games/pysycache-lang/pkg-plist Fri Dec 12 11:23:47 2014 (r374579) +++ head/games/pysycache-lang/pkg-plist Fri Dec 12 11:24:02 2014 (r374580) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412121124.sBCBO32K094492>