svn commit: r304053 - in head: . Mk audio/tuxguitar deskutils/chmsee deskutils/google-gadgets editors/morla graphics/gnash java/eclipse java/eclipse-devel java/icedtea-web lang/gjs mail/firetray mi...

Beat Gaetzi beat at FreeBSD.org
Mon Sep 10 19:19:33 UTC 2012 

Author: beat
Date: Mon Sep 10 19:19:32 2012
New Revision: 304053
URL: http://svn.freebsd.org/changeset/ports/304053

Log:
  - Move libxul 1.9.2 to www/libxul19
  - Update www/libxul to 10.0.7
  - Update all dependent ports to use www/libxul19 (no functional changes)
  - Bump PORTREVISION on ports where libxul is a run dependency as the
    resulting package will change.
  
  Submitted by:	Jan Beich <jbeich at tormail.org>
  With hat:	gecko

Added:
  head/www/libxul/files/patch-bug543241   (contents, props changed)
  head/www/libxul/files/patch-bug691898   (contents, props changed)
  head/www/libxul/files/patch-bug714312   (contents, props changed)
  head/www/libxul/files/patch-bug725655   (contents, props changed)
  head/www/libxul/files/patch-bug728968   (contents, props changed)
  head/www/libxul/files/patch-bug729155   (contents, props changed)
  head/www/libxul/files/patch-bug741737   (contents, props changed)
  head/www/libxul/files/patch-bug753046   (contents, props changed)
  head/www/libxul/files/patch-bug778056   (contents, props changed)
  head/www/libxul/files/patch-bug779847   (contents, props changed)
  head/www/libxul/files/patch-bug783463   (contents, props changed)
  head/www/libxul/files/patch-bug784776   (contents, props changed)
  head/www/libxul/files/patch-bug785638   (contents, props changed)
  head/www/libxul/files/patch-bug788039   (contents, props changed)
  head/www/libxul/files/patch-bug788108   (contents, props changed)
  head/www/libxul/files/patch-bug789436   (contents, props changed)
  head/www/libxul/files/patch-build-pgo-profileserver.py   (contents, props changed)
  head/www/libxul/files/patch-build_unix_run-mozilla.sh   (contents, props changed)
  head/www/libxul/files/patch-clang32-libc++-visibility-hack   (contents, props changed)
  head/www/libxul/files/patch-dom-ipc-ContentChild.cpp   (contents, props changed)
  head/www/libxul/files/patch-gfx-qcms-qcmstypes.h   (contents, props changed)
  head/www/libxul/files/patch-ipc-chromium-Makefile.in   (contents, props changed)
  head/www/libxul/files/patch-ipc-chromium-src-base-message_pump_libevent.cc   (contents, props changed)
  head/www/libxul/files/patch-js-src-configure.in   (contents, props changed)
  head/www/libxul/files/patch-js-src-methodjit-MethodJIT.cpp   (contents, props changed)
  head/www/libxul/files/patch-toolkit-xre-nsEmbedFunctions.cpp   (contents, props changed)
  head/www/libxul/files/patch-toolkit_xre_Makefile.in   (contents, props changed)
  head/www/libxul/files/patch-xulrunner-stub-nsXULStub.cpp   (contents, props changed)
  head/www/libxul19/
     - copied from r303878, head/www/libxul/
Deleted:
  head/www/libxul/files/patch-bug351181
  head/www/libxul/files/patch-content-xslt-public-txDouble.h
  head/www/libxul/files/patch-embedding_base_nsEmbedAPI.cpp
  head/www/libxul/files/patch-gfx-ots-src-os2.cc
  head/www/libxul/files/patch-js-ctypes-libffi-configure
  head/www/libxul/files/patch-js-src-jslock.cpp
  head/www/libxul/files/patch-media-liboggz-include-oggz-oggz_off_t_generated.h
  head/www/libxul/files/patch-media-libsydneyaudio-src-Makefile.in
  head/www/libxul/files/patch-modules-libpr0n-encoders-png-nsPNGDecoder.cpp
  head/www/libxul/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp
  head/www/libxul/files/patch-modules-libpref-src-prefapi.cpp
  head/www/libxul/files/patch-toolkit_library_Makefile.in
  head/www/libxul/files/patch-xpcom_base_nsStackWalk.cpp
Modified:
  head/Mk/bsd.gecko.mk
  head/UPDATING
  head/audio/tuxguitar/Makefile
  head/deskutils/chmsee/Makefile
  head/deskutils/google-gadgets/Makefile
  head/editors/morla/Makefile
  head/graphics/gnash/Makefile
  head/java/eclipse-devel/Makefile
  head/java/eclipse/Makefile
  head/java/icedtea-web/Makefile
  head/lang/gjs/Makefile
  head/mail/firetray/Makefile
  head/misc/xiphos/Makefile
  head/multimedia/gxine/Makefile
  head/net-p2p/vuze/Makefile
  head/net/libproxy-mozjs/Makefile
  head/science/gchemutils/Makefile
  head/security/seahorse-plugins/Makefile
  head/www/Makefile
  head/www/gecko-mediaplayer/Makefile
  head/www/gecko-sharp20/Makefile
  head/www/helixplugin/Makefile
  head/www/libxul/Makefile
  head/www/libxul/distinfo   (contents, props changed)
  head/www/libxul/files/patch-alsapulse
  head/www/libxul/files/patch-bug653551
  head/www/libxul/files/patch-bug685258
  head/www/libxul/files/patch-bug761077
  head/www/libxul/files/patch-bug778078
  head/www/libxul/files/patch-bug781457
  head/www/libxul/files/patch-config_autoconf.mk.in   (contents, props changed)
  head/www/libxul19/Makefile
  head/www/moonshine/Makefile
  head/www/openvrml/Makefile
  head/www/xpi-conkeror/Makefile
  head/www/xpi-gwt-dev-plugin/Makefile
  head/x11-toolkits/swt/Makefile
  head/x11/yelp/Makefile

Modified: head/Mk/bsd.gecko.mk
==============================================================================
--- head/Mk/bsd.gecko.mk	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/Mk/bsd.gecko.mk	Mon Sep 10 19:19:32 2012	(r304053)
@@ -36,9 +36,8 @@ Gecko_Pre_Include=			bsd.gecko.mk
 
 # Users should use the following syntax:
 #
