Date: Thu, 30 Aug 2012 20:22:04 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r967 - in branches/experimental: . mail/linux-thunderbird mail/thunderbird-i18n www/firefox www/firefox-i18n www/linux-firefox www/linux-seamonkey www/seamonkey-i18n Message-ID: <201208302022.q7UKM4qL062322@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: flo
Date: Thu Aug 30 20:22:04 2012
New Revision: 967
Log:
Also commit what i committed to ports svn to gecko svn. The experimental
branch and ports svn should be exactly the same after this commit.
Modified:
branches/experimental/Gecko_ChangeLog
branches/experimental/mail/linux-thunderbird/Makefile
branches/experimental/mail/linux-thunderbird/distinfo
branches/experimental/mail/thunderbird-i18n/Makefile
branches/experimental/www/firefox-i18n/Makefile
branches/experimental/www/firefox/Makefile.webplugins
branches/experimental/www/linux-firefox/Makefile
branches/experimental/www/linux-firefox/distinfo
branches/experimental/www/linux-seamonkey/Makefile
branches/experimental/www/linux-seamonkey/distinfo
branches/experimental/www/linux-seamonkey/pkg-plist
branches/experimental/www/seamonkey-i18n/Makefile
Modified: branches/experimental/Gecko_ChangeLog
==============================================================================
--- branches/experimental/Gecko_ChangeLog Thu Aug 30 04:06:25 2012 (r966)
+++ branches/experimental/Gecko_ChangeLog Thu Aug 30 20:22:04 2012 (r967)
@@ -1,14 +0,0 @@
-gecko 15:
-- update firefox and thunderbird to 15.0
-- update seamonkey to 2.12
-- update nss to 3.13.6
-- update bsdipc code (posix_spawn, SysV shared memory)
-- rename patches to easily track those not (yet) submitted upstream
-- reduce package size, except for www/libxul[1]
-- restore default objdir to what it was in 13.0[2]
-- don't accidentally pick up headers from installed ports[3]
-- *miscellaneous cleanups and fixups*
-
-Obtained from: OpenBSD ports[1]
-Affects: mail/enigmail[2]
-PR: ports/159831, ports/160933, ports/170467[3]
Modified: branches/experimental/mail/linux-thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/linux-thunderbird/Makefile Thu Aug 30 04:06:25 2012 (r966)
+++ branches/experimental/mail/linux-thunderbird/Makefile Thu Aug 30 20:22:04 2012 (r967)
@@ -6,7 +6,7 @@
#
PORTNAME= thunderbird
-PORTVERSION= 10.0.6
+PORTVERSION= 10.0.7
CATEGORIES= mail
MASTER_SITE_SUBDIR?= ${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US
DISTNAME= ${PORTNAME}-${DISTVERSION}esr
Modified: branches/experimental/mail/linux-thunderbird/distinfo
==============================================================================
--- branches/experimental/mail/linux-thunderbird/distinfo Thu Aug 30 04:06:25 2012 (r966)
+++ branches/experimental/mail/linux-thunderbird/distinfo Thu Aug 30 20:22:04 2012 (r967)
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-10.0.6esr.tar.bz2) = 7051b910825a2838ac9a1bcb23c520d82be5fed4871266f1cd8954a8e876776b
-SIZE (thunderbird-10.0.6esr.tar.bz2) = 18574190
+SHA256 (thunderbird-10.0.7esr.tar.bz2) = 2b1fd99bcaa6b4288f86eba7bdf80fe467cde0cf2899a7ec106ba1e4fee0625c
+SIZE (thunderbird-10.0.7esr.tar.bz2) = 18582085
Modified: branches/experimental/mail/thunderbird-i18n/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-i18n/Makefile Thu Aug 30 04:06:25 2012 (r966)
+++ branches/experimental/mail/thunderbird-i18n/Makefile Thu Aug 30 20:22:04 2012 (r967)
@@ -27,7 +27,7 @@
.endif
NO_BUILD= yes
-USE_THUNDERBIRD= 14
+USE_THUNDERBIRD= 15
USE_XPI= thunderbird linux-thunderbird
THUNDERBIRD_I18N_ALL= ar br ca cs da de en-GB en-US es-AR es-ES et eu fi fr \
Modified: branches/experimental/www/firefox-i18n/Makefile
==============================================================================
--- branches/experimental/www/firefox-i18n/Makefile Thu Aug 30 04:06:25 2012 (r966)
+++ branches/experimental/www/firefox-i18n/Makefile Thu Aug 30 20:22:04 2012 (r967)
@@ -18,7 +18,7 @@
EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip
-USE_FIREFOX= 14
+USE_FIREFOX= 15
USE_XPI= firefox linux-firefox
USE_SUBMAKE= yes
Modified: branches/experimental/www/firefox/Makefile.webplugins
==============================================================================
--- branches/experimental/www/firefox/Makefile.webplugins Thu Aug 30 04:06:25 2012 (r966)
+++ branches/experimental/www/firefox/Makefile.webplugins Thu Aug 30 20:22:04 2012 (r967)
@@ -14,10 +14,10 @@
# Documentation and examples:
#
# Makefile.webplugins will create symlinks automatically for each supported
-# applications that supports the webplugins framework. Also, it will remove
+# application that supports the webplugins framework. Also, it will remove
# these symlinks when the plug-in port is uninstalled.
#
-# USE_WEBPLUGINS - Specify a list of application(s) that this plug-in
+# USE_WEBPLUGINS - Specify a list of applications that this plug-in
# port supports. For each of these applications, a
# symlink will be created in
# lib/browser_plugins/symlinks. See
@@ -26,13 +26,13 @@
# Default: USE_WEBPLUGINS=${WEBPLUGINS_APPS_ALL} (all
# applications)
#
-# WEBPLUGINS_NAME - If your port installs file(s) in ${WEBPLUGINS_DIR},
+# WEBPLUGINS_NAME - If your port installs files in ${WEBPLUGINS_DIR},
# then you can tweak WEBPLUGINS_NAME to change the
# name of the directory
# (lib/browser_plugins/symlinks/WEBPLUGINS_NAME).
# Default: WEBPLUGINS_NAME=${PKGBASE}
#
-# WEBPLUGINS_FILES - The plug-in file(s) that are going to be linked
+# WEBPLUGINS_FILES - The plug-in files that are going to be linked
# in lib/browser_plugins/symlinks/*/. It cannot
# be empty or the port will set IGNORE.
#
@@ -40,9 +40,9 @@
# found. Each plug-in file in WEBPLUGINS_FILES
# must be found in WEBPLUGINS_DIR. If your port
# does not install in WEBPLUGINS_DIR, but in its own
-# path. You will need to specify that here or
+# path, you will need to specify that here or
# symlinks will be created to non-existent files.
-# Default: WEBPLUGINS_DIR?=${WEBPLUGINS_LIBDIR}/${WEBPLUGINS_NAME}
+# Default: WEBPLUGINS_DIR=${WEBPLUGINS_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGINS_NAME}
#
#
# The USE_WEBPLUGINS supports wildcards, native, and linux; so you can do any
@@ -53,8 +53,8 @@
# USE_WEBPLUGINS=linux (Supports linux-*)
# USE_WEBPLUGINS=opera webkit-gtk2
#
-# Example to add in Makefile and pkg-plist if the plug-in file(s) install in
-# WEBPLUGINS_DIR, and if your port does this manually:
+# Example to add in Makefile and pkg-plist if the plug-in files are installled
+# to WEBPLUGINS_DIR, and if your port does this manually:
#
# Makefile:
# ------------------------------------------------------
@@ -104,7 +104,7 @@
# ------------------------------------------------------
# [...]
# USE_WEBPLUGINS=gecko*
-# WEBPLUGINS_DIR=#{PREFIX}/lib/application
+# WEBPLUGINS_DIR=${PREFIX}/lib/application
# WEBPLUGINS_FILES=fooplugin.so fooplugin.xpi
#
# .include <bsd.port.pre.mk>
@@ -155,7 +155,7 @@
.if !defined(WEBPLUGINS_FILES) || ${WEBPLUGINS_FILES} == "empty" || \
${WEBPLUGINS_FILES} == ""
-IGNORE= cannot install: the WEBPLUGINS_FILES is empty, please add plugins file in it and see in www/firefox/Makefile.webplugins for document
+IGNORE= can't be installed: WEBPLUGINS_FILES is empty. Please, add plug-in files to it and check www/firefox/Makefile.webplugins for documentation
.endif
.for _TEMP_APP__ in ${WEBPLUGINS_APPS_ALL}
@@ -178,28 +178,28 @@
WEBPLUGINS_SLDIRS= ${USE_WEBPLUGINS_EXP:S.^.${WEBPLUGINS_SLDIR}/.}
WEBPLUGINS_LINKFARMS= ${WEBPLUGINS_APPS} ${WEBPLUGINS_SLDIRS}
-WEBPLUGINS_LIBDIR= ${PREFIX}/lib/browser_plugins
+WEBPLUGINS_LIBDIR= ${LOCALBASE}/lib/browser_plugins
WEBPLUGINS_SLDIR= ${WEBPLUGINS_LIBDIR}/symlinks
-WEBPLUGINS_DIR?= ${WEBPLUGINS_LIBDIR}/${WEBPLUGINS_NAME}
+WEBPLUGINS_DIR?= ${WEBPLUGINS_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGINS_NAME}
PLIST_SUB+= WEBPLUGINS_DIR="${WEBPLUGINS_DIR:S,^${PREFIX}/,,}"
_LNWF= ${WEBPLUGINS_FILES:S,^,${WEBPLUGINS_DIR}/,}
_Q= 2>/dev/null || true
-_WLD= ${WEBPLUGINS_LIBDIR:S,^${PREFIX},%D,}
-_WLF= ${WEBPLUGINS_LINKFARMS:S,${PREFIX},%D,}
-_WSD= ${WEBPLUGINS_SLDIR:S,^${PREFIX},%D,}
+_WLD= ${WEBPLUGINS_LIBDIR:S,^${LOCALBASE},%D,}
+_WLF= ${WEBPLUGINS_LINKFARMS:S,${LOCALBASE},%D,}
+_WSD= ${WEBPLUGINS_SLDIR:S,^${LOCALBASE},%D,}
webplugins-post-install:
@if [ ! -d ${WEBPLUGINS_DIR} ]; then \
${ECHO_CMD}; \
- ${ECHO_CMD} "ERROR: The \"${WEBPLUGINS_DIR}\" in WEBPLUGINS_DIR is either a typo or no longer exists. Please make a bug report to ${MAINTAINER} (maintainer)."; \
+ ${ECHO_CMD} "ERROR: \"${WEBPLUGINS_DIR}\" in WEBPLUGINS_DIR is either a typo or no longer exists. Please, file a bug report to ${MAINTAINER} (maintainer)."; \
${ECHO_CMD}; \
else \
for _f in ${WEBPLUGINS_FILES}; do \
if [ ! -f ${WEBPLUGINS_DIR}/$${_f} ]; then \
${ECHO_CMD}; \
- ${ECHO_CMD} "ERROR: The \"$${_f}\" in WEBPLUGINS_FILES is either a typo or no longer exists. Please make a bug report to ${MAINTAINER} (maintainer)."; \
+ ${ECHO_CMD} "ERROR: \"$${_f}\" in WEBPLUGINS_FILES is either a typo or no longer exists. Please, file a bug report to ${MAINTAINER} (maintainer)."; \
${ECHO_CMD}; \
fi; \
done; \
@@ -210,6 +210,10 @@
${LN} -sf $${_l} $${_d}/ ${_Q}; \
done; \
done; \
+ if [ "${PREFIX}" != "${LOCALBASE}" ]; then \
+ ${ECHO_CMD} "@unexec rmdir ${_WLD} ${_Q}" >> ${TMPPLIST}; \
+ fi; \
+ ${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST}; \
for _d in ${_WLF}; do \
${ECHO_CMD} "@exec ${INSTALL} -d $$_d" >> ${TMPPLIST}; \
for _l in ${_LNWF}; do \
Modified: branches/experimental/www/linux-firefox/Makefile
==============================================================================
--- branches/experimental/www/linux-firefox/Makefile Thu Aug 30 04:06:25 2012 (r966)
+++ branches/experimental/www/linux-firefox/Makefile Thu Aug 30 20:22:04 2012 (r967)
@@ -6,7 +6,7 @@
#
PORTNAME= firefox
-PORTVERSION= 10.0.6
+PORTVERSION= 10.0.7
PORTEPOCH= 1
CATEGORIES= www
MASTER_SITE_SUBDIR?= firefox/releases/${PORTVERSION}esr/linux-i686/en-US
Modified: branches/experimental/www/linux-firefox/distinfo
==============================================================================
--- branches/experimental/www/linux-firefox/distinfo Thu Aug 30 04:06:25 2012 (r966)
+++ branches/experimental/www/linux-firefox/distinfo Thu Aug 30 20:22:04 2012 (r967)
@@ -1,2 +1,2 @@
-SHA256 (firefox-10.0.6esr.tar.bz2) = d2a3fb68bcdb3f0a19885b194f1372a8c3720e5a6019327d41dc8554c805c1cd
-SIZE (firefox-10.0.6esr.tar.bz2) = 17298232
+SHA256 (firefox-10.0.7esr.tar.bz2) = 86d7b4eacead16e34cd58631c84a15d67dcdf8ef457ed6a140e2abe76fe703a8
+SIZE (firefox-10.0.7esr.tar.bz2) = 17303135
Modified: branches/experimental/www/linux-seamonkey/Makefile
==============================================================================
--- branches/experimental/www/linux-seamonkey/Makefile Thu Aug 30 04:06:25 2012 (r966)
+++ branches/experimental/www/linux-seamonkey/Makefile Thu Aug 30 20:22:04 2012 (r967)
@@ -6,7 +6,7 @@
#
PORTNAME= seamonkey
-PORTVERSION= 2.11
+PORTVERSION= 2.12
CATEGORIES= www
MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US
Modified: branches/experimental/www/linux-seamonkey/distinfo
==============================================================================
--- branches/experimental/www/linux-seamonkey/distinfo Thu Aug 30 04:06:25 2012 (r966)
+++ branches/experimental/www/linux-seamonkey/distinfo Thu Aug 30 20:22:04 2012 (r967)
@@ -1,2 +1,2 @@
-SHA256 (seamonkey-2.11.tar.bz2) = a00c9c4d01a1ad74bc5828cbc96cfc349076ad78e0b218ec0ba871e80ff5c405
-SIZE (seamonkey-2.11.tar.bz2) = 23241380
+SHA256 (seamonkey-2.12.tar.bz2) = 52854628b4324ca27f2b5f5f5a1794ae4559eea03dfc000350973a0bc96c071f
+SIZE (seamonkey-2.12.tar.bz2) = 22987660
Modified: branches/experimental/www/linux-seamonkey/pkg-plist
==============================================================================
--- branches/experimental/www/linux-seamonkey/pkg-plist Thu Aug 30 04:06:25 2012 (r966)
+++ branches/experimental/www/linux-seamonkey/pkg-plist Thu Aug 30 20:22:04 2012 (r967)
@@ -119,6 +119,7 @@
lib/%%APP_NAME%%/searchplugins/yahoo.xml
lib/%%APP_NAME%%/updater
lib/%%APP_NAME%%/updater.ini
+lib/%%APP_NAME%%/update-settings.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
Modified: branches/experimental/www/seamonkey-i18n/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-i18n/Makefile Thu Aug 30 04:06:25 2012 (r966)
+++ branches/experimental/www/seamonkey-i18n/Makefile Thu Aug 30 20:22:04 2012 (r967)
@@ -22,7 +22,7 @@
PLISTD?= ${WRKDIR}/plist_dirs
PLISTF?= ${WRKDIR}/plist_files
-USE_SEAMONKEY= 11
+USE_SEAMONKEY= 12
USE_XPI= seamonkey linux-seamonkey
USE_SUBMAKE= yes
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208302022.q7UKM4qL062322>