[SVN-Commit] r1702 - in trunk: Mk Mk/Uses audio/linux-f10-alsa-lib audio/linux-f10-alsa-plugins-oss audio/linux-f10-alsa-plugins-pulseaudio devel/nspr mail/linux-thunderbird mail/thunderbird-i18n multimedia/gmp-api multimedia/openh264 net-im/linux-instantbird security/ca_root_nss security/nss www/firefox-esr-i18n www/firefox-i18n www/libxul www/linux-c6-freshplayerplugin www/linux-firefox www/linux-seamonkey www/linux-tor-browser www/seamonkey-i18n www/xpi-adblock

svn-freebsd-gecko at chruetertee.ch svn-freebsd-gecko at chruetertee.ch
Tue Sep 23 06:49:14 UTC 2014


Author: jbeich
Date: Tue Sep 23 06:48:59 2014
New Revision: 1702

Log:
kill @dirrm from ports per CHANGES from 20140922

Modified:
   trunk/Mk/Uses/webplugin.mk
   trunk/Mk/bsd.gecko.mk
   trunk/audio/linux-f10-alsa-lib/pkg-plist
   trunk/audio/linux-f10-alsa-plugins-oss/pkg-plist
   trunk/audio/linux-f10-alsa-plugins-pulseaudio/pkg-plist
   trunk/devel/nspr/pkg-plist
   trunk/mail/linux-thunderbird/pkg-plist
   trunk/mail/thunderbird-i18n/Makefile
   trunk/multimedia/gmp-api/pkg-plist
   trunk/multimedia/openh264/pkg-plist
   trunk/net-im/linux-instantbird/pkg-plist
   trunk/security/ca_root_nss/pkg-plist
   trunk/security/nss/pkg-plist
   trunk/www/firefox-esr-i18n/Makefile
   trunk/www/firefox-i18n/Makefile
   trunk/www/libxul/Makefile
   trunk/www/linux-c6-freshplayerplugin/Makefile
   trunk/www/linux-firefox/pkg-plist
   trunk/www/linux-seamonkey/Makefile.common
   trunk/www/linux-seamonkey/pkg-plist
   trunk/www/linux-tor-browser/pkg-plist
   trunk/www/seamonkey-i18n/Makefile
   trunk/www/xpi-adblock/Makefile.xpi

Modified: trunk/Mk/Uses/webplugin.mk
==============================================================================
--- trunk/Mk/Uses/webplugin.mk	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/Mk/Uses/webplugin.mk	Tue Sep 23 06:48:59 2014	(r1702)
@@ -54,7 +54,6 @@
 #	[...]
 #	%%WEBPLUGIN_DIR%%/fooplugin.so
 #	%%WEBPLUGIN_DIR%%/fooplugin.xpi
-#	@dirrmtry %%WEBPLUGIN_DIR%%
 #	------------------------------------------------------
 #
 # Here is what it will look like when it creates the symlinks:
@@ -93,7 +92,6 @@
 #	lib/application/fooplugin.la
 #	lib/application/fooplugin.so
 #	lib/application/fooplugin.xpi
-#	@dirrm lib/application
 #	------------------------------------------------------
 #
 # Here is what it will look like when it creates symlinks:
@@ -174,9 +172,6 @@
 	${LN} -sf ${l:S,^,${WEBPLUGIN_DIR}/,} ${STAGEDIR}${d}/
 	@${ECHO_CMD} "${d:S,^${LOCALBASE}/,,}/${l:T}" >> ${TMPPLIST}
 .endfor
-	@${ECHO_CMD} "@unexec rmdir ${d:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST}
 .endfor
-	@${ECHO_CMD} "@unexec rmdir ${_WEBPLUGIN_SLDIR:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec rmdir ${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE},%D,} 2>/dev/null || true" >> ${TMPPLIST}
 
 .endif

Modified: trunk/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/Mk/bsd.gecko.mk	Tue Sep 23 06:48:59 2014	(r1702)
@@ -94,7 +94,6 @@
 MOZILLA_SUFX?=	none
 MOZSRC?=	${WRKSRC}
 WRKSRC?=	${WRKDIR}/mozilla
-PLISTD?=	${WRKDIR}/plist_dirs
 PLISTF?=	${WRKDIR}/plist_files
 
 MOZ_PIS_DIR?=		lib/${MOZILLA}/init.d