-# WITH_GECKO= libxul libxul-devel
-#  Use libxul whenever a port supports it, falling back on libxul-devel.
-#  Note: libxul-devel does not exist at the moment!
+# WITH_GECKO= libxul libxul19
+#  Use libxul whenever a port supports it, falling back on libxul19.
 # WITH_GECKO= libxul
 #  Sets your preferred backend. With this example, libxul will always
 #  be chosen, unless the port doesn't support a libxul backend. In that
@@ -48,20 +47,19 @@ Gecko_Pre_Include=			bsd.gecko.mk
 #
 # Ports should use the following:
 #
-# USE_GECKO= libxul libxul-devel
+# USE_GECKO= libxul libxul19
 #  The list of gecko backends that the port supports. Unless the user
 #  overrides it with WITH_GECKO, the first gecko listed in USE_GECKO
 #  will be the default. In the above example, www/libxul will be used
-#  as a gecko backend unless WITH_GECKO=libxul-devel is defined by the
-#  user. Note: libxul-devel does not exist at the moment!
+#  as a gecko backend unless WITH_GECKO=libxul19 is defined by the
+#  user.
 #
-# USE_GECKO= libxul-devel<->libxul
-#  This will sed -e 's/libxul/libxul-devel/' on Makefile.in's and configure 
-#  if ${GECKO}=="libxul-devel"
+# USE_GECKO= libxul19<->libxul
+#  This will sed -e 's/libxul/libxul19/' on Makefile.in's and configure 
+#  if ${GECKO}=="libxul19"
 #
 #  Example:
-#  USE_GECKO= libxul libxul-devel
-#  Note: libxul-devel does not exist at the moment!
+#  USE_GECKO= libxul libxul19
 # 
 #  post-patch:
 #	@${REINPALCE_CMD} -e 's|mozilla-|${GECKO}-|' \
@@ -71,11 +69,10 @@ Gecko_Pre_Include=			bsd.gecko.mk
 #  has been chosen.
 #
 #  Example:
-#  USE_GECKO= libxul libxul-devel
-#  Note: libxul-devel does not exist at the moment!
+#  USE_GECKO= libxul libxul19
 #  
 #  post-patch:
-#  .if ${GECKO}=="libxul-devel"
+#  .if ${GECKO}=="libxul19"
 #	@${REINPLACE_CMD} -e 's|mozilla-|libxul-|' \
 #		${MOZSRC}/configure
 #  .endif

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/UPDATING	Mon Sep 10 19:19:32 2012	(r304053)
@@ -5,6 +5,19 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20120910:
+  AFFECTS: users of www/libxul
+  AUTHOR: gecko at FreeBSD.org
+
+  The www/libxul has been updated to 10.0 and the older version 1.9.2
+  has moved to www/libxul19.
+
+  If you want to stay with 1.9.2 please run the following command:
+
+  # portmaster -o www/libxul19 www/libxul
+  or
+  # portupgrade -o www/libxul19 www/libxul
+
 20120909:
   AFFECTS: users of www/testlink
   AUTHOR: tota at FreeBSD.org

Modified: head/audio/tuxguitar/Makefile
==============================================================================
--- head/audio/tuxguitar/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/audio/tuxguitar/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -8,7 +8,7 @@
 
 PORTNAME=	tuxguitar
 PORTVERSION=	1.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio java
 MASTER_SITES=	SF/${PORTNAME}/TuxGuitar/TuxGuitar-${PORTVERSION}:src \
 		${MASTER_SITE_LOCAL}/gahr/:fluid \
@@ -33,7 +33,7 @@ MAKE_ENV+=	PREFIX=${PREFIX} INSTALL_DOC_
 
 USE_JAVA=	yes
 USE_ANT=	yes
-USE_GECKO=	libxul
+USE_GECKO=	libxul19
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 JAVA_VERSION=	1.5+
@@ -54,7 +54,7 @@ SUB_FILES=	tuxguitar
 SUB_LIST=	DATADIR=${DATADIR} \
 		PREFIX=${PREFIX} \
 		JAVALIBDIR=${JAVALIBDIR} \
