From owner-svn-ports-head@FreeBSD.ORG Fri Dec 12 11:24:03 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A73D46A7; Fri, 12 Dec 2014 11:24:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 88A5B9C7; Fri, 12 Dec 2014 11:24:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBCBO3UL094494; Fri, 12 Dec 2014 11:24:03 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBCBO32K094492; Fri, 12 Dec 2014 11:24:03 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201412121124.sBCBO32K094492@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Fri, 12 Dec 2014 11:24:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374580 - head/games/pysycache-lang 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.18-1 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: Fri, 12 Dec 2014 11:24:03 -0000 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 .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 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