Author: jbeich
Date: Sat Nov 16 08:41:16 2013
New Revision: 1389
Log:
avoid having to reinstall after plugin
Modified:
trunk/mail/linux-thunderbird/pkg-plist
trunk/www/linux-firefox/pkg-plist
trunk/www/linux-seamonkey/Makefile.common
trunk/www/linux-seamonkey/pkg-plist
Modified: trunk/mail/linux-thunderbird/pkg-plist
==============================================================================
--- trunk/mail/linux-thunderbird/pkg-plist Sat Nov 16 08:41:08 2013
(r1388)
+++ trunk/mail/linux-thunderbird/pkg-plist Sat Nov 16 08:41:16 2013
(r1389)
@@ -56,6 +56,7 @@
lib/%%APP_NAME%%/omni.ja
lib/%%APP_NAME%%/platform.ini
lib/%%APP_NAME%%/plugin-container
+lib/%%APP_NAME%%/plugins
lib/%%APP_NAME%%/precomplete
lib/%%APP_NAME%%/removed-files
lib/%%APP_NAME%%/run-mozilla.sh
@@ -71,9 +72,7 @@
lib/%%APP_NAME%%/update-settings.ini
lib/%%APP_NAME%%/updater
lib/%%APP_NAME%%/updater.ini
-@exec /bin/cp -R %%LOCALBASE%%/lib/browser_plugins/symlinks/%%APP_NAME%%/
%D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true
@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%%/plugins/ -depth 1 -type l -delete
2>/dev/null || true
@unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/ -depth 1 -type l
-delete 2>/dev/null || true
@dirrm lib/%%APP_NAME%%/chrome/icons/default
@dirrm lib/%%APP_NAME%%/chrome/icons
@@ -87,6 +86,5 @@
@dirrm lib/%%APP_NAME%%/extensions
@dirrm lib/%%APP_NAME%%/icons
@dirrm lib/%%APP_NAME%%/isp
-@dirrm lib/%%APP_NAME%%/plugins
@dirrm lib/%%APP_NAME%%/searchplugins
@dirrm lib/%%APP_NAME%%
Modified: trunk/www/linux-firefox/pkg-plist
==============================================================================
--- trunk/www/linux-firefox/pkg-plist Sat Nov 16 08:41:08 2013 (r1388)
+++ trunk/www/linux-firefox/pkg-plist Sat Nov 16 08:41:16 2013 (r1389)
@@ -15,6 +15,7 @@
lib/%%APP_NAME%%/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
lib/%%APP_NAME%%/browser/icons/mozicon128.png
lib/%%APP_NAME%%/browser/omni.ja
+lib/%%APP_NAME%%/browser/plugins
lib/%%APP_NAME%%/browser/searchplugins/amazondotcom.xml
lib/%%APP_NAME%%/browser/searchplugins/bing.xml
lib/%%APP_NAME%%/browser/searchplugins/eBay.xml
@@ -68,9 +69,7 @@
lib/%%APP_NAME%%/webapprt-stub
lib/%%APP_NAME%%/webapprt/omni.ja
lib/%%APP_NAME%%/webapprt/webapprt.ini
-@exec /bin/cp -R %%LOCALBASE%%/lib/browser_plugins/symlinks/%%APP_NAME%%/
%D/lib/%%APP_NAME%%/browser/plugins/ 2>/dev/null || true
@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/plugins/ -depth 1 -type l
-delete 2>/dev/null || true
@unexec /usr/bin/find %D/lib/%%APP_NAME%%/browser/extensions/ -depth 1 -type
l -delete 2>/dev/null || true
@dirrm lib/%%APP_NAME%%/browser/chrome/icons/default
@dirrm lib/%%APP_NAME%%/browser/chrome/icons
@@ -81,7 +80,6 @@
@dirrm
lib/%%APP_NAME%%/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
@dirrm lib/%%APP_NAME%%/browser/extensions
@dirrm lib/%%APP_NAME%%/browser/icons
-@dirrm lib/%%APP_NAME%%/browser/plugins
@dirrm lib/%%APP_NAME%%/browser/searchplugins
@dirrm lib/%%APP_NAME%%/browser
@dirrm lib/%%APP_NAME%%/components
Modified: trunk/www/linux-seamonkey/Makefile.common
==============================================================================
--- trunk/www/linux-seamonkey/Makefile.common Sat Nov 16 08:41:08 2013
(r1388)
+++ trunk/www/linux-seamonkey/Makefile.common Sat Nov 16 08:41:16 2013
(r1389)
@@ -47,8 +47,9 @@
.if !target(post-extract)
post-extract:
@${RM} -rf ${WRKSRC}/updates
- @${MKDIR} ${WRKSRC}/${APP_SUBDIR}plugins
@${MKDIR} ${WRKSRC}/${APP_SUBDIR}extensions
+ @${LN} -sf ${LOCALBASE}/lib/browser_plugins/symlinks/${APP_NAME} \
+ ${WRKSRC}/${APP_SUBDIR}plugins
.endif
.if defined(REPLACE_GRE)
@@ -88,8 +89,6 @@
@${PRINTF} '#! /bin/sh\n${GECKO_ENV} ${FDIR}/${BIN_NAME} "$$@"\n' \
>>${PREFIX}/bin/${APP_NAME}
@${CHMOD} +x ${PREFIX}/bin/${APP_NAME}
- @${CP} -R ${LOCALBASE}/lib/browser_plugins/symlinks/${APP_NAME}/ \
- ${FDIR}/${APP_SUBDIR}plugins/ ${_Q}
@${CP} -R ${LOCALBASE}/lib/xpi/symlinks/${APP_NAME}/ \
${FDIR}/${APP_SUBDIR}extensions/ ${_Q}
.endif
@@ -120,12 +119,8 @@
${ECHO_CMD} share/applications/%%APP_NAME%%.desktop >> ${PLIST}
cd ${WRKSRC} && ${FIND} -s . -type f -or -type l | \
${SED} -e "s#^\.#lib/%%APP_NAME%%#" | ${SORT} >> ${PLIST}
- ${ECHO_CMD} '@exec ${CP} -R
%%LOCALBASE%%/lib/browser_plugins/symlinks/%%APP_NAME%%/ \
- %D/lib/%%APP_NAME%%/${APP_SUBDIR}plugins/ ${_Q}' >> ${PLIST}
${ECHO_CMD} '@exec ${CP} -R
%%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ \
%D/lib/%%APP_NAME%%/${APP_SUBDIR}extensions/ ${_Q}' >> ${PLIST}
- ${ECHO_CMD} '@unexec ${FIND} %D/lib/%%APP_NAME%%/${APP_SUBDIR}plugins/ \
- -depth 1 -type l -delete ${_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 | \
Modified: trunk/www/linux-seamonkey/pkg-plist
==============================================================================
--- trunk/www/linux-seamonkey/pkg-plist Sat Nov 16 08:41:08 2013 (r1388)
+++ trunk/www/linux-seamonkey/pkg-plist Sat Nov 16 08:41:16 2013 (r1389)
@@ -107,6 +107,7 @@
lib/%%APP_NAME%%/omni.ja
lib/%%APP_NAME%%/platform.ini
lib/%%APP_NAME%%/plugin-container
+lib/%%APP_NAME%%/plugins
lib/%%APP_NAME%%/precomplete
lib/%%APP_NAME%%/removed-files
lib/%%APP_NAME%%/run-mozilla.sh
@@ -119,9 +120,7 @@
lib/%%APP_NAME%%/update-settings.ini
lib/%%APP_NAME%%/updater
lib/%%APP_NAME%%/updater.ini
-@exec /bin/cp -R %%LOCALBASE%%/lib/browser_plugins/symlinks/%%APP_NAME%%/
%D/lib/%%APP_NAME%%/plugins/ 2>/dev/null || true
@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%%/plugins/ -depth 1 -type l -delete
2>/dev/null || true
@unexec /usr/bin/find %D/lib/%%APP_NAME%%/extensions/ -depth 1 -type l
-delete 2>/dev/null || true
@dirrm lib/%%APP_NAME%%/chrome/icons/default
@dirrm lib/%%APP_NAME%%/chrome/icons
@@ -137,6 +136,5 @@
@dirrm lib/%%APP_NAME%%/extensions
@dirrm lib/%%APP_NAME%%/icons
@dirrm lib/%%APP_NAME%%/isp
-@dirrm lib/%%APP_NAME%%/plugins
@dirrm lib/%%APP_NAME%%/searchplugins
@dirrm lib/%%APP_NAME%%
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"