-		GECKO=${GECKO}
+		GECKO=${GECKO:S/19//}
 
 post-extract:
 	${CP} ${DISTDIR}/8MBGMSFX.SF2 ${WRKDIR}

Modified: head/deskutils/chmsee/Makefile
==============================================================================
--- head/deskutils/chmsee/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/deskutils/chmsee/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -7,7 +7,7 @@
 
 PORTNAME=	chmsee
 PORTVERSION=	1.3.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -20,7 +20,7 @@ LIB_DEPENDS=	chm.0:${PORTSDIR}/misc/chml
 LICENSE=	GPLv2
 
 USE_GNOME=	gnomehier libglade2
-USE_GECKO=	libxul
+USE_GECKO=	libxul19
 USE_GETTEXT=	yes
 USE_CMAKE=	yes
 CMAKE_ARGS=	-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=TRUE
@@ -30,8 +30,8 @@ MAN1=		chmsee.1
 
 .include <bsd.port.pre.mk>
 
-.if defined(GECKO) && ${GECKO:Mlibxul}!=""
-GTKMOZEMBED_LIB="${GECKO}-embedding-unstable nspr"
+.if defined(GECKO) && ${GECKO:S/19//:Mlibxul}!=""
+GTKMOZEMBED_LIB="${GECKO:S/19//}-embedding nspr"
 .else
 GTKMOZEMBED_LIB="${GECKO}-gtkmozembed"
 CFLAGS+=	-I${LOCALBASE}/include/${GECKO}/commandhandler \
@@ -45,7 +45,7 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/REQUIRED/s|libxul-.*=1.9.0.999|${GTKMOZEMBED_LIB}|g ; \
-		 /FLAVOUR/s|libxul|${GECKO}|g' ${WRKSRC}/CMakeLists.txt
+		 /FLAVOUR/s|libxul|${GECKO:S/19//}|g' ${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e \
 		's|.desktop.in|.desktop.skel|g' ${WRKSRC}/data/CMakeLists.txt
 

Modified: head/deskutils/google-gadgets/Makefile
==============================================================================
--- head/deskutils/google-gadgets/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/deskutils/google-gadgets/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -7,7 +7,7 @@
 
 PORTNAME=	google-gadgets
 PORTVERSION=	0.11.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	deskutils
 MASTER_SITES=	http://google-gadgets-for-linux.googlecode.com/files/
 DISTNAME=	${PORTNAME}-for-linux-${PORTVERSION}
@@ -64,7 +64,7 @@ LIB_DEPENDS+=	webkitgtk-1.0.0:${PORTSDIR
 .endif
 
 .if defined(WITH_MOZILLA)
-USE_GECKO=	libxul
+USE_GECKO=	libxul19
 .endif
 
 .if defined(WITHOUT_GTKWEBKIT) && defined(WITHOUT_MOZILLA) && defined(WITH_GTK)

Modified: head/editors/morla/Makefile
==============================================================================
--- head/editors/morla/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/editors/morla/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -48,7 +48,7 @@ post-patch:
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_XULRUNNER)
-USE_GECKO=	libxul
+USE_GECKO=	libxul19
 CONFIGURE_ARGS+=	--with-javascript=xulrunner
 .else
 CONFIGURE_ARGS+=	--with-javascript=none

Modified: head/graphics/gnash/Makefile
==============================================================================
--- head/graphics/gnash/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/graphics/gnash/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnash
 PORTVERSION=	0.8.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	GNU/${PORTNAME}/${PORTVERSION}/
 
@@ -105,8 +105,8 @@ WEBPLUGINS_FILES=	libgnashplugin.so
 .include "${PORTSDIR}/www/firefox/Makefile.webplugins"
 PLIST_SUB+=	NPAPI=""
 CONFIGURE_ARGS+=--with-npapi-plugindir="${WEBPLUGINS_DIR}"
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libxul/xpidl:${PORTSDIR}/www/libxul
-RUN_DEPENDS+=	${LOCALBASE}/lib/libxul/xpidl:${PORTSDIR}/www/libxul
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libxul/xpidl:${PORTSDIR}/www/libxul19
+RUN_DEPENDS+=	${LOCALBASE}/lib/libxul/xpidl:${PORTSDIR}/www/libxul19
 .else
 PLIST_SUB+=	NPAPI="@comment "
 CONFIGURE_ARGS+=	--disable-npapi

Modified: head/java/eclipse-devel/Makefile
==============================================================================
--- head/java/eclipse-devel/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/java/eclipse-devel/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -7,7 +7,7 @@
 
 PORTNAME=	eclipse-devel
 PORTVERSION=	3.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.eclipse.org/technology/linuxtools/eclipse-build/3.7.x_Indigo/:1 \
 		http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository/plugins/:2 \
@@ -46,7 +46,7 @@ OPTIONS=	TESTS	"Build SDK test suite"	of
 ONLY_FOR_ARCHS=	i386 amd64
 
 USE_ANT=	yes
-USE_GECKO=	libxul
+USE_GECKO=	libxul19
 USE_GL=		glu
 USE_GMAKE=	yes
 USE_GNOME=	desktopfileutils gconf2 gtk20 gnomevfs2 libgnome libgnomeui pkgconfig
@@ -120,7 +120,7 @@ ECLIPSE_GENERATED_BUILDSCRIPTS=	eclipse-
 ALL_TARGET=	provision.cvs
 INSTALL_TARGET=	installSDKinDropins
 MAKE_ARGS=	-DbuildOs=freebsd -DbuildArch=${ARCH:C/amd64/x86_64/:C/i386/x86/} -Dprefix=${PREFIX} -Dlocalbase=${LOCALBASE} -Dlabel=${PORTVERSION}
-MAKE_ENV+=	GRE_HOME=${PREFIX}/lib/${GECKO} _JAVA_OPTIONS="-Xmx1024m" JAVA_VENDOR=${JAVA_VENDOR}
+MAKE_ENV+=	GRE_HOME=${PREFIX}/lib/${GECKO:S/19//} _JAVA_OPTIONS="-Xmx1024m" JAVA_VENDOR=${JAVA_VENDOR}
 
 WRKSRC=		${WRKDIR}/${ECLIPSE_BUILD_SRCFILE:C/${EXTRACT_SUFX}//}
 PATCH_STRIP=	-p1
@@ -248,7 +248,7 @@ do-install:
 	@${MKDIR} ${PREFIX}/${DROPINS_DIR}
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${INSTALL_TARGET})
 	@${SED} \
-	  -e "s+%%BROWSER%%+${GECKO}+g" \
+	  -e "s+%%BROWSER%%+${GECKO:S/19//}+g" \
 	  -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \
 	  -e "s+%%JAVA_HOME%%+${JAVA_HOME}+g" \
 	  -e "s+%%JAVA_OS%%+${JAVA_OS}+g" \

Modified: head/java/eclipse/Makefile
==============================================================================
--- head/java/eclipse/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/java/eclipse/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -7,7 +7,7 @@
 
 PORTNAME=	eclipse
 PORTVERSION=	3.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.eclipse.org/technology/linuxtools/eclipse-build/3.7.x_Indigo/:1 \
 		http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository/plugins/:2 \
@@ -44,7 +44,7 @@ OPTIONS=	TESTS	"Build SDK test suite"	of
 ONLY_FOR_ARCHS=	i386 amd64
 
 USE_ANT=	yes
-USE_GECKO=	libxul
+USE_GECKO=	libxul19
 USE_GL=		glu
 USE_GMAKE=	yes
 USE_GNOME=	desktopfileutils gconf2 gtk20 gnomevfs2 libgnome libgnomeui pkgconfig
@@ -118,7 +118,7 @@ ECLIPSE_GENERATED_BUILDSCRIPTS=	eclipse-
 ALL_TARGET=	provision.cvs
 INSTALL_TARGET=	installSDKinDropins
 MAKE_ARGS=	-DbuildOs=freebsd -DbuildArch=${ARCH:C/amd64/x86_64/:C/i386/x86/} -Dprefix=${PREFIX} -Dlocalbase=${LOCALBASE} -Dlabel=${PORTVERSION}
-MAKE_ENV+=	GRE_HOME=${PREFIX}/lib/${GECKO} _JAVA_OPTIONS="-Xmx1024m" JAVA_VENDOR=${JAVA_VENDOR}
+MAKE_ENV+=	GRE_HOME=${PREFIX}/lib/${GECKO:S/19//} _JAVA_OPTIONS="-Xmx1024m" JAVA_VENDOR=${JAVA_VENDOR}
 
 WRKSRC=		${WRKDIR}/${ECLIPSE_BUILD_SRCFILE:C/${EXTRACT_SUFX}//}
 PATCH_STRIP=	-p1
@@ -246,7 +246,7 @@ do-install:
 	@${MKDIR} ${PREFIX}/${DROPINS_DIR}
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${INSTALL_TARGET})
 	@${SED} \
-	  -e "s+%%BROWSER%%+${GECKO}+g" \
+	  -e "s+%%BROWSER%%+${GECKO:S/19//}+g" \
 	  -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \
 	  -e "s+%%JAVA_HOME%%+${JAVA_HOME}+g" \
 	  -e "s+%%JAVA_OS%%+${JAVA_OS}+g" \

Modified: head/java/icedtea-web/Makefile
==============================================================================
--- head/java/icedtea-web/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/java/icedtea-web/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -7,6 +7,7 @@
 
 PORTNAME=	icedtea-web
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	java www
 MASTER_SITES=	http://icedtea.wildebeest.org/download/source/ \
 		http://icedtea.classpath.org/download/source/
@@ -67,7 +68,7 @@ PORTDOCS+=	plugin
 
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/glib-2.0.pc:${PORTSDIR}/devel/glib20 \
 		${LOCALBASE}/libdata/pkgconfig/gtk+-2.0.pc:${PORTSDIR}/x11-toolkits/gtk20 \
-		${LOCALBASE}/libdata/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/libxul
+		${LOCALBASE}/libdata/pkgconfig/mozilla-plugin.pc:${PORTSDIR}/www/libxul19
 
 CONFIGURE_ARGS+=--with-gtk=2
 .include "${PORTSDIR}/www/firefox/Makefile.webplugins"

Modified: head/lang/gjs/Makefile
==============================================================================
--- head/lang/gjs/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/lang/gjs/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -8,7 +8,7 @@
 
 PORTNAME=	gjs
 PORTVERSION=	0.7.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -19,7 +19,7 @@ COMMENT=	GNOME JavaScript binding
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 
-USE_GECKO=	libxul
+USE_GECKO=	libxul19
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes

Modified: head/mail/firetray/Makefile
==============================================================================
--- head/mail/firetray/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/mail/firetray/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -7,7 +7,7 @@
 
 PORTNAME=	firetray
 DISTVERSION=	0.2.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	${PORTNAME}-${DISTVERSION}-src
@@ -20,16 +20,16 @@ PATCH_DEPENDS=	nspr>=4.8:${PORTSDIR}/dev
 BROKEN=		does not build
 
 USE_ZIP=	yes
-USE_GECKO=	libxul
+USE_GECKO=	libxul19
 USE_SCONS=	yes
 USE_PKGCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 EXTRACT_AFTER_ARGS=	-d ${WRKSRC}
-GECKO_CONFIG=	${LOCALBASE}/bin/pkg-config ${GECKO}
+GECKO_CONFIG=	${LOCALBASE}/bin/pkg-config ${GECKO:S/19//}
 
 BUILD_SH_FLAGS=	--dynamic-linking \
-		--gecko-sdk-bin=`${DIRNAME} ${XPIDL}` \
+		--gecko-sdk-bin=`${DIRNAME} ${XPIDL:S/19//}` \
 		--gecko-sdk-lib=`${GECKO_CONFIG} --variable=sdkdir`/lib \
 		--gecko-sdk-idl=`${GECKO_CONFIG} --variable=idldir` \
 		--gecko-sdk-include=`${GECKO_CONFIG} --variable=includedir`

Modified: head/misc/xiphos/Makefile
==============================================================================
--- head/misc/xiphos/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/misc/xiphos/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -46,7 +46,7 @@ LIB_DEPENDS=		webkitgtk:${PORTSDIR}/www/
 
 .if ${PORT_OPTIONS:MLIBXUL}
 WAF_CONFIGURE_ARGS=	--backend=xulrunner
-USE_GECKO=		libxul
+USE_GECKO=		libxul19
 .endif
 
 .if ${PORT_OPTIONS:MGTKHTML}

Modified: head/multimedia/gxine/Makefile
==============================================================================
--- head/multimedia/gxine/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/multimedia/gxine/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -7,7 +7,7 @@
 
 PORTNAME=	gxine
 PORTVERSION=	0.5.907
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/xine/${PORTNAME}/${PORTVERSION}
 
@@ -24,7 +24,7 @@ MOZILLA_PLUGIN_DESC=	Mozilla plugin
 
 USE_XZ=		yes
 USE_GNOME=	gnomehack gtk20
-USE_GECKO=	libxul
+USE_GECKO=	libxul19
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ENV=	MKDIR_P="${MKDIR}"

Modified: head/net-p2p/vuze/Makefile
==============================================================================
--- head/net-p2p/vuze/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/net-p2p/vuze/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -7,6 +7,7 @@
 
 PORTNAME=	vuze
 PORTVERSION=	4.7.0.2
+PORTREVISION=	1
 CATEGORIES=	net-p2p java
 # Moved to x-obsolete, could do with an update
 MASTER_SITES=	SF/azureus/vuze/Vuze_${PORTVERSION:S/.//g}
@@ -35,7 +36,7 @@ USE_ZIP=	yes
 #com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterStream.java \
 #com/aelitis/azureus/core/networkmanager/impl/TransportHelperFilterTransparent.java
 
-USE_GECKO=	libxul
+USE_GECKO=	libxul19
 
 NO_WRKSUBDIR=	yes
 
@@ -56,7 +57,7 @@ PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE} \
 SUB_FILES=	${PORTNAME}
 SUB_LIST=	LIBDIR="${LOCALBASE}/lib" JARFILE="${JARFILE}" \
 		SWTJAR="${JAVALIBDIR}/${SWT}.jar" JAVA="${LOCALBASE}/bin/java" \
-		GECKO="${GECKO}"
+		GECKO="${GECKO:S/19//}"
 
 DESKTOP_ENTRIES=	"Vuze" \
 			"A full feature BitTorrent client" \

Modified: head/net/libproxy-mozjs/Makefile
==============================================================================
--- head/net/libproxy-mozjs/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/net/libproxy-mozjs/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #    $MCom: ports/net/libproxy-mozjs/Makefile,v 1.5 2011/01/12 13:10:53 kwm Exp $
 
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net www
 PKGNAMESUFFIX=	-mozjs
 
@@ -17,7 +17,7 @@ LIB_DEPENDS=	proxy.1:${PORTSDIR}/net/lib
 MASTERDIR=	${.CURDIR}/../libproxy
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
-USE_GECKO=	libxul
+USE_GECKO=	libxul19
 
 LIBPROXY_SLAVE=	mozjs
 

Modified: head/science/gchemutils/Makefile
==============================================================================
--- head/science/gchemutils/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/science/gchemutils/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -55,7 +55,7 @@ XUL_DESC=	Build browser plugin (requires
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MXUL}
-USE_GECKO=	libxul
+USE_GECKO=	libxul19
 CONFIGURE_ARGS+=--enable-mozilla-plugin
 PLIST_SUB+=	XUL=""
 .else

Modified: head/security/seahorse-plugins/Makefile
==============================================================================
--- head/security/seahorse-plugins/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/security/seahorse-plugins/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -22,7 +22,7 @@ LIB_DEPENDS=	cryptui.0:${PORTSDIR}/secur
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-#USE_GECKO=	libxul
+#USE_GECKO=	libxul19
 USE_GNOME=	gnomehack intlhack gnomeprefix gconf2 gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
@@ -44,7 +44,7 @@ MAN1=		seahorse-agent.1 seahorse-tool.1
 #.if ${GECKO}=="libxul"
 #CONFIGURE_ARGS+=--with-gecko=libxul-unstable
 #.else
-#CONFIGURE_ARGS+=--with-gecko=${GECKO}
+#CONFIGURE_ARGS+=--with-gecko=${GECKO:S/19//}
 #.endif
 
 .if !defined(WITHOUT_GEDIT)

Modified: head/www/Makefile
==============================================================================
--- head/www/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/www/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -388,6 +388,7 @@
     SUBDIR += libmicrohttpd
     SUBDIR += libwww
     SUBDIR += libxul
+    SUBDIR += libxul19
     SUBDIR += lifetype
     SUBDIR += lightsquid
     SUBDIR += lighttpd

Modified: head/www/gecko-mediaplayer/Makefile
==============================================================================
--- head/www/gecko-mediaplayer/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/www/gecko-mediaplayer/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -7,7 +7,7 @@
 
 PORTNAME=	gecko-mediaplayer
 PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www multimedia gnome
 MASTER_SITES=	GOOGLE_CODE
 
@@ -23,7 +23,7 @@ OPTIONS=	GCONF	"Use Gconf to store prefe
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	glib20 pkgconfig
-USE_GECKO=	libxul
+USE_GECKO=	libxul19
 USE_WEBPLUGINS=	native
 WEBPLUGINS_FILES=	${PORTNAME}-dvx.so ${PORTNAME}-qt.so ${PORTNAME}-rm.so \
 				${PORTNAME}-wmp.so ${PORTNAME}.so

Modified: head/www/gecko-sharp20/Makefile
==============================================================================
--- head/www/gecko-sharp20/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/www/gecko-sharp20/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -8,7 +8,7 @@
 
 PORTNAME=	gecko-sharp
 PORTVERSION=	0.13
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.novell.com/pub/mono/sources/${PORTNAME}2/
 DISTNAME=	${PORTNAME}-2.0-${PORTVERSION}
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-2.0-${PORTVERSION}
 MAINTAINER=	mono at FreeBSD.org
 COMMENT=	Mono bindings to embed Mozilla
 
-USE_GECKO=	libxul
+USE_GECKO=	libxul19
 USE_GNOME=	gtksharp20
 LATEST_LINK=	gecko-sharp20
 GNU_CONFIGURE=	yes

Modified: head/www/helixplugin/Makefile
==============================================================================
--- head/www/helixplugin/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/www/helixplugin/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -7,7 +7,7 @@
 
 PORTNAME=	hxplugin
 PORTVERSION=	20080318
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www multimedia
 MASTER_SITES=	http://virtual-estates.net/~mi/port-stuff/
 
@@ -17,8 +17,8 @@ COMMENT=	Browser plugin for Real or Heli
 USE_BZIP2	 =	yes
 USE_DOS2UNIX	 =	yes
 MAKEFILE	 =	${FILESDIR}/BSDmakefile
-USE_GECKO	 =	libxul
-MAKE_ENV	+=	TOP="${WRKSRC}" GECKO=${GECKO}
+USE_GECKO	 =	libxul19
+MAKE_ENV	+=	TOP="${WRKSRC}" GECKO=${GECKO:S/19//}
 MAKE_JOBS_UNSAFE =	yes
 
 USE_WEBPLUGINS=	native

Modified: head/www/libxul/Makefile
==============================================================================
--- head/www/libxul/Makefile	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/www/libxul/Makefile	Mon Sep 10 19:19:32 2012	(r304053)
@@ -6,53 +6,50 @@
 #
 
 PORTNAME=	libxul
-DISTVERSION=	1.9.2.28
-PORTREVISION=	1
+DISTVERSION=	10.0.7
 CATEGORIES?=	www devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	firefox/releases/3.6.28/source
-DISTNAME=	firefox-3.6.28.source
+MASTER_SITE_SUBDIR=	firefox/releases/${DISTVERSION}esr/source
+DISTNAME=	firefox-${DISTVERSION}esr.source
 
 MAINTAINER?=	gecko at FreeBSD.org
 COMMENT?=	Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps
 
-WRKSRC=		${WRKDIR}/mozilla-1.9.2
-CONFLICTS=	mozilla-[0-9]* libxul-[0-9][0-9].*
-GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
-			lib/${MOZILLA}/include lib/${MOZILLA}/lib
+BUILD_DEPENDS=	nspr>=4.8.8:${PORTSDIR}/devel/nspr \
+		nss>=3.13.1:${PORTSDIR}/security/nss \
+		sqlite3>=3.7.7.1:${PORTSDIR}/databases/sqlite3 \
+		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
+		unzip:${PORTSDIR}/archivers/unzip
+
+WRKSRC=		${WRKDIR}/mozilla-esr10
+CONFLICTS=	mozilla-[0-9]* libxul-1.9.*
 
 USE_AUTOTOOLS=	autoconf213:env
 WANT_GNOME=	yes
+USE_QT4=	# empty
+QT_NONSTANDARD=	yes
 WANT_PERL=	yes
 ALL_TARGET=	default
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_GL=		gl
 MAKE_JOBS_SAFE=	yes
 MAKE_ENV=	SKIP_GRE_REGISTRATION=1 mozappdir=${PREFIX}/lib/${MOZILLA}
 LDFLAGS+=	-Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}
 USE_LDCONFIG=	${PREFIX}/lib/${MOZILLA}
 
-MOZ_OPTIONS?=	--enable-application=xulrunner \
-		--disable-ipc
+MOZ_OPTIONS?=	--enable-application=xulrunner
 MOZ_EXTENSIONS=	default,cookie,permissions
 USE_GECKO=	gecko
 MOZILLA_EXEC_NAME=xulrunner
-USE_MOZILLA=	-event -ffi -vpx
-MOZ_CHROME=	jar
+USE_MOZILLA=	# empty
 MOZILLA_PLIST_DIRS=	bin include lib share/idl
 PLIST_DIRSTRY=	share/idl
-MOZ_PKGCONFIG_FILES=	libxul-embedding libxul mozilla-gtkmozembed-embedding \
-		mozilla-gtkmozembed mozilla-js mozilla-plugin
-
-OPTIONS_DEFINE=	JAVA
-JAVA_DESC?=	JAVA xpcom
+MOZ_PKGCONFIG_FILES=	libxul-embedding libxul mozilla-js \
+			mozilla-plugin
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
-
-OPTIONS_DEFINE:=${OPTIONS_DEFINE:NLIBPROXY}
-OPTIONS_SINGLE:=${OPTIONS_SINGLE:NTOOLKIT}
-
 .include <bsd.port.pre.mk>
 
 .if ${USE_MOZILLA:M-nss}
@@ -70,19 +67,17 @@ CFLAGS+=	-mminimal-toc
 .endif
 .endif
 
-.if ${PORT_OPTIONS:MJAVA}
-USE_JAVA=	yes
-JAVA_VERSION+=	1.5+
-JAVA_OS+=	native
-MOZ_EXPORT+=	JAVA_HOME="${JAVA_HOME}"
-MOZ_OPTIONS+=	--enable-javaxpcom
-.else
-MOZ_OPTIONS+=	--disable-javaxpcom
+.if ${ARCH} == amd64 || ${ARCH} == i386
+BUILD_DEPENDS+=	yasm:${PORTSDIR}/devel/yasm
+.endif
+
+.if !empty(CXX:M*clang++*)
+CXXFLAGS+=	-Wno-return-type-c-linkage
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's|/usr/local/include|${LOCALBASE}/include|' \
-	    	${WRKSRC}/js/src/config/mkdepend/Makefile.in
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		${WRKSRC}/xulrunner/stub/nsXULStub.cpp
 
 pre-configure:
 	(cd ${WRKSRC} && ${AUTOCONF})
@@ -90,8 +85,8 @@ pre-configure:
 
 post-build:
 	@${REINPLACE_CMD} -e "s|\(Libs:.*\)\($$\)|\1 -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}\2| ; \
-	    	s|%sdkdir%|%sdkdir%/sdk|g ; \
+		s|%sdkdir%|%sdkdir%/sdk|g ; \
 		s|%%MOZ_LIBDIR%%|${PREFIX}/lib/${MOZILLA}|g" \
-	    	${WRKSRC}/xulrunner/installer/*.pc.in || ${TRUE}
+		${WRKSRC}/xulrunner/installer/*.pc.in || ${TRUE}
 
 .include <bsd.port.post.mk>

Modified: head/www/libxul/distinfo
==============================================================================
--- head/www/libxul/distinfo	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/www/libxul/distinfo	Mon Sep 10 19:19:32 2012	(r304053)
@@ -1,2 +1,2 @@
-SHA256 (firefox-3.6.28.source.tar.bz2) = a6c4bc52095194428cf3b17341b68ac473b7654984000c45d1be3eae55d78260
-SIZE (firefox-3.6.28.source.tar.bz2) = 51698958
+SHA256 (firefox-10.0.7esr.source.tar.bz2) = 91b0dab3168d75a4f157dabfdf6a95367cd3a8767298d88fb43be251f37f4423
+SIZE (firefox-10.0.7esr.source.tar.bz2) = 75624327

Modified: head/www/libxul/files/patch-alsapulse
==============================================================================
--- head/www/libxul/files/patch-alsapulse	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/www/libxul/files/patch-alsapulse	Mon Sep 10 19:19:32 2012	(r304053)
@@ -1,50 +1,49 @@
 --- config/autoconf.mk.in~
 +++ config/autoconf.mk.in
-@@ -555,6 +555,14 @@ MOZ_LIBNOTIFY_CFLAGS	= @MOZ_LIBNOTIFY_CF
+@@ -568,7 +568,13 @@ MOZ_LIBNOTIFY_CFLAGS	= @MOZ_LIBNOTIFY_CF
  MOZ_LIBNOTIFY_LIBS	= @MOZ_LIBNOTIFY_LIBS@
  MOZ_ENABLE_LIBNOTIFY	= @MOZ_ENABLE_LIBNOTIFY@
  
 +MOZ_ALSA                = @MOZ_ALSA@
-+MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS@
+ MOZ_ALSA_LIBS           = @MOZ_ALSA_LIBS@
 +MOZ_ALSA_CFLAGS         = @MOZ_ALSA_CFLAGS@
 +
 +MOZ_PULSEAUDIO          = @MOZ_PULSEAUDIO@
 +MOZ_PULSEAUDIO_LIBS     = @MOZ_PULSEAUDIO_LIBS@
 +MOZ_PULSEAUDIO_CFLAGS   = @MOZ_PULSEAUDIO_CFLAGS@
-+
+ 
  GLIB_CFLAGS	= @GLIB_CFLAGS@
  GLIB_LIBS	= @GLIB_LIBS@
- GLIB_GMODULE_LIBS	= @GLIB_GMODULE_LIBS@
 --- configure.in~
 +++ configure.in
-@@ -5660,15 +5660,49 @@ dnl ====================================
+@@ -5758,17 +5775,48 @@ dnl ====================================
+ dnl = Check alsa availability on Linux if using sydneyaudio
+ dnl ========================================================
  
- dnl If using sydneyaudio with Linux, ensure that the alsa library is available
- if test "$COMPILE_ENVIRONMENT"; then
--if test -n "$MOZ_SYDNEYAUDIO"; then
 +MOZ_ARG_ENABLE_BOOL(alsa,
 +[  --enable-alsa          Enable Alsa support],
 +MOZ_ALSA=1,
 +MOZ_ALSA= MOZ_ALSA_FORCE=$enableval)
 +
+ dnl If using sydneyaudio with Linux, ensure that the alsa library is available
+-if test -n "$MOZ_SYDNEYAUDIO"; then
 +if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then
     case "$target_os" in
  linux*)
--      AC_CHECK_LIB(asound, snd_pcm_open,,AC_MSG_ERROR([Ogg support on Linux requires the alsa library]))
 +      MOZ_ALSA=1
-       ;;
-    esac
- fi
++      ;;
++   esac
++fi
 +
 +if test -n "$MOZ_ALSA"; then
-+      PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
-+         [echo "$MOZ_ALSA_PKG_ERRORS"
-+          AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux.  Disable with --disable-ogg --disable-wave --disable-webm.  (On Ubuntu, you might try installing the package libasound2-dev.)])])
-+fi
+       PKG_CHECK_MODULES(MOZ_ALSA, alsa, ,
+          [echo "$MOZ_ALSA_PKG_ERRORS"
+           AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux.  Disable with --disable-ogg --disable-wave --disable-webm.  (On Ubuntu, you might try installing the package libasound2-dev.)])])
+-      ;;
+-   esac
  fi
  
 +AC_SUBST(MOZ_ALSA_CFLAGS)
-+AC_SUBST(MOZ_ALSA_LIBS)
 +AC_SUBST(MOZ_ALSA)
 +
 +dnl ========================================================
@@ -67,25 +66,23 @@
 +AC_SUBST(MOZ_PULSEAUDIO)
 +
  dnl ========================================================
- dnl Splashscreen
+ dnl Permissions System
  dnl ========================================================
 --- media/libsydneyaudio/src/Makefile.in~
 +++ media/libsydneyaudio/src/Makefile.in
-@@ -45,12 +45,6 @@ MODULE		= sydneyaudio
- LIBRARY_NAME	= sydneyaudio
- FORCE_STATIC_LIB= 1
- 
--ifeq ($(OS_ARCH),Linux)
+@@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android)
+ CSRCS		= \
+ 		sydney_audio_android.c \
+ 		$(NULL)
+-else ifeq ($(OS_ARCH),Linux)
 -CSRCS		= \
 -		sydney_audio_alsa.c \
 -		$(NULL)
--endif
--
- ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
- CSRCS		= \
- 		sydney_audio_waveapi.c \
-@@ -83,6 +83,18 @@ CSRCS         = \
-               $(NULL)
+ endif
+ 
+ ifeq ($(OS_ARCH),WINNT)
+@@ -68,6 +64,18 @@ CSRCS		= \
+ 		$(NULL)
  endif
  
 +ifdef MOZ_ALSA
@@ -105,18 +102,18 @@
  endif
 --- toolkit/library/libxul-config.mk~
 +++ toolkit/library/libxul-config.mk
-@@ -90,6 +90,14 @@ endif
- LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/os2
+@@ -348,10 +348,12 @@ ifdef MOZ_NATIVE_LIBVPX
+ EXTRA_DSO_LDOPTS += $(MOZ_LIBVPX_LIBS)
  endif
  
+-ifdef MOZ_SYDNEYAUDIO
+-ifeq ($(OS_ARCH),Linux)
 +ifdef MOZ_ALSA
-+EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
-+endif
+ EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
+ endif
 +
 +ifdef MOZ_PULSEAUDIO
 +EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS)
-+endif
-+
- # dependent libraries
- ifdef MOZ_IPC
- STATIC_LIBS += \
+ endif
+ 
+ ifdef HAVE_CLOCK_MONOTONIC

Added: head/www/libxul/files/patch-bug543241
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/libxul/files/patch-bug543241	Mon Sep 10 19:19:32 2012	(r304053)
@@ -0,0 +1,14 @@
+--- ./xpcom/threads/nsThreadManager.cpp.orig	2011-08-25 02:37:45.000000000 +0200
++++ ./xpcom/threads/nsThreadManager.cpp	2011-08-28 17:14:14.000000000 +0200
+@@ -89,6 +89,11 @@
+ nsresult
+ nsThreadManager::Init()
+ {
++#if defined(NS_TLS) && (__FreeBSD_version < 802513 \
++  || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045))
++  if (!gTLSThreadID)
++    gTLSThreadID = mozilla::threads::Generic;
++#endif
+   if (!mThreadsByPRThread.Init())
+     return NS_ERROR_OUT_OF_MEMORY;
+ 

Modified: head/www/libxul/files/patch-bug653551
==============================================================================
--- head/www/libxul/files/patch-bug653551	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/www/libxul/files/patch-bug653551	Mon Sep 10 19:19:32 2012	(r304053)
@@ -11,14 +11,19 @@ diff --git js/src/configure.in js/src/co
 index 84390cf..d663c46 100644
 --- js/src/configure.in
 +++ js/src/configure.in
-@@ -2471,8 +2471,10 @@ arm*-*)
-     NANOJIT_ARCH=ARM
+@@ -2806,13 +2806,15 @@ arm*-*)
+     AC_DEFINE(JS_NUNBOX32)
      ;;
  sparc*-*)
 +    if test ! "$HAVE_64BIT_OS" ; then
-     ENABLE_JIT=1
      NANOJIT_ARCH=Sparc
+     ENABLE_METHODJIT=1
+     ENABLE_MONOIC=1
+     ENABLE_POLYIC=1
+     ENABLE_METHODJIT_TYPED_ARRAY=1
+     AC_DEFINE(JS_CPU_SPARC)
+     AC_DEFINE(JS_NUNBOX32)
 +    fi
      ;;
- esac
- 
+ mips*-*)
+     ENABLE_METHODJIT=1

Modified: head/www/libxul/files/patch-bug685258
==============================================================================
--- head/www/libxul/files/patch-bug685258	Mon Sep 10 19:15:11 2012	(r304052)
+++ head/www/libxul/files/patch-bug685258	Mon Sep 10 19:19:32 2012	(r304053)
@@ -6,12 +6,12 @@ Bug 685258 - Pulse audio backend does no
 diff --git a/content/media/nsAudioStream.cpp b/content/media/nsAudioStream.cpp
 --- content/media/nsAudioStream.cpp
 +++ content/media/nsAudioStream.cpp
-@@ -83,7 +83,7 @@ void nsAudioStream::Init(PRInt32 aNumCha
-   mChannels = aNumChannels;
+@@ -429,7 +429,7 @@ nsresult nsNativeAudioStream::Init(PRInt32 aNumChannels, PRInt32 aRate, SampleFo
    mFormat = aFormat;
+ 
    if (sa_stream_create_pcm(reinterpret_cast<sa_stream_t**>(&mAudioHandle),
--                           NULL, 
+-                           NULL,
 +                           "Mozilla",
-                            SA_MODE_WRONLY, 
+                            SA_MODE_WRONLY,
                             SA_PCM_FORMAT_S16_NE,
                             aRate,

Added: head/www/libxul/files/patch-bug691898
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/libxul/files/patch-bug691898	Mon Sep 10 19:19:32 2012	(r304053)
@@ -0,0 +1,285 @@
+From: Mike Hommey <mh at glandium.org>
+Date: Sat, 24 Dec 2011 09:56:58 +0100
+Subject: Bug 691898 - Use YARR interpreter instead of PCRE on platforms where
+ YARR JIT is not supported
+
+---
+ js/src/Makefile.in           |   21 +++++++++++++--------
+ js/src/vm/RegExpObject-inl.h |   28 ++++++----------------------
+ js/src/vm/RegExpObject.cpp   |   36 ------------------------------------
+ js/src/vm/RegExpObject.h     |   27 ++++++---------------------
+ js/src/yarr/wtfbridge.h      |    2 --
+ 5 files changed, 25 insertions(+), 89 deletions(-)
+
+diff --git a/js/src/Makefile.in b/js/src/Makefile.in
+index fc48cbd..49f0bdc 100644
+--- js/src/Makefile.in
++++ js/src/Makefile.in
+@@ -416,15 +416,20 @@ CPPSRCS += 	checks.cc \
+ 
+ ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU)))
+ 
+-VPATH +=        $(srcdir)/yarr/pcre \
++VPATH +=        $(srcdir)/assembler \
++                $(srcdir)/assembler/wtf \
++                $(srcdir)/yarr \
+ 		$(NULL)
+ 
+ CPPSRCS += \
+-                pcre_compile.cpp \
+-                pcre_exec.cpp \
+-                pcre_tables.cpp \
+-                pcre_xclass.cpp \
+-                pcre_ucp_searchfuncs.cpp \
++                Assertions.cpp \
++                OSAllocatorOS2.cpp \
++                OSAllocatorPosix.cpp \
++                OSAllocatorWin.cpp \
++                PageBlock.cpp \
++                YarrInterpreter.cpp \
++                YarrPattern.cpp \
++                YarrSyntaxChecker.cpp \
+ 		$(NULL)
+ else
+ 
+@@ -1015,10 +1020,10 @@ endif
+ # Needed to "configure" it correctly.  Unfortunately these
+ # flags wind up being applied to all code in js/src, not just
+ # the code in js/src/assembler.
+-CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1
++CXXFLAGS += -DUSE_SYSTEM_MALLOC=1
+ 
+ ifneq (,$(ENABLE_YARR_JIT)$(ENABLE_TRACEJIT)$(ENABLE_METHODJIT))
+-CXXFLAGS +=  -DENABLE_JIT=1
++CXXFLAGS +=  -DENABLE_JIT=1 -DENABLE_ASSEMBLER=1
+ endif
+ 
+ INCLUDES +=	-I$(srcdir)/assembler -I$(srcdir)/yarr
+diff --git a/js/src/vm/RegExpObject-inl.h b/js/src/vm/RegExpObject-inl.h
+index 5f7817d..91108a7 100644
+--- js/src/vm/RegExpObject-inl.h
++++ js/src/vm/RegExpObject-inl.h
+@@ -327,6 +327,7 @@ RegExpPrivate::create(JSContext *cx, JSString *source, RegExpFlag flags, TokenSt
+     return RetType(self);
+ }
+ 
++#if ENABLE_YARR_JIT
+ /* This function should be deleted once bad Android platforms phase out. See bug 604774. */
+ inline bool
+ RegExpPrivateCode::isJITRuntimeEnabled(JSContext *cx)
+@@ -337,12 +338,12 @@ RegExpPrivateCode::isJITRuntimeEnabled(JSContext *cx)
+     return true;
+ #endif
+ }
++#endif
+ 
+ inline bool
+ RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, TokenStream *ts,
+                            uintN *parenCount, RegExpFlag flags)
+ {
+-#if ENABLE_YARR_JIT
+     /* Parse the pattern. */
+     ErrorCode yarrError;
+     YarrPattern yarrPattern(pattern, bool(flags & IgnoreCaseFlag), bool(flags & MultilineFlag),
+@@ -359,7 +360,7 @@ RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, TokenStream *
+      * case we have to bytecode compile it.
+      */
+ 
+-#ifdef JS_METHODJIT
++#if ENABLE_YARR_JIT && defined(JS_METHODJIT)
+     if (isJITRuntimeEnabled(cx) && !yarrPattern.m_containsBackreferences) {
+         if (!cx->compartment->ensureJaegerCompartmentExists(cx))
+             return false;
+@@ -371,21 +372,11 @@ RegExpPrivateCode::compile(JSContext *cx, JSLinearString &pattern, TokenStream *
+     }
+ #endif
+ 
++#if ENABLE_YARR_JIT
+     codeBlock.setFallBack(true);
++#endif
+     byteCode = byteCompile(yarrPattern, cx->compartment->regExpAllocator).get();
+     return true;
+-#else /* !defined(ENABLE_YARR_JIT) */
+-    int error = 0;
+-    compiled = jsRegExpCompile(pattern.chars(), pattern.length(),
+-                  ignoreCase() ? JSRegExpIgnoreCase : JSRegExpDoNotIgnoreCase,
+-                  multiline() ? JSRegExpMultiline : JSRegExpSingleLine,
+-                  parenCount, &error);
+-    if (error) {
+-        reportPCREError(cx, error);
+-        return false;
+-    }
+-    return true;
+-#endif
+ }
+ 
+ inline bool
+@@ -431,19 +422,12 @@ RegExpPrivateCode::execute(JSContext *cx, const jschar *chars, size_t start, siz
+     else
+         result = JSC::Yarr::execute(codeBlock, chars, start, length, output);
+ #else
+-    result = jsRegExpExecute(cx, compiled, chars, length, start, output, outputCount);
++    result = JSC::Yarr::interpret(byteCode, chars, start, length, output);
+ #endif
+ 
+     if (result == -1)
+         return Success_NotFound;
+ 
+-#if !ENABLE_YARR_JIT
+-    if (result < 0) {
+-        reportPCREError(cx, result);
+-        return Error;
+-    }
+-#endif
+-
+     JS_ASSERT(result >= 0);
+     return Success;
+ }
+diff --git a/js/src/vm/RegExpObject.cpp b/js/src/vm/RegExpObject.cpp
+index f75c6a5..7631dd5 100644
+--- js/src/vm/RegExpObject.cpp
++++ js/src/vm/RegExpObject.cpp
+@@ -251,7 +251,6 @@ Class js::RegExpClass = {
+     NULL                     /* trace */
+ };
+ 
+-#if ENABLE_YARR_JIT
+ void
+ RegExpPrivateCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode error)
+ {
+@@ -283,41 +282,6 @@ RegExpPrivateCode::reportYarrError(JSContext *cx, TokenStream *ts, ErrorCode err
+     }
+ }

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list