[SVN-Commit] r1678 - trunk/www/linux-tor-browser

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Sat Aug 30 09:24:58 2014
New Revision: 1678

Log:
convert PLIST_SUB to option helper

Modified:
   trunk/www/linux-tor-browser/Makefile
   trunk/www/linux-tor-browser/pkg-plist

Modified: trunk/www/linux-tor-browser/Makefile
==============================================================================
--- trunk/www/linux-tor-browser/Makefile	Sat Aug 30 00:08:43 2014	(r1677)
+++ trunk/www/linux-tor-browser/Makefile	Sat Aug 30 09:24:58 2014	(r1678)
@@ -40,9 +40,11 @@
 
 ALL_LOCALES=	ar de en-US es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN
 LOCALE=		${${PORT_OPTIONS:MLANG_*}}
+PLIST_SUB=	LOCALE="${LOCALE}"
 
 OPTIONS_DEFAULT=LANG_US
 OPTIONS_SINGLE=	L10N
+OPTIONS_SUB=	yes
 
 L10N_DESC?= 	Localization
 
@@ -54,14 +56,6 @@
 . endif
 .endfor
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLANG_US}
-PLIST_SUB+=	L10N="@comment "
-.else
-PLIST_SUB+=	L10N="" LOCALE="${LOCALE}"
-.endif
-
 post-extract:
 	@${CHMOD} -R +rX ${WRKSRC}
 

Modified: trunk/www/linux-tor-browser/pkg-plist
==============================================================================
--- trunk/www/linux-tor-browser/pkg-plist	Sat Aug 30 00:08:43 2014	(r1677)
+++ trunk/www/linux-tor-browser/pkg-plist	Sat Aug 30 09:24:58 2014	(r1678)
@@ -191,7 +191,7 @@
 lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/defaults/preferences/preferences.js
 lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/defaults/rulesets.sqlite
 lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/install.rdf
-%%L10N%%lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/langpack-%%LOCALE%%@firefox.mozilla.org.xpi
+%%NO_LANG_US%%lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/langpack-%%LOCALE%%@firefox.mozilla.org.xpi
 lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/tor-launcher at torproject.org.xpi
 lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/torbutton at torproject.org.xpi
 lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi