Date: Wed, 30 Jul 2014 14:42:42 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1645 - in branches/firefox31: . Mk Mk/Uses audio devel/nspr mail/thunderbird mail/thunderbird-i18n multimedia security/nss www/firefox www/firefox-esr-i18n www/firefox-i18n www/firefox-nightly www/libxul www/libxul/files www/linux-firefox www/linux-seamonkey www/linux-tor-browser www/seamonkey www/seamonkey-i18n www/seamonkey/files www/xpi-adblock Message-ID: <201407301442.s6UEgglr058618@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Wed Jul 30 14:42:42 2014
New Revision: 1645
Log:
fork trunk for easier merge to ports
Added:
branches/firefox31/
- copied from r1640, trunk/
branches/firefox31/www/seamonkey/files/patch-bug1026499
- copied unchanged from r1644, trunk/www/seamonkey/files/patch-bug1026499
branches/firefox31/www/seamonkey/files/patch-bug1026828
- copied unchanged from r1644, trunk/www/seamonkey/files/patch-bug1026828
branches/firefox31/www/seamonkey/files/patch-bug1041381
- copied unchanged from r1644, trunk/www/seamonkey/files/patch-bug1041381
branches/firefox31/www/seamonkey/files/patch-bug1041795
- copied unchanged from r1644, trunk/www/seamonkey/files/patch-bug1041795
branches/firefox31/www/seamonkey/files/patch-bug292127
- copied unchanged from r1644, trunk/www/seamonkey/files/patch-bug292127
branches/firefox31/www/seamonkey/files/patch-bug702179
- copied, changed from r1644, trunk/www/seamonkey/files/patch-bug702179
branches/firefox31/www/seamonkey/files/patch-bug779713
- copied unchanged from r1644, trunk/www/seamonkey/files/patch-bug779713
Replaced:
branches/firefox31/www/seamonkey/
- copied from r1594, trunk/www/seamonkey/
Deleted:
branches/firefox31/Gecko_UPDATING
branches/firefox31/Mk/Uses/webplugin.mk
branches/firefox31/audio/
branches/firefox31/multimedia/
branches/firefox31/www/firefox-nightly/
branches/firefox31/www/libxul/files/pkg-deinstall.in
branches/firefox31/www/libxul/files/pkg-install.in
branches/firefox31/www/linux-tor-browser/
branches/firefox31/www/seamonkey/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl
branches/firefox31/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in
branches/firefox31/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
branches/firefox31/www/xpi-adblock/
Modified:
branches/firefox31/Mk/Uses/gecko.mk
branches/firefox31/Mk/bsd.gecko.mk
branches/firefox31/devel/nspr/Makefile
branches/firefox31/mail/thunderbird-i18n/Makefile
branches/firefox31/mail/thunderbird/Makefile
branches/firefox31/security/nss/Makefile
branches/firefox31/www/firefox-esr-i18n/Makefile
branches/firefox31/www/firefox-esr-i18n/Makefile.lang
branches/firefox31/www/firefox-i18n/Makefile
branches/firefox31/www/firefox/Makefile
branches/firefox31/www/libxul/Makefile
branches/firefox31/www/linux-firefox/Makefile
branches/firefox31/www/linux-seamonkey/Makefile
branches/firefox31/www/seamonkey-i18n/Makefile
branches/firefox31/www/seamonkey-i18n/Makefile.lang
branches/firefox31/www/seamonkey-i18n/Makefile.option
branches/firefox31/www/seamonkey-i18n/distinfo
branches/firefox31/www/seamonkey/Makefile
branches/firefox31/www/seamonkey/distinfo
Deleted: trunk/Gecko_UPDATING
==============================================================================
--- trunk/Gecko_UPDATING Wed Jul 30 14:42:42 2014 (r1640)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,8 +0,0 @@
-20140429:
- AFFECTS: users of www/firefox, www/seamonkey, mail/thunderbird, www/libxul
- AUTHOR: gecko@FreeBSD.org
-
- Gecko ports were switched to use more system libraries. Some of them
- must be built with certain options unset (default).
-
- - audio/soundtouch has to be installed with INTEGER_SAMPLES option disabled
Modified: branches/firefox31/Mk/Uses/gecko.mk
==============================================================================
--- trunk/Mk/Uses/gecko.mk Thu Jul 24 18:40:55 2014 (r1640)
+++ branches/firefox31/Mk/Uses/gecko.mk Wed Jul 30 14:42:42 2014 (r1645)
@@ -1,4 +1,4 @@
-# $FreeBSD: head/Mk/Uses/gecko.mk 352640 2014-04-29 20:35:24Z beat $
+# $FreeBSD: head/Mk/Uses/gecko.mk 357413 2014-06-11 03:42:55Z beat $
#
# Handle dependency of different gecko based applications
#
@@ -53,8 +53,8 @@
.elif ${_GECKO_ARGS:Mseamonkey}
-_GECKO_DEFAULT_VERSION= 27
-_GECKO_VERSIONS= 27
+_GECKO_DEFAULT_VERSION= 26
+_GECKO_VERSIONS= 26
_GECKO_TYPE= seamonkey
.if exists(${LOCALBASE}/bin/seamonkey)
@@ -63,7 +63,7 @@
.endif
# Dependence lines for different Seamonkey versions
-27_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
+26_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
.elif ${_GECKO_ARGS:Mthunderbird}
Deleted: trunk/Mk/Uses/webplugin.mk
==============================================================================
--- trunk/Mk/Uses/webplugin.mk Wed Jul 30 14:42:42 2014 (r1640)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,186 +0,0 @@
-# $FreeBSD: head/Mk/Uses/webplugin.mk 333595 2013-11-12 18:01:39Z bapt $
-#
-# MAINTAINER= gecko@FreeBSD.org
-#
-# Documentation and examples:
-#
-# Feature: webplugin
-# Usage: USES=webplugin or USES=webplugin:ARGS
-# Valid ARGS: gecko: Support geko based plugings
-# native: Support gecko, opera, webkit-gtk*
-# linux: Support linux plugins
-# [list of indivudual engines]: specify browsers to use
-# all: All browser (implicit, default)
-#
-# USES=webplugin will create symlinks automatically for each supported
-# application that supports the webplugin framework. Also, it will remove
-# these symlinks when the plug-in port is uninstalled.
-#
-# WEBPLUGIN_NAME - If your port installs files in ${WEBPLUGIN_DIR},
-# then you can tweak WEBPLUGIN_NAME to change the
-# name of the directory
-# (lib/browser_plugins/symlinks/WEBPLUGIN_NAME).
-# Default: WEBPLUGIN_NAME=${PKGBASE}
-#
-# WEBPLUGIN_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.
-#
-# WEBPLUGIN_DIR - The directory where the plug-in file(s) can be
-# found. Each plug-in file in WEBPLUGIN_FILES
-# must be found in WEBPLUGIN_DIR. If your port
-# does not install in WEBPLUGIN_DIR, but in its own
-# path, you will need to specify that here or
-# symlinks will be created to non-existent files.
-# Default: WEBPLUGIN_DIR=${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGIN_NAME}
-#
-# Makefile:
-# ------------------------------------------------------
-# USES= webplugin:gecko
-# [...]
-# WEBPLUGIN_FILES=fooplugin.so fooplugin.xpi
-#
-# post-install:
-# ${MKDIR} ${STAGEDIR}${WEBPLUGIN_DIR}
-# ${INSTALL_DATA} ${WEBPLUGIN_FILES:S,^,${WRKSRC}/plugins/,} \
-# ${STAGEDIR}${WEBPLUGIN_DIR}
-#
-# .include <bsd.port.mk>
-# ------------------------------------------------------
-#
-# You do not need to add lib/browser_plugins and lib/browser_plugins/symlinks
-# in pkg-plist, because they will be removed automatically.
-#
-# pkg-plist:
-# ------------------------------------------------------
-# [...]
-# %%WEBPLUGIN_DIR%%/fooplugin.so
-# %%WEBPLUGIN_DIR%%/fooplugin.xpi
-# @dirrmtry %%WEBPLUGIN_DIR%%
-# ------------------------------------------------------
-#
-# Here is what it will look like when it creates the symlinks:
-#
-# ------------------------------------------------------
-# /usr/local/lib/browser_plugins/symlinks/gecko/fooplugin.so -> /usr/local/lib/browser_plugins/application/fooplugin.so
-# /usr/local/lib/browser_plugins/symlinks/gecko/fooplugin.xpi -> /usr/local/lib/browser_plugins/application/fooplugin.xpi
-# ------------------------------------------------------
-#
-# If your port uses libtool, and installs any *.a and *.la files, do not add
-# these files to WEBPLUGIN_FILES. WEBPLUGIN_FILES should be *.so or/and
-# *.xpi ONLY.
-#
-# Example to add in Makefile and pkg-plist if your port installs plug-ins in
-# its own directory, and you need to set WEBPLUGIN_DIR.
-#
-# Makefile:
-# ------------------------------------------------------
-# [...]
-# USES= webplugin:gecko
-# WEBPLUGIN_DIR=${PREFIX}/lib/application
-# WEBPLUGIN_FILES=fooplugin.so fooplugin.xpi
-#
-# [...]
-#
-# .include <bsd.port.mk>
-# ------------------------------------------------------
-#
-# As for the pkg-plist, it should only include the actual files your
-# port installs:
-#
-# pkg-plist:
-# ------------------------------------------------------
-# [...]
-# lib/application/fooplugin.a
-# 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:
-#
-# ------------------------------------------------------
-# /usr/local/lib/browser_plugins/symlinks/gecko/fooplugin.so -> /usr/local/lib/application/fooplugin.so
-# /usr/local/lib/browser_plugins/symlinks/gecko/fooplugin.xpi -> /usr/local/lib/application/fooplugin.xpi
-# ------------------------------------------------------
-
-.if !defined(_INCLUDE_USES_WEBPLUGIN_MK)
-_INCLUDE_USES_WEBPLUGIN_MK= yes
-
-WEBPLUGIN_NAME?= ${PKGBASE}
-_WEBPLUGIN_APPS_ALL_LINUX= linux-firefox linux-opera linux-opera-devel \
- linux-seamonkey
-_WEBPLUGIN_APPS_ALL_NATIVE= gecko opera opera-devel webkit-gtk2
-_WEBPLUGIN_APPS_ALL= ${_WEBPLUGIN_APPS_ALL_LINUX} \
- ${_WEBPLUGIN_APPS_ALL_NATIVE}
-
-webplugin_ARGS?= all
-_WEBPLUGIN_ARGS= ${webplugin_ARGS:C/,/ /}
-_WEBPLUGIN_TEST= ${_WEBPLUGIN_APPS_ALL}
-.if ${_WEBPLUGIN_ARGS} == all
-_WEBPLUGIN_PATTERN= *
-.elif ${_WEBPLUGIN_ARGS} == native
-_WEBPLUGIN_PATTERN= *
-_WEBPLUGIN_TEST= ${_WEBPLUGIN_APPS_ALL_NATIVE}
-.elif ${_WEBPLUGIN_ARGS} == linux
-_WEBPLUGIN_PATTERN= *
-_WEBPLUGIN_TEST= ${_WEBPLUGIN_APPS_ALL_LINUX}
-.else
-_WEBPLUGIN_PATTERN= ${_WEBPLUGIN_ARGS}
-.endif
-
-.if !defined(WEBPLUGIN_FILES)
-IGNORE= Cannot be installed: WEBPLUGIN_FILES is empty. Please, add plug-in files to it
-.endif
-
-.for _TEMP_APP__ in ${_WEBPLUGIN_APPS_ALL}
-_TEMP_APP_=${_TEMP_APP__}
-_TEMP_FLAG_=0
-. for _TEMP_USE__ in ${USE_webplugin}
-_TEMP_USE_=${_TEMP_USE__}
-. if !${_TEMP_APP_:C!${_TEMP_USE_:S/*/.*/:S/?/./}!!} || \
- ( ${_TEMP_APP_:Mlinux-*} && ${_TEMP_USE_:Mlinux} ) || \
- ( ${_TEMP_APP_:Nlinux-*} && ${_TEMP_USE_:Mnative} )
-_TEMP_FLAG_=1
-. endif
-. endfor
-. if ${_TEMP_FLAG_}
-USE_WEBPLUGIN_EXP+= ${_TEMP_APP__}
-. endif
-.endfor
-
-.for p in ${_WEBPLUGIN_PATTERN}
-_WEBPLUGIN_MATCHED+= ${_WEBPLUGIN_TEST:M${p}}
-.endfor
-
-_WEBPLUGIN_LIBDIR= ${LOCALBASE}/lib/browser_plugins
-_WEBPLUGIN_SLDIR= ${_WEBPLUGIN_LIBDIR}/symlinks
-
-_WEBPLUGIN_SLDIRS= ${_WEBPLUGIN_MATCHED:S.^.${_WEBPLUGIN_SLDIR}/.}
-
-_WEBPLUGIN_APPS= ${USE_WEBPLUGIN_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:N*opera*:N*gecko*:N*webkit*}
-_WEBPLUGIN_LINKFARMS= ${_WEBPLUGIN_APPS} ${_WEBPLUGIN_SLDIRS}
-
-WEBPLUGIN_DIR?= ${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGIN_NAME}
-
-PLIST_SUB+= WEBPLUGIN_DIR="${WEBPLUGIN_DIR:S,^${PREFIX}/,,}"
-
-_LNWF= ${WEBPLUGIN_FILES:S,^,${WEBPLUGIN_DIR}/,}
-
-webplugin-post-install:
- @${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST}
-.for d in ${_WEBPLUGIN_LINKFARMS}
- ${INSTALL} -d ${STAGEDIR}${d}
-.for l in ${_LNWF}
- ${LN} -sf ${l} ${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}
-
-post-install: webplugin-post-install
-
-.endif
Modified: branches/firefox31/Mk/bsd.gecko.mk
==============================================================================
--- trunk/Mk/bsd.gecko.mk Thu Jul 24 18:40:55 2014 (r1640)
+++ branches/firefox31/Mk/bsd.gecko.mk Wed Jul 30 14:42:42 2014 (r1645)
@@ -4,7 +4,7 @@
# Date created: 12 Nov 2005
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
-# $FreeBSD: head/Mk/bsd.gecko.mk 352986 2014-05-05 09:45:36Z bapt $
+# $FreeBSD: head/Mk/bsd.gecko.mk 362796 2014-07-24 13:32:58Z bapt $
#
# 4 column tabs prevent hair loss and tooth decay!
@@ -100,7 +100,7 @@
PORT_MOZCONFIG?= ${FILESDIR}/mozconfig.in
MOZCONFIG?= ${WRKSRC}/.mozconfig
-MOZILLA_PLIST_DIRS?= bin lib
+MOZILLA_PLIST_DIRS?= bin lib share/pixmaps share/applications
PKGINSTALL?= ${WRKDIR}/pkg-install
PKGDEINSTALL?= ${WRKDIR}/pkg-deinstall
PKGINSTALL_INC?= ${.CURDIR}/../../www/firefox/files/pkg-install.in
@@ -115,7 +115,7 @@
${MOZILLA}-xpcom ${MOZILLA}-plugin
MOZ_EXPORT+= ${CONFIGURE_ENV} \
- LIBS="${LIBS}" PERL="${PERL}"
+ PERL="${PERL}"
MOZ_OPTIONS+= --prefix="${PREFIX}"
CPPFLAGS+= -isystem${LOCALBASE}/include
Modified: branches/firefox31/devel/nspr/Makefile
==============================================================================
--- trunk/devel/nspr/Makefile Thu Jul 24 18:40:55 2014 (r1640)
+++ branches/firefox31/devel/nspr/Makefile Wed Jul 30 14:42:42 2014 (r1645)
@@ -1,5 +1,5 @@
# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
-# $FreeBSD: head/devel/nspr/Makefile 336446 2013-12-14 13:42:06Z flo $
+# $FreeBSD: head/devel/nspr/Makefile 359185 2014-06-25 05:35:31Z bapt $
PORTNAME= nspr
DISTVERSION= 4.10.6
@@ -7,7 +7,7 @@
MASTER_SITES= MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src
MAINTAINER= gecko@FreeBSD.org
-COMMENT= A platform-neutral API for system level and libc like functions
+COMMENT= Platform-neutral API for system level and libc like functions
WRKSRC= ${WRKDIR}/${DISTNAME}/nspr/build
@@ -21,7 +21,7 @@
MAKE_ENV= DIST=${WRKSRC}/dist
-LIBS= libnspr4.so.1 libplc4.so.1 libplds4.so.1
+LIBRARIES= libnspr4.so.1 libplc4.so.1 libplds4.so.1
.include <bsd.port.pre.mk>
@@ -46,7 +46,7 @@
${INSTALL_SCRIPT} ${WRKSRC}/config/nspr-config ${STAGEDIR}${PREFIX}/bin
${MKDIR} ${STAGEDIR}${PREFIX}/libdata/pkgconfig
${INSTALL_DATA} ${WRKSRC}/config/nspr.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
-.for lib in ${LIBS}
+.for lib in ${LIBRARIES}
.if defined(STRIP) && ${STRIP} != ""
${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${lib}
.endif
@@ -55,12 +55,12 @@
.endfor
prtests:
- ${GMAKE} -C ${WRKSRC}/pr/tests
+ ${MAKE_CMD} -C ${WRKSRC}/pr/tests
${LN} -sf libmy.so.1 ${WRKSRC}/pr/tests/dll/libmy.so
cd ${WRKSRC}/pr/tests && ../../../pr/tests/runtests.sh
libtests:
- ${GMAKE} -C ${WRKSRC}/lib/tests
+ ${MAKE_CMD} -C ${WRKSRC}/lib/tests
${WRKSRC}/lib/tests/string
${WRKSRC}/lib/tests/base64t
# The test below is commented out, because arena requires
Modified: branches/firefox31/mail/thunderbird-i18n/Makefile
==============================================================================
--- trunk/mail/thunderbird-i18n/Makefile Thu Jul 24 18:40:55 2014 (r1640)
+++ branches/firefox31/mail/thunderbird-i18n/Makefile Wed Jul 30 14:42:42 2014 (r1645)
@@ -1,5 +1,5 @@
# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
-# $FreeBSD: head/mail/thunderbird-i18n/Makefile 356960 2014-06-07 23:46:45Z antoine $
+# $FreeBSD: head/mail/thunderbird-i18n/Makefile 357413 2014-06-11 03:42:55Z beat $
PORTNAME= thunderbird-i18n
PORTVERSION= 31.0
Modified: branches/firefox31/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile Thu Jul 24 18:40:55 2014 (r1640)
+++ branches/firefox31/mail/thunderbird/Makefile Wed Jul 30 14:42:42 2014 (r1645)
@@ -1,5 +1,5 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
-# $FreeBSD: head/mail/thunderbird/Makefile 339634 2014-01-13 21:00:02Z rene $
+# $FreeBSD: head/mail/thunderbird/Makefile 362796 2014-07-24 13:32:58Z bapt $
PORTNAME= thunderbird
DISTVERSION= 31.0
@@ -147,6 +147,7 @@
${WRKSRC}/mailnews/extensions/enigmail/util/fixlang.pl \
${WRKSRC}/mailnews/extensions/enigmail/util/make-lang-xpi.pl
@${REINPLACE_CMD} -e '/^xpi/s/$$/ all/' \
+ -e '/^all/s/ xpi//' \
-e '/^XPI_MODULE_VERS/s/= .*/= ${EM_VERSION}/' \
${WRKSRC}/mailnews/extensions/enigmail/Makefile
@${REINPLACE_CMD} -e '/em:version/s,>[^<]*<,>${EM_VERSION}<,' \
@@ -165,7 +166,7 @@
${SETENV} ${MAKE_ENV} ./configure
post-build:
- ${SETENV} ${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS_NUMBER} all xpi \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} all xpi \
-C ${WRKSRC}/mailnews/extensions/enigmail
.endif
Modified: branches/firefox31/security/nss/Makefile
==============================================================================
--- trunk/security/nss/Makefile Thu Jul 24 18:40:55 2014 (r1640)
+++ branches/firefox31/security/nss/Makefile Wed Jul 30 14:42:42 2014 (r1645)
@@ -1,5 +1,5 @@
# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
-# $FreeBSD: head/security/nss/Makefile 336446 2013-12-14 13:42:06Z flo $
+# $FreeBSD: head/security/nss/Makefile 362631 2014-07-23 07:49:43Z delphij $
PORTNAME= nss
PORTVERSION= 3.16.3
Modified: branches/firefox31/www/firefox-esr-i18n/Makefile
==============================================================================
--- trunk/www/firefox-esr-i18n/Makefile Thu Jul 24 18:40:55 2014 (r1640)
+++ branches/firefox31/www/firefox-esr-i18n/Makefile Wed Jul 30 14:42:42 2014 (r1645)
@@ -1,5 +1,5 @@
# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
-# $FreeBSD: head/www/firefox-esr-i18n/Makefile 350695 2014-04-09 12:46:48Z bapt $
+# $FreeBSD: head/www/firefox-esr-i18n/Makefile 357413 2014-06-11 03:42:55Z beat $
PORTNAME= firefox
PORTVERSION= 24.7.0
Modified: branches/firefox31/www/firefox-esr-i18n/Makefile.lang
==============================================================================
--- trunk/www/firefox-esr-i18n/Makefile.lang Thu Jul 24 18:40:55 2014 (r1640)
+++ branches/firefox31/www/firefox-esr-i18n/Makefile.lang Wed Jul 30 14:42:42 2014 (r1645)
@@ -1,5 +1,5 @@
# Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp>
-# $FreeBSD: head/www/firefox-esr-i18n/Makefile.lang 315079 2013-03-23 20:20:22Z flo $
+# $FreeBSD: head/www/firefox-esr-i18n/Makefile.lang 336446 2013-12-14 13:42:06Z flo $
FIREFOX_I18N_ALL_= ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb \
cy da de el en-GB en-US en-ZA eo es-AR es-CL es-ES \
Modified: branches/firefox31/www/firefox-i18n/Makefile
==============================================================================
--- trunk/www/firefox-i18n/Makefile Thu Jul 24 18:40:55 2014 (r1640)
+++ branches/firefox31/www/firefox-i18n/Makefile Wed Jul 30 14:42:42 2014 (r1645)
@@ -1,5 +1,5 @@
# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
-# $FreeBSD: head/www/firefox-i18n/Makefile 355802 2014-05-30 08:50:20Z marino $
+# $FreeBSD: head/www/firefox-i18n/Makefile 357413 2014-06-11 03:42:55Z beat $
PORTNAME= firefox-i18n
PORTVERSION= 31.0
Modified: branches/firefox31/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile Thu Jul 24 18:40:55 2014 (r1640)
+++ branches/firefox31/www/firefox/Makefile Wed Jul 30 14:42:42 2014 (r1645)
@@ -1,5 +1,5 @@
# Created by: Alan Eldridge <alane@FreeBSD.org>
-# $FreeBSD: head/www/firefox/Makefile 339634 2014-01-13 21:00:02Z rene $
+# $FreeBSD: head/www/firefox/Makefile 362796 2014-07-24 13:32:58Z bapt $
PORTNAME= firefox
DISTVERSION= 31.0
Modified: branches/firefox31/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul/Makefile Thu Jul 24 18:40:55 2014 (r1640)
+++ branches/firefox31/www/libxul/Makefile Wed Jul 30 14:42:42 2014 (r1645)
@@ -1,11 +1,10 @@
# Created by: Michael Johnson <ahze@FreeBSD.org>
-# $FreeBSD: head/www/libxul/Makefile 339634 2014-01-13 21:00:02Z rene $
+# $FreeBSD: head/www/libxul/Makefile 359586 2014-06-27 17:21:06Z miwi $
PORTNAME= libxul
DISTVERSION= 24.7.0
CATEGORIES?= www devel
-MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \
- https://ftp.mozilla.org/pub/mozilla.org/firefox/candidates/${DISTVERSION}esr-candidates/build1/source/
+MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source
DISTNAME= firefox-${DISTVERSION}esr.source
MAINTAINER?= gecko@FreeBSD.org
Deleted: trunk/www/libxul/files/pkg-deinstall.in
==============================================================================
--- trunk/www/libxul/files/pkg-deinstall.in Wed Jul 30 14:42:42 2014 (r1640)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $MCom: ports/www/mozilla/pkg-deinstall.in,v 1.25 2008/07/26 19:07:07 ahze Exp $
-#
-# Date created: Mon Nov 29, 2003
-# Whom: Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xDEINSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/*.rdf
-rm -f ${MOZDIR}/component.reg
-rm -f ${MOZDIR}/components/*.dat
-rm -f ${MOZDIR}/components.ini
-rm -f ${MOZDIR}/defaults.ini
-rm -f ${MOZDIR}/chrome/app-chrome.manifest
-rm -rf ${MOZDIR}/updates
-find %%MOZDIR%%/plugins/ -depth 1 -type l -delete > /dev/null 2>&1
-find %%MOZDIR%%/extensions/ -depth 1 -type l -delete > /dev/null 2>&1
-
-exit 0
Deleted: trunk/www/libxul/files/pkg-install.in
==============================================================================
--- trunk/www/libxul/files/pkg-install.in Wed Jul 30 14:42:42 2014 (r1640)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# $MCom: ports/www/mozilla/pkg-install.in,v 1.26 2008/08/04 16:58:03 mezz Exp $
-#
-# Date created: Mon Nov 29, 2003
-# Whom: Thierry Thomas (<thierry@pompo.net>)
-# Fix the chrome registry.
-
-umask 022
-PATH=/bin:/usr/bin
-
-[ "x$1" = "x" ] && exit 1
-[ "x$2" != "xPOST-INSTALL" ] && exit 0
-
-MOZDIR=%%MOZDIR%%
-MOZBIN=${MOZDIR}/%%MOZILLA_BIN%%
-REGXPCOM=${MOZDIR}/regxpcom
-REGCHROME=${MOZDIR}/regchrome
-
-rm -rf ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/chrome/*.rdf
-mkdir -p ${MOZDIR}/chrome/overlayinfo
-rm -f ${MOZDIR}/component.reg
-
-cd ${MOZDIR} || exit 1
-if [ -f ${REGXPCOM} ]; then
- ./run-mozilla.sh ${REGXPCOM} || true
-fi
-if [ -f ${REGCHROME} ]; then
- ./run-mozilla.sh ${REGCHROME} || true
-fi
-if [ -f ${MOZBIN} -a "${1%-*}" = "nvu" ]; then
- ./run-mozilla.sh ${MOZBIN} -register > /dev/null 2>&1
-fi
-cp -R %%LOCALBASE%%/lib/xpi/symlinks/%%MOZILLA%%/ %%MOZDIR%%/extensions/ > /dev/null 2>&1
-
-exit 0
Modified: branches/firefox31/www/linux-firefox/Makefile
==============================================================================
--- trunk/www/linux-firefox/Makefile Thu Jul 24 18:40:55 2014 (r1640)
+++ branches/firefox31/www/linux-firefox/Makefile Wed Jul 30 14:42:42 2014 (r1645)
@@ -1,5 +1,5 @@
# Created by: voisine
-# $FreeBSD: head/www/linux-firefox/Makefile 336446 2013-12-14 13:42:06Z flo $
+# $FreeBSD: head/www/linux-firefox/Makefile 357413 2014-06-11 03:42:55Z beat $
PORTNAME= firefox
DISTVERSION= 31.0
Modified: branches/firefox31/www/linux-seamonkey/Makefile
==============================================================================
--- trunk/www/linux-seamonkey/Makefile Thu Jul 24 18:40:55 2014 (r1640)
+++ branches/firefox31/www/linux-seamonkey/Makefile Wed Jul 30 14:42:42 2014 (r1645)
@@ -1,5 +1,5 @@
# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
-# $FreeBSD: head/www/linux-seamonkey/Makefile 336446 2013-12-14 13:42:06Z flo $
+# $FreeBSD: head/www/linux-seamonkey/Makefile 362322 2014-07-20 14:44:10Z rene $
PORTNAME= seamonkey
DISTVERSION= 2.26
Modified: branches/firefox31/www/seamonkey-i18n/Makefile
==============================================================================
--- trunk/www/seamonkey-i18n/Makefile Thu Jul 24 18:40:55 2014 (r1640)
+++ branches/firefox31/www/seamonkey-i18n/Makefile Wed Jul 30 14:42:42 2014 (r1645)
@@ -2,7 +2,7 @@
# $FreeBSD: head/www/seamonkey-i18n/Makefile 355802 2014-05-30 08:50:20Z marino $
PORTNAME= seamonkey-i18n
-PORTVERSION= 2.26
+PORTVERSION= 2.26.1
CATEGORIES= www mail news editors irc
MASTER_SITES= MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/langpack
PKGNAMEPREFIX=
Modified: branches/firefox31/www/seamonkey-i18n/Makefile.lang
==============================================================================
--- trunk/www/seamonkey-i18n/Makefile.lang Thu Jul 24 18:40:55 2014 (r1640)
+++ branches/firefox31/www/seamonkey-i18n/Makefile.lang Wed Jul 30 14:42:42 2014 (r1645)
@@ -1,5 +1,5 @@
# Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp>
-# $FreeBSD: head/www/seamonkey-i18n/Makefile.lang 315079 2013-03-23 20:20:22Z flo $
+# $FreeBSD: head/www/seamonkey-i18n/Makefile.lang 336446 2013-12-14 13:42:06Z flo $
SEAMONKEY_I18N_ALL_= be ca cs de en-GB en-US es-AR es-ES fi fr gl hu it \
ja-JP-mac ja lt nb-NO nl pl pt-PT ru sk sv-SE tr uk \
Modified: branches/firefox31/www/seamonkey-i18n/Makefile.option
==============================================================================
--- trunk/www/seamonkey-i18n/Makefile.option Thu Jul 24 18:40:55 2014 (r1640)
+++ branches/firefox31/www/seamonkey-i18n/Makefile.option Wed Jul 30 14:42:42 2014 (r1645)
@@ -1,5 +1,5 @@
# Created by: Koji Yokota <yokota@res.otaru-uc.ac.jp>
-# $FreeBSD: head/www/seamonkey-i18n/Makefile.option 315079 2013-03-23 20:20:22Z flo $
+# $FreeBSD: head/www/seamonkey-i18n/Makefile.option 336446 2013-12-14 13:42:06Z flo $
OPTIONS_DEFINE= LANG_BE \
LANG_CA \
Modified: branches/firefox31/www/seamonkey-i18n/distinfo
==============================================================================
--- trunk/www/seamonkey-i18n/distinfo Thu Jul 24 18:40:55 2014 (r1640)
+++ branches/firefox31/www/seamonkey-i18n/distinfo Wed Jul 30 14:42:42 2014 (r1645)
@@ -1,52 +1,54 @@
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.be.langpack.xpi) = bba364903e2cd080a83b4c7b06317ce547fce0463e46cb1ff5241dcd3b0341f7
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.be.langpack.xpi) = 818751
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.ca.langpack.xpi) = 8885d0412bd420b77a831bc28aae685d0962ef840ddb16e380cd07a2f2ef176c
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.ca.langpack.xpi) = 816735
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.cs.langpack.xpi) = cc77420a27f8e0757bcbdd6f8df2be361883ae1c5840e63f63a1386e43bc498c
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.cs.langpack.xpi) = 814944
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.de.langpack.xpi) = 960ce22067f7cd19ec30c1249a588c651785a8989f374e14e8d06de8dce35237
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.de.langpack.xpi) = 822042
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.en-GB.langpack.xpi) = 42aa60112205d55fb9f835baf1a051da97942a950a17fbb37f0aac7cf6f5135e
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.en-GB.langpack.xpi) = 785904
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.en-US.langpack.xpi) = 31b47ea472f6f4293f896355d8d4092ced3094ab001afc3625c33de1dfb4a6e8
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.en-US.langpack.xpi) = 786788
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.es-AR.langpack.xpi) = 70e3502d5578c3d793645c47872c436f92845800f5a74bcea3803b2c5db73dad
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.es-AR.langpack.xpi) = 836833
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.es-ES.langpack.xpi) = 13bdb45b40c8a9b03f3c93aca5d120ce163a9dc263c68d9fa225826bf429c1a0
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.es-ES.langpack.xpi) = 814002
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.fi.langpack.xpi) = f21cd2e898e11039b2909cad62a71e8f4ee769c68c5681d82300f95c9c70c00a
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.fi.langpack.xpi) = 784387
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.fr.langpack.xpi) = 4e892a84852f9d7470c7c7ff4cc6ff8da0cb5bc8e8197d41ca3105ded6d7356d
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.fr.langpack.xpi) = 795188
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.gl.langpack.xpi) = de1db0aefa37fa6ce4ca2ab6ddbd53d4466e48cb435861270266ca0f56e338e0
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.gl.langpack.xpi) = 794258
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.hu.langpack.xpi) = a1c8b084b6b64bb0b992e9a05c6fa49c9a5a48b437e86351b8a2ed1f2997f22c
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.hu.langpack.xpi) = 828526
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.it.langpack.xpi) = 30dde81ae8bf1379caabc0a7e35bee72b8fa9fa052136de333dcbcd7f3ea550a
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.it.langpack.xpi) = 728566
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.ja.langpack.xpi) = 002743784937853e368c31ca5f80056eb50bd91dfa3f791164e388ab66e1e160
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.ja.langpack.xpi) = 867575
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.lt.langpack.xpi) = 5beaf750798ffe4979e31e19dd88721df2819eeb4ac6cfb73388c0acecfb80f3
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.lt.langpack.xpi) = 832068
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.nb-NO.langpack.xpi) = 5559b7554f6683b7ad444af019d7ad75b13795f6669653b3be9c0934d12857a9
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.nb-NO.langpack.xpi) = 805527
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.nl.langpack.xpi) = 794019b24058071a080b6450991fa79ca71a447df7702e6384785895fce18a34
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.nl.langpack.xpi) = 781831
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.pl.langpack.xpi) = fff16b9b77830bf983c49e42516091ec987a9616168d8040598799349b135e1f
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.pl.langpack.xpi) = 855815
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.pt-PT.langpack.xpi) = 35ecbc2df9c90227ce0e46d854237272d019ad4a5c54e459cdf82a601a9d52dd
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.pt-PT.langpack.xpi) = 817865
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.ru.langpack.xpi) = 9c4c665da191538e1e836ecad5b4556f5a9ed4a4db94c4779db537dd2cef1c94
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.ru.langpack.xpi) = 885692
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.sk.langpack.xpi) = dca3c93b1b2131e58483a537961df44a044b80f5cc97fb2628b384f26e973212
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.sk.langpack.xpi) = 841872
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.sv-SE.langpack.xpi) = e55f7d962db49d461b3b2cc2cc93da46da64139164b8d83f2e67df35bbfa2979
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.sv-SE.langpack.xpi) = 809829
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.tr.langpack.xpi) = d4923efdc2d4e3a294b864c1fbb9fe0a9a9d0d3636cb4ebed2e2263fbabbe5fa
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.tr.langpack.xpi) = 791385
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.uk.langpack.xpi) = ebdc37f591c32ddfe8783257c3944b6a44be15a2b10be4298326c187caddda81
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.uk.langpack.xpi) = 853567
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.zh-CN.langpack.xpi) = 57ab3c518f60627b9cbbe57f5a25b22dace427ec9597d395953104732a5cf0fe
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.zh-CN.langpack.xpi) = 818845
-SHA256 (xpi/seamonkey-i18n-2.26/seamonkey-2.26.zh-TW.langpack.xpi) = 2512be926be2859e16e058977e9dc31d29a3c8b92eefe5a6b3a6f304325cb7fe
-SIZE (xpi/seamonkey-i18n-2.26/seamonkey-2.26.zh-TW.langpack.xpi) = 843200
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.be.langpack.xpi) = 1304caf66562d819b8df6089224496d2ef593054201a124fdfea4e8d325268d6
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.be.langpack.xpi) = 818753
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.ca.langpack.xpi) = 77845f85562118ccf17ba7233408516c57aaa91a0b1f5083a08c8341e5c819a9
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.ca.langpack.xpi) = 816736
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.cs.langpack.xpi) = e71366cacb6274864fe5e6f441f3e7ebb15db090a92df30ae2395d9bcb518913
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.cs.langpack.xpi) = 814946
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.de.langpack.xpi) = 9ac22a758f62bc31aaa83a5d3a1d21e2fa0bc06d6f4ee26c8adf85e8225064ae
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.de.langpack.xpi) = 822043
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.en-GB.langpack.xpi) = 30ecd2a83e179017d24eb0dfa9e9ec7d220f0fd16bada1be14ddc69688f74ea6
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.en-GB.langpack.xpi) = 785905
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.en-US.langpack.xpi) = 1fdf1d312b6f82662e877b8361e5ae4df5249958bfd8a454e32b3b9da15867e2
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.en-US.langpack.xpi) = 786790
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.es-AR.langpack.xpi) = e6202b022e8c952449b8509f39803a626e5005fbc11ea1102af8082880b7ff27
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.es-AR.langpack.xpi) = 836836
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.es-ES.langpack.xpi) = 9818c7eb20cb9b5f47928cb8299f4807d1a722995760b70e6cae3a945bd04cc3
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.es-ES.langpack.xpi) = 814004
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.fi.langpack.xpi) = e0c70cf2fdf60b45394d89a8515820b6984edd4b252bfda19c59cb0f405467c2
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.fi.langpack.xpi) = 784389
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.fr.langpack.xpi) = b57475d1b47a2b6fb64d27230212784602146d2c45fa037b57c2ec27c0761311
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.fr.langpack.xpi) = 795190
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.gl.langpack.xpi) = 8c1d47ec6fca70b88f3fde4f2b54c6838d8a6d1cc29fc66d2d1b7f912214b8bf
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.gl.langpack.xpi) = 794260
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.hu.langpack.xpi) = 08311664e95c3da977d81c033bce4d75c1339e9eecff7bcf507318cf54ed9a82
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.hu.langpack.xpi) = 828532
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.it.langpack.xpi) = 128f4fee131b28dcde7464f675e255c5bf31bd5ba99227cc95b4257a98cb726f
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.it.langpack.xpi) = 728567
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.ja-JP-mac.langpack.xpi) = eb0b4075407d56a539b310803c1d1f505aee15253739b87e78e43875cf00331b
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.ja-JP-mac.langpack.xpi) = 892974
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.ja.langpack.xpi) = c8eaf09ad594cd589e9486fa149a695375ce4603bb927ebaafa3b72b8a13c11e
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.ja.langpack.xpi) = 867577
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.lt.langpack.xpi) = ffac3896d8c24aef230918573efa26d0d409aad53708cfdfc94679913b50b262
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.lt.langpack.xpi) = 832069
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.nb-NO.langpack.xpi) = 5f80ae03c4890980031fdc96d422d2713142d3f11e5a6b5bc6ebe106f84d474e
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.nb-NO.langpack.xpi) = 805528
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.nl.langpack.xpi) = 28ea348e46bb9ef6328fad3b1d45a18b103741803b30e4ebe5e746ae3d6b3c69
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.nl.langpack.xpi) = 781833
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.pl.langpack.xpi) = 223ae1798bb0284415218545de43919c4361a5dbd55ab2b5d4805678087e333b
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.pl.langpack.xpi) = 855816
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.pt-PT.langpack.xpi) = 49116b6d66bb00fd16e09cf9a9935cb5228300f6ac209e72ae5fd274d4afc3eb
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.pt-PT.langpack.xpi) = 817866
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.ru.langpack.xpi) = a40a053a9df8174febf2a19f98e11cfef75a82a2c3666e80b551d22ad89a495d
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.ru.langpack.xpi) = 885694
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.sk.langpack.xpi) = c6afd39a1a25384f79c58ad5757c7e15147bae3578f6e6a5d302907fbc8b0bf7
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.sk.langpack.xpi) = 841874
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.sv-SE.langpack.xpi) = 6f1ff640ee52f6f27536a1aa127bb1bc4badefcdc07157c18e3ab6d8d9bececd
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.sv-SE.langpack.xpi) = 809831
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.tr.langpack.xpi) = b7e7a2e962c156b7012d449381d40866d233a460c1f4c45ef91f67d472db2d64
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.tr.langpack.xpi) = 791387
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.uk.langpack.xpi) = 7009492796add5f7e6a6b08eda9a875245f1ed69f6457e4dedc459945694c81c
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.uk.langpack.xpi) = 853570
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.zh-CN.langpack.xpi) = c288ec1f532f021eda32ef6dd10ae12acecbbb9e1797ee21dfaeaa07fc656d7f
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.zh-CN.langpack.xpi) = 818847
+SHA256 (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.zh-TW.langpack.xpi) = 06a8fbb17152d706ec6b880e86572151cfa1a30d0d105514ecc90afcaf1daf22
+SIZE (xpi/seamonkey-i18n-2.26.1/seamonkey-2.26.1.zh-TW.langpack.xpi) = 843202
Modified: branches/firefox31/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Mon Jun 9 22:12:02 2014 (r1594)
+++ branches/firefox31/www/seamonkey/Makefile Wed Jul 30 14:42:42 2014 (r1645)
@@ -1,8 +1,9 @@
# Created by: eivind/dima/jseger
-# $FreeBSD: head/www/seamonkey/Makefile 339634 2014-01-13 21:00:02Z rene $
+# $FreeBSD: head/www/seamonkey/Makefile 362796 2014-07-24 13:32:58Z bapt $
PORTNAME= seamonkey
-DISTVERSION= 2.26
+DISTVERSION= 2.26.1
+PORTREVISION= 2
CATEGORIES?= www mail news editors irc ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
@@ -29,7 +30,7 @@
LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l
-EM_VERSION= 1.6.1_pre20140112
+EM_VERSION= 1.7
L_VERSION= 3.1
SSP_UNSAFE= yes
@@ -103,11 +104,11 @@
.endif
.if ${PORT_OPTIONS:MALSA}
-BUILD_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
+RUN_DEPENDS+= alsa-lib>=1.0.27.2_1:${PORTSDIR}/audio/alsa-lib
.endif
.if ${PORT_OPTIONS:MGSTREAMER}
-BUILD_DEPENDS+= gstreamer1-libav>=1.2.4:${PORTSDIR}/multimedia/gstreamer1-libav
+RUN_DEPENDS+= gstreamer1-libav>=1.2.4_1:${PORTSDIR}/multimedia/gstreamer1-libav
.endif
.if ! ${PORT_OPTIONS:MMAILNEWS}
@@ -120,19 +121,17 @@
MOZ_OPTIONS+= --enable-ldap --enable-mailnews
.endif
.if ${PORT_OPTIONS:MENIGMAIL}
-#MASTER_SITES+= https://www.enigmail.net/download/source/:enigmail
-MASTER_SITES+= https://dev.gentoo.org/~polynomial-c/mozilla/:enigmail
+MASTER_SITES+= https://www.enigmail.net/download/source/:enigmail
DISTFILES+= ${EM_DISTFILE}:enigmail
RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg
EM_DISTNAME= enigmail-${EM_VERSION}
-EM_DISTFILE= ${EM_DISTNAME}.tar.xz
-EM_XPI_FILE= ${WRKSRC}/mailnews/extensions/enigmail/build/${EM_DISTNAME}-${OPSYS:L}-${ARCH:S/amd64/x86_64/:S/i386/x86/}-gcc3.xpi
+EM_DISTFILE= ${EM_DISTNAME}.tar.gz
+EM_XPI_FILE= ${WRKSRC}/mailnews/extensions/enigmail/build/${EM_DISTNAME}-${OPSYS:tl}-${ARCH:S/amd64/x86_64/:S/i386/x86/}-gcc3.xpi
EM_ORIG_ID= {847b3a00-7ab1-11d4-8f02-006008948af5}
EM_ID= ${PORTNAME}@mozilla-enigmail.org
EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/install.rdf \
${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \
${XPI_LIBDIR}/${EM_ID}/modules/enigmailCommon.jsm
-EXTRA_PATCHES+= ${FILESDIR}/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl
.endif
.endif
@@ -144,7 +143,7 @@
MOZ_OPTIONS+= --enable-calendar
MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar
LIGHTNING_DIR= share/lightning
-XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning-${L_VERSION}.en-US.${OPSYS:L}${OSREL}-${ARCH:S/amd64/x86_64/}.xpi
+XPI_FILE= ${MOZ_OBJDIR}/mozilla/dist/xpi-stage/lightning-${L_VERSION}.en-US.${OPSYS:tl}${OSREL}-${ARCH:S/amd64/x86_64/}.xpi
XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103}
XPI_ID= lightning@seamonkey.mozilla.org
.else
@@ -172,6 +171,7 @@
${WRKSRC}/mailnews/extensions/enigmail/util/fixlang.pl \
${WRKSRC}/mailnews/extensions/enigmail/util/make-lang-xpi.pl
@${REINPLACE_CMD} -e '/^xpi/s/$$/ all/' \
+ -e '/^all/s/ xpi//' \
-e '/^XPI_MODULE_VERS/s/= .*/= ${EM_VERSION}/' \
${WRKSRC}/mailnews/extensions/enigmail/Makefile
@${REINPLACE_CMD} -e '/em:version/s,>[^<]*<,>${EM_VERSION}<,' \
@@ -192,7 +192,7 @@
.if ${PORT_OPTIONS:MMAILNEWS} && ${PORT_OPTIONS:MENIGMAIL}
post-build:
- ${SETENV} ${MAKE_ENV} ${GMAKE} -j${MAKE_JOBS_NUMBER} all xpi \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} -j${MAKE_JOBS_NUMBER} all xpi \
-C ${WRKSRC}/mailnews/extensions/enigmail
.endif
Modified: branches/firefox31/www/seamonkey/distinfo
==============================================================================
--- trunk/www/seamonkey/distinfo Mon Jun 9 22:12:02 2014 (r1594)
+++ branches/firefox31/www/seamonkey/distinfo Wed Jul 30 14:42:42 2014 (r1645)
@@ -1,4 +1,4 @@
-SHA256 (seamonkey-2.26.source.tar.bz2) = 985262d39f38fc20d307e810c371c9f581f7c55a66cfabd6b5561c236116b874
-SIZE (seamonkey-2.26.source.tar.bz2) = 165548355
-SHA256 (enigmail-1.6.1_pre20140112.tar.xz) = 2d89a9186c3ccfc9397c933c6f63c0518224fea0096d7a292dba3765de088149
-SIZE (enigmail-1.6.1_pre20140112.tar.xz) = 916028
+SHA256 (seamonkey-2.26.1.source.tar.bz2) = 741d383c87cc58e38b8d5eef34033a88a4352ff7d76064914bfc05fef1c5d2f3
+SIZE (seamonkey-2.26.1.source.tar.bz2) = 165537001
+SHA256 (enigmail-1.7.tar.gz) = cddbf35783194a4e994f9584ad5bee74750e25f690e81727ba9eccc4f814f161
+SIZE (enigmail-1.7.tar.gz) = 1414100
Deleted: trunk/www/seamonkey/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl
==============================================================================
--- trunk/www/seamonkey/files/extra-patch-mailnews-extensions-enigmail-config-getOsTarget.pl Wed Jul 30 14:42:42 2014 (r1594)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,53 +0,0 @@
-commit 49a1daf
-Author: Patrick Brunschwig <patrick@enigmail.net>
-Date: Tue Jan 28 18:10:54 2014 +0100
-
- fixed detection of compiler type for better supporting cross-compilers
----
- config/getOsTarget.pl | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git config/getOsTarget.pl config/getOsTarget.pl
-index 91285cd..cf4a233 100755
---- mailnews/extensions/enigmail/config/getOsTarget.pl
-+++ mailnews/extensions/enigmail/config/getOsTarget.pl
-@@ -9,13 +9,15 @@
- # -c : CPU and compiler type
- # -o : OS type
-
-+use File::Basename;
-+
- if ($#ARGV != 3) {
- exit (1);
- }
-
- my $srcOs = $ARGV[1];
- my $srcCpu = $ARGV[2];
--my $srcComp = $ARGV[3];
-+my $srcComp = basename($ARGV[3]);
-
- my $targetOs = "";
- my $targetCpu = "";
-@@ -95,10 +97,10 @@ else {
- if ($targetOs eq "WINNT") {
- $targetComp = "msvc";
- }
--if ($srcComp =~ /^gcc/) {
-+elsif ($srcComp =~ /gcc/ || $srcComp =~ /clang/) {
- $targetComp = "gcc3";
- }
--elsif ($srcComp =~ /^cc/) {
-+elsif ($srcComp =~ /cc/) {
- if ($targetOs eq "SunOS") {
- $targetComp = "sunc";
- }
-@@ -107,6 +109,9 @@ elsif ($srcComp =~ /cc/) {
- elsif ($targetOs eq "AIX") {
- $targetComp = "ibmc";
- }
-+ else {
-+ $targetComp = "gcc3";
-+ }
- }
- else {
- $targetComp = $srcComp;
Copied: branches/firefox31/www/seamonkey/files/patch-bug1026499 (from r1644, trunk/www/seamonkey/files/patch-bug1026499)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/firefox31/www/seamonkey/files/patch-bug1026499 Wed Jul 30 14:42:42 2014 (r1645, copy of r1644, trunk/www/seamonkey/files/patch-bug1026499)
@@ -0,0 +1,68 @@
+commit 8d0efe4
+Author: Martin Husemann <martin@NetBSD.org>
+Date: Wed Jun 18 18:12:22 2014 +0200
+
+ Bug 1026499 - Use MOZ_ALIGNED_DECL to declare union members in ipdl value declarations. r=bsmedberg
+---
+ ipc/ipdl/ipdl/cxx/ast.py | 7 ++++---
+ ipc/ipdl/ipdl/cxx/cgen.py | 5 ++++-
+ ipc/ipdl/ipdl/lower.py | 2 +-
+ 4 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git ipc/ipdl/ipdl/cxx/ast.py ipc/ipdl/ipdl/cxx/ast.py
+index 3180a65..c2d945b 100644
+--- mozilla/ipc/ipdl/ipdl/cxx/ast.py
++++ mozilla/ipc/ipdl/ipdl/cxx/ast.py
+@@ -336,12 +336,13 @@ Type.VOID = Type('void')
+ Type.VOIDPTR = Type('void', ptr=1)
+
+ class TypeArray(Node):
+- def __init__(self, basetype, nmemb):
+- '''the type |basetype DECLNAME[nmemb]|. |nmemb| is an Expr'''
++ def __init__(self, basetype, nmemb, alignType):
++ '''the type |basetype DECLNAME[nmemb]|. |nmemb| is an Expr, |alignType| is a type'''
+ self.basetype = basetype
+ self.nmemb = nmemb
++ self.alignType = alignType
+ def __deepcopy__(self, memo):
+- return TypeArray(deepcopy(self.basetype, memo), nmemb)
++ return TypeArray(deepcopy(self.basetype, memo), nmemb, alignType)
+
+ class TypeEnum(Node):
+ def __init__(self, name=None):
+diff --git ipc/ipdl/ipdl/cxx/cgen.py ipc/ipdl/ipdl/cxx/cgen.py
+index 48b0988..bc914cf 100644
+--- mozilla/ipc/ipdl/ipdl/cxx/cgen.py
++++ mozilla/ipc/ipdl/ipdl/cxx/cgen.py
+@@ -101,6 +101,7 @@ class CxxCodeGen(CodePrinter, Visitor):
+ def visitDecl(self, d):
+ # C-syntax arrays make code generation much more annoying
+ if isinstance(d.type, TypeArray):
++ self.write('MOZ_ALIGNED_DECL(')
+ d.type.basetype.accept(self)
+ else:
+ d.type.accept(self)
+@@ -111,7 +112,9 @@ class CxxCodeGen(CodePrinter, Visitor):
+ if isinstance(d.type, TypeArray):
+ self.write('[')
+ d.type.nmemb.accept(self)
+- self.write(']')
++ self.write('], MOZ_ALIGNOF(')
++ d.type.alignType.accept(self)
++ self.write('))')
+
+ def visitParam(self, p):
+ self.visitDecl(p)
+diff --git ipc/ipdl/ipdl/lower.py ipc/ipdl/ipdl/lower.py
+index e97a34c..9360f3c 100644
+--- mozilla/ipc/ipdl/ipdl/lower.py
++++ mozilla/ipc/ipdl/ipdl/lower.py
+@@ -768,7 +768,7 @@ IPDL union type."""
+ if self.recursive:
+ return self.ptrToType()
+ else:
+- return TypeArray(Type('char'), ExprSizeof(self.internalType()))
++ return TypeArray(Type('char'), ExprSizeof(self.internalType()), self.internalType())
+
+ def unionValue(self):
+ # NB: knows that Union's storage C union is named |mValue|
Copied: branches/firefox31/www/seamonkey/files/patch-bug1026828 (from r1644, trunk/www/seamonkey/files/patch-bug1026828)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/firefox31/www/seamonkey/files/patch-bug1026828 Wed Jul 30 14:42:42 2014 (r1645, copy of r1644, trunk/www/seamonkey/files/patch-bug1026828)
@@ -0,0 +1,20 @@
+diff --git storage/src/moz.build storage/src/moz.build
+index 4cd2551..5c40536 100644
+--- mozilla/storage/src/moz.build
++++ mozilla/storage/src/moz.build
+@@ -50,11 +50,14 @@ FINAL_LIBRARY = 'storagecomps'
+ # (such as NSS) might trigger an initialization of sqlite and allocation
+ # of memory using the default allocator, prior to the storage service
+ # registering its allocator, causing memory management failures (bug 938730).
++# However, this is not an issue if both the jemalloc allocator and the default
++# allocator are the same thing.
+ #
+ # Note: On Windows our sqlite build assumes we use jemalloc. If you disable
+ # MOZ_STORAGE_MEMORY on Windows, you will also need to change the "ifdef
+ # MOZ_MEMORY" options in db/sqlite3/src/Makefile.in.
+-if CONFIG['MOZ_MEMORY'] and not CONFIG['MOZ_NATIVE_SQLITE']:
++if CONFIG['MOZ_MEMORY'] and (not CONFIG['MOZ_NATIVE_SQLITE']
++ or CONFIG['MOZ_NATIVE_JEMALLOC']):
+ if CONFIG['OS_TARGET'] != 'Android':
+ DEFINES['MOZ_STORAGE_MEMORY'] = True
+
Copied: branches/firefox31/www/seamonkey/files/patch-bug1041381 (from r1644, trunk/www/seamonkey/files/patch-bug1041381)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/firefox31/www/seamonkey/files/patch-bug1041381 Wed Jul 30 14:42:42 2014 (r1645, copy of r1644, trunk/www/seamonkey/files/patch-bug1041381)
@@ -0,0 +1,12 @@
+diff --git config/rules.mk config/rules.mk
+index 1dee8c3..4d67eda 100644
+--- mozilla/config/rules.mk
++++ mozilla/config/rules.mk
+@@ -822,6 +822,7 @@ endif
+ ifdef DTRACE_PROBE_OBJ
+ EXTRA_DEPS += $(DTRACE_PROBE_OBJ)
+ OBJS += $(DTRACE_PROBE_OBJ)
++EXCLUDED_OBJS += $(DTRACE_PROBE_OBJ)
+ endif
+
+ $(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
Copied: branches/firefox31/www/seamonkey/files/patch-bug1041795 (from r1644, trunk/www/seamonkey/files/patch-bug1041795)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/firefox31/www/seamonkey/files/patch-bug1041795 Wed Jul 30 14:42:42 2014 (r1645, copy of r1644, trunk/www/seamonkey/files/patch-bug1041795)
@@ -0,0 +1,48 @@
+diff --git config/rules.mk config/rules.mk
+index 4d67eda..783942f 100644
+--- mozilla/config/rules.mk
++++ mozilla/config/rules.mk
+@@ -858,7 +858,7 @@ ifdef DTRACE_PROBE_OBJ
+ ifndef DTRACE_LIB_DEPENDENT
+ NON_DTRACE_OBJS := $(filter-out $(DTRACE_PROBE_OBJ),$(OBJS))
+ $(DTRACE_PROBE_OBJ): $(NON_DTRACE_OBJS)
+- dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS)
++ dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(NON_DTRACE_OBJS)
+ endif
+ endif
+ endif
+@@ -876,7 +876,7 @@ ifndef INCREMENTAL_LINKER
+ endif
+ ifdef DTRACE_LIB_DEPENDENT
+ ifndef XP_MACOSX
+- dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
++ dtrace -x nolibs -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
+ endif
+ $(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS))
+ @$(RM) $(DTRACE_PROBE_OBJ)
+diff --git js/src/Makefile.in js/src/Makefile.in
+index 28ca5e8..96793d7 100644
+--- mozilla/js/src/Makefile.in
++++ mozilla/js/src/Makefile.in
+@@ -342,7 +342,7 @@ endif
+
+ ifdef HAVE_DTRACE
+ $(CURDIR)/javascript-trace.h: $(srcdir)/devtools/javascript-trace.d
+- dtrace -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in
++ dtrace -x nolibs -h -s $(srcdir)/devtools/javascript-trace.d -o javascript-trace.h.in
+ sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \
+ -e '/const/!s/char \*/const char */g' \
+ javascript-trace.h.in > javascript-trace.h
+diff --git probes/Makefile.in probes/Makefile.in
+index 6d18f34..deec83f 100644
+--- mozilla/probes/Makefile.in
++++ mozilla/probes/Makefile.in
+@@ -7,7 +7,7 @@ export:: $(DIST)/include/mozilla-trace.h
+
+ # Replace _DTRACE_VERSION with INCLUDE_MOZILLA_DTRACE
+ $(DIST)/include/mozilla-trace.h: mozilla-trace.d Makefile
+- dtrace -h -s $(srcdir)/mozilla-trace.d -o mozilla-trace.h.tmp
++ dtrace -x nolibs -h -s $(srcdir)/mozilla-trace.d -o mozilla-trace.h.tmp
+ sed -e 's/if _DTRACE_VERSION/ifdef INCLUDE_MOZILLA_DTRACE/' \
+ mozilla-trace.h.tmp > $(DIST)/include/mozilla-trace.h
+ rm mozilla-trace.h.tmp
Copied: branches/firefox31/www/seamonkey/files/patch-bug292127 (from r1644, trunk/www/seamonkey/files/patch-bug292127)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/firefox31/www/seamonkey/files/patch-bug292127 Wed Jul 30 14:42:42 2014 (r1645, copy of r1644, trunk/www/seamonkey/files/patch-bug292127)
@@ -0,0 +1,232 @@
+--- ldap/sdks/c-sdk/ldap/include/ldap.h~
++++ ldap/sdks/c-sdk/ldap/include/ldap.h
+@@ -40,6 +40,229 @@
+ #ifndef _LDAP_H
+ #define _LDAP_H
+
++/* rename symbols to not clash with openldap (bug 292127) */
++#define ldap_abandon moz_ldap_abandon
++#define ldap_abandon_ext moz_ldap_abandon_ext
++#define ldap_abandoned moz_ldap_abandoned
++#define ldap_add moz_ldap_add
++#define ldap_add_ext moz_ldap_add_ext
++#define ldap_add_ext_s moz_ldap_add_ext_s
++#define ldap_add_result_entry moz_ldap_add_result_entry
++#define ldap_add_s moz_ldap_add_s
++#define ldap_ber_free moz_ldap_ber_free
++#define ldap_bind moz_ldap_bind
++#define ldap_bind_s moz_ldap_bind_s
++#define ldap_build_filter moz_ldap_build_filter
++#define ldap_cache_flush moz_ldap_cache_flush
++#define ldap_charray_add moz_ldap_charray_add
++#define ldap_charray_dup moz_ldap_charray_dup
++#define ldap_charray_free moz_ldap_charray_free
++#define ldap_charray_inlist moz_ldap_charray_inlist
++#define ldap_charray_merge moz_ldap_charray_merge
++#define ldap_charray_position moz_ldap_charray_position
++#define ldap_compare moz_ldap_compare
++#define ldap_compare_ext moz_ldap_compare_ext
++#define ldap_compare_ext_s moz_ldap_compare_ext_s
++#define ldap_compare_s moz_ldap_compare_s
++#define ldap_control_free moz_ldap_control_free
++#define ldap_controls_free moz_ldap_controls_free
++#define ldap_count_entries moz_ldap_count_entries
++#define ldap_count_messages moz_ldap_count_messages
++#define ldap_count_references moz_ldap_count_references
++#define ldap_count_values moz_ldap_count_values
++#define ldap_count_values_len moz_ldap_count_values_len
++#define ldap_create_authzid_control moz_ldap_create_authzid_control
++#define ldap_create_filter moz_ldap_create_filter
++#define ldap_create_geteffectiveRights_control moz_ldap_create_geteffectiveRights_control
++#define ldap_create_passwordpolicy_control moz_ldap_create_passwordpolicy_control
++#define ldap_create_passwordpolicy_control_ext moz_ldap_create_passwordpolicy_control_ext
++#define ldap_create_persistentsearch_control moz_ldap_create_persistentsearch_control
++#define ldap_create_proxiedauth_control moz_ldap_create_proxiedauth_control
++#define ldap_create_proxyauth_control moz_ldap_create_proxyauth_control
++#define ldap_create_sort_control moz_ldap_create_sort_control
++#define ldap_create_sort_keylist moz_ldap_create_sort_keylist
++#define ldap_create_userstatus_control moz_ldap_create_userstatus_control
++#define ldap_create_virtuallist_control moz_ldap_create_virtuallist_control
++#define ldap_delete moz_ldap_delete
++#define ldap_delete_ext moz_ldap_delete_ext
++#define ldap_delete_ext_s moz_ldap_delete_ext_s
++#define ldap_delete_result_entry moz_ldap_delete_result_entry
++#define ldap_delete_s moz_ldap_delete_s
++#define ldap_dn2ufn moz_ldap_dn2ufn
++#define ldap_entry2html moz_ldap_entry2html
++#define ldap_entry2html_search moz_ldap_entry2html_search
++#define ldap_entry2text moz_ldap_entry2text
++#define ldap_entry2text_search moz_ldap_entry2text_search
++#define ldap_err2string moz_ldap_err2string
++#define ldap_errlist moz_ldap_errlist
++#define ldap_explode moz_ldap_explode
++#define ldap_explode_dn moz_ldap_explode_dn
++#define ldap_explode_dns moz_ldap_explode_dns
++#define ldap_explode_rdn moz_ldap_explode_rdn
++#define ldap_extended_operation moz_ldap_extended_operation
++#define ldap_extended_operation_s moz_ldap_extended_operation_s
++#define ldap_find_control moz_ldap_find_control
++#define ldap_first_attribute moz_ldap_first_attribute
++#define ldap_first_disptmpl moz_ldap_first_disptmpl
++#define ldap_first_entry moz_ldap_first_entry
++#define ldap_first_message moz_ldap_first_message
++#define ldap_first_reference moz_ldap_first_reference
++#define ldap_first_searchobj moz_ldap_first_searchobj
++#define ldap_first_tmplcol moz_ldap_first_tmplcol
++#define ldap_first_tmplrow moz_ldap_first_tmplrow
++#define ldap_free_friendlymap moz_ldap_free_friendlymap
++#define ldap_free_searchprefs moz_ldap_free_searchprefs
++#define ldap_free_sort_keylist moz_ldap_free_sort_keylist
++#define ldap_free_templates moz_ldap_free_templates
++#define ldap_free_urldesc moz_ldap_free_urldesc
++#define ldap_friendly_name moz_ldap_friendly_name
++#define ldap_get_dn moz_ldap_get_dn
++#define ldap_get_entry_controls moz_ldap_get_entry_controls
++#define ldap_get_lang_values moz_ldap_get_lang_values
++#define ldap_get_lang_values_len moz_ldap_get_lang_values_len
++#define ldap_get_lderrno moz_ldap_get_lderrno
++#define ldap_get_option moz_ldap_get_option
++#define ldap_get_values moz_ldap_get_values
++#define ldap_get_values_len moz_ldap_get_values_len
++#define ldap_getfilter_free moz_ldap_getfilter_free
++#define ldap_getfirstfilter moz_ldap_getfirstfilter
++#define ldap_getnextfilter moz_ldap_getnextfilter
++#define ldap_init moz_ldap_init
++#define ldap_init_getfilter moz_ldap_init_getfilter
++#define ldap_init_getfilter_buf moz_ldap_init_getfilter_buf
++#define ldap_init_searchprefs moz_ldap_init_searchprefs
++#define ldap_init_searchprefs_buf moz_ldap_init_searchprefs_buf
++#define ldap_init_templates moz_ldap_init_templates
++#define ldap_init_templates_buf moz_ldap_init_templates_buf
++#define ldap_is_dns_dn moz_ldap_is_dns_dn
++#define ldap_is_ldap_url moz_ldap_is_ldap_url
++#define ldap_keysort_entries moz_ldap_keysort_entries
++#define ldap_ld_free moz_ldap_ld_free
++#define ldap_memcache_abandon moz_ldap_memcache_abandon
++#define ldap_memcache_append moz_ldap_memcache_append
++#define ldap_memcache_createkey moz_ldap_memcache_createkey
++#define ldap_memcache_destroy moz_ldap_memcache_destroy
++#define ldap_memcache_flush moz_ldap_memcache_flush
++#define ldap_memcache_flush_results moz_ldap_memcache_flush_results
++#define ldap_memcache_get moz_ldap_memcache_get
++#define ldap_memcache_init moz_ldap_memcache_init
++#define ldap_memcache_new moz_ldap_memcache_new
++#define ldap_memcache_result moz_ldap_memcache_result
++#define ldap_memcache_set moz_ldap_memcache_set
++#define ldap_memcache_update moz_ldap_memcache_update
++#define ldap_memfree moz_ldap_memfree
++#define ldap_modify moz_ldap_modify
++#define ldap_modify_ext moz_ldap_modify_ext
++#define ldap_modify_ext_s moz_ldap_modify_ext_s
++#define ldap_modify_s moz_ldap_modify_s
++#define ldap_modrdn moz_ldap_modrdn
++#define ldap_modrdn2 moz_ldap_modrdn2
++#define ldap_modrdn2_s moz_ldap_modrdn2_s
++#define ldap_modrdn_s moz_ldap_modrdn_s
++#define ldap_mods_free moz_ldap_mods_free
++#define ldap_msgdelete moz_ldap_msgdelete
++#define ldap_msgfree moz_ldap_msgfree
++#define ldap_msgid moz_ldap_msgid
++#define ldap_msgtype moz_ldap_msgtype
++#define ldap_multisort_entries moz_ldap_multisort_entries
++#define ldap_name2template moz_ldap_name2template
++#define ldap_next_attribute moz_ldap_next_attribute
++#define ldap_next_disptmpl moz_ldap_next_disptmpl
++#define ldap_next_entry moz_ldap_next_entry
++#define ldap_next_message moz_ldap_next_message
++#define ldap_next_reference moz_ldap_next_reference
++#define ldap_next_searchobj moz_ldap_next_searchobj
++#define ldap_next_tmplcol moz_ldap_next_tmplcol
++#define ldap_next_tmplrow moz_ldap_next_tmplrow
++#define ldap_oc2template moz_ldap_oc2template
++#define ldap_open moz_ldap_open
++#define ldap_parse_authzid_control moz_ldap_parse_authzid_control
++#define ldap_parse_entrychange_control moz_ldap_parse_entrychange_control
++#define ldap_parse_extended_result moz_ldap_parse_extended_result
++#define ldap_parse_passwd moz_ldap_parse_passwd
++#define ldap_parse_passwordpolicy_control moz_ldap_parse_passwordpolicy_control
++#define ldap_parse_passwordpolicy_control_ext moz_ldap_parse_passwordpolicy_control_ext
++#define ldap_parse_reference moz_ldap_parse_reference
++#define ldap_parse_result moz_ldap_parse_result
++#define ldap_parse_sasl_bind_result moz_ldap_parse_sasl_bind_result
++#define ldap_parse_sort_control moz_ldap_parse_sort_control
++#define ldap_parse_userstatus_control moz_ldap_parse_userstatus_control
++#define ldap_parse_virtuallist_control moz_ldap_parse_virtuallist_control
++#define ldap_parse_whoami moz_ldap_parse_whoami
++#define ldap_passwd moz_ldap_passwd
++#define ldap_passwd_s moz_ldap_passwd_s
++#define ldap_passwordpolicy_err2txt moz_ldap_passwordpolicy_err2txt
++#define ldap_perror moz_ldap_perror
++#define ldap_rename moz_ldap_rename
++#define ldap_rename_s moz_ldap_rename_s
++#define ldap_result moz_ldap_result
++#define ldap_result2error moz_ldap_result2error
++#define ldap_sasl_bind moz_ldap_sasl_bind
++#define ldap_sasl_bind_s moz_ldap_sasl_bind_s
++#define ldap_sasl_interactive_bind_ext_s moz_ldap_sasl_interactive_bind_ext_s
++#define ldap_sasl_interactive_bind_s moz_ldap_sasl_interactive_bind_s
++#define ldap_search moz_ldap_search
++#define ldap_search_ext moz_ldap_search_ext
++#define ldap_search_ext_s moz_ldap_search_ext_s
++#define ldap_search_s moz_ldap_search_s
++#define ldap_search_st moz_ldap_search_st
++#define ldap_set_filter_additions moz_ldap_set_filter_additions
++#define ldap_set_lderrno moz_ldap_set_lderrno
++#define ldap_set_option moz_ldap_set_option
++#define ldap_set_rebind_proc moz_ldap_set_rebind_proc
++#define ldap_setfilteraffixes moz_ldap_setfilteraffixes
++#define ldap_simple_bind moz_ldap_simple_bind
++#define ldap_simple_bind_s moz_ldap_simple_bind_s
++#define ldap_sort_entries moz_ldap_sort_entries
++#define ldap_sort_strcasecmp moz_ldap_sort_strcasecmp
++#define ldap_sort_values moz_ldap_sort_values
++#define ldap_start_tls_s moz_ldap_start_tls_s
++#define ldap_str2charray moz_ldap_str2charray
++#define ldap_tmplattrs moz_ldap_tmplattrs
++#define ldap_tmplerr2string moz_ldap_tmplerr2string
++#define ldap_tmplerrlist moz_ldap_tmplerrlist
++#define ldap_ufn_search_c moz_ldap_ufn_search_c
++#define ldap_ufn_search_ct moz_ldap_ufn_search_ct
++#define ldap_ufn_search_ctx moz_ldap_ufn_search_ctx
++#define ldap_ufn_search_s moz_ldap_ufn_search_s
++#define ldap_ufn_setfilter moz_ldap_ufn_setfilter
++#define ldap_ufn_setprefix moz_ldap_ufn_setprefix
++#define ldap_ufn_timeout moz_ldap_ufn_timeout
++#define ldap_unbind moz_ldap_unbind
++#define ldap_unbind_ext moz_ldap_unbind_ext
++#define ldap_unbind_s moz_ldap_unbind_s
++#define ldap_url_parse moz_ldap_url_parse
++#define ldap_url_parse_no_defaults moz_ldap_url_parse_no_defaults
++#define ldap_url_search moz_ldap_url_search
++#define ldap_url_search_s moz_ldap_url_search_s
++#define ldap_url_search_st moz_ldap_url_search_st
++#define ldap_utf8characters moz_ldap_utf8characters
++#define ldap_utf8copy moz_ldap_utf8copy
++#define ldap_utf8getcc moz_ldap_utf8getcc
++#define ldap_utf8isalnum moz_ldap_utf8isalnum
++#define ldap_utf8isalpha moz_ldap_utf8isalpha
++#define ldap_utf8isdigit moz_ldap_utf8isdigit
++#define ldap_utf8isspace moz_ldap_utf8isspace
++#define ldap_utf8isxdigit moz_ldap_utf8isxdigit
++#define ldap_utf8len moz_ldap_utf8len
++#define ldap_utf8next moz_ldap_utf8next
++#define ldap_utf8prev moz_ldap_utf8prev
++#define ldap_utf8strtok_r moz_ldap_utf8strtok_r
++#define ldap_vals2html moz_ldap_vals2html
++#define ldap_vals2text moz_ldap_vals2text
++#define ldap_value_free moz_ldap_value_free
++#define ldap_value_free_len moz_ldap_value_free_len
++#define ldap_version moz_ldap_version
++#define ldap_whoami moz_ldap_whoami
++#define ldap_whoami_s moz_ldap_whoami_s
++#define ldap_x_calloc moz_ldap_x_calloc
++#define ldap_x_free moz_ldap_x_free
++#define ldap_x_hostlist_first moz_ldap_x_hostlist_first
++#define ldap_x_hostlist_next moz_ldap_x_hostlist_next
++#define ldap_x_hostlist_statusfree moz_ldap_x_hostlist_statusfree
++#define ldap_x_malloc moz_ldap_x_malloc
++#define ldap_x_realloc moz_ldap_x_realloc
++
+ /* Standard LDAP API functions and declarations */
+ #include "ldap-standard.h"
+
Copied and modified: branches/firefox31/www/seamonkey/files/patch-bug702179 (from r1644, trunk/www/seamonkey/files/patch-bug702179)
==============================================================================
--- trunk/www/seamonkey/files/patch-bug702179 Wed Jul 30 12:22:31 2014 (r1644, copy source)
+++ branches/firefox31/www/seamonkey/files/patch-bug702179 Wed Jul 30 14:42:42 2014 (r1645)
@@ -17,7 +17,7 @@
MOZ_PNG_LIBS='$(call EXPAND_LIBNAME_PATH,mozpng,$(DEPTH)/media/libpng)'
-MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)'
-+MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(DEPTH)/js/src)'
++MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(DEPTH)/js/src/js/src)'
MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)'
MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
XPCOM_FROZEN_LDOPTS='$(call EXPAND_LIBNAME_PATH,xul mozalloc,$(LIBXUL_DIST)/bin)'
@@ -34,3 +34,18 @@
ifdef JS_STANDALONE
SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,mfbt,$(DEPTH)/mfbt)
ifndef MOZ_NATIVE_ZLIB
+diff --git suite/build/Makefile.in suite/build/Makefile.in
+index 66549c1..75b848d 100644
+--- suite/build/Makefile.in
++++ suite/build/Makefile.in
+@@ -33,6 +33,10 @@ EXTRA_DSO_LDOPTS += \
+ $(TK_LIBS) \
+ $(NULL)
+
++ifndef ZLIB_IN_MOZGLUE
++EXTRA_DSO_LDOPTS += $(MOZ_ZLIB_LIBS)
++endif
++
+ include $(topsrcdir)/config/rules.mk
+
+ # Ensure that we don't embed a manifest referencing the CRT.
Copied: branches/firefox31/www/seamonkey/files/patch-bug779713 (from r1644, trunk/www/seamonkey/files/patch-bug779713)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/firefox31/www/seamonkey/files/patch-bug779713 Wed Jul 30 14:42:42 2014 (r1645, copy of r1644, trunk/www/seamonkey/files/patch-bug779713)
@@ -0,0 +1,77 @@
+diff --git mfbt/Alignment.h mfbt/Alignment.h
+index e0843ca..353ec36 100644
+--- mozilla/mfbt/Alignment.h
++++ mozilla/mfbt/Alignment.h
+@@ -9,11 +9,20 @@
+ #ifndef mozilla_Alignment_h
+ #define mozilla_Alignment_h
+
++#include "mozilla/Attributes.h"
++
+ #include <stddef.h>
+ #include <stdint.h>
+
+ namespace mozilla {
+
++#if defined(MOZ_HAVE_CXX11_ALIGNAS)
++#define MOZ_ALIGNOF(T) alignof(T)
++#elif defined(__GNUC__)
++#define MOZ_ALIGNOF(T) __alignof__(T)
++#elif defined(_MSC_VER)
++#define MOZ_ALIGNOF(T) __alignof(T)
++#else
+ /*
+ * This class, and the corresponding macro MOZ_ALIGNOF, figures out how many
+ * bytes of alignment a given type needs.
+@@ -32,6 +41,7 @@ public:
+ };
+
+ #define MOZ_ALIGNOF(T) mozilla::AlignmentFinder<T>::alignment
++#endif
+
+ /*
+ * Declare the MOZ_ALIGNED_DECL macro for declaring aligned types.
+@@ -43,7 +53,10 @@ public:
+ * will declare a two-character array |arr| aligned to 8 bytes.
+ */
+
+-#if defined(__GNUC__)
++#if defined(MOZ_HAVE_CXX11_ALIGNAS)
++# define MOZ_ALIGNED_DECL(_type, _align) \
++ alignas(_align) _type
++#elif defined(__GNUC__)
+ # define MOZ_ALIGNED_DECL(_type, _align) \
+ _type __attribute__((aligned(_align)))
+ #elif defined(_MSC_VER)
+diff --git mfbt/Attributes.h mfbt/Attributes.h
+index d317766..ddb13da 100644
+--- mozilla/mfbt/Attributes.h
++++ mozilla/mfbt/Attributes.h
+@@ -54,6 +54,9 @@
+ # ifndef __has_extension
+ # define __has_extension __has_feature /* compatibility, for older versions of clang */
+ # endif
++# if __has_extension(cxx_alignas)
++# define MOZ_HAVE_CXX11_ALIGNAS
++# endif
+ # if __has_extension(cxx_constexpr)
+ # define MOZ_HAVE_CXX11_CONSTEXPR
+ # endif
+@@ -75,6 +78,9 @@
+ # endif
+ #elif defined(__GNUC__)
+ # if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
++# if MOZ_GCC_VERSION_AT_LEAST(4, 8, 0)
++# define MOZ_HAVE_CXX11_ALIGNAS
++# endif
+ # if MOZ_GCC_VERSION_AT_LEAST(4, 7, 0)
+ # define MOZ_HAVE_CXX11_OVERRIDE
+ # define MOZ_HAVE_CXX11_FINAL final
+@@ -96,6 +102,7 @@
+ # define MOZ_HAVE_NORETURN __attribute__((noreturn))
+ #elif defined(_MSC_VER)
+ # if _MSC_VER >= 1800
++# define MOZ_HAVE_CXX11_ALIGNAS
+ # define MOZ_HAVE_CXX11_DELETE
+ # endif
+ # if _MSC_VER >= 1700
Deleted: trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in
==============================================================================
--- trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-Makefile.in Wed Jul 30 14:42:42 2014 (r1594)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,13 +0,0 @@
---- mozilla/ipc/chromium/Makefile.in~
-+++ mozilla/ipc/chromium/Makefile.in
-@@ -55,9 +60,7 @@ vpath %.c \
- $(srcdir)/src/third_party/libevent \
- $(NULL)
- else # } else {
--# message_pump_libevent.cc includes third_party/libevent/event.h,
--# which we put in $(DIST), see export rule below
--LOCAL_INCLUDES += -I$(DIST)
-+LOCAL_INCLUDES += $(filter %/compat, $(MOZ_LIBEVENT_CFLAGS))
- endif # }
-
- vpath %.cc \
Deleted: trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc
==============================================================================
--- trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-message_pump_libevent.cc Wed Jul 30 14:42:42 2014 (r1594)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,11 +0,0 @@
---- mozilla/ipc/chromium/src/base/message_pump_libevent.cc~
-+++ mozilla/ipc/chromium/src/base/message_pump_libevent.cc
-@@ -16,7 +16,7 @@
- #include "base/scoped_ptr.h"
- #include "base/time.h"
- #include "nsDependentSubstring.h"
--#include "third_party/libevent/event.h"
-+#include "event.h"
-
- // Lifecycle of struct event
- // Libevent uses two main data structures:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407301442.s6UEgglr058618>