Date: Wed, 29 May 2013 17:01:48 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1263 - in trunk/www: linux-firefox linux-seamonkey Message-ID: <201305291701.r4TH1mrT008871@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed May 29 17:01:48 2013
New Revision: 1263
Log:
update linux-firefox to 21.0
Modified:
trunk/www/linux-firefox/Makefile
trunk/www/linux-firefox/distinfo
trunk/www/linux-firefox/pkg-plist
trunk/www/linux-seamonkey/Makefile
trunk/www/linux-seamonkey/Makefile.common
trunk/www/linux-seamonkey/distinfo
trunk/www/linux-seamonkey/pkg-plist
Modified: trunk/www/linux-firefox/Makefile
==============================================================================
--- trunk/www/linux-firefox/Makefile Tue May 28 20:43:15 2013 (r1262)
+++ trunk/www/linux-firefox/Makefile Wed May 29 17:01:48 2013 (r1263)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/linux-firefox/Makefile 310165 2013-01-09 23:28:19Z flo $
PORTNAME= firefox
-PORTVERSION= 20.0
+PORTVERSION= 21.0
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US
@@ -18,6 +18,8 @@
USE_LINUX_APPS= dbusglib dbuslibs alsalib alsa-plugins-oss
+APP_SUBDIR= browser/ # plugins, extensions
+
.include "${.CURDIR}/../linux-seamonkey/Makefile.common"
# XXX remove after linux_base-c6 and linux-c6-gtk2 become default
Modified: trunk/www/linux-firefox/distinfo
==============================================================================
--- trunk/www/linux-firefox/distinfo Tue May 28 20:43:15 2013 (r1262)
+++ trunk/www/linux-firefox/distinfo Wed May 29 17:01:48 2013 (r1263)
@@ -1,2 +1,2 @@
-SHA256 (firefox-20.0.tar.bz2) = 1ac19cfb0b449de7fdb6e61f7c62f64aade8c024bd3200466c771b8c3d76379a
-SIZE (firefox-20.0.tar.bz2) = 23435135
+SHA256 (firefox-21.0.tar.bz2) = 1151e4998badcfd984624ee42fea572c7da64112d631901652fd558f5640fffe
+SIZE (firefox-21.0.tar.bz2) = 24410321
Modified: trunk/www/linux-firefox/pkg-plist
==============================================================================
--- trunk/www/linux-firefox/pkg-plist Tue May 28 20:43:15 2013 (r1262)
+++ trunk/www/linux-firefox/pkg-plist Wed May 29 17:01:48 2013 (r1263)
@@ -2,28 +2,38 @@
share/applications/%%APP_NAME%%.desktop
lib/%%APP_NAME%%/Throbber-small.gif
lib/%%APP_NAME%%/application.ini
-lib/%%APP_NAME%%/blocklist.xml
+lib/%%APP_NAME%%/browser/blocklist.xml
+lib/%%APP_NAME%%/browser/chrome.manifest
+lib/%%APP_NAME%%/browser/chrome/icons/default/default16.png
+lib/%%APP_NAME%%/browser/chrome/icons/default/default32.png
+lib/%%APP_NAME%%/browser/chrome/icons/default/default48.png
+lib/%%APP_NAME%%/browser/components/components.manifest
+lib/%%APP_NAME%%/browser/components/libbrowsercomps.so
+lib/%%APP_NAME%%/browser/crashreporter-override.ini
+lib/%%APP_NAME%%/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
+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/searchplugins/amazondotcom.xml
+lib/%%APP_NAME%%/browser/searchplugins/bing.xml
+lib/%%APP_NAME%%/browser/searchplugins/eBay.xml
+lib/%%APP_NAME%%/browser/searchplugins/google.xml
+lib/%%APP_NAME%%/browser/searchplugins/twitter.xml
+lib/%%APP_NAME%%/browser/searchplugins/wikipedia.xml
+lib/%%APP_NAME%%/browser/searchplugins/yahoo.xml
lib/%%APP_NAME%%/chrome.manifest
-lib/%%APP_NAME%%/chrome/icons/default/default16.png
-lib/%%APP_NAME%%/chrome/icons/default/default32.png
-lib/%%APP_NAME%%/chrome/icons/default/default48.png
-lib/%%APP_NAME%%/components/binary.manifest
-lib/%%APP_NAME%%/components/libbrowsercomps.so
+lib/%%APP_NAME%%/components/components.manifest
lib/%%APP_NAME%%/components/libdbusservice.so
lib/%%APP_NAME%%/components/libmozgnome.so
lib/%%APP_NAME%%/crashreporter
-lib/%%APP_NAME%%/crashreporter-override.ini
lib/%%APP_NAME%%/crashreporter.ini
lib/%%APP_NAME%%/defaults/pref/browser-prefs.js
lib/%%APP_NAME%%/defaults/pref/channel-prefs.js
lib/%%APP_NAME%%/dependentlibs.list
lib/%%APP_NAME%%/dictionaries/en-US.aff
lib/%%APP_NAME%%/dictionaries/en-US.dic
-lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
-lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
lib/%%APP_NAME%%/firefox
lib/%%APP_NAME%%/firefox-bin
-lib/%%APP_NAME%%/icons/mozicon128.png
lib/%%APP_NAME%%/icons/updater.png
lib/%%APP_NAME%%/libfreebl3.chk
lib/%%APP_NAME%%/libfreebl3.so
@@ -53,51 +63,31 @@
lib/%%APP_NAME%%/precomplete
lib/%%APP_NAME%%/removed-files
lib/%%APP_NAME%%/run-mozilla.sh
-lib/%%APP_NAME%%/searchplugins/amazondotcom.xml
-lib/%%APP_NAME%%/searchplugins/bing.xml
-lib/%%APP_NAME%%/searchplugins/eBay.xml
-lib/%%APP_NAME%%/searchplugins/google.xml
-lib/%%APP_NAME%%/searchplugins/twitter.xml
-lib/%%APP_NAME%%/searchplugins/wikipedia.xml
-lib/%%APP_NAME%%/searchplugins/yahoo.xml
lib/%%APP_NAME%%/update-settings.ini
lib/%%APP_NAME%%/updater
lib/%%APP_NAME%%/updater.ini
lib/%%APP_NAME%%/webapprt-stub
lib/%%APP_NAME%%/webapprt/omni.ja
lib/%%APP_NAME%%/webapprt/webapprt.ini
-@exec /bin/cp -R %%LOCALBASE%%/lib/npapi/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
-@dirrm lib/%%APP_NAME%%/chrome
+@exec /bin/cp -R %%LOCALBASE%%/lib/npapi/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
+@dirrm lib/%%APP_NAME%%/browser/chrome
+@dirrm lib/%%APP_NAME%%/browser/components
+@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
@dirrm lib/%%APP_NAME%%/defaults/pref
@dirrm lib/%%APP_NAME%%/defaults
@dirrm lib/%%APP_NAME%%/dictionaries
-@dirrm lib/%%APP_NAME%%/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
-@dirrm lib/%%APP_NAME%%/extensions
@dirrm lib/%%APP_NAME%%/icons
-@dirrm lib/%%APP_NAME%%/modules/accessibility
-@dirrm lib/%%APP_NAME%%/modules/commonjs/promise
-@dirrm lib/%%APP_NAME%%/modules/commonjs
-@dirrm lib/%%APP_NAME%%/modules/identity
-@dirrm lib/%%APP_NAME%%/modules/services
-@dirrm lib/%%APP_NAME%%/modules/services-aitc
-@dirrm lib/%%APP_NAME%%/modules/services-common
-@dirrm lib/%%APP_NAME%%/modules/services-crypto
-@dirrm lib/%%APP_NAME%%/modules/services-sync/engines
-@dirrm lib/%%APP_NAME%%/modules/services-sync/stages
-@dirrm lib/%%APP_NAME%%/modules/services-sync
-@dirrm lib/%%APP_NAME%%/modules/services/datareporting
-@dirrm lib/%%APP_NAME%%/modules/services/metrics
-@dirrm lib/%%APP_NAME%%/modules/sessionstore
-@dirrm lib/%%APP_NAME%%/modules
-@dirrm lib/%%APP_NAME%%/plugins
-@dirrm lib/%%APP_NAME%%/searchplugins
-@dirrm lib/%%APP_NAME%%/webapprt/components
@dirrm lib/%%APP_NAME%%/webapprt
@dirrm lib/%%APP_NAME%%
@dirrmtry share/applications
Modified: trunk/www/linux-seamonkey/Makefile
==============================================================================
--- trunk/www/linux-seamonkey/Makefile Tue May 28 20:43:15 2013 (r1262)
+++ trunk/www/linux-seamonkey/Makefile Wed May 29 17:01:48 2013 (r1263)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/linux-seamonkey/Makefile 310165 2013-01-09 23:28:19Z flo $
PORTNAME= seamonkey
-PORTVERSION= 2.17
+PORTVERSION= 2.18b4
CATEGORIES= www
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US
Modified: trunk/www/linux-seamonkey/Makefile.common
==============================================================================
--- trunk/www/linux-seamonkey/Makefile.common Tue May 28 20:43:15 2013 (r1262)
+++ trunk/www/linux-seamonkey/Makefile.common Wed May 29 17:01:48 2013 (r1263)
@@ -34,7 +34,8 @@
.if !target(post-extract)
post-extract:
@${RM} -rf ${WRKSRC}/updates
- @${MKDIR} ${WRKSRC}/plugins ${WRKSRC}/extensions
+ @${MKDIR} ${WRKSRC}/${APP_SUBDIR}plugins
+ @${MKDIR} ${WRKSRC}/${APP_SUBDIR}extensions
.endif
.if ${CATEGORIES:Mwww}
@@ -58,9 +59,9 @@
@${CHOWN} -R ${BINOWN}:${BINGRP} ${FDIR}/
@${LN} -sf ${FDIR}/${BIN_NAME} ${PREFIX}/bin/${APP_NAME}
@${CP} -R ${LOCALBASE}/lib/npapi/symlinks/${APP_NAME}/ \
- ${FDIR}/plugins/ ${_Q}
+ ${FDIR}/${APP_SUBDIR}plugins/ ${_Q}
@${CP} -R ${LOCALBASE}/lib/xpi/symlinks/${APP_NAME}/ \
- ${FDIR}/extensions/ ${_Q}
+ ${FDIR}/${APP_SUBDIR}extensions/ ${_Q}
.endif
# Keep empty directories with pkg_* tools
@@ -90,12 +91,12 @@
cd ${WRKSRC} && ${FIND} -s . -type f -or -type l | \
${SED} -e "s#^\.#lib/%%APP_NAME%%#" | ${SORT} >> ${PLIST}
${ECHO_CMD} '@exec ${CP} -R %%LOCALBASE%%/lib/npapi/symlinks/%%APP_NAME%%/ \
- %D/lib/%%APP_NAME%%/plugins/ ${_Q}' >> ${PLIST}
+ %D/lib/%%APP_NAME%%/${APP_SUBDIR}plugins/ ${_Q}' >> ${PLIST}
${ECHO_CMD} '@exec ${CP} -R %%LOCALBASE%%/lib/xpi/symlinks/%%APP_NAME%%/ \
- %D/lib/%%APP_NAME%%/extensions/ ${_Q}' >> ${PLIST}
- ${ECHO_CMD} '@unexec ${FIND} %D/lib/%%APP_NAME%%/plugins/ \
+ %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%%/extensions/ \
+ ${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}
Modified: trunk/www/linux-seamonkey/distinfo
==============================================================================
--- trunk/www/linux-seamonkey/distinfo Tue May 28 20:43:15 2013 (r1262)
+++ trunk/www/linux-seamonkey/distinfo Wed May 29 17:01:48 2013 (r1263)
@@ -1,2 +1,2 @@
-SHA256 (seamonkey-2.17.tar.bz2) = 4efb6ff9ce3f4ad1eae881b865e6f4fe55972f5ea450a93dca66d77185426511
-SIZE (seamonkey-2.17.tar.bz2) = 26580709
+SHA256 (seamonkey-2.18b4.tar.bz2) = 120dc1012f0f1157e9dc4d590bba0547a54530a0fb56fc212806b4b349094769
+SIZE (seamonkey-2.18b4.tar.bz2) = 27699408
Modified: trunk/www/linux-seamonkey/pkg-plist
==============================================================================
--- trunk/www/linux-seamonkey/pkg-plist Tue May 28 20:43:15 2013 (r1262)
+++ trunk/www/linux-seamonkey/pkg-plist Wed May 29 17:01:48 2013 (r1263)
@@ -53,7 +53,7 @@
lib/%%APP_NAME%%/chrome/icons/default/venkman-window.png
lib/%%APP_NAME%%/chrome/icons/default/venkman-window16.png
lib/%%APP_NAME%%/chrome/icons/default/venkman-window48.png
-lib/%%APP_NAME%%/components/binary.manifest
+lib/%%APP_NAME%%/components/components.manifest
lib/%%APP_NAME%%/components/libdbusservice.so
lib/%%APP_NAME%%/components/libmozgnome.so
lib/%%APP_NAME%%/components/libnkgnomevfs.so
@@ -138,19 +138,6 @@
@dirrm lib/%%APP_NAME%%/extensions
@dirrm lib/%%APP_NAME%%/icons
@dirrm lib/%%APP_NAME%%/isp
-@dirrm lib/%%APP_NAME%%/modules/services-aitc
-@dirrm lib/%%APP_NAME%%/modules/services-common
-@dirrm lib/%%APP_NAME%%/modules/services-crypto
-@dirrm lib/%%APP_NAME%%/modules/services-sync/stages
-@dirrm lib/%%APP_NAME%%/modules/services-sync/engines
-@dirrm lib/%%APP_NAME%%/modules/services-sync
-@dirrm lib/%%APP_NAME%%/modules/services/datareporting
-@dirrm lib/%%APP_NAME%%/modules/services
-@dirrm lib/%%APP_NAME%%/modules/identity
-@dirrm lib/%%APP_NAME%%/modules/commonjs/promise
-@dirrm lib/%%APP_NAME%%/modules/commonjs
-@dirrm lib/%%APP_NAME%%/modules/accessibility
-@dirrm lib/%%APP_NAME%%/modules
@dirrm lib/%%APP_NAME%%/plugins
@dirrm lib/%%APP_NAME%%/searchplugins
@dirrm lib/%%APP_NAME%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305291701.r4TH1mrT008871>