Date: Fri, 12 Dec 2014 11:24:16 +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: r374581 - head/games/pysycache-themes Message-ID: <201412121124.sBCBOG8N094658@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Fri Dec 12 11:24:16 2014 New Revision: 374581 URL: https://svnweb.freebsd.org/changeset/ports/374581 QAT: https://qat.redports.org/buildarchive/r374581/ Log: - Switch manual enforcement of selecting at least one theme to OPTIONS_MULTI - Simplify installlation - Drop @dirrm* from plist Modified: head/games/pysycache-themes/Makefile head/games/pysycache-themes/pkg-plist Modified: head/games/pysycache-themes/Makefile ============================================================================== --- head/games/pysycache-themes/Makefile Fri Dec 12 11:24:02 2014 (r374580) +++ head/games/pysycache-themes/Makefile Fri Dec 12 11:24:16 2014 (r374581) @@ -20,7 +20,10 @@ NO_BUILD= yes WRKSRC= ${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME} DATADIR= ${PREFIX}/share/${DIST_SUBDIR} -OPTIONS_DEFINE= ANIMALS EARTH FOOD PLANTS SKY SPORTS VEHICLE WORLD AFRICA +OPTIONS_MULTI= THEME +OPTIONS_MULTI_THEME= ANIMALS EARTH FOOD PLANTS SKY SPORTS VEHICLE WORLD AFRICA +OPTIONS_DEFAULT= ANIMALS EARTH FOOD PLANTS SKY SPORTS VEHICLE WORLD AFRICA + ANIMALS_DESC= Animals move mouse theme EARTH_DESC= Earth move mouse theme FOOD_DESC= Food move mouse theme @@ -31,14 +34,11 @@ VEHICLE_DESC= Vehicle move mouse theme WORLD_DESC= World move mouse theme AFRICA_DESC= Africa activity theme -OPTIONS_DEFAULT= ANIMALS EARTH FOOD PLANTS SKY SPORTS VEHICLE WORLD AFRICA - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MANIMALS} DISTFILES+= animals-${PORTVERSION}.zip PLIST_SUB+= ANIMALS="" -FLAG_THEME= true HAVE_THEME+= animals .else PLIST_SUB+= ANIMALS="@comment " @@ -47,7 +47,6 @@ PLIST_SUB+= ANIMALS="@comment " .if ${PORT_OPTIONS:MEARTH} DISTFILES+= earth-${PORTVERSION}.zip PLIST_SUB+= EARTH="" -FLAG_THEME= true HAVE_THEME+= earth .else PLIST_SUB+= EARTH="@comment " @@ -56,7 +55,6 @@ PLIST_SUB+= EARTH="@comment " .if ${PORT_OPTIONS:MFOOD} DISTFILES+= food-${PORTVERSION}.zip PLIST_SUB+= FOOD="" -FLAG_THEME= true HAVE_THEME+= food .else PLIST_SUB+= FOOD="@comment " @@ -65,7 +63,6 @@ PLIST_SUB+= FOOD="@comment " .if ${PORT_OPTIONS:MPLANTS} DISTFILES+= plants-${PORTVERSION}.zip PLIST_SUB+= PLANTS="" -FLAG_THEME= true HAVE_THEME+= plants .else PLIST_SUB+= PLANTS="@comment " @@ -74,7 +71,6 @@ PLIST_SUB+= PLANTS="@comment " .if ${PORT_OPTIONS:MSKY} DISTFILES+= sky-${PORTVERSION}.zip PLIST_SUB+= SKY="" -FLAG_THEME= true HAVE_THEME+= sky .else PLIST_SUB+= SKY="@comment " @@ -83,7 +79,6 @@ PLIST_SUB+= SKY="@comment " .if ${PORT_OPTIONS:MSPORTS} DISTFILES+= sports-${PORTVERSION}.zip PLIST_SUB+= SPORTS="" -FLAG_THEME= true HAVE_THEME+= sports .else PLIST_SUB+= SPORTS="@comment " @@ -92,7 +87,6 @@ PLIST_SUB+= SPORTS="@comment " .if ${PORT_OPTIONS:MVEHICLE} DISTFILES+= vehicle-${PORTVERSION}.zip PLIST_SUB+= VEHICLE="" -FLAG_THEME= true HAVE_THEME+= vehicle .else PLIST_SUB+= VEHICLE="@comment " @@ -101,7 +95,6 @@ PLIST_SUB+= VEHICLE="@comment " .if ${PORT_OPTIONS:MWORLD} DISTFILES+= world-${PORTVERSION}.zip PLIST_SUB+= WORLD="" -FLAG_THEME= true HAVE_THEME+= world .else PLIST_SUB+= WORLD="@comment " @@ -110,24 +103,11 @@ PLIST_SUB+= WORLD="@comment " .if ${PORT_OPTIONS:MAFRICA} DISTFILES+= africa-${PORTVERSION}.zip PLIST_SUB+= AFRICA="" -FLAG_THEME= true HAVE_THEME+= africa .else PLIST_SUB+= AFRICA="@comment " .endif -pre-fetch: -.if defined(FLAG_THEME) - @${TRUE} -.else - @${ECHO} "######################" - @${ECHO} "# #" - @${ECHO} "# No themes selected #" - @${ECHO} "# #" - @${ECHO} "######################" - @${FALSE} -.endif - do-extract: @${MKDIR} ${WRKSRC} .for OPT in ${HAVE_THEME} @@ -135,8 +115,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-themes/pkg-plist ============================================================================== --- head/games/pysycache-themes/pkg-plist Fri Dec 12 11:24:02 2014 (r374580) +++ head/games/pysycache-themes/pkg-plist Fri Dec 12 11:24:16 2014 (r374581) @@ -518,20 +518,3 @@ %%WORLD%%%%DATADIR%%/themes-move/world/503.dfg %%WORLD%%%%DATADIR%%/themes-move/world/514.dfg %%WORLD%%%%DATADIR%%/themes-move/world/00093.dfg -%%AFRICA%%@dirrm %%DATADIR%%/themes-click/africa -%%ANIMALS%%@dirrm %%DATADIR%%/themes-move/animals/cache -%%ANIMALS%%@dirrm %%DATADIR%%/themes-move/animals -%%EARTH%%@dirrm %%DATADIR%%/themes-move/earth/cache -%%EARTH%%@dirrm %%DATADIR%%/themes-move/earth -%%FOOD%%@dirrm %%DATADIR%%/themes-move/food/cache -%%FOOD%%@dirrm %%DATADIR%%/themes-move/food -%%PLANTS%%@dirrm %%DATADIR%%/themes-move/plants/cache -%%PLANTS%%@dirrm %%DATADIR%%/themes-move/plants -%%SKY%%@dirrm %%DATADIR%%/themes-move/sky/cache -%%SKY%%@dirrm %%DATADIR%%/themes-move/sky -%%SPORTS%%@dirrm %%DATADIR%%/themes-move/sports/cache -%%SPORTS%%@dirrm %%DATADIR%%/themes-move/sports -%%VEHICLE%%@dirrm %%DATADIR%%/themes-move/vehicle/cache -%%VEHICLE%%@dirrm %%DATADIR%%/themes-move/vehicle -%%WORLD%%@dirrm %%DATADIR%%/themes-move/world/cache -%%WORLD%%@dirrm %%DATADIR%%/themes-move/world
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412121124.sBCBOG8N094658>