@@ -591,15 +590,12 @@
 
 gecko-create-plist:
 # Create the plist
-	${RM} -f ${PLISTF} ${PLISTD}
+	${RM} -f ${PLISTF}
 .for dir in ${MOZILLA_PLIST_DIRS}
 	@cd ${STAGEDIR}${PREFIX}/${dir} && ${FIND} -H -s * ! -type d | \
-		${SED} -e 's|^|${dir}/|' >> ${PLISTF} && \
-		${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm ${dir}/|' >> ${PLISTD}
+		${SED} -e 's|^|${dir}/|' >> ${PLISTF}
 .endfor
 	${CAT} ${PLISTF} | ${SORT} >> ${TMPPLIST}
-	${CAT} ${PLISTD} | ${SORT} -r >> ${TMPPLIST}
 
 gecko-moz-pis-pre-install:
 .if defined(MOZ_PIS_SCRIPTS)

Modified: trunk/audio/linux-f10-alsa-lib/pkg-plist
==============================================================================
--- trunk/audio/linux-f10-alsa-lib/pkg-plist	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/audio/linux-f10-alsa-lib/pkg-plist	Tue Sep 23 06:48:59 2014	(r1702)
@@ -88,10 +88,3 @@
 usr/share/doc/alsa-lib-1.0.21/TODO
 usr/share/doc/alsa-lib-1.0.21/asoundrc.txt
 @comment non-empty directory listing in revers order
- at dirrm usr/share/doc/alsa-lib-1.0.21
- at dirrm usr/share/alsa/pcm
- at dirrm usr/share/alsa/cards/SI7018
- at dirrm usr/share/alsa/cards
- at dirrm usr/share/alsa
- at dirrm usr/lib/alsa-lib/smixer
- at dirrm usr/lib/alsa-lib

Modified: trunk/audio/linux-f10-alsa-plugins-oss/pkg-plist
==============================================================================
--- trunk/audio/linux-f10-alsa-plugins-oss/pkg-plist	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/audio/linux-f10-alsa-plugins-oss/pkg-plist	Tue Sep 23 06:48:59 2014	(r1702)
@@ -3,5 +3,3 @@
 usr/share/doc/alsa-plugins-oss-1.0.21/COPYING
 usr/share/doc/alsa-plugins-oss-1.0.21/COPYING.GPL
 usr/share/doc/alsa-plugins-oss-1.0.21/README-pcm-oss
- at dirrm usr/share/doc/alsa-plugins-oss-1.0.21
- at dirrmtry usr/lib/alsa-lib

Modified: trunk/audio/linux-f10-alsa-plugins-pulseaudio/pkg-plist
==============================================================================
--- trunk/audio/linux-f10-alsa-plugins-pulseaudio/pkg-plist	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/audio/linux-f10-alsa-plugins-pulseaudio/pkg-plist	Tue Sep 23 06:48:59 2014	(r1702)
@@ -4,5 +4,3 @@
 usr/share/doc/alsa-plugins-pulseaudio-1.0.21/COPYING
 usr/share/doc/alsa-plugins-pulseaudio-1.0.21/COPYING.GPL
 usr/share/doc/alsa-plugins-pulseaudio-1.0.21/README-pulse
- at dirrm usr/share/doc/alsa-plugins-pulseaudio-1.0.21
- at dirrmtry usr/lib/alsa-lib

Modified: trunk/devel/nspr/pkg-plist
==============================================================================
--- trunk/devel/nspr/pkg-plist	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/devel/nspr/pkg-plist	Tue Sep 23 06:48:59 2014	(r1702)
@@ -90,7 +90,3 @@
 lib/libplds4.so
 lib/libplds4.so.1
 libdata/pkgconfig/nspr.pc
- at dirrm include/nspr/private
- at dirrm include/nspr/obsolete
- at dirrm include/nspr/md
- at dirrm include/nspr

Modified: trunk/mail/linux-thunderbird/pkg-plist
==============================================================================
--- trunk/mail/linux-thunderbird/pkg-plist	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/mail/linux-thunderbird/pkg-plist	Tue Sep 23 06:48:59 2014	(r1702)
@@ -78,17 +78,3 @@
 lib/%%APP_NAME%%/updater.ini
 @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true
 @unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/  -depth 1 -type l -delete 2>/dev/null || true
- at dirrm lib/%%APP_NAME%%/chrome/icons/default
- at dirrm lib/%%APP_NAME%%/chrome/icons
- at dirrm lib/%%APP_NAME%%/chrome
- at dirrm lib/%%APP_NAME%%/components
- at dirrm lib/%%APP_NAME%%/defaults/messenger
- at dirrm lib/%%APP_NAME%%/defaults/pref
- at dirrm lib/%%APP_NAME%%/defaults
- at dirrm lib/%%APP_NAME%%/dictionaries
- at dirrm lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
- at dirrm lib/%%APP_NAME%%/extensions
- at dirrm lib/%%APP_NAME%%/icons
- at dirrm lib/%%APP_NAME%%/isp
- at dirrm lib/%%APP_NAME%%/searchplugins
- at dirrm lib/%%APP_NAME%%

Modified: trunk/mail/thunderbird-i18n/Makefile
==============================================================================
--- trunk/mail/thunderbird-i18n/Makefile	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/mail/thunderbird-i18n/Makefile	Tue Sep 23 06:48:59 2014	(r1702)
@@ -24,7 +24,6 @@
 XPI_DISTNAMES=	${THUNDERBIRD_I18N_}
 
 PLIST?=		${WRKDIR}/plist
-PLISTD?=	${WRKDIR}/plist_dirs
 PLISTF?=	${WRKDIR}/plist_files
 
 .include "${.CURDIR}/Makefile.option"
@@ -55,12 +54,9 @@
 		fi; \
 		cd ${WRKSRC}/langpack-$$lang at thunderbird.mozilla.org/; \
 		${FIND} -H -s * ! -type d | \
-		${SED} -e "s|^|lib/xpi/langpack-$$lang at thunderbird.mozilla.org/|" >> ${PLISTF} && \
-		${FIND} -d * -type d | \
-		${SED} -e "s|^|@dirrm lib/xpi/langpack-$$lang at thunderbird.mozilla.org/|" >> ${PLISTD}; \
+		${SED} -e "s|^|lib/xpi/langpack-$$lang at thunderbird.mozilla.org/|" >> ${PLISTF}; \
 	done
 	${CAT} ${PLISTF} | ${SORT} >> ${PLIST}
-	${CAT} ${PLISTD} | ${SORT} -r >> ${PLIST}
 
 
 do-install:

Modified: trunk/multimedia/gmp-api/pkg-plist
==============================================================================
--- trunk/multimedia/gmp-api/pkg-plist	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/multimedia/gmp-api/pkg-plist	Tue Sep 23 06:48:59 2014	(r1702)
@@ -16,4 +16,3 @@
 include/gmp-api/gmp-video-frame.h
 include/gmp-api/gmp-video-host.h
 include/gmp-api/gmp-video-plane.h
- at dirrm include/gmp-api

Modified: trunk/multimedia/openh264/pkg-plist
==============================================================================
--- trunk/multimedia/openh264/pkg-plist	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/multimedia/openh264/pkg-plist	Tue Sep 23 06:48:59 2014	(r1702)
@@ -13,6 +13,3 @@
 lib/libopenh264.a
 lib/libopenh264.so
 lib/libopenh264.so.0
- at dirrm include/wels
-%%PLUGINS%%@dirrm %%WEBPLUGIN_DIR%%
-%%PLUGINS%%@dirrmtry lib/browser_plugins

Modified: trunk/net-im/linux-instantbird/pkg-plist
==============================================================================
--- trunk/net-im/linux-instantbird/pkg-plist	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/net-im/linux-instantbird/pkg-plist	Tue Sep 23 06:48:59 2014	(r1702)
@@ -61,14 +61,3 @@
 lib/%%APP_NAME%%/updater.ini
 @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true
 @unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/  -depth 1 -type l -delete 2>/dev/null || true
- at dirrm lib/%%APP_NAME%%/chrome/icons/default
- at dirrm lib/%%APP_NAME%%/chrome/icons
- at dirrm lib/%%APP_NAME%%/chrome
- at dirrm lib/%%APP_NAME%%/components
- at dirrm lib/%%APP_NAME%%/defaults/pref
- at dirrm lib/%%APP_NAME%%/defaults
- at dirrm lib/%%APP_NAME%%/dictionaries
- at dirrm lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
- at dirrm lib/%%APP_NAME%%/extensions
- at dirrm lib/%%APP_NAME%%/icons
- at dirrm lib/%%APP_NAME%%

Modified: trunk/security/ca_root_nss/pkg-plist
==============================================================================
--- trunk/security/ca_root_nss/pkg-plist	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/security/ca_root_nss/pkg-plist	Tue Sep 23 06:48:59 2014	(r1702)
@@ -1,4 +1,3 @@
 %%CERTDIR%%/ca-root-nss.crt
- at dirrmtry %%CERTDIR%%
 %%ETCSYMLINK%%@cwd /
 %%ETCSYMLINK%%etc/ssl/cert.pem

Modified: trunk/security/nss/pkg-plist
==============================================================================
--- trunk/security/nss/pkg-plist	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/security/nss/pkg-plist	Tue Sep 23 06:48:59 2014	(r1702)
@@ -136,6 +136,3 @@
 lib/nss/libssl3.so
 lib/nss/libssl3.so.1
 libdata/pkgconfig/nss.pc
- at dirrm lib/nss
- at dirrm include/nss/nss
- at dirrm include/nss

Modified: trunk/www/firefox-esr-i18n/Makefile
==============================================================================
--- trunk/www/firefox-esr-i18n/Makefile	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/www/firefox-esr-i18n/Makefile	Tue Sep 23 06:48:59 2014	(r1702)
@@ -27,7 +27,6 @@
 XPI_DISTNAMES=	${FIREFOX_I18N_}
 
 PLIST?=		${WRKDIR}/plist
-PLISTD?=	${WRKDIR}/plist_dirs
 PLISTF?=	${WRKDIR}/plist_files
 
 .include "${.CURDIR}/Makefile.option"
@@ -62,12 +61,9 @@
 		fi; \
 		cd ${WRKSRC}/langpack-$$lang at firefox.mozilla.org/; \
 		${FIND} -H -s * ! -type d | \
-		${SED} -e "s|^|lib/xpi/langpack-$$lang at firefox.mozilla.org/|" >> ${PLISTF} && \
-		${FIND} -d * -type d | \
-		${SED} -e "s|^|@dirrm lib/xpi/langpack-$$lang at firefox.mozilla.org/|" >> ${PLISTD}; \
+		${SED} -e "s|^|lib/xpi/langpack-$$lang at firefox.mozilla.org/|" >> ${PLISTF}; \
 	done
 	${CAT} ${PLISTF} | ${SORT} >> ${PLIST}
-	${CAT} ${PLISTD} | ${SORT} -r >> ${PLIST}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${XPI_LIBDIR} ${STAGEDIR}${XPI_SLDIRS_ALL}

Modified: trunk/www/firefox-i18n/Makefile
==============================================================================
--- trunk/www/firefox-i18n/Makefile	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/www/firefox-i18n/Makefile	Tue Sep 23 06:48:59 2014	(r1702)
@@ -25,7 +25,6 @@
 XPI_DISTNAMES=	${FIREFOX_I18N_}
 
 PLIST?=		${WRKDIR}/plist
-PLISTD?=	${WRKDIR}/plist_dirs
 PLISTF?=	${WRKDIR}/plist_files
 
 .include "${.CURDIR}/Makefile.option"
@@ -60,12 +59,9 @@
 		fi; \
 		cd ${WRKSRC}/langpack-$$lang at firefox.mozilla.org/; \
 		${FIND} -H -s * ! -type d | \
-		${SED} -e "s|^|lib/xpi/langpack-$$lang at firefox.mozilla.org/|" >> ${PLISTF} && \
-		${FIND} -d * -type d | \
-		${SED} -e "s|^|@dirrm lib/xpi/langpack-$$lang at firefox.mozilla.org/|" >> ${PLISTD}; \
+		${SED} -e "s|^|lib/xpi/langpack-$$lang at firefox.mozilla.org/|" >> ${PLISTF}; \
 	done
 	${CAT} ${PLISTF} | ${SORT} >> ${PLIST}
-	${CAT} ${PLISTD} | ${SORT} -r >> ${PLIST}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${XPI_LIBDIR} ${STAGEDIR}${XPI_SLDIRS_ALL}

Modified: trunk/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul/Makefile	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/www/libxul/Makefile	Tue Sep 23 06:48:59 2014	(r1702)
@@ -53,7 +53,6 @@
 MOZILLA_EXEC_NAME=xulrunner
 USE_MOZILLA=	# empty
 MOZILLA_PLIST_DIRS=	bin include lib share/idl libdata
-PLIST_DIRSTRY=	share/idl
 MOZ_PKGCONFIG_FILES=	libxul-embedding libxul mozilla-js \
 			mozilla-plugin
 

Modified: trunk/www/linux-c6-freshplayerplugin/Makefile
==============================================================================
--- trunk/www/linux-c6-freshplayerplugin/Makefile	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/www/linux-c6-freshplayerplugin/Makefile	Tue Sep 23 06:48:59 2014	(r1702)
@@ -26,7 +26,6 @@
 WEBPLUGIN_FILES=libfreshwrapper-pepperflash.so
 PLIST_FILES=	%%WEBPLUGIN_DIR%%/libfreshwrapper-pepperflash.so \
 		${EXTRA_LIBS:S,^,${LINUXBASE},}
-PLIST_DIRSTRY=	lib/browser_plugins
 EXTRA_LIBS=	/usr/lib/libconfig.so.8 \
 		/usr/lib/libevent-2.0.so.5 \
 		/usr/lib/libevent_pthreads-2.0.so.5 \

Modified: trunk/www/linux-firefox/pkg-plist
==============================================================================
--- trunk/www/linux-firefox/pkg-plist	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/www/linux-firefox/pkg-plist	Tue Sep 23 06:48:59 2014	(r1702)
@@ -72,21 +72,3 @@
 lib/%%APP_NAME%%/webapprt/webapprt.ini
 @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/browser/extensions/ 2>/dev/null || true
 @unexec /usr/bin/find %D/lib/%%APP_NAME%%/browser/extensions/  -depth 1 -type l -delete 2>/dev/null || true
- at dirrm lib/%%APP_NAME%%/browser/chrome/icons/default
- at dirrm lib/%%APP_NAME%%/browser/chrome/icons
- at dirrm lib/%%APP_NAME%%/browser/chrome
- at dirrm lib/%%APP_NAME%%/browser/components
- at dirrm lib/%%APP_NAME%%/browser/defaults/preferences
- at dirrm lib/%%APP_NAME%%/browser/defaults
- at dirrm lib/%%APP_NAME%%/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
- at dirrm lib/%%APP_NAME%%/browser/extensions
- at dirrm lib/%%APP_NAME%%/browser/icons
- at dirrm lib/%%APP_NAME%%/browser/searchplugins
- at dirrm lib/%%APP_NAME%%/browser
- at dirrm lib/%%APP_NAME%%/components
- at dirrm lib/%%APP_NAME%%/defaults/pref
- at dirrm lib/%%APP_NAME%%/defaults
- at dirrm lib/%%APP_NAME%%/dictionaries
- at dirrm lib/%%APP_NAME%%/icons
- at dirrm lib/%%APP_NAME%%/webapprt
- at dirrm lib/%%APP_NAME%%

Modified: trunk/www/linux-seamonkey/Makefile.common
==============================================================================
--- trunk/www/linux-seamonkey/Makefile.common	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/www/linux-seamonkey/Makefile.common	Tue Sep 23 06:48:59 2014	(r1702)
@@ -59,7 +59,6 @@
 .if !target(post-extract)
 post-extract:
 	@${RM} -rf ${WRKSRC}/updates
-	@${MKDIR} ${WRKSRC}/${APP_SUBDIR}extensions
 	@${LN} -sf ${LOCALBASE}/lib/browser_plugins/symlinks/${APP_NAME} \
 		${WRKSRC}/${APP_SUBDIR}plugins
 . if defined(WANT_GTK218)
@@ -123,8 +122,6 @@
 		%D/lib/%%APP_NAME%%/${APP_SUBDIR}extensions/ ${_Q}' >> ${PLIST}
 	${ECHO_CMD} '@unexec ${FIND} %D/lib/%%APP_NAME%%/${APP_SUBDIR}extensions/ \
 		-depth 1 -type l -delete ${_Q}' >> ${PLIST}
-	cd ${WRKSRC} && ${FIND} -sd . -type d | \
-		${SED} -e "s#^\.#@dirrm lib/%%APP_NAME%%#" >> ${PLIST}
 .if defined(WANT_GTK218)
 . for f in ${GTK218_FILES}
 	${REINPLACE_CMD} -i '' '/${f:T}/s/^/%%GTK218%%/' ${PLIST}

Modified: trunk/www/linux-seamonkey/pkg-plist
==============================================================================
--- trunk/www/linux-seamonkey/pkg-plist	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/www/linux-seamonkey/pkg-plist	Tue Sep 23 06:48:59 2014	(r1702)
@@ -126,19 +126,3 @@
 lib/%%APP_NAME%%/updater.ini
 @exec /bin/cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/  %D/lib/%%APP_NAME%%/extensions/ 2>/dev/null || true
 @unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/  -depth 1 -type l -delete 2>/dev/null || true
- at dirrm lib/%%APP_NAME%%/chrome/icons/default
- at dirrm lib/%%APP_NAME%%/chrome/icons
- at dirrm lib/%%APP_NAME%%/chrome
- at dirrm lib/%%APP_NAME%%/components
- at dirrm lib/%%APP_NAME%%/defaults/messenger
- at dirrm lib/%%APP_NAME%%/defaults/pref
- at dirrm lib/%%APP_NAME%%/defaults/profile
- at dirrm lib/%%APP_NAME%%/defaults
- at dirrm lib/%%APP_NAME%%/dictionaries
- at dirrm lib/%%APP_NAME%%/distribution/extensions
- at dirrm lib/%%APP_NAME%%/distribution
- at dirrm lib/%%APP_NAME%%/extensions
- at dirrm lib/%%APP_NAME%%/icons
- at dirrm lib/%%APP_NAME%%/isp
- at dirrm lib/%%APP_NAME%%/searchplugins
- at dirrm lib/%%APP_NAME%%

Modified: trunk/www/linux-tor-browser/pkg-plist
==============================================================================
--- trunk/www/linux-tor-browser/pkg-plist	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/www/linux-tor-browser/pkg-plist	Tue Sep 23 06:48:59 2014	(r1702)
@@ -1512,201 +1512,3 @@
 lib/linux-tor-browser/Browser/webapprt/omni.ja
 lib/linux-tor-browser/Browser/webapprt/webapprt.ini
 lib/linux-tor-browser/start-tor-browser
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Docs/FlashProxy
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Docs/Licenses/PluggableTransports
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Docs/Licenses
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Docs/Obfsproxy
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Docs/fteproxy
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Docs/libfte
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Docs/meek
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Docs/sources
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Docs
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/Caches
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/content/code
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/content/rules
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/content
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/ar
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/bg
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/cs
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/da
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/de
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/el
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/en
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/es
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/eu
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/fa
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/fi
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/fr
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/he
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/hr
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/hu
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/it
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/ja
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/ko
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/lt
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/lv
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/ms
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/nb
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/nl
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/pl
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/pt
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/ru
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/si
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/sk
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/sl
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/sv
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/tr
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/zh-CN
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale/zh-TW
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/locale
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome/skin
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/chrome
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/components
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/defaults/preferences
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org/defaults
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions/https-everywhere at eff.org
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/extensions
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default/preferences
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.default
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.meek-http-helper/extensions
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser/profile.meek-http-helper
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Browser
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel/Tor
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Skel
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/Crypto/Cipher
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/Crypto/Hash
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/Crypto/Protocol
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/Crypto/PublicKey
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/Crypto/Random/Fortuna
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/Crypto/Random/OSRNG
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/Crypto/Random
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/Crypto/SelfTest/Cipher
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/Crypto/SelfTest/Hash
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/Crypto/SelfTest/Protocol
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/Crypto/SelfTest/PublicKey
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/Crypto/SelfTest/Random/Fortuna
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/Crypto/SelfTest/Random/OSRNG
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/Crypto/SelfTest/Random
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/Crypto/SelfTest/Signature
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/Crypto/SelfTest/Util
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/Crypto/SelfTest
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/Crypto/Signature
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/Crypto/Util
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/Crypto
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/M2Crypto/PGP
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/M2Crypto/SSL
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/M2Crypto
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/flashproxy
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/fte/tests/dfas
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/fte/tests
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/fte
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/fteproxy/defs
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/fteproxy/tests
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/fteproxy
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/obfsproxy/common
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/obfsproxy/managed
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/obfsproxy/network
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/obfsproxy/test/transports
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/obfsproxy/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/obfsproxy/transports/scramblesuit
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/obfsproxy/transports
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/obfsproxy
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/ometa/_generated
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/ometa/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/ometa
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/pyptlib/util
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/pyptlib
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/terml/_generated
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/terml/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/terml
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/application/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/application
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/conch/client
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/conch/insults
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/conch/openssh_compat
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/conch/scripts
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/conch/ssh
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/conch/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/conch/ui
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/conch
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/cred
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/enterprise
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/internet/iocpreactor/iocpsupport
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/internet/iocpreactor
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/internet/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/internet
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/lore/scripts
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/lore/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/lore
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/mail/scripts
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/mail/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/mail
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/manhole/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/manhole/ui/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/manhole/ui
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/manhole
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/names/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/names
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/news/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/news
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/pair/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/pair
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/persisted/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/persisted
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/plugins
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/protocols/gps
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/protocols/mice
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/protocols/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/protocols
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/python/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/python
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/runner/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/runner
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/scripts/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/scripts
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/spread/ui
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/spread
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/tap
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/trial/_dist/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/trial/_dist
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/trial/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/trial
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/web/_auth
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/web/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/web
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/words/im
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/words/protocols/jabber
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/words/protocols
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/words/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/words/xish
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted/words
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/twisted
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/txsocksx/test
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/txsocksx
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/yaml
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/zope/interface/common/tests
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/zope/interface/common
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/zope/interface/tests
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/zope/interface
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports/zope
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor/PluggableTransports
- at dirrm lib/linux-tor-browser/Browser/TorBrowser/Tor
- at dirrm lib/linux-tor-browser/Browser/TorBrowser
- at dirrm lib/linux-tor-browser/Browser/browser/chrome/icons/default
- at dirrm lib/linux-tor-browser/Browser/browser/chrome/icons
- at dirrm lib/linux-tor-browser/Browser/browser/chrome
- at dirrm lib/linux-tor-browser/Browser/browser/components
- at dirrm lib/linux-tor-browser/Browser/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
- at dirrm lib/linux-tor-browser/Browser/browser/extensions
- at dirrm lib/linux-tor-browser/Browser/browser/icons
- at dirrm lib/linux-tor-browser/Browser/browser/searchplugins
- at dirrm lib/linux-tor-browser/Browser/browser
- at dirrm lib/linux-tor-browser/Browser/components
- at dirrm lib/linux-tor-browser/Browser/defaults/pref
- at dirrm lib/linux-tor-browser/Browser/defaults
- at dirrm lib/linux-tor-browser/Browser/dictionaries
- at dirrm lib/linux-tor-browser/Browser/icons
- at dirrm lib/linux-tor-browser/Browser/webapprt
- at dirrm lib/linux-tor-browser/Browser
- at dirrm lib/linux-tor-browser

Modified: trunk/www/seamonkey-i18n/Makefile
==============================================================================
--- trunk/www/seamonkey-i18n/Makefile	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/www/seamonkey-i18n/Makefile	Tue Sep 23 06:48:59 2014	(r1702)
@@ -26,7 +26,6 @@
 XPI_DISTNAMES=	${SEAMONKEY_I18N_}
 
 PLIST?=		${WRKDIR}/plist
-PLISTD?=	${WRKDIR}/plist_dirs
 PLISTF?=	${WRKDIR}/plist_files
 
 .include "${.CURDIR}/Makefile.option"
@@ -58,12 +57,9 @@
 		fi; \
 		cd ${WRKSRC}/langpack-$$lang at seamonkey.mozilla.org/; \
 		${FIND} -H -s * ! -type d | \
-		${SED} -e "s|^|lib/xpi/langpack-$$lang at seamonkey.mozilla.org/|" >> ${PLISTF} && \
-		${FIND} -d * -type d | \
-		${SED} -e "s|^|@dirrm lib/xpi/langpack-$$lang at seamonkey.mozilla.org/|" >> ${PLISTD}; \
+		${SED} -e "s|^|lib/xpi/langpack-$$lang at seamonkey.mozilla.org/|" >> ${PLISTF}; \
 	done
 	${CAT} ${PLISTF} | ${SORT} >> ${PLIST}
-	${CAT} ${PLISTD} | ${SORT} -r >> ${PLIST}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${XPI_LIBDIR} ${STAGEDIR}${XPI_SLDIRS_ALL}

Modified: trunk/www/xpi-adblock/Makefile.xpi
==============================================================================
--- trunk/www/xpi-adblock/Makefile.xpi	Sun Sep 21 13:10:40 2014	(r1701)
+++ trunk/www/xpi-adblock/Makefile.xpi	Tue Sep 23 06:48:59 2014	(r1702)
@@ -7,8 +7,6 @@
 #				  PLIST_FILES. XPI_FILES can be generated by xpi-gen, but be
 #				  sure to put chrome.manifest in ${FILESDIR} before that if you
 #				  need it.
-# XPI_DIRS		- List of directories in xpi archive. This is used to produce
-#				  PLIST_DIRS.
 # XPI_DISTNAME	- The name of distribution
 #				  Default: ${PORTNAME}
 # PORTNAME, PORTVERSION, DISTVERSIONSUFFIX, CATEGORIES, MAINTAINER, COMMENT
@@ -143,9 +141,6 @@
 .ifndef XPI_DISTNAMES
 XPI_XPIDIR?=	${XPI_LIBDIR}/${XPI_ID}
 .endif
-XPI_DIRS_TRY=	${XPI_SLDIRS_ALL:S,^${PREFIX}/,,} \
-		${XPI_SLDIR:S,^${PREFIX}/,,} \
-		${XPI_LIBDIR:S,^${PREFIX}/,,}
 
 PLIST_SUB+=	XPI_LIBDIR="${XPI_LIBDIR:S,^${PREFIX}/,,}" \
 		XPI_XPIDIR="${XPI_XPIDIR:S,^${PREFIX}/,,}"
@@ -155,13 +150,11 @@
 _A=	>> ${TMPPLIST}
 _Q=	2>/dev/null || true
 PLIST_FILES+=	${XPI_FILES:S!^!${_TD}/!}
-PLIST_DIRS+=	${XPI_DIRS:S!^!${_TD}/!} ${_TD}
 
 .for dist in ${XPI_DISTNAMES}
 XPI_XPIDIR_${dist}=	${XPI_LIBDIR}/${XPI_ID_${dist}}
 _TD_${dist}=	${XPI_XPIDIR_${dist}:S,^${PREFIX}/,,}
 PLIST_FILES+=	${XPI_FILES_${dist}:S!^!${_TD_${dist}}/!}
-PLIST_DIRS+=	${XPI_DIRS_${dist}:S!^!${_TD_${dist}}/!} ${_TD_${dist}}
 .endfor
 
 .if !target(do-install)
@@ -174,7 +167,6 @@
 	@${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${STAGEDIR}${PREFIX},%D,}' ${_A}
 	@${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} $$_dir/ ${_Q}; }' ${_A}
 	@${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${XPI_ID} ; }' ${_A}
-	@for _dir in ${XPI_DIRS_TRY} ; { ${ECHO_CMD} "@unexec rmdir %D/$$_dir ${_Q}" ${_A} ; }
 .endif
 
 .if !target(relink)
@@ -206,7 +198,6 @@
 	@if [ -d ${FILESDIR} -a -f ${FILESDIR}/chrome.manifest ] ; \
 		then ${ECHO_CMD} chrome.manifest ; fi
 	@${ECHO_CMD}
-	@${ECHO_CMD} -n 'XPI_DIRS='
 	@cd ${WRKSRC} && ${FIND} -ds . -not -name . -type d | cut -f2- -d/ | ${TR} '\n' ' '
 	@${ECHO_CMD}
 
@@ -214,8 +205,6 @@
 	@${FIND} -s ${WRKSRC} -not -type d | ${SED} -e "s,^${WRKSRC},%%XPI_XPIDIR%%," > ${PLIST}
 	@if [ -d ${FILESDIR} -a -f ${FILESDIR}/chrome.manifest ] ; \
 		then ${ECHO_CMD} %%XPI_XPIDIR%%/chrome.manifest >> ${PLIST} ; fi
-	@${FIND} -ds ${WRKSRC} -type d -not -name ${DISTNAME} | \
-		${SED} -e "s,^${WRKSRC}, at dirrm %%XPI_XPIDIR%%," >> ${PLIST}
 
 xpi-pre-chrome:
 	@${CHMOD} g+w ${_TD_FULL}


More information about the freebsd-gecko mailing list