Attachment 108219 Details for Bug 149044 – libxul-1.9.2.8-update2.patch

[patch] libxul-1.9.2.8-update2.patch

libxul-1.9.2.8-update2.patch (text/plain), 117.74 KB, created by Beat Gaetzi on 2010-08-04 15:10:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Beat Gaetzi

Created: 2010-08-04 15:10:53 UTC

Size: 117.74 KB

patch

obsolete

>Index: audio/tuxguitar/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/audio/tuxguitar/Makefile,v
>retrieving revision 1.28
>diff -u -r1.28 Makefile
>--- audio/tuxguitar/Makefile	28 Mar 2010 06:31:27 -0000	1.28
>+++ audio/tuxguitar/Makefile	25 Jul 2010 17:37:19 -0000
>@@ -8,7 +8,7 @@
> 
> PORTNAME=	tuxguitar
> PORTVERSION=	1.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	audio java
> MASTER_SITES=	SF/${PORTNAME}/TuxGuitar/TuxGuitar-${PORTVERSION}:src \
> 		${MASTER_SITE_LOCAL}/gahr/:fluid \
>Index: deskutils/chmsee/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/deskutils/chmsee/Makefile,v
>retrieving revision 1.26
>diff -u -r1.26 Makefile
>--- deskutils/chmsee/Makefile	27 Jul 2010 01:25:14 -0000	1.26
>+++ deskutils/chmsee/Makefile	28 Jul 2010 12:26:11 -0000
>@@ -18,7 +18,7 @@
> 		gcrypt.17:${PORTSDIR}/security/libgcrypt
> 
> USE_GNOME=	gnomehier libglade2
>-USE_GECKO=	libxul seamonkey
>+USE_GECKO=	libxul
> USE_GETTEXT=	yes
> USE_CMAKE=	yes
> CMAKE_USE_PTHREAD=	yes
>Index: deskutils/mcatalog/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/deskutils/mcatalog/Makefile,v
>retrieving revision 1.24
>diff -u -r1.24 Makefile
>--- deskutils/mcatalog/Makefile	31 May 2010 01:58:01 -0000	1.24
>+++ deskutils/mcatalog/Makefile	25 Jul 2010 17:37:46 -0000
>@@ -8,7 +8,7 @@
> 
> PORTNAME=	mcatalog
> PORTVERSION=	0.2
>-PORTREVISION=	14
>+PORTREVISION=	15
> CATEGORIES=	deskutils gnome
> MASTER_SITES=	http://www.mcatalog.net/releases/
> 
>Index: deskutils/google-gadgets/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/deskutils/google-gadgets/Makefile,v
>retrieving revision 1.19
>diff -u -r1.19 Makefile
>--- deskutils/google-gadgets/Makefile	11 Jun 2010 13:37:34 -0000	1.19
>+++ deskutils/google-gadgets/Makefile	25 Jul 2010 17:38:05 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	google-gadgets
> PORTVERSION=	0.11.2
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	deskutils
> MASTER_SITES=	http://google-gadgets-for-linux.googlecode.com/files/
> DISTNAME=	${PORTNAME}-for-linux-${PORTVERSION}
>@@ -37,7 +37,7 @@
> USE_GSTREAMER=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -Wno-deprecated-declarations" LDFLAGS="-L${LOCALBASE}/lib"
>-CONFIGURE_ARGS=	--enable-ltdl-install=no --with-browser-plugins-dir=${LOCALBASE}/lib/browser_plugins
>+CONFIGURE_ARGS=	--disable-werror --enable-ltdl-install=no --with-browser-plugins-dir=${LOCALBASE}/lib/browser_plugins
> USE_AUTOTOOLS=	libtool:22:env autoconf:262:env automake:110:env aclocal:110:env libltdl:22
> WANT_GNOME=	yes
> USE_GNOME=	gnomehack
>@@ -62,7 +62,7 @@
> .endif
> 
> .if defined(WITH_MOZILLA)
>-USE_GECKO=	libxul firefox mozilla seamonkey xulrunner
>+USE_GECKO=	libxul
> .endif
> 
> .if defined(WITHOUT_GTKWEBKIT) && defined(WITHOUT_MOZILLA) && defined(WITH_GTK)
>Index: devel/mono-tools/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/devel/mono-tools/Makefile,v
>retrieving revision 1.20
>diff -u -r1.20 Makefile
>--- devel/mono-tools/Makefile	1 Jun 2010 12:41:22 -0000	1.20
>+++ devel/mono-tools/Makefile	25 Jul 2010 17:38:16 -0000
>@@ -8,6 +8,7 @@
> 
> PORTNAME=	mono-tools
> PORTVERSION=	2.6.2
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/${PORTNAME}/
> 
>Index: german/bsdforen-firefox-searchplugin/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/german/bsdforen-firefox-searchplugin/Makefile,v
>retrieving revision 1.11
>diff -u -r1.11 Makefile
>--- german/bsdforen-firefox-searchplugin/Makefile	28 Mar 2010 06:36:02 -0000	1.11
>+++ german/bsdforen-firefox-searchplugin/Makefile	25 Jul 2010 17:40:24 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	bsdforen-firefox-searchplugin
> PORTVERSION=	0.3
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	german www
> MASTER_SITES=	http://www.crashmail.de/files/ \
> 		http://people.bsdgroup.de/~steve/files/
>@@ -17,8 +17,9 @@
> MAINTAINER=	stefan.tell@crashmail.de
> COMMENT=	Firefox searchplugins for the www.bsdforen.de board and wiki
> 
>+RUN_DEPENDS=	firefox3:${PORTSDIR}/www/firefox
>+
> NO_BUILD=	yes
>-USE_GECKO=	libxul
> 
> .include <bsd.port.pre.mk>
> 
>Index: german/bsdgroup-firefox-searchplugin/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/german/bsdgroup-firefox-searchplugin/Makefile,v
>retrieving revision 1.8
>diff -u -r1.8 Makefile
>--- german/bsdgroup-firefox-searchplugin/Makefile	28 Mar 2010 06:36:02 -0000	1.8
>+++ german/bsdgroup-firefox-searchplugin/Makefile	25 Jul 2010 17:40:37 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	bsdgroup-firefox-searchplugin
> PORTVERSION=	0.2
>-PORTREVISION=	6
>+PORTREVISION=	7
> CATEGORIES=	german www
> MASTER_SITES=	http://www.crashmail.de/files/ \
> 		http://people.bsdgroup.de/~steve/files/
>@@ -17,8 +17,9 @@
> MAINTAINER=	stefan.tell@crashmail.de
> COMMENT=	Firefox searchplugins for the www.BSDGroup.de board
> 
>+RUN_DEPENDS=	firefox3:${PORTSDIR}/www/firefox
>+
> NO_BUILD=	yes
>-USE_GECKO=	libxul
> 
> do-extract:
> 	@${MKDIR} ${WRKSRC}
>Index: java/eclipse/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/java/eclipse/Makefile,v
>retrieving revision 1.69
>diff -u -r1.69 Makefile
>--- java/eclipse/Makefile	10 Jul 2010 19:34:25 -0000	1.69
>+++ java/eclipse/Makefile	25 Jul 2010 17:40:51 -0000
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	eclipse
> PORTVERSION=	3.5.2
>+PORTREVISION=	1
> CATEGORIES=	java devel
> MASTER_SITES=	http://download.eclipse.org/technology/linuxtools/eclipse-build/:1 \
> 		http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/:2 \
>Index: java/eclipse-devel/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/java/eclipse-devel/Makefile,v
>retrieving revision 1.31
>diff -u -r1.31 Makefile
>--- java/eclipse-devel/Makefile	10 Jun 2010 06:20:29 -0000	1.31
>+++ java/eclipse-devel/Makefile	25 Jul 2010 17:40:56 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	eclipse-devel
> PORTVERSION=	3.5.2
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	java devel
> MASTER_SITES=	http://download.eclipse.org/technology/linuxtools/eclipse-build/:1 \
> 		http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/bundles/:2 \
>Index: lang/gjs/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/lang/gjs/Makefile,v
>retrieving revision 1.6
>diff -u -r1.6 Makefile
>--- lang/gjs/Makefile	31 May 2010 01:59:32 -0000	1.6
>+++ lang/gjs/Makefile	25 Jul 2010 17:41:01 -0000
>@@ -8,7 +8,7 @@
> 
> PORTNAME=	gjs
> PORTVERSION=	0.6
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	lang gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome2
>Index: multimedia/moonlight/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/multimedia/moonlight/Makefile,v
>retrieving revision 1.19
>diff -u -r1.19 Makefile
>--- multimedia/moonlight/Makefile	24 Jul 2010 16:38:17 -0000	1.19
>+++ multimedia/moonlight/Makefile	25 Jul 2010 17:41:07 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	moonlight
> PORTVERSION=	2.2
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	multimedia www
> MASTER_SITES=	http://ftp.novell.com/pub/mono/sources/moon/${PORTVERSION}/
> DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
>@@ -32,8 +32,8 @@
> CONFIGURE_ARGS=	--with-cairo=system \
> 		--with-debug=yes \
> 		--with-ff2=no \
>-		--with-ff3=yes \
>-		--with-ff36=no \
>+		--with-ff3=no \
>+		--with-ff36=yes \
> 		--with-mcspath=${MONODIR}/mcs/ \
> 		--with-mono-basic-path=${MONOBASICDIR}/
> 
>Index: multimedia/moonlight/pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/multimedia/moonlight/pkg-plist,v
>retrieving revision 1.4
>diff -u -r1.4 pkg-plist
>--- multimedia/moonlight/pkg-plist	6 Jun 2010 09:21:40 -0000	1.4
>+++ multimedia/moonlight/pkg-plist	25 Jul 2010 17:26:56 -0000
>@@ -94,8 +94,8 @@
> lib/moonlight/plugin/System.dll.mdb
> lib/moonlight/plugin/libmoonloader.la
> lib/moonlight/plugin/libmoonloader.so
>-lib/moonlight/plugin/libmoonplugin-ff3bridge.la
>-lib/moonlight/plugin/libmoonplugin-ff3bridge.so
>+lib/moonlight/plugin/libmoonplugin-ff36bridge.la
>+lib/moonlight/plugin/libmoonplugin-ff36bridge.so
> lib/moonlight/plugin/libmoonplugin.la
> lib/moonlight/plugin/libmoonplugin.so
> lib/moonlight/plugin/mscorlib.dll
>Index: net/libproxy-mozjs/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/net/libproxy-mozjs/Makefile,v
>retrieving revision 1.6
>diff -u -r1.6 Makefile
>--- net/libproxy-mozjs/Makefile	28 Mar 2010 06:41:21 -0000	1.6
>+++ net/libproxy-mozjs/Makefile	25 Jul 2010 17:41:15 -0000
>@@ -5,7 +5,7 @@
> # $FreeBSD: ports/net/libproxy-mozjs/Makefile,v 1.6 2010/03/28 06:41:21 dinoex Exp $
> #
> 
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	net devel
> PKGNAMESUFFIX=	-mozjs
> 
>@@ -27,7 +27,7 @@
> LIBPROXY_SLAVE=	yes
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|mozilla-js|mozilla-js libxul-unstable|g' \
>+	@${REINPLACE_CMD} -e 's|mozilla-js|mozilla-js libxul|g' \
> 		${WRKSRC}/configure
> 
> .include "${MASTERDIR}/Makefile"
>Index: net/penguintv/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/net/penguintv/Makefile,v
>retrieving revision 1.34
>diff -u -r1.34 Makefile
>--- net/penguintv/Makefile	3 May 2010 21:44:09 -0000	1.34
>+++ net/penguintv/Makefile	25 Jul 2010 17:41:20 -0000
>@@ -6,7 +6,7 @@
> 
> PORTNAME=	PenguinTV
> PORTVERSION=	4.1.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net audio multimedia
> MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME:L}/4.1
> DISTNAME=	penguintv_${PORTVERSION}-0
>Index: net-p2p/vuze/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/net-p2p/vuze/Makefile,v
>retrieving revision 1.69
>diff -u -r1.69 Makefile
>--- net-p2p/vuze/Makefile	28 Mar 2010 06:42:10 -0000	1.69
>+++ net-p2p/vuze/Makefile	25 Jul 2010 17:41:26 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	vuze
> PORTVERSION=	4.3.1.4
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	net-p2p java
> MASTER_SITES=	SF/azureus/${PORTNAME}/${PORTNAME}-${PORTVERSION}
> DISTNAME=	Vuze_${PORTVERSION}_source
>Index: news/openftd/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/news/openftd/Makefile,v
>retrieving revision 1.17
>diff -u -r1.17 Makefile
>--- news/openftd/Makefile	3 Apr 2010 10:44:28 -0000	1.17
>+++ news/openftd/Makefile	25 Jul 2010 17:41:31 -0000
>@@ -8,7 +8,7 @@
> 
> PORTNAME=	openftd
> PORTVERSION=	1.1.0
>-PORTREVISION=	7
>+PORTREVISION=	8
> CATEGORIES=	news
> MASTER_SITES=	http://www.icheb.nl/mirrors/openftd/
> 
>Index: www/firefox-sync/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/firefox-sync/Makefile,v
>retrieving revision 1.21
>diff -u -r1.21 Makefile
>--- www/firefox-sync/Makefile	8 Jul 2010 12:21:08 -0000	1.21
>+++ www/firefox-sync/Makefile	25 Jul 2010 17:41:51 -0000
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	firefox-sync
> PORTVERSION=	1.4
>+PORTREVISION=	1
> PORTEPOCH=	2
> CATEGORIES=	www
> MASTER_SITES=	http://files.roorback.net/ \
>Index: www/gecko-mediaplayer/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/gecko-mediaplayer/Makefile,v
>retrieving revision 1.7
>diff -u -r1.7 Makefile
>--- www/gecko-mediaplayer/Makefile	31 May 2010 02:01:24 -0000	1.7
>+++ www/gecko-mediaplayer/Makefile	25 Jul 2010 17:42:04 -0000
>@@ -6,8 +6,8 @@
> #
> 
> PORTNAME=	gecko-mediaplayer
>-PORTVERSION=	0.9.5
>-PORTREVISION=	5
>+PORTVERSION=	0.9.9.2
>+PORTREVISION=	1
> CATEGORIES=	www multimedia gnome
> MASTER_SITES=	GOOGLE_CODE
> 
>@@ -22,13 +22,16 @@
> 
> GNU_CONFIGURE=	yes
> USE_GETTEXT=	yes
>-USE_GNOME=	glib20
>-USE_GECKO=	libxul seamonkey
>+USE_GNOME=	glib20 pkgconfig
>+USE_GECKO=	libxul
> USE_WEBPLUGINS=	native
> WEBPLUGINS_FILES=	${PORTNAME}-dvx.so ${PORTNAME}-qt.so ${PORTNAME}-rm.so \
> 				${PORTNAME}-wmp.so ${PORTNAME}.so
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
> 		LDFLAGS="-L${LOCALBASE}/lib"
>+CONFIGURE_ARGS+=	--enable-new-libxul \
>+		--with-xulrunner-sdk="${LOCALBASE}/include" \
>+		--with-plugin_dir="${WEBPLUGINS_DIR}"
> 
> PORTDOCS=	README COPYING AUTHORS ChangeLog INSTALL NEWS javascript.txt
> 
>@@ -47,7 +50,8 @@
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's|$$(libdir)/mozilla/plugins|${WEBPLUGINS_DIR}|' \
>+	@${REINPLACE_CMD} -e 's|-ldl||' \
>+		${WRKSRC}/configure \
> 		${WRKSRC}/src/Makefile.in
> .if defined(NOPORTDOCS)
> 	@${REINPLACE_CMD} -e \
>Index: www/gecko-mediaplayer/distinfo
>===================================================================
>RCS file: /home/pcvs/ports/www/gecko-mediaplayer/distinfo,v
>retrieving revision 1.1
>diff -u -r1.1 distinfo
>--- www/gecko-mediaplayer/distinfo	26 Apr 2009 23:34:53 -0000	1.1
>+++ www/gecko-mediaplayer/distinfo	25 Jul 2010 17:23:14 -0000
>@@ -1,3 +1,3 @@
>-MD5 (gecko-mediaplayer-0.9.5.tar.gz) = 95b83f30a41769e14a3c7bbb422b514e
>-SHA256 (gecko-mediaplayer-0.9.5.tar.gz) = 60cd30e5d44e0ee1e3b96309c3767f5f2eb1cbc29d3d49b7c624cfa60579bf16
>-SIZE (gecko-mediaplayer-0.9.5.tar.gz) = 220301
>+MD5 (gecko-mediaplayer-0.9.9.2.tar.gz) = deb41a4bcbde2b78d548dc37b684cfbb
>+SHA256 (gecko-mediaplayer-0.9.9.2.tar.gz) = 378b6c149e41efd5f0e47c8a711d7b3e108409cb72c6f9504ac4a8791de83cd6
>+SIZE (gecko-mediaplayer-0.9.9.2.tar.gz) = 262053
>Index: www/gecko-mediaplayer/pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/www/gecko-mediaplayer/pkg-plist,v
>retrieving revision 1.1
>diff -u -r1.1 pkg-plist
>--- www/gecko-mediaplayer/pkg-plist	26 Apr 2009 23:34:53 -0000	1.1
>+++ www/gecko-mediaplayer/pkg-plist	25 Jul 2010 17:23:14 -0000
>@@ -3,10 +3,12 @@
> %%WEBPLUGINS_DIR%%/gecko-mediaplayer-rm.so
> %%WEBPLUGINS_DIR%%/gecko-mediaplayer-wmp.so
> %%WEBPLUGINS_DIR%%/gecko-mediaplayer.so
>+share/locale/cs/LC_MESSAGES/gecko-mediaplayer.mo
> share/locale/es/LC_MESSAGES/gecko-mediaplayer.mo
> share/locale/fr/LC_MESSAGES/gecko-mediaplayer.mo
> share/locale/it/LC_MESSAGES/gecko-mediaplayer.mo
> share/locale/ja/LC_MESSAGES/gecko-mediaplayer.mo
>+share/locale/nl/LC_MESSAGES/gecko-mediaplayer.mo
> share/locale/pl/LC_MESSAGES/gecko-mediaplayer.mo
> share/locale/pt_BR/LC_MESSAGES/gecko-mediaplayer.mo
> share/locale/tr/LC_MESSAGES/gecko-mediaplayer.mo
>Index: www/gecko-mediaplayer/files/patch-configure
>===================================================================
>RCS file: www/gecko-mediaplayer/files/patch-configure
>diff -N www/gecko-mediaplayer/files/patch-configure
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ www/gecko-mediaplayer/files/patch-configure	25 Jul 2010 17:23:14 -0000
>@@ -0,0 +1,20 @@
>+--- configure.orig	2010-02-24 16:19:09.000000000 +0100
>++++ configure	2010-06-14 22:12:46.000000000 +0200
>+@@ -8710,7 +8710,7 @@
>+ if test "${with_xulrunner_sdk+set}" = set; then
>+   withval=$with_xulrunner_sdk;
>+ 	XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk
>+-	GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java"
>++	GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/libxul -I$XULRUNNER_SDK_PREFIX/nspr"
>+ 	GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl"
>+ 	# Check whether --enable-new-libxul was given.
>+ if test "${enable_new_libxul+set}" = set; then
>+@@ -8720,7 +8720,7 @@
>+ fi
>+ 
>+ 
>+-	if test $usenewlibxul == yes; then
>++	if test $usenewlibxul = yes; then
>+ 
>+ cat >>confdefs.h <<\_ACEOF
>+ #define HAVE_NEW_XULRUNNER 1
>Index: www/gecko-sharp20/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/gecko-sharp20/Makefile,v
>retrieving revision 1.22
>diff -u -r1.22 Makefile
>--- www/gecko-sharp20/Makefile	28 Mar 2010 06:44:44 -0000	1.22
>+++ www/gecko-sharp20/Makefile	25 Jul 2010 17:42:09 -0000
>@@ -8,7 +8,7 @@
> 
> PORTNAME=	gecko-sharp
> PORTVERSION=	0.13
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	www
> MASTER_SITES=	ftp://ftp.novell.com/pub/mono/sources/${PORTNAME}2/
> DISTNAME=	${PORTNAME}-2.0-${PORTVERSION}
>Index: www/kazehakase/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/kazehakase/Makefile,v
>retrieving revision 1.78
>diff -u -r1.78 Makefile
>--- www/kazehakase/Makefile	25 Jul 2010 23:09:56 -0000	1.78
>+++ www/kazehakase/Makefile	28 Jul 2010 12:36:54 -0000
>@@ -8,7 +8,7 @@
> 
> PORTNAME=	kazehakase
> PORTVERSION=	0.5.8
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	www
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
> MASTER_SITE_SUBDIR=	${PORTNAME}/43802
>@@ -22,7 +22,7 @@
> USE_GNOME=	gnomehack intlhack gnomeprefix gtk20
> USE_GMAKE=	yes
> USE_GETTEXT=	yes
>-USE_GECKO=	libxul seamonkey
>+USE_GECKO=	libxul
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--with-gecko_engine=${GECKO}
>@@ -83,6 +83,10 @@
> 		's|-D.*_DISABLE_DEPRECATED=1||g'
> 	@${REINPLACE_CMD} -e 's|-D.*_DISABLE_DEPRECATED||g' \
> 		${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|-embedding||g' \
>+		${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e 's|-unstable||g' \
>+		${WRKSRC}/configure
> 
> pre-install:
> 	@${REINPLACE_CMD} -e 's|localen|locale|' \
>Index: www/kazehakase/files/patch-gtk
>===================================================================
>RCS file: www/kazehakase/files/patch-gtk
>diff -N www/kazehakase/files/patch-gtk
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ www/kazehakase/files/patch-gtk	25 Jul 2010 17:25:48 -0000
>@@ -0,0 +1,180 @@
>+--- src/kz-tab-label.c	(revision 3870)
>++++ src/kz-tab-label.c	(revision 3871)
>+@@ -519,7 +519,7 @@
>+ 	
>+ 	g_return_if_fail(KZ_IS_TAB_LABEL(kztab));
>+ 
>+-	if (!GTK_WIDGET_REALIZED(kztab)) return;
>++	if (!gtk_widget_get_realized(GTK_WIDGET(kztab))) return;
>+ 
>+ 	priv = KZ_TAB_LABEL_GET_PRIVATE (kztab);
>+ 	if (priv->create_thumbnail &&
>+@@ -965,7 +965,7 @@
>+ 
>+ 	widget = GTK_WIDGET(kztab);
>+ 
>+-	if(GTK_WIDGET_REALIZED(widget))
>++	if(gtk_widget_get_realized(widget))
>+ 	{
>+ 		GdkBitmap *mask;
>+ 		KzTabLabelPrivate *priv = KZ_TAB_LABEL_GET_PRIVATE(kztab);
>+--- src/dialogs/kz-about-dialog.c	(revision 3870)
>++++ src/dialogs/kz-about-dialog.c	(revision 3871)
>+@@ -78,7 +78,7 @@
>+ 
>+ 	/* Draw background image */
>+ 	gdk_draw_pixbuf(widget->window,
>+-			widget->style->bg_gc[GTK_WIDGET_STATE(widget)],
>++			widget->style->bg_gc[gtk_widget_get_state(widget)],
>+ 			image,
>+ 			0, 0,
>+ 			0, 0,
>+@@ -87,7 +87,7 @@
>+ 			0, 0);
>+ 	/* Draw logo at top right */
>+ 	gdk_draw_pixbuf(widget->window,
>+-			widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
>++			widget->style->fg_gc[gtk_widget_get_state(widget)],
>+ 			logo,
>+ 			0, 0,
>+ 			bg_width - logo_width, 0,
>+@@ -113,7 +113,7 @@
>+ 	pango_layout_set_alignment(info_layout, PANGO_ALIGN_RIGHT);
>+ 	pango_layout_get_pixel_extents(info_layout, &link, &logical);
>+ 	gdk_draw_layout(widget->window,
>+-			widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
>++			widget->style->fg_gc[gtk_widget_get_state(widget)],
>+ 			bg_width - logical.width, logo_height,
>+ 			info_layout);
>+ 	g_free (version);
>+@@ -127,7 +127,7 @@
>+ 	pango_layout_set_width(copyright_layout, -1);
>+ 	pango_layout_get_pixel_extents(copyright_layout, &link, &logical);
>+ 	gdk_draw_layout(widget->window,
>+-			widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
>++			widget->style->fg_gc[gtk_widget_get_state(widget)],
>+ 			bg_width - logical.width, bg_height - logical.height,
>+ 			copyright_layout);
>+ 
>+--- src/kz-web.c	(revision 3870)
>++++ src/kz-web.c	(revision 3871)
>+@@ -656,7 +656,7 @@
>+ 
>+     requisition->height = GTK_CONTAINER(widget)->border_width;
>+ 
>+-    if (child && GTK_WIDGET_VISIBLE(child)) {
>++    if (child && gtk_widget_get_visible(child)) {
>+         gtk_widget_size_request(child, &child_requisition);
>+         requisition->width += child_requisition.width;
>+         requisition->height += child_requisition.height;
>+@@ -669,11 +669,11 @@
>+     GtkWidget *child;
>+     GtkAllocation child_allocation;
>+ 
>+-    if (!GTK_WIDGET_REALIZED(widget))
>++    if (!gtk_widget_get_realized(widget))
>+         return;
>+     widget->allocation = *allocation;
>+ 
>+-    if (GTK_WIDGET_NO_WINDOW(widget)) {
>++    if (!gtk_widget_get_has_window(widget)) {
>+         child_allocation.x = allocation->x + GTK_CONTAINER(widget)->border_width;
>+         child_allocation.y = allocation->y + GTK_CONTAINER(widget)->border_width;
>+     } else {
>+--- src/widget/kz-entry.c	(revision 3870)
>++++ src/widget/kz-entry.c	(revision 3871)
>+@@ -137,7 +137,7 @@
>+ {
>+     GtkEntry *entry = GTK_ENTRY(widget);
>+ 
>+-    if (!GTK_WIDGET_HAS_FOCUS(widget) &&
>++    if (!gtk_widget_has_focus(widget) &&
>+         (!gtk_entry_get_text(entry) || gtk_entry_get_text(entry)[0] == '\0')) {
>+         PangoLayout *layout;
>+         PangoAttrList *attrs;
>+--- src/widget/kz-paned.c	(revision 3870)
>++++ src/widget/kz-paned.c	(revision 3871)
>+@@ -154,8 +154,8 @@
>+ 
>+ 	paned = GTK_PANED(kzpaned);
>+ 
>+-	return paned->child1 && GTK_WIDGET_VISIBLE(paned->child1) &&
>+-		paned->child2 && GTK_WIDGET_VISIBLE(paned->child2);
>++	return paned->child1 && gtk_widget_get_visible(paned->child1) &&
>++		paned->child2 && gtk_widget_get_visible(paned->child2);
>+ }
>+ 
>+ void
>+--- src/kz-download-box.c	(revision 3870)
>++++ src/kz-download-box.c	(revision 3871)
>+@@ -344,7 +344,7 @@
>+ 				icon_set,
>+ 				icon->image->style,
>+ 				gtk_widget_get_direction(icon->image),
>+-				GTK_WIDGET_STATE(icon->image),
>++				gtk_widget_get_state(icon->image),
>+ 				GTK_ICON_SIZE_MENU,
>+ 				icon->image,
>+ 				"download icon");
>+--- src/actions/kz-zoom-action.c	(revision 3870)
>++++ src/actions/kz-zoom-action.c	(revision 3871)
>+@@ -205,7 +205,7 @@
>+ 	KzWeb *web;
>+ 	KzZoomActionPrivate *priv = KZ_ZOOM_ACTION_GET_PRIVATE (action);
>+ 
>+-	if (!priv->spin || !GTK_WIDGET_VISIBLE(priv->spin))
>++	if (!priv->spin || !gtk_widget_get_visible(priv->spin))
>+ 		return;
>+ 
>+ 	web = KZ_WINDOW_CURRENT_WEB(priv->kz);
>+@@ -228,7 +228,7 @@
>+ 	
>+ 	priv = KZ_ZOOM_ACTION_GET_PRIVATE (action);
>+ 
>+-	if (!priv->spin || !GTK_WIDGET_VISIBLE(priv->spin))
>++	if (!priv->spin || !gtk_widget_get_visible(priv->spin))
>+ 		return;
>+ 	
>+ 	spin = priv->spin;
>+@@ -249,7 +249,7 @@
>+ 	
>+ 	priv = KZ_ZOOM_ACTION_GET_PRIVATE (action);
>+ 	
>+-	if (!priv->spin || !GTK_WIDGET_VISIBLE(priv->spin))
>++	if (!priv->spin || !gtk_widget_get_visible(priv->spin))
>+ 		return 1.0;
>+ 	ratio = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(priv->spin)) / 100;
>+     
>+--- src/kz-window.c	(revision 3870)
>++++ src/kz-window.c	(revision 3871)
>+@@ -615,7 +615,7 @@
>+ 
>+ 	g_return_if_fail(KZ_IS_WINDOW(kz));
>+ 
>+-	if (!GTK_WIDGET_REALIZED(kz)) return;
>++	if (!gtk_widget_get_realized(GTK_WIDGET(kz))) return;
>+ 
>+ 	web = KZ_WINDOW_CURRENT_WEB(kz);
>+ 	kz_actions_set_sensitive(kz, web);
>+--- configure.ac	(revision 3870)
>++++ configure.ac	(revision 3871)
>+@@ -101,7 +101,7 @@
>+ dnl **************************************************************
>+ dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified
>+ dnl in MODULES, pass to pkg-config
>+-AM_PATH_GTK_2_0(2.17.7, , ,[gthread])
>++AM_PATH_GTK_2_0(2.20.0, , ,[gthread])
>+ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
>+ AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
>+ 
>+--- configure.orig	2010-07-08 19:04:29.000000000 +0200
>++++ configure	2010-07-08 19:07:21.000000000 +0200
>+@@ -17020,7 +17020,7 @@
>+     no_gtk=yes
>+   fi
>+ 
>+-  min_gtk_version=2.17.7
>++  min_gtk_version=2.20.0
>+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5
>+ $as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; }
>+ 
>Index: www/kazehakase/files/patch-gtk.orig
>===================================================================
>RCS file: www/kazehakase/files/patch-gtk.orig
>diff -N www/kazehakase/files/patch-gtk.orig
>Index: www/kazehakase/files/patch-macros_gecko.m4
>===================================================================
>RCS file: www/kazehakase/files/patch-macros_gecko.m4
>diff -N www/kazehakase/files/patch-macros_gecko.m4
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ www/kazehakase/files/patch-macros_gecko.m4	25 Jul 2010 17:25:48 -0000
>@@ -0,0 +1,58 @@
>+--- macros/gecko.m4.orig	2009-09-29 05:38:19.000000000 +0200
>++++ macros/gecko.m4	2010-07-18 19:50:53.000000000 +0200
>+@@ -30,7 +30,7 @@
>+     AM_CXXFLAGS=$_SAVE_AM_CXXFLAGS
>+ fi
>+ 
>+-CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/widget -I$MOZILLA_INCLUDE_ROOT/layout -I$MOZILLA_INCLUDE_ROOT/helperAppDlg -I$MOZILLA_INCLUDE_ROOT/dom -I$MOZILLA_INCLUDE_ROOT/exthandler -I$MOZILLA_INCLUDE_ROOT/pipnss -I$MOZILLA_INCLUDE_ROOT/necko -I$MOZILLA_INCLUDE_ROOT/gfx -I$MOZILLA_INCLUDE_ROOT/content -I$MOZILLA_INCLUDE_ROOT/locale -I$MOZILLA_INCLUDE_ROOT/docshell -I$MOZILLA_INCLUDE_ROOT/mimetype -I$MOZILLA_INCLUDE_ROOT/nkcache -I$MOZILLA_INCLUDE_ROOT/uriloader -I$MOZILLA_INCLUDE_ROOT/walle t -I$MOZILLA_INCLUDE_ROOT/passwordmgr -I$MOZILLA_INCLUDE_ROOT/string -I$MOZILLA_INCLUDE_ROOT/xpcom `$PKG_CONFIG --cflags-only-I $GECKO_MODULE` -Wconversion -Werror"
>++CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/widget -I$MOZILLA_INCLUDE_ROOT/layout -I$MOZILLA_INCLUDE_ROOT/helperAppDlg -I$MOZILLA_INCLUDE_ROOT/dom -I$MOZILLA_INCLUDE_ROOT/exthandler -I$MOZILLA_INCLUDE_ROOT/pipnss -I$MOZILLA_INCLUDE_ROOT/necko -I$MOZILLA_INCLUDE_ROOT/gfx -I$MOZILLA_INCLUDE_ROOT/content -I$MOZILLA_INCLUDE_ROOT/locale -I$MOZILLA_INCLUDE_ROOT/docshell -I$MOZILLA_INCLUDE_ROOT/mimetype -I$MOZILLA_INCLUDE_ROOT/nkcache -I$MOZILLA_INCLUDE_ROOT/uriloader -I$MOZILLA_INCLUDE_ROOT/walle t -I$MOZILLA_INCLUDE_ROOT/passwordmgr -I$MOZILLA_INCLUDE_ROOT/string -I$MOZILLA_INCLUDE_ROOT/xpcom `$PKG_CONFIG --cflags-only-I $GECKO_MODULE` -Wconversion"
>+ CXXFLAGS="$AM_CXXFLAGS `$PKG_CONFIG --cflags-only-other $GECKO_MODULE`"
>+ 
>+ AC_MSG_RESULT([$CXXFLAGS])
>+@@ -197,6 +197,8 @@
>+ 		       [Whether to use mozilla, firefox seamonkey xpcom (default: mozilla)]),
>+ 	[GECKO="$withval"])
>+ 
>++LIBXUL_UNIFIED_VER=1.9.2
>++LIBXUL_UNIFIED=0
>+ AC_MSG_CHECKING([for gecko engine])
>+ if test "x$GECKO" = "xno"; then
>+   GECKO=
>+@@ -216,6 +218,9 @@
>+     GECKO=xulrunner
>+   elif $PKG_CONFIG --exists libxul-unstable; then
>+     GECKO=libxul
>++  elif $PKG_CONFIG --exists "libxul >= $LIBXUL_UNIFIED_VER" ; then
>++    GECKO=libxul
>++    LIBXUL_UNIFIED=1
>+   else
>+     gecko_engine_not_found_message="not found"
>+   fi
>+@@ -239,7 +244,10 @@
>+   mozilla-firefox) min_version=1.0 ;;
>+   seamonkey) min_version=1.1 ;;
>+   xulrunner) min_version=1.8 ;;
>+-  libxul) min_version=1.9 ;;
>++  libxul) 
>++    min_version=1.9
>++    if test x"$LIBXUL_UNIFIED"="x1" ; then min_version=1.9.2 ; fi
>++    ;;
>+   esac
>+   
>+   dnl **************************************************************
>+@@ -250,13 +258,13 @@
>+   		enable_gtkmozembed=no)
>+   if test x"$enable_gtkmozembed" = "xyes"; then
>+     if test x"$GECKO" = "xlibxul"; then
>+-      GECKO_MODULE=$GECKO-unstable
>++      GECKO_MODULE=$GECKO
>+     else
>+       GECKO_MODULE=$GECKO-xpcom
>+     fi
>+   else
>+     if test x"$GECKO" = "xlibxul"; then
>+-      GECKO_MODULE=$GECKO-embedding-unstable
>++      GECKO_MODULE=$GECKO
>+     else
>+       GECKO_MODULE=$GECKO-gtkmozembed
>+     fi
>Index: www/kazehakase/files/patch-macros_gecko.m4.orig
>===================================================================
>RCS file: www/kazehakase/files/patch-macros_gecko.m4.orig
>diff -N www/kazehakase/files/patch-macros_gecko.m4.orig
>Index: www/kazehakase/files/patch-module_embed_gecko_kz-mozwrapper.cpp
>===================================================================
>RCS file: www/kazehakase/files/patch-module_embed_gecko_kz-mozwrapper.cpp
>diff -N www/kazehakase/files/patch-module_embed_gecko_kz-mozwrapper.cpp
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ www/kazehakase/files/patch-module_embed_gecko_kz-mozwrapper.cpp	25 Jul 2010 17:25:48 -0000
>@@ -0,0 +1,42 @@
>+--- module/embed/gecko/kz-mozwrapper.cpp	(revision 3871)
>++++ module/embed/gecko/kz-mozwrapper.cpp	(revision 3872)
>+@@ -102,7 +102,7 @@
>+ #ifndef G_OS_WIN32
>+ #  define nsString_h___
>+ #  define nsAString_h___
>+-#  include <nsPresContext.h>
>++//#  include <nsPresContext.h>
>+ #  undef nsAString_h___
>+ #  undef nsString_h___
>+ #endif
>+@@ -2152,29 +2152,5 @@
>+ gboolean
>+ KzMozWrapper::SetZoomOnDocShell (float aZoom, nsIDocShell *DocShell)
>+ {
>+-#ifndef G_OS_WIN32
>+-	nsCOMPtr<nsPresContext> PresContext;
>+-	nsresult rv = DocShell->GetPresContext (getter_AddRefs(PresContext));
>+-	if (NS_FAILED(rv) || !PresContext) return FALSE;
>+-
>+-	nsIDeviceContext *DeviceContext(nsnull);
>+-	DeviceContext = PresContext->DeviceContext();
>+-	if (!DeviceContext) return FALSE;
>+-
>+-	nsCOMPtr<nsIContentViewer> ContentViewer;
>+-	
>+-	rv = DocShell->GetContentViewer(getter_AddRefs(ContentViewer));
>+-	if (NS_FAILED(rv) || !ContentViewer) return FALSE;
>+-
>+-	nsCOMPtr<nsIMarkupDocumentViewer> mdv = do_QueryInterface(ContentViewer);
>+-	if (!mdv) return FALSE;
>+-
>+-	rv = mdv->SetTextZoom (aZoom);
>+-
>+-	if NS_FAILED(rv) return FALSE;
>+-	
>+-	return TRUE;
>+-#else
>+-	return FALSE;
>+-#endif
>++	return NS_SUCCEEDED(mDOMWindow->SetTextZoom(aZoom));
>+ }
>Index: www/kazehakase/files/patch-module_embed_gecko_kz-mozwrapper.cpp.orig
>===================================================================
>RCS file: www/kazehakase/files/patch-module_embed_gecko_kz-mozwrapper.cpp.orig
>diff -N www/kazehakase/files/patch-module_embed_gecko_kz-mozwrapper.cpp.orig
>Index: www/moonshine/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/moonshine/Makefile,v
>retrieving revision 1.9
>diff -u -r1.9 Makefile
>--- www/moonshine/Makefile	3 Aug 2010 16:18:58 -0000	1.9
>+++ www/moonshine/Makefile	4 Aug 2010 13:09:40 -0000
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	moonshine
> PORTVERSION=	0.7
>+PORTREVISION=	1
> CATEGORIES=	www multimedia
> MASTER_SITES=	http://github.com/abock/moonshine/tarball/${PORTVERSION}/
> DISTNAME=	abock-${PORTNAME}-${GITCOMMIT}
>Index: www/openvrml/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/openvrml/Makefile,v
>retrieving revision 1.59
>diff -u -r1.59 Makefile
>--- www/openvrml/Makefile	3 Apr 2010 10:44:35 -0000	1.59
>+++ www/openvrml/Makefile	25 Jul 2010 17:42:42 -0000
>@@ -6,8 +6,8 @@
> #
> 
> PORTNAME=	openvrml
>-PORTVERSION=	0.17.5
>-PORTREVISION=	9
>+PORTVERSION=	0.18.6
>+PORTREVISION=	1
> CATEGORIES=	www graphics
> MASTER_SITES=	SF
> 
>@@ -20,25 +20,27 @@
> 		js.1:${PORTSDIR}/lang/spidermonkey			\
> 		jpeg.11:${PORTSDIR}/graphics/jpeg			\
> 		png.6:${PORTSDIR}/graphics/png				\
>-		curl.6:${PORTSDIR}/ftp/curl
>+		curl.6:${PORTSDIR}/ftp/curl				\
>+		gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext
> 
> USE_GL=		yes
> USE_GNOME=	gnomehack libglade2 libgnomeui
> USE_SDL=	sdl
> USE_JAVA=	yes
> GNU_CONFIGURE=	yes
>-LIBTOOLFILES=	configure mozilla-plugin/configure lib/gtkglext/configure
>+LIBTOOLFILES=	configure
> CONFIGURE_ARGS=	--enable-gecko-rpath
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OPSYS:L}"	\
> 		LDFLAGS="-L${LOCALBASE}/lib -L${JAVA_HOME}/jre/lib/${ARCH}/client ${PTHREAD_LIBS}" \
> 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" PTHREAD_LIBS="${PTHREAD_LIBS}"	\
>-		LIBS="-lm"
>+		LIBS="-lm" BOOST_LIB_SUFFIX=""
> USE_GMAKE=	yes
> USE_LDCONFIG=	yes
>-USE_GECKO=	libxul seamonkey
>+USE_GECKO=	libxul
> 
> USE_WEBPLUGINS=	native
> WEBPLUGINS_FILES=openvrml.so
>+MAKE_JOBS_UNSAFE=yes
> 
> .if !defined(NOPORTDOCS)
> PORTDOCS=	*
>@@ -79,12 +81,16 @@
> 		${WRKSRC}/${cfg}
> .endfor
> 	${REINPLACE_CMD} -e 's|$$(libdir)/mozilla/plugins|${WEBPLUGINS_DIR}|'	\
>-		${WRKSRC}/mozilla-plugin/src/Makefile.in
>+		${WRKSRC}/src/Makefile.in
> .if ${GECKO} != "firefox"
> 	${REINPLACE_CMD} -e "s|FIREFOX_JS|${GECKO:U}_JS|g;s|firefox-js|${GECKO}-js|"	\
> 		${WRKSRC}/configure
> 	${REINPLACE_CMD} -e "s|firefox-plugin|${GECKO}-plugin|g"	\
>-		${WRKSRC}/mozilla-plugin/configure
>+		${WRKSRC}/configure
>+	${REINPLACE_CMD} -e "s|mozilla-plugin|${GECKO}|g" \
>+		${WRKSRC}/configure
>+	${REINPLACE_CMD} -e "s|boost_thread-mt|boost_thread|g" \
>+		${WRKSRC}/configure
> .endif
> 
> post-install:
>Index: www/openvrml/distinfo
>===================================================================
>RCS file: /home/pcvs/ports/www/openvrml/distinfo,v
>retrieving revision 1.12
>diff -u -r1.12 distinfo
>--- www/openvrml/distinfo	6 Feb 2008 20:46:33 -0000	1.12
>+++ www/openvrml/distinfo	25 Jul 2010 17:27:57 -0000
>@@ -1,3 +1,3 @@
>-MD5 (openvrml-0.17.5.tar.gz) = efc09f7803ac3aaf8ab0af66615faef0
>-SHA256 (openvrml-0.17.5.tar.gz) = 979bb4795dc1583024fbe502ff3f51807216678b64a43533818f784017aa72eb
>-SIZE (openvrml-0.17.5.tar.gz) = 6067792
>+MD5 (openvrml-0.18.6.tar.gz) = 25dbcc72f44d3ced197af2d25eb378c5
>+SHA256 (openvrml-0.18.6.tar.gz) = 06114a218fe7566757cdfef87d0a9736f3bcb4b9ca164f05ef172a38c9101772
>+SIZE (openvrml-0.18.6.tar.gz) = 4727317
>Index: www/openvrml/pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/www/openvrml/pkg-plist,v
>retrieving revision 1.12
>diff -u -r1.12 pkg-plist
>--- www/openvrml/pkg-plist	10 Jan 2009 02:45:44 -0000	1.12
>+++ www/openvrml/pkg-plist	25 Jul 2010 17:27:57 -0000
>@@ -3,6 +3,7 @@
> include/openvrml/openvrml-config.h
> include/openvrml/openvrml-gl-common.h
> include/openvrml/openvrml-gl-config.h
>+include/openvrml/openvrml/bad_url.h
> include/openvrml/openvrml/basetypes.h
> include/openvrml/openvrml/bounding_volume.h
> include/openvrml/openvrml/browser.h
>@@ -13,41 +14,85 @@
> include/openvrml/openvrml/gl/viewer.h
> include/openvrml/openvrml/node.h
> include/openvrml/openvrml/node_impl_util.h
>-include/openvrml/openvrml/read_write_mutex.h
> include/openvrml/openvrml/rendering_context.h
>+include/openvrml/openvrml/scene.h
> include/openvrml/openvrml/scope.h
> include/openvrml/openvrml/script.h
> include/openvrml/openvrml/viewer.h
> include/openvrml/openvrml/vrml97_grammar.h
>-include/openvrml/openvrml/vrml97node.h
>-include/openvrml/openvrml/x3d_cad_geometry.h
>-include/openvrml/openvrml/x3d_core.h
>-include/openvrml/openvrml/x3d_dis.h
>-include/openvrml/openvrml/x3d_environmental_effects.h
>-include/openvrml/openvrml/x3d_event_utilities.h
>-include/openvrml/openvrml/x3d_geometry2d.h
>-include/openvrml/openvrml/x3d_geospatial.h
>-include/openvrml/openvrml/x3d_grouping.h
>-include/openvrml/openvrml/x3d_hanim.h
>-include/openvrml/openvrml/x3d_interpolation.h
>-include/openvrml/openvrml/x3d_key_device_sensor.h
>-include/openvrml/openvrml/x3d_networking.h
>-include/openvrml/openvrml/x3d_nurbs.h
>-include/openvrml/openvrml/x3d_rendering.h
>-include/openvrml/openvrml/x3d_shape.h
>-include/openvrml/openvrml/x3d_texturing.h
> include/openvrml/openvrml/x3d_vrml_grammar.h
> lib/libopenvrml-gl.a
>+lib/libopenvrml-gl.la
> lib/libopenvrml-gl.so
>-lib/libopenvrml-gl.so.7
>+lib/libopenvrml-gl.so.8
> lib/libopenvrml.a
>+lib/libopenvrml.la
> lib/libopenvrml.so
>-lib/libopenvrml.so.8
>+lib/libopenvrml.so.9
>+%%WEBPLUGINS_DIR%%/openvrml.a
> %%WEBPLUGINS_DIR%%/openvrml.la
> %%WEBPLUGINS_DIR%%/openvrml.so
>+lib/openvrml/node/vrml97.a
>+lib/openvrml/node/vrml97.la
>+lib/openvrml/node/vrml97.so
>+lib/openvrml/node/x3d-cad-geometry.a
>+lib/openvrml/node/x3d-cad-geometry.la
>+lib/openvrml/node/x3d-cad-geometry.so
>+lib/openvrml/node/x3d-core.a
>+lib/openvrml/node/x3d-core.la
>+lib/openvrml/node/x3d-core.so
>+lib/openvrml/node/x3d-dis.a
>+lib/openvrml/node/x3d-dis.la
>+lib/openvrml/node/x3d-dis.so
>+lib/openvrml/node/x3d-environmental-effects.a
>+lib/openvrml/node/x3d-environmental-effects.la
>+lib/openvrml/node/x3d-environmental-effects.so
>+lib/openvrml/node/x3d-event-utilities.a
>+lib/openvrml/node/x3d-event-utilities.la
>+lib/openvrml/node/x3d-event-utilities.so
>+lib/openvrml/node/x3d-geometry2d.a
>+lib/openvrml/node/x3d-geometry2d.la
>+lib/openvrml/node/x3d-geometry2d.so
>+lib/openvrml/node/x3d-geospatial.a
>+lib/openvrml/node/x3d-geospatial.la
>+lib/openvrml/node/x3d-geospatial.so
>+lib/openvrml/node/x3d-grouping.a
>+lib/openvrml/node/x3d-grouping.la
>+lib/openvrml/node/x3d-grouping.so
>+lib/openvrml/node/x3d-h-anim.a
>+lib/openvrml/node/x3d-h-anim.la
>+lib/openvrml/node/x3d-h-anim.so
>+lib/openvrml/node/x3d-interpolation.a
>+lib/openvrml/node/x3d-interpolation.la
>+lib/openvrml/node/x3d-interpolation.so
>+lib/openvrml/node/x3d-key-device-sensor.a
>+lib/openvrml/node/x3d-key-device-sensor.la
>+lib/openvrml/node/x3d-key-device-sensor.so
>+lib/openvrml/node/x3d-networking.a
>+lib/openvrml/node/x3d-networking.la
>+lib/openvrml/node/x3d-networking.so
>+lib/openvrml/node/x3d-nurbs.a
>+lib/openvrml/node/x3d-nurbs.la
>+lib/openvrml/node/x3d-nurbs.so
>+lib/openvrml/node/x3d-rendering.a
>+lib/openvrml/node/x3d-rendering.la
>+lib/openvrml/node/x3d-rendering.so
>+lib/openvrml/node/x3d-shape.a
>+lib/openvrml/node/x3d-shape.la
>+lib/openvrml/node/x3d-shape.so
>+lib/openvrml/node/x3d-texturing.a
>+lib/openvrml/node/x3d-texturing.la
>+lib/openvrml/node/x3d-texturing.so
>+lib/openvrml/script/java.a
>+lib/openvrml/script/java.la
>+lib/openvrml/script/java.so
>+lib/openvrml/script/javascript.a
>+lib/openvrml/script/javascript.la
>+lib/openvrml/script/javascript.so
> libdata/pkgconfig/openvrml-gl.pc
> libdata/pkgconfig/openvrml.pc
> libexec/openvrml-xembed
>+share/dbus-1/services/org.openvrml.BrowserControl.service
> %%PORTDOCS%%%%EXAMPLESDIR%%/Anchor.wrl
> %%PORTDOCS%%%%EXAMPLESDIR%%/Click.wrl
> %%PORTDOCS%%%%EXAMPLESDIR%%/EventPROTO.wrl
>@@ -66,14 +111,48 @@
> %%PORTDOCS%%%%EXAMPLESDIR%%/scale.wrl
> %%PORTDOCS%%%%EXAMPLESDIR%%/snoman.wrl
> %%PORTDOCS%%%%EXAMPLESDIR%%/warbird.wrl
>-share/openvrml-player/glade/openvrml-player.glade
>-@dirrm share/openvrml-player/glade
>-@dirrm share/openvrml-player
>+%%DATADIR%%-player/ui/openvrml-player.ui
>+%%DATADIR%%-xembed/dbus-1/browser-factory.xml
>+%%DATADIR%%-xembed/dbus-1/browser-host.xml
>+%%DATADIR%%-xembed/dbus-1/browser.xml
>+%%DATADIR%%/component/cad-geometry.xml
>+%%DATADIR%%/component/core.xml
>+%%DATADIR%%/component/dis.xml
>+%%DATADIR%%/component/environmental-effects.xml
>+%%DATADIR%%/component/environmental-sensor.xml
>+%%DATADIR%%/component/event-utilities.xml
>+%%DATADIR%%/component/geometry2d.xml
>+%%DATADIR%%/component/geometry3d.xml
>+%%DATADIR%%/component/geospatial.xml
>+%%DATADIR%%/component/grouping.xml
>+%%DATADIR%%/component/h-anim.xml
>+%%DATADIR%%/component/interpolation.xml
>+%%DATADIR%%/component/key-device-sensor.xml
>+%%DATADIR%%/component/lighting.xml
>+%%DATADIR%%/component/navigation.xml
>+%%DATADIR%%/component/networking.xml
>+%%DATADIR%%/component/nurbs.xml
>+%%DATADIR%%/component/pointing-device-sensor.xml
>+%%DATADIR%%/component/rendering.xml
>+%%DATADIR%%/component/shape.xml
>+%%DATADIR%%/component/sound.xml
>+%%DATADIR%%/component/text.xml
>+%%DATADIR%%/component/texturing.xml
>+%%DATADIR%%/component/time.xml
>+%%DATADIR%%/component/vrml97.xml
>+%%DATADIR%%/java/script.jar
> @dirrmtry %%WEBPLUGINS_DIR%%
>+@dirrm %%DATADIR%%-xembed/dbus-1
>+@dirrm %%DATADIR%%-xembed
>+@dirrm %%DATADIR%%-player/ui
>+@dirrm %%DATADIR%%-player
>+@dirrm %%DATADIR%%/java
>+@dirrm %%DATADIR%%/component
>+@dirrm %%DATADIR%%
>+@dirrm lib/openvrml/script
>+@dirrm lib/openvrml/node
>+@dirrm lib/openvrml
> @dirrm include/openvrml/openvrml/gl
> @dirrm include/openvrml/openvrml
> @dirrm include/openvrml
> %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
>-@dirrmtry share/gtk-doc/html/gtkglext
>-@dirrmtry share/gtk-doc/html
>-@dirrmtry share/gtk-doc
>Index: www/openvrml/files/patch-Makefile.in
>===================================================================
>RCS file: /home/pcvs/ports/www/openvrml/files/patch-Makefile.in,v
>retrieving revision 1.4
>diff -u -r1.4 patch-Makefile.in
>--- www/openvrml/files/patch-Makefile.in	6 Jan 2008 10:22:07 -0000	1.4
>+++ www/openvrml/files/patch-Makefile.in	25 Jul 2010 17:27:57 -0000
>@@ -1,11 +1,11 @@
>---- Makefile.in.orig	Sat Jul 21 14:49:12 2007
>-+++ Makefile.in	Sat Jul 21 14:52:07 2007
>-@@ -252,7 +252,7 @@
>- target_vendor = @target_vendor@
>+--- Makefile.in.orig	2010-07-12 20:04:30.000000000 +0200
>++++ Makefile.in	2010-07-12 20:05:35.000000000 +0200
>+@@ -327,7 +327,7 @@
>+ top_build_prefix = @top_build_prefix@
>  top_builddir = @top_builddir@
>  top_srcdir = @top_srcdir@
>--SUBDIRS = doc ide-projects models lib java src mozilla-plugin examples tests
>-+SUBDIRS = ide-projects models lib java src mozilla-plugin examples tests
>+-SUBDIRS = doc ide-projects models src data examples tests
>++SUBDIRS = ide-projects models src data examples tests
>  ACLOCAL_AMFLAGS = -I m4
>  EXTRA_DIST = \
>          openvrml.pc.in \
>Index: www/openvrml/files/patch-Makefile.in.orig
>===================================================================
>RCS file: www/openvrml/files/patch-Makefile.in.orig
>diff -N www/openvrml/files/patch-Makefile.in.orig
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ www/openvrml/files/patch-Makefile.in.orig	6 Jan 2008 10:22:07 -0000
>@@ -0,0 +1,11 @@
>+--- Makefile.in.orig	Sat Jul 21 14:49:12 2007
>++++ Makefile.in	Sat Jul 21 14:52:07 2007
>+@@ -252,7 +252,7 @@
>+ target_vendor = @target_vendor@
>+ top_builddir = @top_builddir@
>+ top_srcdir = @top_srcdir@
>+-SUBDIRS = doc ide-projects models lib java src mozilla-plugin examples tests
>++SUBDIRS = ide-projects models lib java src mozilla-plugin examples tests
>+ ACLOCAL_AMFLAGS = -I m4
>+ EXTRA_DIST = \
>+         openvrml.pc.in \
>Index: www/openvrml/files/patch-configure
>===================================================================
>RCS file: /home/pcvs/ports/www/openvrml/files/patch-configure,v
>retrieving revision 1.3
>diff -u -r1.3 patch-configure
>--- www/openvrml/files/patch-configure	6 Feb 2008 20:46:33 -0000	1.3
>+++ www/openvrml/files/patch-configure	25 Jul 2010 17:27:57 -0000
>@@ -1,11 +0,0 @@
>---- configure.orig	2008-02-04 11:43:58.000000000 +0100
>-+++ configure	2008-02-05 23:12:39.000000000 +0100
>-@@ -25349,7 +25349,7 @@
>- fi
>- 
>- openvrml_run_path="${GRE_PATH}${openvrml_run_path}"
>--OPENVRML_RPATH="-rpath ${openvrml_run_path}"
>-+OPENVRML_RPATH="${openvrml_run_path}"
>- 
>- fi
>- 
>Index: www/openvrml/files/patch-configure.orig
>===================================================================
>RCS file: www/openvrml/files/patch-configure.orig
>diff -N www/openvrml/files/patch-configure.orig
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ www/openvrml/files/patch-configure.orig	6 Feb 2008 20:46:33 -0000
>@@ -0,0 +1,11 @@
>+--- configure.orig	2008-02-04 11:43:58.000000000 +0100
>++++ configure	2008-02-05 23:12:39.000000000 +0100
>+@@ -25349,7 +25349,7 @@
>+ fi
>+ 
>+ openvrml_run_path="${GRE_PATH}${openvrml_run_path}"
>+-OPENVRML_RPATH="-rpath ${openvrml_run_path}"
>++OPENVRML_RPATH="${openvrml_run_path}"
>+ 
>+ fi
>+ 
>Index: www/openvrml/files/patch-ltmain.sh
>===================================================================
>RCS file: /home/pcvs/ports/www/openvrml/files/patch-ltmain.sh,v
>retrieving revision 1.1
>diff -u -r1.1 patch-ltmain.sh
>--- www/openvrml/files/patch-ltmain.sh	7 Apr 2004 06:28:35 -0000	1.1
>+++ www/openvrml/files/patch-ltmain.sh	25 Jul 2010 17:27:57 -0000
>@@ -1,15 +0,0 @@
>---- ltmain.sh.orig	Wed Apr  7 12:00:09 2004
>-+++ ltmain.sh	Wed Apr  7 12:00:20 2004
>-@@ -5428,10 +5428,12 @@
>- 	fi
>- 
>- 	# Install the pseudo-library for information purposes.
>-+	if /usr/bin/false ; then
>- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
>- 	instname="$dir/$name"i
>- 	$show "$install_prog $instname $destdir/$name"
>- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
>-+	fi
>- 
>- 	# Maybe install the static library, too.
>- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
>Index: www/openvrml/files/patch-ltmain.sh.orig
>===================================================================
>RCS file: www/openvrml/files/patch-ltmain.sh.orig
>diff -N www/openvrml/files/patch-ltmain.sh.orig
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ www/openvrml/files/patch-ltmain.sh.orig	7 Apr 2004 06:28:35 -0000
>@@ -0,0 +1,15 @@
>+--- ltmain.sh.orig	Wed Apr  7 12:00:09 2004
>++++ ltmain.sh	Wed Apr  7 12:00:20 2004
>+@@ -5428,10 +5428,12 @@
>+ 	fi
>+ 
>+ 	# Install the pseudo-library for information purposes.
>++	if /usr/bin/false ; then
>+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
>+ 	instname="$dir/$name"i
>+ 	$show "$install_prog $instname $destdir/$name"
>+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
>++	fi
>+ 
>+ 	# Maybe install the static library, too.
>+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
>Index: www/openvrml/files/patch-src_Makefile.in
>===================================================================
>RCS file: www/openvrml/files/patch-src_Makefile.in
>diff -N www/openvrml/files/patch-src_Makefile.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ www/openvrml/files/patch-src_Makefile.in	25 Jul 2010 17:27:57 -0000
>@@ -0,0 +1,10 @@
>+--- src/Makefile.in.orig	2010-07-02 09:21:26.000000000 +0200
>++++ src/Makefile.in	2010-07-02 11:34:41.000000000 +0200
>+@@ -1684,6 +1684,7 @@
>+ 
>+ mozilla_plugin_openvrml_la_CXXFLAGS = \
>+         $(MOZILLA_PLUGIN_CFLAGS) \
>++	$(JS_CFLAGS) \
>+         $(DBUS_G_CFLAGS)
>+ 
>+ mozilla_plugin_openvrml_la_SOURCES = mozilla-plugin/openvrml.cpp
>Index: www/openvrml/files/patch-src_Makefile.in.orig
>===================================================================
>RCS file: www/openvrml/files/patch-src_Makefile.in.orig
>diff -N www/openvrml/files/patch-src_Makefile.in.orig
>Index: www/xpi-conkeror/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/xpi-conkeror/Makefile,v
>retrieving revision 1.18
>diff -u -r1.18 Makefile
>--- www/xpi-conkeror/Makefile	11 Jun 2010 13:37:39 -0000	1.18
>+++ www/xpi-conkeror/Makefile	25 Jul 2010 17:42:48 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	conkeror
> PORTVERSION=	20090821
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	www
> MASTER_SITES=	http://mirror.4bit.ws/ \
> 		${MASTER_SITE_LOCAL} \
>Index: www/xpi-gwt-dev-plugin/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/xpi-gwt-dev-plugin/Makefile,v
>retrieving revision 1.4
>diff -u -r1.4 Makefile
>--- www/xpi-gwt-dev-plugin/Makefile	28 Mar 2010 06:45:11 -0000	1.4
>+++ www/xpi-gwt-dev-plugin/Makefile	25 Jul 2010 17:42:54 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	xpi-gwt-dev-plugin
> PORTVERSION=	2.0
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	www
> MASTER_SITES=	http://sites.google.com/site/daemonwizard/
> DISTNAME=	gwt-dev-plugin-${PORTVERSION}-partial
>Index: x11/yelp/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/x11/yelp/Makefile,v
>retrieving revision 1.73
>diff -u -r1.73 Makefile
>--- x11/yelp/Makefile	31 May 2010 02:01:43 -0000	1.73
>+++ x11/yelp/Makefile	25 Jul 2010 17:42:58 -0000
>@@ -8,7 +8,7 @@
> 
> PORTNAME=	yelp
> PORTVERSION=	2.30.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	x11 gnome
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome2
>Index: x11-toolkits/hs-gtk2hs/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/x11-toolkits/hs-gtk2hs/Makefile,v
>retrieving revision 1.42
>diff -u -r1.42 Makefile
>--- x11-toolkits/hs-gtk2hs/Makefile	28 Mar 2010 06:46:45 -0000	1.42
>+++ x11-toolkits/hs-gtk2hs/Makefile	25 Jul 2010 17:43:03 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	gtk2hs
> PORTVERSION=	0.10.0
>-PORTREVISION=	5
>+PORTREVISION=	6
> PORTEPOCH=	1
> CATEGORIES=	x11-toolkits haskell
> MASTER_SITES=	SF
>Index: x11-toolkits/py-gnome-extras/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/x11-toolkits/py-gnome-extras/Makefile,v
>retrieving revision 1.37
>diff -u -r1.37 Makefile
>--- x11-toolkits/py-gnome-extras/Makefile	28 Mar 2010 06:47:19 -0000	1.37
>+++ x11-toolkits/py-gnome-extras/Makefile	25 Jul 2010 17:43:08 -0000
>@@ -8,7 +8,7 @@
> 
> PORTNAME=	gnome-extras
> PORTVERSION=	2.25.3
>-PORTREVISION=	8
>+PORTREVISION=	9
> CATEGORIES=	x11-toolkits python gnome
> MASTER_SITES=	GNOME
> MASTER_SITE_SUBDIR=	sources/gnome-python-extras/${PORTVERSION:C/..$//}
>@@ -44,13 +44,17 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if defined(GECKO) && ${GECKO:Mlibxul}!=""
>-CONFIGURE_ARGS+=	--with-gtkmozembed=mozilla
>-.else
>+.if defined(GECKO)
> CONFIGURE_ARGS+=	--with-gtkmozembed=${GECKO}
> .endif
> 
> post-patch:
>+.if ${GECKO}=="libxul"
>+	@${REINPLACE_CMD} -e 's|xulrunner|libxul|' \
>+		${WRKSRC}/configure
>+.endif
>+	@${REINPLACE_CMD} -e 's|$mozpackage-gtkmozembed|$mozpackage|' \
>+		${WRKSRC}/configure
> 	@${FIND} ${WRKSRC}/docs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
> 		-e 's|^HTML_DIR =.*|HTML_DIR = ${DOCSDIR}|g'
> 
>Index: x11-toolkits/swt/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/x11-toolkits/swt/Makefile,v
>retrieving revision 1.18
>diff -u -r1.18 Makefile
>--- x11-toolkits/swt/Makefile	28 Mar 2010 06:47:29 -0000	1.18
>+++ x11-toolkits/swt/Makefile	25 Jul 2010 17:43:16 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	swt
> DISTVERSION=	3.5.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	x11-toolkits devel java
> MASTER_SITES=	${MASTER_SITE_ECLIPSE}
> MASTER_SITE_SUBDIR=	R-${DISTVERSION}-200909170800
>Index: x11-toolkits/swt-devel/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/x11-toolkits/swt-devel/Makefile,v
>retrieving revision 1.29
>diff -u -r1.29 Makefile
>--- x11-toolkits/swt-devel/Makefile	28 Mar 2010 06:47:30 -0000	1.29
>+++ x11-toolkits/swt-devel/Makefile	25 Jul 2010 17:43:21 -0000
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	swt-devel
> DISTVERSION=	3.6M5
>-PORTREVISION=	1
>+PORTREVISION=	2
> PORTEPOCH=	1
> CATEGORIES=	x11-toolkits devel java
> MASTER_SITES=	${MASTER_SITE_ECLIPSE}
>Index: www/libxul/Makefile
>===================================================================
>RCS file: /home/pcvs/ports/www/libxul/Makefile,v
>retrieving revision 1.17
>diff -u -r1.17 Makefile
>--- www/libxul/Makefile	28 Mar 2010 06:44:52 -0000	1.17
>+++ www/libxul/Makefile	25 Jul 2010 16:51:52 -0000
>@@ -3,40 +3,40 @@
> # Whom:			Michael Johnson <ahze@FreeBSD.org>
> #
> # $FreeBSD: ports/www/libxul/Makefile,v 1.17 2010/03/28 06:44:52 dinoex Exp $
>-#   $MCom: ports/www/libxul/Makefile,v 1.25 2009/04/07 17:47:01 marcus Exp $
> #
> 
> PORTNAME=	libxul
>-PORTVERSION=	1.9.0.17
>-PORTREVISION=	2
>+DISTVERSION=	1.9.2.8
> CATEGORIES?=	www devel
> MASTER_SITES=	${MASTER_SITE_MOZILLA}
>-MASTER_SITE_SUBDIR=	xulrunner/releases/${PORTVERSION}/source/
>-DISTNAME=	xulrunner-${PORTVERSION}-source
>+MASTER_SITE_SUBDIR=	xulrunner/releases/${DISTVERSION}/source
>+DISTNAME=	xulrunner-${DISTVERSION}.source
> 
> MAINTAINER?=	gecko@FreeBSD.org
> COMMENT?=	Mozilla runtime package that can be used to bootstrap XUL+XPCOM apps
> 
>-LIB_DEPENDS?=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
>-
>-CONFLICTS=	mozilla-[0-9]* xulrunner-[0-9]*
>+WRKSRC=		${WRKDIR}/mozilla-1.9.2
>+CONFLICTS=	mozilla-[0-9]*
> GECKO_PLIST_PRE_DIRS=	lib/${MOZILLA}/bin lib/${MOZILLA}/idl \
>-			lib/${MOZILLA}/include lib/${MOZILLA}/lib \
>-			lib/${MOZILLA}/sdk/idl lib/${MOZILLA}/sdk/include
>+			lib/${MOZILLA}/include lib/${MOZILLA}/lib
> 
>+USE_AUTOTOOLS=	autoconf:213
> WANT_GNOME=	yes
> WANT_PERL=	yes
> ALL_TARGET=	default
> HAS_CONFIGURE=	yes
> USE_BZIP2=	yes
> USE_GMAKE=	yes
>+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}
> 
> PORT_MOZCONFIG=	${WRKSRC}/xulrunner/config/mozconfig
> MOZ_OPTIONS?=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
> 		--disable-javaxpcom --enable-canvas \
>-		--enable-system-cairo
>+		--enable-system-cairo --disable-updater \
>+		--disable-necko-wifi --disable-ipc
> MOZ_EXTENSIONS=	default,cookie,permissions
> OPTIONS=	# Empty, used for generic gecko OPTIONS
> USE_GECKO_OPTIONS=	java debug logging optimized_cflags
>@@ -44,16 +44,42 @@
> MOZILLA_EXEC_NAME=xulrunner
> MOZ_TOOLKIT=	cairo-gtk2
> USE_MOZILLA=	-png -nss -dbm -jpeg
>-MOZ_PKGCONFIG_FILES=	libxul-embedding-unstable libxul-embedding \
>-		libxul-unstable	libxul mozilla-gtkmozembed-embedding \
>+MOZ_PKGCONFIG_FILES=	libxul-embedding libxul mozilla-gtkmozembed-embedding \
> 		mozilla-gtkmozembed mozilla-js mozilla-nss mozilla-plugin
> 
>+OPTIONS=	DBUS "Enable D-BUS support" on
>+
> .include <bsd.port.pre.mk>
> 
>+GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED
>+} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
>+
>+.if ${OSVERSION} < 700000
>+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
>+EXTRA_PATCHES=	${FILESDIR}/releng6_pulseaudio
>+.else
>+EXTRA_PATCHES=	${FILESDIR}/libsydney_oss
>+.endif
>+
>+.if defined(WITHOUT_DBUS)
>+MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
>+.else
>+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
>+		notify.1:${PORTSDIR}/devel/libnotify
>+.endif
>+
> post-patch:
> 	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
> 	    	${WRKSRC}/storage/build/Makefile.in \
> 		${WRKSRC}/db/sqlite3/src/Makefile.in
>+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
>+		s|-lpthread|${PTHREAD_LIBS}|g ; \
>+		s|echo aout|echo elf|g ; \
>+		s|/usr/X11R6|${LOCALBASE}|g' \
>+		${WRKSRC}/js/src/configure
>+
>+pre-configure:
>+	(cd ${WRKSRC}/js/src/ && ${AUTOCONF})
> 
> post-build:
> 	@${REINPLACE_CMD} -e "s|$Libs:.*$$$$$|\1 -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH}\2| ; \
>Index: www/libxul/distinfo
>===================================================================
>RCS file: /home/pcvs/ports/www/libxul/distinfo,v
>retrieving revision 1.9
>diff -u -r1.9 distinfo
>--- www/libxul/distinfo	6 Jan 2010 18:44:34 -0000	1.9
>+++ www/libxul/distinfo	25 Jul 2010 16:13:12 -0000
>@@ -1,3 +1,3 @@
>-MD5 (xulrunner-1.9.0.17-source.tar.bz2) = 25b8f426abe7d5d3fec7fb789250cf23
>-SHA256 (xulrunner-1.9.0.17-source.tar.bz2) = 78fad9fa3ba081642610220d34fc79e49c68c5d767bbfc847363d6cc2c4c4845
>-SIZE (xulrunner-1.9.0.17-source.tar.bz2) = 37382767
>+MD5 (xulrunner-1.9.2.8.source.tar.bz2) = 75cf324216ccedd655d0d913ae122a7b
>+SHA256 (xulrunner-1.9.2.8.source.tar.bz2) = 55999f277737a07f144a1b1e11cdd6acbaeae6979e92089518aeb0991aeca829
>+SIZE (xulrunner-1.9.2.8.source.tar.bz2) = 51233312
>Index: www/libxul/files/libsydney_oss
>===================================================================
>RCS file: www/libxul/files/libsydney_oss
>diff -N www/libxul/files/libsydney_oss
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ www/libxul/files/libsydney_oss	18 Jul 2010 11:53:19 -0000
>@@ -0,0 +1,15 @@
>+--- media/libsydneyaudio/src/Makefile.in.orig	2009-08-17 14:21:06.000000000 +0200
>++++ media/libsydneyaudio/src/Makefile.in	2009-08-17 14:21:53.000000000 +0200
>+@@ -45,6 +45,12 @@
>+ LIBRARY_NAME	= sydneyaudio
>+ FORCE_STATIC_LIB= 1
>+ 
>++ifeq ($(OS_ARCH),FreeBSD)
>++CSRCS		= \
>++		sydney_audio_oss.c \
>++		$(NULL)
>++endif
>++
>+ ifeq ($(OS_ARCH),Linux)
>+ CSRCS		= \
>+ 		sydney_audio_alsa.c \
>Index: www/libxul/files/patch-configure
>===================================================================
>RCS file: www/libxul/files/patch-configure
>diff -N www/libxul/files/patch-configure
>--- www/libxul/files/patch-configure	10 Apr 2009 05:56:28 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,38 +0,0 @@
>---- configure.orig	2008-05-28 11:31:02.000000000 -0700
>-+++ configure	2008-07-26 07:27:03.712894513 -0700
>-@@ -10808,7 +10808,7 @@
>-   echo $ac_n "(cached) $ac_c" 1>&6
>- else
>-   ac_save_LIBS="$LIBS"
>--LIBS="-liconv  $LIBS"
>-+LIBS="-L$LOCALBASE/lib -liconv  $LIBS"
>- cat > conftest.$ac_ext <<EOF
>- #line 10814 "configure"
>- #include "confdefs.h"
>-@@ -10839,7 +10839,7 @@
>- fi
>- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
>-   echo "$ac_t""yes" 1>&6
>--  _ICONV_LIBS="$_ICONV_LIBS -liconv"
>-+  _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"
>- else
>-   echo "$ac_t""no" 1>&6
>- echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
>-@@ -10849,7 +10849,7 @@
>-   echo $ac_n "(cached) $ac_c" 1>&6
>- else
>-   ac_save_LIBS="$LIBS"
>--LIBS="-liconv  $LIBS"
>-+LIBS="-L$LOCALBASE/lib -liconv  $LIBS"
>- cat > conftest.$ac_ext <<EOF
>- #line 10855 "configure"
>- #include "confdefs.h"
>-@@ -10880,7 +10880,7 @@
>- fi
>- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
>-   echo "$ac_t""yes" 1>&6
>--  _ICONV_LIBS="$_ICONV_LIBS -liconv"
>-+  _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"
>- else
>-   echo "$ac_t""no" 1>&6
>- fi
>Index: www/libxul/files/patch-configure.in
>===================================================================
>RCS file: www/libxul/files/patch-configure.in
>diff -N www/libxul/files/patch-configure.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ www/libxul/files/patch-configure.in	18 Jul 2010 11:53:19 -0000
>@@ -0,0 +1,22 @@
>+--- configure.in.orig	2009-10-29 23:11:31.000000000 +0100
>++++ configure.in	2009-11-16 19:51:19.000000000 +0100
>+@@ -1352,7 +1352,7 @@
>+     CPU_ARCH=sparc
>+     ;;
>+ 
>+-x86_64 | ia64)
>++amd64 | x86_64 | ia64)
>+     CPU_ARCH="$OS_TEST"
>+     ;;
>+ 
>+@@ -3582,8 +3582,8 @@
>+     *)
>+     
>+ AC_CHECK_LIB(c, iconv, [_ICONV_LIBS="$_ICONV_LIBS"],
>+-    AC_CHECK_LIB(iconv, iconv, [_ICONV_LIBS="$_ICONV_LIBS -liconv"],
>+-        AC_CHECK_LIB(iconv, libiconv, [_ICONV_LIBS="$_ICONV_LIBS -liconv"])))
>++    AC_CHECK_LIB(iconv, iconv, [_ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"],
>++        AC_CHECK_LIB(iconv, libiconv, [_ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"])))
>+ _SAVE_LIBS=$LIBS
>+ LIBS="$LIBS $_ICONV_LIBS"
>+ AC_CACHE_CHECK(
>Index: www/libxul/files/patch-content-xslt-public-txDouble.h
>===================================================================
>RCS file: www/libxul/files/patch-content-xslt-public-txDouble.h
>diff -N www/libxul/files/patch-content-xslt-public-txDouble.h
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ www/libxul/files/patch-content-xslt-public-txDouble.h	18 Jul 2010 11:53:19 -0000
>@@ -0,0 +1,11 @@
>+--- content/xslt/public/txDouble.h.orig	2009-08-16 21:46:27.000000000 +0200
>++++ content/xslt/public/txDouble.h	2009-08-16 21:49:53.000000000 +0200
>+@@ -43,7 +43,7 @@
>+ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
>+ #ifdef __FreeBSD__
>+ #include <ieeefp.h>
>+-#ifdef __alpha__
>++#if !defined(__amd64__) && !defined(__i386__)
>+ static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
>+ #else
>+ static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML;
>Index: www/libxul/files/patch-content_xslt_public_txDouble.h
>===================================================================
>RCS file: www/libxul/files/patch-content_xslt_public_txDouble.h
>diff -N www/libxul/files/patch-content_xslt_public_txDouble.h
>--- www/libxul/files/patch-content_xslt_public_txDouble.h	12 Apr 2009 03:30:29 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,20 +0,0 @@
>---- content/xslt/public/txDouble.h.orig	Fri Oct 13 00:00:29 2006
>-+++ content/xslt/public/txDouble.h	Fri Oct 13 00:00:53 2006
>-@@ -41,7 +41,7 @@
>- #define __txdouble_h__
>- 
>- //A trick to handle IEEE floating point exceptions on FreeBSD - E.D.
>--#ifdef __FreeBSD__
>-+/* #ifdef __FreeBSD__
>- #include <ieeefp.h>
>- #ifdef __alpha__
>- fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP;
>-@@ -50,7 +50,7 @@
>- #endif
>- fp_except_t oldmask = fpsetmask(~allmask);
>- #endif
>--
>-+*/
>- /**
>-  * Macros to workaround math-bugs bugs in various platforms
>-  */
>Index: www/libxul/files/patch-js-src-Makefile.in
>===================================================================
>RCS file: www/libxul/files/patch-js-src-Makefile.in
>diff -N www/libxul/files/patch-js-src-Makefile.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ www/libxul/files/patch-js-src-Makefile.in	18 Jul 2010 11:53:19 -0000
>@@ -0,0 +1,11 @@
>+--- js/src/Makefile.in.orig	2009-05-11 15:21:19.000000000 +0200
>++++ js/src/Makefile.in	2009-05-11 15:21:34.000000000 +0200
>+@@ -427,7 +427,7 @@
>+ endif # WINNT
>+ 
>+ ifeq ($(OS_ARCH),FreeBSD)
>+-EXTRA_LIBS	+= -pthread
>++EXTRA_LIBS	+= -pthread -lc
>+ endif
>+ ifeq ($(OS_ARCH),IRIX)
>+ ifdef USE_N32
>Index: www/libxul/files/patch-js-src-config-mkdepend-Makefile.in
>===================================================================
>RCS file: www/libxul/files/patch-js-src-config-mkdepend-Makefile.in
>diff -N www/libxul/files/patch-js-src-config-mkdepend-Makefile.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ www/libxul/files/patch-js-src-config-mkdepend-Makefile.in	18 Jul 2010 11:53:19 -0000
>@@ -0,0 +1,11 @@
>+--- js/src/config/mkdepend/Makefile.in.orig	2009-08-15 17:45:39.000000000 +0200
>++++ js/src/config/mkdepend/Makefile.in	2009-08-15 17:46:08.000000000 +0200
>+@@ -72,7 +72,7 @@
>+ 
>+ include $(topsrcdir)/config/rules.mk
>+ 
>+-HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
>++HOST_CFLAGS	+= -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
>+ 
>+ ifdef GNU_CC
>+ _GCCDIR		= $(shell $(CC) -print-file-name=include)
>Index: www/libxul/files/patch-js-src-configure.in
>===================================================================
>RCS file: www/libxul/files/patch-js-src-configure.in
>diff -N www/libxul/files/patch-js-src-configure.in
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ www/libxul/files/patch-js-src-configure.in	18 Jul 2010 11:53:19 -0000
>@@ -0,0 +1,13 @@
>+--- js/src/configure.in.orig	2009-09-30 21:50:26.000000000 +0200
>++++ js/src/configure.in	2009-09-30 21:50:44.000000000 +0200
>+@@ -2467,10 +2467,6 @@
>+     ENABLE_JIT=1
>+     NANOJIT_ARCH=ARM
>+     ;;
>+-sparc*-*)
>+-    ENABLE_JIT=1
>+-    NANOJIT_ARCH=Sparc
>+-    ;;
>+ esac
>+ 
>+ MOZ_ARG_DISABLE_BOOL(jit,
>Index: www/libxul/files/patch-js-src-jslock.cpp
>===================================================================
>RCS file: www/libxul/files/patch-js-src-jslock.cpp
>diff -N www/libxul/files/patch-js-src-jslock.cpp
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ www/libxul/files/patch-js-src-jslock.cpp	18 Jul 2010 11:53:19 -0000
>@@ -0,0 +1,18 @@
>+--- js/src/jslock.cpp.orig	2009-10-07 20:15:38.000000000 +0200
>++++ js/src/jslock.cpp	2009-10-07 21:36:14.000000000 +0200
>+@@ -160,8 +160,13 @@
>+     unsigned int res;
>+ 
>+     __asm__ __volatile__ (
>+-                  "stbar\n"
>+-                  "cas [%1],%2,%3\n"
>++                  "membar #StoreLoad | #LoadLoad\n"
>++#                 if defined (__sparc64__)
>++                    "casx [%1],%2,%3\n"
>++#                 else
>++                    "cas [%1],%2,%3\n" /* 32-bit version */
>++#                 endif
>++                  "membar #StoreLoad | #LoadLoad\n"
>+                   "cmp %2,%3\n"
>+                   "be,a 1f\n"
>+                   "mov 1,%0\n"
>Index: www/libxul/files/patch-js_src_jsnum.c
>===================================================================
>RCS file: www/libxul/files/patch-js_src_jsnum.c
>diff -N www/libxul/files/patch-js_src_jsnum.c
>--- www/libxul/files/patch-js_src_jsnum.c	12 Apr 2009 03:30:29 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,28 +0,0 @@
>---- js/src/jsnum.c.orig	Sun Nov  5 18:37:07 2006
>-+++ js/src/jsnum.c	Sun Nov  5 18:42:31 2006
>-@@ -45,6 +45,9 @@
>- #if defined(XP_WIN) || defined(XP_OS2)
>- #include <float.h>
>- #endif
>-+#if defined(__FreeBSD__)
>-+#include <sys/param.h>
>-+#endif
>- #include <locale.h>
>- #include <limits.h>
>- #include <math.h>
>-@@ -532,7 +535,15 @@ static jsdouble NaN;
>- 
>- #else
>- 
>-+#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
>-+#include <fenv.h>
>-+#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT))
>-+
>-+#else
>-+
>- #define FIX_FPU() ((void)0)
>-+
>-+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
>- 
>- #endif
>- 
>Index: www/libxul/files/patch-js_src_jsnum.cpp
>===================================================================
>RCS file: www/libxul/files/patch-js_src_jsnum.cpp
>diff -N www/libxul/files/patch-js_src_jsnum.cpp
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ www/libxul/files/patch-js_src_jsnum.cpp	18 Jul 2010 11:53:19 -0000
>@@ -0,0 +1,29 @@
>+--- js/src/jsnum.cpp.orig	2009-10-14 18:03:30.000000000 +0200
>++++ js/src/jsnum.cpp	2009-10-15 21:49:44.000000000 +0200
>+@@ -43,6 +43,9 @@
>+ /*
>+  * JS number type and wrapper class.
>+  */
>++#if defined(__FreeBSD__)
>++#include <sys/param.h>
>++#endif
>+ #ifdef XP_OS2
>+ #define _PC_53  PC_53
>+ #define _MCW_EM MCW_EM
>+@@ -691,8 +694,16 @@
>+ 
>+ #else
>+ 
>++#if defined(__FreeBSD__) && __FreeBSD_version >= 601000
>++#include <fenv.h>
>++#define FIX_FPU() (fedisableexcept(FE_ALL_EXCEPT))
>++
>++#else
>++
>+ #define FIX_FPU() ((void)0)
>+ 
>++#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */
>++
>+ #endif
>+ 
>+ JSBool
>Index: www/libxul/files/patch-layout-style-nsCSSValue.h
>===================================================================
>RCS file: www/libxul/files/patch-layout-style-nsCSSValue.h
>diff -N www/libxul/files/patch-layout-style-nsCSSValue.h
>--- www/libxul/files/patch-layout-style-nsCSSValue.h	12 Apr 2009 03:30:29 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,215 +0,0 @@
>-# Ensure correct alignment for nsCSSValue objects inside nsCSSValue::Array.
>-#  (Bug 476345)
>-
>---- layout/style/nsCSSValue.h.orig	2008-07-02 00:51:43.000000000 +0200
>-+++ layout/style/nsCSSValue.h	2009-02-01 21:43:29.000000000 +0100
>-@@ -286,104 +286,7 @@
>-   // failure.
>-   static nsStringBuffer* BufferFromString(const nsString& aValue);
>-   
>--  struct Array {
>--
>--    // return |Array| with reference count of zero
>--    static Array* Create(PRUint16 aItemCount) {
>--      return new (aItemCount) Array(aItemCount);
>--    }
>--
>--    nsCSSValue& operator[](PRUint16 aIndex) {
>--      NS_ASSERTION(aIndex < mCount, "out of range");
>--      return *(First() + aIndex);
>--    }
>--
>--    const nsCSSValue& operator[](PRUint16 aIndex) const {
>--      NS_ASSERTION(aIndex < mCount, "out of range");
>--      return *(First() + aIndex);
>--    }
>--
>--    nsCSSValue& Item(PRUint16 aIndex) { return (*this)[aIndex]; }
>--    const nsCSSValue& Item(PRUint16 aIndex) const { return (*this)[aIndex]; }
>--
>--    PRUint16 Count() const { return mCount; }
>--
>--    PRBool operator==(const Array& aOther) const
>--    {
>--      if (mCount != aOther.mCount)
>--        return PR_FALSE;
>--      for (PRUint16 i = 0; i < mCount; ++i)
>--        if ((*this)[i] != aOther[i])
>--          return PR_FALSE;
>--      return PR_TRUE;
>--    }
>--
>--    void AddRef() {
>--      if (mRefCnt == PR_UINT16_MAX) {
>--        NS_WARNING("refcount overflow, leaking nsCSSValue::Array");
>--        return;
>--      }
>--      ++mRefCnt;
>--      NS_LOG_ADDREF(this, mRefCnt, "nsCSSValue::Array", sizeof(*this));
>--    }
>--    void Release() {
>--      if (mRefCnt == PR_UINT16_MAX) {
>--        NS_WARNING("refcount overflow, leaking nsCSSValue::Array");
>--        return;
>--      }
>--      --mRefCnt;
>--      NS_LOG_RELEASE(this, mRefCnt, "nsCSSValue::Array");
>--      if (mRefCnt == 0)
>--        delete this;
>--    }
>--
>--  private:
>--
>--    PRUint16 mRefCnt;
>--    PRUint16 mCount;
>--
>--    void* operator new(size_t aSelfSize, PRUint16 aItemCount) CPP_THROW_NEW {
>--      return ::operator new(aSelfSize + sizeof(nsCSSValue)*aItemCount);
>--    }
>--
>--    void operator delete(void* aPtr) { ::operator delete(aPtr); }
>--
>--    nsCSSValue* First() {
>--      return (nsCSSValue*) (((char*)this) + sizeof(*this));
>--    }
>--
>--    const nsCSSValue* First() const {
>--      return (const nsCSSValue*) (((const char*)this) + sizeof(*this));
>--    }
>--
>--#define CSSVALUE_LIST_FOR_VALUES(var)                                         \
>--  for (nsCSSValue *var = First(), *var##_end = var + mCount;                  \
>--       var != var##_end; ++var)
>--
>--    Array(PRUint16 aItemCount)
>--      : mRefCnt(0)
>--      , mCount(aItemCount)
>--    {
>--      MOZ_COUNT_CTOR(nsCSSValue::Array);
>--      CSSVALUE_LIST_FOR_VALUES(val) {
>--        new (val) nsCSSValue();
>--      }
>--    }
>--
>--    ~Array()
>--    {
>--      MOZ_COUNT_DTOR(nsCSSValue::Array);
>--      CSSVALUE_LIST_FOR_VALUES(val) {
>--        val->~nsCSSValue();
>--      }
>--    }
>--
>--#undef CSSVALUE_LIST_FOR_VALUES
>--
>--  private:
>--    Array(const Array& aOther); // not to be implemented
>--  };
>--
>-+  struct Array;
>-   struct URL {
>-     // Methods are not inline because using an nsIPrincipal means requiring
>-     // caps, which leads to REQUIRES hell, since this header is included all
>-@@ -454,5 +357,102 @@
>-   }         mValue;
>- };
>- 
>--#endif /* nsCSSValue_h___ */
>-+struct nsCSSValue::Array {
>-+
>-+  // return |Array| with reference count of zero
>-+  static Array* Create(PRUint16 aItemCount) {
>-+    return new (aItemCount) Array(aItemCount);
>-+  }
>-+
>-+  nsCSSValue& operator[](PRUint16 aIndex) {
>-+    NS_ASSERTION(aIndex < mCount, "out of range");
>-+    return mArray[aIndex];
>-+  }
>-+
>-+  const nsCSSValue& operator[](PRUint16 aIndex) const {
>-+    NS_ASSERTION(aIndex < mCount, "out of range");
>-+    return mArray[aIndex];
>-+  }
>-+
>-+  nsCSSValue& Item(PRUint16 aIndex) { return (*this)[aIndex]; }
>-+  const nsCSSValue& Item(PRUint16 aIndex) const { return (*this)[aIndex]; }
>-+
>-+  PRUint16 Count() const { return mCount; }
>-+
>-+  PRBool operator==(const Array& aOther) const
>-+  {
>-+    if (mCount != aOther.mCount)
>-+      return PR_FALSE;
>-+    for (PRUint16 i = 0; i < mCount; ++i)
>-+      if ((*this)[i] != aOther[i])
>-+        return PR_FALSE;
>-+    return PR_TRUE;
>-+  }
>-+
>-+  void AddRef() {
>-+    if (mRefCnt == PR_UINT16_MAX) {
>-+      NS_WARNING("refcount overflow, leaking nsCSSValue::Array");
>-+      return;
>-+    }
>-+    ++mRefCnt;
>-+    NS_LOG_ADDREF(this, mRefCnt, "nsCSSValue::Array", sizeof(*this));
>-+  }
>-+  void Release() {
>-+    if (mRefCnt == PR_UINT16_MAX) {
>-+      NS_WARNING("refcount overflow, leaking nsCSSValue::Array");
>-+      return;
>-+    }
>-+    --mRefCnt;
>-+    NS_LOG_RELEASE(this, mRefCnt, "nsCSSValue::Array");
>-+    if (mRefCnt == 0)
>-+      delete this;
>-+  }
>-+
>-+private:
>-+
>-+  PRUint16 mRefCnt;
>-+  const PRUint16 mCount;
>-+  // This must be the last sub-object, since we extend this array to
>-+  // be of size mCount; it needs to be a sub-object so it gets proper
>-+  // alignment.
>-+  nsCSSValue mArray[1];
>- 
>-+  void* operator new(size_t aSelfSize, PRUint16 aItemCount) CPP_THROW_NEW {
>-+    return ::operator new(aSelfSize + sizeof(nsCSSValue) * (aItemCount - 1));
>-+  }
>-+
>-+  void operator delete(void* aPtr) { ::operator delete(aPtr); }
>-+
>-+  nsCSSValue* First() { return mArray; }
>-+
>-+  const nsCSSValue* First() const { return mArray; }
>-+
>-+#define CSSVALUE_LIST_FOR_EXTRA_VALUES(var)                                   \
>-+for (nsCSSValue *var = First() + 1, *var##_end = First() + mCount;          \
>-+     var != var##_end; ++var)
>-+
>-+  Array(PRUint16 aItemCount)
>-+    : mRefCnt(0)
>-+    , mCount(aItemCount)
>-+  {
>-+    MOZ_COUNT_CTOR(nsCSSValue::Array);
>-+    CSSVALUE_LIST_FOR_EXTRA_VALUES(val) {
>-+      new (val) nsCSSValue();
>-+    }
>-+  }
>-+
>-+  ~Array()
>-+  {
>-+    MOZ_COUNT_DTOR(nsCSSValue::Array);
>-+    CSSVALUE_LIST_FOR_EXTRA_VALUES(val) {
>-+      val->~nsCSSValue();
>-+    }
>-+  }
>-+
>-+#undef CSSVALUE_LIST_FOR_VALUES
>-+
>-+private:
>-+  Array(const Array& aOther); // not to be implemented
>-+};
>-+
>-+#endif /* nsCSSValue_h___ */
>Index: www/libxul/files/patch-layout_generic_Makefile.in
>===================================================================
>RCS file: /home/pcvs/ports/www/libxul/files/patch-layout_generic_Makefile.in,v
>retrieving revision 1.1
>diff -u -r1.1 patch-layout_generic_Makefile.in
>--- www/libxul/files/patch-layout_generic_Makefile.in	12 Apr 2009 03:30:29 -0000	1.1
>+++ www/libxul/files/patch-layout_generic_Makefile.in	18 Jul 2010 11:53:19 -0000
>@@ -1,9 +1,9 @@
>---- layout/generic/Makefile.in.orig	2008-06-19 12:29:06.000000000 -0500
>-+++ layout/generic/Makefile.in	2008-06-19 12:30:04.000000000 -0500
>-@@ -188,9 +188,10 @@
>+--- layout/generic/Makefile.in.orig	2009-08-07 00:49:41.000000000 +0200
>++++ layout/generic/Makefile.in	2009-08-09 20:54:53.000000000 +0200
>+@@ -187,9 +187,10 @@
>  		-I$(srcdir)/../../content/base/src \
>  		-I$(srcdir)/../../content/html/content/src \
>- 		-I$(srcdir)/../../dom/src/base \
>+ 		-I$(srcdir)/../../dom/base \
> -		$(MOZ_CAIRO_CFLAGS) \
>  		$(NULL)
>  
>Index: www/libxul/files/patch-media-liboggz-include-oggz-oggz_off_t_generated.h
>===================================================================
>RCS file: www/libxul/files/patch-media-liboggz-include-oggz-oggz_off_t_generated.h
>diff -N www/libxul/files/patch-media-liboggz-include-oggz-oggz_off_t_generated.h
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ www/libxul/files/patch-media-liboggz-include-oggz-oggz_off_t_generated.h	18 Jul 2010 11:53:19 -0000
>@@ -0,0 +1,11 @@
>+--- media/liboggz/include/oggz/oggz_off_t_generated.h.orig	2009-08-24 17:52:50.000000000 +0200
>++++ media/liboggz/include/oggz/oggz_off_t_generated.h	2009-09-10 19:13:22.000000000 +0200
>+@@ -59,7 +59,7 @@
>+ 
>+ #include <sys/types.h>
>+ 
>+-#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2)
>++#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined(__FreeBSD__)
>+ typedef off_t oggz_off_t;
>+ #else
>+ typedef loff_t oggz_off_t;
>Index: www/libxul/files/patch-modules-libpref-src-prefapi.cpp
>===================================================================
>RCS file: www/libxul/files/patch-modules-libpref-src-prefapi.cpp
>diff -N www/libxul/files/patch-modules-libpref-src-prefapi.cpp
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ www/libxul/files/patch-modules-libpref-src-prefapi.cpp	18 Jul 2010 11:53:19 -0000
>@@ -0,0 +1,102 @@
>+
>+This bug is due to the fact, applications are restarted before extension
>+defaults are loaded.
>+
>+To reproduce, choose any preference and set the values like:
>+system default:
>+  pref("prefkey",systemvalue);
>+extension default:
>+  pref("prefkey", extensiondefault);
>+user pref:
>+  user_pref("prefkey", systemvalue);
>+
>+Next, trigger application behaviour similar to upgrade by removing compreg.dat
>+from profile and start the application.
>+
>+Result:
>+User sees extensiondefault after upgrade, because the user_pref has been
>+eliminated ... which is definitly not what the user expects because he explicitly
>+had *systemvalue* set before the upgrade.
>+
>+Evaluation:
>+The bug happens because restart is performed *before* extension defaults have been
>+loaded and the prefapi.cpp always eliminate user preference if the user preference
>+is equal to the actual default (which happens to be extensiondefault normally  - so
>+no reset, but is systemvalue during restart).
>+
>+Fix:
>+1. savePrefs should not try to be smart ... this patch removes the heuristic that guesses
>+whether a setting can be eliminated or not; it should be sufficient to only eliminate
>+prefs in hashPrefs.
>+
>+2. This patch prevents hashPrefs from eliminating the user pref in case we are in
>+*startup* ... unfortunately no such state info exists, which lets us guess that
>+we are in startup for the previously not dealt case: !set_default && 
>+!pref_ValueChanged(pref->defaultPref, value, type) && !PREF_HAS_USER_VALUE(pref).
>+
>+If is the case we explicitly remember that this setting is a user-pref ...
>+even though it might be temporarily equal to the default pref.
>+
>+---
>+ modules/libpref/src/prefapi.cpp |   20 ++++++++++++++------
>+ 1 file changed, 14 insertions(+), 6 deletions(-)
>+
>+Index: modules/libpref/src/prefapi.cpp
>+===================================================================
>+--- modules/libpref/src/prefapi.cpp
>++++ modules/libpref/src/prefapi.cpp
>+@@ -324,23 +324,20 @@
>+     if (!pref)
>+         return PL_DHASH_NEXT;
>+ 
>+     nsCAutoString prefValue;
>+ 
>+     // where we're getting our pref from
>+     PrefValue* sourcePref;
>+ 
>+-    if (PREF_HAS_USER_VALUE(pref) &&
>+-        pref_ValueChanged(pref->defaultPref,
>+-                          pref->userPref,
>+-                          (PrefType) PREF_TYPE(pref)))
>+-        sourcePref = &pref->userPref;
>+-    else if (PREF_IS_LOCKED(pref))
>++    if (PREF_IS_LOCKED(pref))
>+         sourcePref = &pref->defaultPref;
>++    else if (PREF_HAS_USER_VALUE(pref))
>++        sourcePref = &pref->userPref;
>+     else
>+         // do not save default prefs that haven't changed
>+         return PL_DHASH_NEXT;
>+ 
>+     // strings are in quotes!
>+     if (pref->flags & PREF_STRING) {
>+         prefValue = '\"';
>+         str_escape(sourcePref->stringVal, prefValue);
>+@@ -742,16 +739,27 @@
>+            Otherwise, set the user value only if it has changed */
>+         if ( !pref_ValueChanged(pref->defaultPref, value, type) )
>+         {
>+             if (PREF_HAS_USER_VALUE(pref))
>+             {
>+                 pref->flags &= ~PREF_USERSET;
>+                 if (!PREF_IS_LOCKED(pref))
>+                     valueChanged = PR_TRUE;
>++            } else {
>++                // this is tricky: we have !set_default ...
>++                // thus we are setting a user pref; however the user
>++                // pref set is same as *current default*; this normally
>++                // means to un-set ... however since we have
>++                // !PREF_HAS_USER_VALUE(pref) this can only be during
>++                // startup
>++                pref_SetValue(&pref->userPref, value, type);
>++                pref->flags |= PREF_USERSET;
>++                if (!PREF_IS_LOCKED(pref))
>++                    valueChanged = PR_TRUE;
>+             }
>+         }
>+         else if ( !PREF_HAS_USER_VALUE(pref) ||
>+                    pref_ValueChanged(pref->userPref, value, type) )
>+         {
>+             pref_SetValue(&pref->userPref, value, type);
>+             pref->flags |= PREF_USERSET;
>+             if (!PREF_IS_LOCKED(pref))
>Index: www/libxul/files/patch-security_coreconf_FreeBSD.mk
>===================================================================
>RCS file: /home/pcvs/ports/www/libxul/files/patch-security_coreconf_FreeBSD.mk,v
>retrieving revision 1.3
>diff -u -r1.3 patch-security_coreconf_FreeBSD.mk
>--- www/libxul/files/patch-security_coreconf_FreeBSD.mk	28 Dec 2009 11:22:33 -0000	1.3
>+++ www/libxul/files/patch-security_coreconf_FreeBSD.mk	18 Jul 2010 11:53:19 -0000
>@@ -1,57 +1,18 @@
>---- security/coreconf/FreeBSD.mk.orig	2009-11-22 11:51:31.000000000 -0800
>-+++ security/coreconf/FreeBSD.mk	2009-11-22 11:51:44.000000000 -0800
>-@@ -37,16 +37,32 @@
>- 
>- include $(CORE_DEPTH)/coreconf/UNIX.mk
>- 
>--DEFAULT_COMPILER	= gcc
>--CC			= gcc
>--CCC			= g++
>-+CCC			= ${CXX}
>- RANLIB			= ranlib
>- 
>- ifeq ($(OS_TEST),alpha)
>- CPU_ARCH		= alpha
>- else
>-+ifeq ($(OS_TEST),powerpc)
>-+CPU_ARCH		= powerpc
>-+else
>-+ifeq ($(OS_TEST),sparc64)
>-+CPU_ARCH		= sparc64
>-+USE_64			= 1
>-+else
>-+ifeq ($(OS_TEST),ia64)
>-+CPU_ARCH		= ia64
>-+USE_64			= 1
>-+else
>-+ifeq ($(OS_TEST),amd64)
>-+CPU_ARCH		= amd64
>-+else
>+--- security/coreconf/FreeBSD.mk.orig	2010-06-26 07:29:06.000000000 +0200
>++++ security/coreconf/FreeBSD.mk	2010-07-18 13:25:06.000000000 +0200
>+@@ -49,9 +49,6 @@
>+ ifeq ($(CPU_ARCH),pc98)
>  CPU_ARCH		= x86
>  endif
>-+endif
>-+endif
>-+endif
>-+endif
>+-ifeq ($(CPU_ARCH),amd64)
>+-CPU_ARCH		= x86_64
>+-endif
>  
>- OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
>+ OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
>  
>-@@ -73,7 +89,11 @@
>- DLL_SUFFIX		= so.1.0
>- endif
>- 
>--MKSHLIB			= $(CC) $(DSO_LDOPTS)
>-+ifneq (,$(filter alpha ia64,$(OS_TEST)))
>-+MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
>-+else
>-+MKSHLIB			= $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@
>-+endif
>- ifdef MAPFILE
>- 	MKSHLIB += -Wl,--version-script,$(MAPFILE)
>- endif
>-@@ -81,5 +101,3 @@
>-         sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@
>+@@ -87,4 +84,4 @@
>  
>  G++INCLUDES		= -I/usr/include/g++
>--
>+ 
> -INCLUDES		+= -I/usr/X11R6/include
>++#INCLUDES		+= -I/usr/X11R6/include
>Index: www/libxul/files/patch-toolkit-components-history-src-nsGlobalHistory.cpp
>===================================================================
>RCS file: www/libxul/files/patch-toolkit-components-history-src-nsGlobalHistory.cpp
>diff -N www/libxul/files/patch-toolkit-components-history-src-nsGlobalHistory.cpp
>--- www/libxul/files/patch-toolkit-components-history-src-nsGlobalHistory.cpp	12 Apr 2009 03:30:29 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,24 +0,0 @@
>---- toolkit/components/history/src/nsGlobalHistory.cpp.orig	2006-02-02 20:55:17.000000000 +0100
>-+++ toolkit/components/history/src/nsGlobalHistory.cpp
>-@@ -322,7 +322,9 @@ matchAgeInDaysCallback(nsIMdbRow *row, v
>-   if (err != 0) return PR_FALSE;
>-   
>-   PRTime rowDate;
>--  PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", &rowDate);
>-+  long long ld;
>-+  PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", &ld);
>-+  rowDate = ld;
>- 
>-   PRInt32 days = GetAgeInDays(matchSearchTerm->now, rowDate);
>-   
>-@@ -1067,7 +1069,9 @@ nsGlobalHistory::GetRowValue(nsIMdbRow *
>-   if (!yarn.mYarn_Fill || !yarn.mYarn_Buf)
>-     return NS_OK;
>- 
>--  PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", aResult);
>-+  long long ld;
>-+  PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", &ld);
>-+  *aResult = ld;
>-   
>-   return NS_OK;
>- }
>Index: www/libxul/files/patch-toolkit-components-places-src-nsMorkHistoryImporter.cpp
>===================================================================
>RCS file: www/libxul/files/patch-toolkit-components-places-src-nsMorkHistoryImporter.cpp
>diff -N www/libxul/files/patch-toolkit-components-places-src-nsMorkHistoryImporter.cpp
>--- www/libxul/files/patch-toolkit-components-places-src-nsMorkHistoryImporter.cpp	12 Apr 2009 03:30:29 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,17 +0,0 @@
>---- toolkit/components/places/src/nsMorkHistoryImporter.cpp.orig	2008-03-19 20:30:49.000000000 +0100
>-+++ toolkit/components/places/src/nsMorkHistoryImporter.cpp	2008-12-17 09:38:05.000000000 +0100
>-@@ -148,9 +148,12 @@ AddToHistoryCB(const nsCSubstring &aRowI
>-     }
>- 
>-     PRTime date;
>--    if (PR_sscanf(values[kLastVisitColumn].get(), "%lld", &date) != 1) {
>-+    long long ld;
>-+    if (PR_sscanf(values[kLastVisitColumn].get(), "%lld", &ld) != 1) {
>-       date = -1;
>--    }
>-+    } else {
>-+      date = ld;
>-+   }
>- 
>-     PRBool isTyped = values[kTypedColumn].EqualsLiteral("1");
>-     PRInt32 transition = isTyped ?
>Index: www/libxul/files/patch-toolkit-components-url-classifier-src-nsUrlClassifierDBService.cpp
>===================================================================
>RCS file: www/libxul/files/patch-toolkit-components-url-classifier-src-nsUrlClassifierDBService.cpp
>diff -N www/libxul/files/patch-toolkit-components-url-classifier-src-nsUrlClassifierDBService.cpp
>--- www/libxul/files/patch-toolkit-components-url-classifier-src-nsUrlClassifierDBService.cpp	12 Apr 2009 03:30:29 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,28 +0,0 @@
>-# reported upstream as: https://bugzilla.mozilla.org/show_bug.cgi?id=469276
>-
>---- toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp.orig	2008-08-25 22:59:14.000000000 +0200
>-+++ toolkit/components/url-classifier/src/nsUrlClassifierDBService.cpp	2008-12-12 16:31:11.000000000 +0100
>-@@ -2023,8 +2023,9 @@
>-           return NS_ERROR_FAILURE;
>-         }
>-         const nsCSubstring& str = Substring(chunk, start, 4);
>--        const PRUint32 *p = reinterpret_cast<const PRUint32*>(str.BeginReading());
>--        entry->mAddChunkId = PR_ntohl(*p);
>-+        PRUint32 p;
>-+	memcpy(&p, str.BeginReading(), 4);
>-+        entry->mAddChunkId = PR_ntohl(p);
>-         if (entry->mAddChunkId == 0) {
>-           NS_WARNING("Received invalid chunk number.");
>-           return NS_ERROR_FAILURE;
>-@@ -2052,8 +2053,9 @@
>- 
>-         if (chunkType == CHUNK_SUB) {
>-           const nsCSubstring& str = Substring(chunk, start, 4);
>--          const PRUint32 *p = reinterpret_cast<const PRUint32*>(str.BeginReading());
>--          entry->mAddChunkId = PR_ntohl(*p);
>-+	  PRUint32 p;
>-+	  memcpy(&p, str.BeginReading(), 4);
>-+          entry->mAddChunkId = PR_ntohl(p);
>-           if (entry->mAddChunkId == 0) {
>-             NS_WARNING("Received invalid chunk number.");
>-             return NS_ERROR_FAILURE;
>Index: www/libxul/files/patch-toolkit_mozapps_installer_packager.mk
>===================================================================
>RCS file: www/libxul/files/patch-toolkit_mozapps_installer_packager.mk
>diff -N www/libxul/files/patch-toolkit_mozapps_installer_packager.mk
>--- www/libxul/files/patch-toolkit_mozapps_installer_packager.mk	10 Apr 2009 05:56:28 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,11 +0,0 @@
>---- toolkit/mozapps/installer/packager.mk.orig	2007-09-26 13:45:01.000000000 -0400
>-+++ toolkit/mozapps/installer/packager.mk	2007-09-26 13:47:29.000000000 -0400
>-@@ -409,7 +409,7 @@
>- 	(cd $(DIST)/sdk/include && tar $(TAR_CREATE_FLAGS) - .) | \
>- 	  (cd $(DESTDIR)$(includedir)/stable && tar -xf -)
>- # The dist/include has module subdirectories that we need to flatten
>--	find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
>-+	find $(DIST)/include -type f -o -type l -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
>- # IDL directory is stable (dist/sdk/idl) and unstable (dist/idl)
>- 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/stable 
>- 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable
>Index: www/libxul/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
>===================================================================
>RCS file: www/libxul/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
>diff -N www/libxul/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h
>--- www/libxul/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h	22 Nov 2009 21:32:27 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,20 +0,0 @@
>---- xpcom/reflect/xptcall/src/xptcprivate.h.orig	2009-11-09 21:43:49.000000000 -0800
>-+++ xpcom/reflect/xptcall/src/xptcprivate.h	2009-11-09 21:44:05.000000000 -0800
>-@@ -45,7 +45,7 @@
>- 
>- class xptiInterfaceEntry;
>- 
>--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
>-+#if !defined(__ia64)
>- #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0;
>- #else
>- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0;
>-@@ -62,7 +62,7 @@
>- #undef STUB_ENTRY
>- #undef SENTINEL_ENTRY
>- 
>--#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__))
>-+#if !defined(__ia64)
>- #define STUB_ENTRY(n) NS_IMETHOD Stub##n();
>- #else
>- #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64);
>Index: www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
>===================================================================
>RCS file: /home/pcvs/ports/www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in,v
>retrieving revision 1.1
>diff -u -r1.1 patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
>--- www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in	10 Apr 2009 05:56:28 -0000	1.1
>+++ www/libxul/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in	18 Jul 2010 11:53:19 -0000
>@@ -1,16 +1,16 @@
>---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	Thu Aug 14 21:00:23 2003
>-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	Sun Feb  1 15:06:40 2004
>-@@ -49,6 +49,9 @@
>- ifeq (86,$(findstring 86,$(OS_TEST)))
>+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2009-09-16 04:41:25.000000000 +0200
>++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	2009-10-03 21:30:21.000000000 +0200
>+@@ -73,6 +73,9 @@
>+ DEFINES		+= -DKEEP_STACK_16_BYTE_ALIGNED
>  CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
>  endif
> +ifeq (x86_64,$(OS_TEST))
> +CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
> +endif
>  endif
>- #
>- # New code for Linux, et. al., with gcc
>-@@ -60,7 +63,7 @@
>+ endif
>+ 
>+@@ -96,7 +99,7 @@
>  endif
>  endif
>  # IA64 Linux
>@@ -19,7 +19,18 @@
>  ifneq (,$(findstring ia64,$(OS_TEST)))
>  CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
>  ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
>-@@ -106,9 +109,15 @@
>+@@ -111,8 +114,8 @@
>+ #
>+ # FreeBSD/amd64
>+ #
>+-ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64)
>+-CPPSRCS		:= xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp
>++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64)
>++CPPSRCS         := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
>+ endif
>+ #
>+ # BeOS/Intel (uses the same unixish_x86 code)
>+@@ -165,9 +168,15 @@
>  ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
>  endif
>  #
>@@ -36,19 +47,28 @@
>  CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
>  endif
>  #
>-@@ -294,6 +303,15 @@
>- ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc)
>- CPPSRCS		:= xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp
>+@@ -322,7 +331,7 @@
>+ #
>+ # Linux/PPC
>+ #
>+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc)
>++ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST)))
>+ CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
>+ ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
>+ AS		:= $(CC) -c -x assembler-with-cpp
>+@@ -400,6 +409,15 @@
>  ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
>-+endif
>-+#
>+ endif
>+ #
> +# FreeBSD/SPARC64
> +#
> +ifeq ($(OS_ARCH),FreeBSD)
> +ifneq (,$(findstring sparc,$(OS_TEST)))
>-+CPPSRCS		:= xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp
>-+ASFILES		:= xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s
>++CPPSRCS		:= xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
>++ASFILES		:= xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
> +endif
>- endif
>++endif
>++#
>+ # OpenBSD/SPARC
>  #
>- # Solaris/SPARC
>+ ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc)
>Index: www/libxul/files/patch-xpfe-components-history-src-nsGlobalHistory.cpp
>===================================================================
>RCS file: www/libxul/files/patch-xpfe-components-history-src-nsGlobalHistory.cpp
>diff -N www/libxul/files/patch-xpfe-components-history-src-nsGlobalHistory.cpp
>--- www/libxul/files/patch-xpfe-components-history-src-nsGlobalHistory.cpp	12 Apr 2009 03:30:29 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,24 +0,0 @@
>---- xpfe/components/history/src/nsGlobalHistory.cpp.orig	2007-12-03 05:25:14.000000000 +0100
>-+++ xpfe/components/history/src/nsGlobalHistory.cpp
>-@@ -304,7 +304,9 @@ matchAgeInDaysCallback(nsIMdbRow *row, v
>-   if (err != 0) return PR_FALSE;
>-   
>-   PRTime rowDate;
>--  PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", &rowDate);
>-+  long long ld;
>-+  PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", &ld);
>-+  rowDate = ld;
>- 
>-   PRInt32 days = matchSearchTerm->globalHist->GetAgeInDays(rowDate);
>-   
>-@@ -1000,7 +1002,9 @@ nsGlobalHistory::GetRowValue(nsIMdbRow *
>-   if (!yarn.mYarn_Fill || !yarn.mYarn_Buf)
>-     return NS_OK;
>- 
>--  PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", aResult);
>-+  long long ld;
>-+  PR_sscanf((const char*)yarn.mYarn_Buf, "%lld", &ld);
>-+  *aResult = ld;
>- 
>-   return NS_OK;
>- }
>Index: www/libxul/files/patch-xptcall-amd64
>===================================================================
>RCS file: /home/pcvs/ports/www/libxul/files/patch-xptcall-amd64,v
>retrieving revision 1.1
>diff -u -r1.1 patch-xptcall-amd64
>--- www/libxul/files/patch-xptcall-amd64	10 Apr 2009 05:56:28 -0000	1.1
>+++ www/libxul/files/patch-xptcall-amd64	18 Jul 2010 11:53:19 -0000
>@@ -1,5 +1,5 @@
>---- /dev/null	Wed Dec 31 16:00:00 1969
>-+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp	Thu Oct 16 22:59:43 2003
>+--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp.orig	2009-10-02 22:13:13.000000000 +0200
>++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp	2009-10-02 22:41:36.000000000 +0200
> @@ -0,0 +1,174 @@
> +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
> +// Platform specific code to invoke XPCOM methods on native objects
>@@ -98,8 +98,8 @@
> +}
> +
> +extern "C"
>-+XPTC_PUBLIC_API(nsresult)
>-+XPTC_InvokeByIndex(nsISupports * that, PRUint32 methodIndex,
>++EXPORT_XPCOM_API(nsresult)
>++NS_InvokeByIndex_P(nsISupports * that, PRUint32 methodIndex,
> +                   PRUint32 paramCount, nsXPTCVariant * params)
> +{
> +    PRUint32 nr_gpr, nr_fpr, nr_stack;
>@@ -175,14 +175,15 @@
> +    PRUint32 result = ((Method)methodAddress)(a0, a1, a2, a3, a4, a5);
> +    return result;
> +}
>---- /dev/null	Wed Dec 31 16:00:00 1969
>-+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp	Thu Oct 16 23:01:08 2003
>-@@ -0,0 +1,206 @@
>+--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp.orig	2009-10-02 22:13:13.000000000 +0200
>++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp	2009-10-02 22:39:37.000000000 +0200
>+@@ -0,0 +1,200 @@
> +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
> +
> +// Implement shared vtbl methods.
> +
> +#include "xptcprivate.h"
>++#include "xptiprivate.h"
> +
> +// The Linux/x86-64 ABI passes the first 6 integral parameters and the
> +// first 8 floating point parameters in registers (rdi, rsi, rdx, rcx,
>@@ -209,7 +210,6 @@
> +{
> +    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
> +    nsXPTCMiniVariant* dispatchParams = NULL;
>-+    nsIInterfaceInfo* iface_info = NULL;
> +    const nsXPTMethodInfo* info;
> +    PRUint32 paramCount;
> +    PRUint32 i;
>@@ -217,12 +217,7 @@
> +
> +    NS_ASSERTION(self,"no self");
> +
>-+    self->GetInterfaceInfo(&iface_info);
>-+    NS_ASSERTION(iface_info,"no interface info");
>-+    if (! iface_info)
>-+        return NS_ERROR_UNEXPECTED;
>-+
>-+    iface_info->GetMethodInfo(PRUint16(methodIndex), &info);
>++    self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info);
> +    NS_ASSERTION(info,"no method info");
> +    if (! info)
> +        return NS_ERROR_UNEXPECTED;
>@@ -297,9 +292,8 @@
> +        }
> +    }
> +
>-+    result = self->CallMethod((PRUint16) methodIndex, info, dispatchParams);
>-+
>-+    NS_RELEASE(iface_info);
>++    result = self->mOuter->CallMethod((PRUint16)methodIndex, info,
>++                                      dispatchParams);
> +
> +    if (dispatchParams != paramBuffer)
> +        delete [] dispatchParams;
>Index: www/libxul/files/patch-xptcall-powerpc
>===================================================================
>RCS file: www/libxul/files/patch-xptcall-powerpc
>diff -N www/libxul/files/patch-xptcall-powerpc
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ www/libxul/files/patch-xptcall-powerpc	18 Jul 2010 11:53:19 -0000
>@@ -0,0 +1,580 @@
>+--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_freebsd.s.orig	2009-09-26 22:23:56.000000000 +0200
>++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_freebsd.s	2009-09-27 10:01:48.000000000 +0200
>+@@ -0,0 +1,110 @@
>++# -*- Mode: Asm -*-
>++#
>++# The contents of this file are subject to the Netscape Public
>++# License Version 1.1 (the "License"); you may not use this file
>++# except in compliance with the License. You may obtain a copy of
>++# the License at http://www.mozilla.org/NPL/
>++#
>++# Software distributed under the License is distributed on an "AS
>++# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
>++# implied. See the License for the specific language governing
>++# rights and limitations under the License.
>++#
>++# The Original Code is mozilla.org code.
>++#
>++# The Initial Developer of the Original Code is Netscape
>++# Communications Corporation.  Portions created by Netscape are
>++# Copyright (C) 1999 Netscape Communications Corporation. All
>++# Rights Reserved.
>++#
>++# Contributor(s):
>++#   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
>++#   beard@netscape.com (Patrick Beard)
>++#   waterson@netscape.com (Chris Waterson)
>++#
>++.set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
>++.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
>++.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
>++.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
>++.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
>++.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
>++.set r30,30; .set r31,31
>++.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
>++.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
>++.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
>++.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
>++.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
>++.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
>++.set f30,30; .set f31,31
>++		      
>++        .section ".text"
>++	.align 2
>++	.globl NS_InvokeByIndex_P
>++	.type  NS_InvokeByIndex_P,@function
>++
>++#
>++# NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
>++#                    PRUint32 paramCount, nsXPTCVariant* params)
>++#
>++
>++NS_InvokeByIndex_P:
>++	stwu    sp,-32(sp)			# setup standard stack frame
>++	mflr    r0				# save LR
>++	stw     r3,8(sp)			# r3 <= that
>++	stw     r4,12(sp)			# r4 <= methodIndex
>++	stw     r30,16(sp)
>++	stw     r31,20(sp)
>++
>++	stw     r0,36(sp)			# store LR backchain
>++	mr      r31,sp
>++
>++	rlwinm  r10,r5,3,0,27			# r10 = (ParamCount * 2 * 4) & ~0x0f
>++	addi    r0,r10,96			# reserve stack for GPR and FPR register save area r0 = r10 + 96
>++	lwz     r9,0(sp)			# r9 = backchain
>++	neg     r0,r0
>++	stwux   r9,sp,r0			# reserve stack sapce and save SP backchain
>++	
>++	addi    r3,sp,8				# r3 <= args
>++	mr      r4,r5				# r4 <= paramCount
>++	mr      r5,r6				# r5 <= params
>++	add     r6,r3,r10			# r6 <= gpregs ( == args + r10 )
>++	mr      r30,r6				# store in r30 for use later...
>++	addi    r7,r6,32			# r7 <= fpregs ( == gpregs + 32 )
>++
>++	bl      invoke_copy_to_stack@local	# (args, paramCount, params, gpregs, fpregs)
>++
>++	lfd     f1,32(r30)			# load FP registers with method parameters
>++	lfd     f2,40(r30)   
>++	lfd     f3,48(r30)  
>++	lfd     f4,56(r30)  
>++	lfd     f5,64(r30)  
>++	lfd     f6,72(r30)  
>++	lfd     f7,80(r30)  
>++	lfd     f8,88(r30)
>++
>++	lwz     r3,8(r31)			# r3 <= that
>++	lwz     r4,12(r31)			# r4 <= methodIndex
>++	lwz     r5,0(r3)			# r5 <= vtable ( == *that )
>++	
>++	slwi    r4,r4,2				# convert to offset ( *= 4 )
>++	lwzx    r0,r5,r4			# r0 <= methodpointer ( == vtable + offset )
>++
>++        lwz     r4,4(r30)			# load GP regs with method parameters
>++	lwz     r5,8(r30)   
>++	lwz     r6,12(r30)  
>++	lwz     r7,16(r30)  
>++	lwz     r8,20(r30)  
>++	lwz     r9,24(r30)  
>++	lwz     r10,28(r30)
>++
>++	mtlr    r0				# copy methodpointer to LR    
>++	blrl					# call method
>++	
>++	lwz     r30,16(r31)			# restore r30 & r31
>++	lwz     r31,20(r31)
>++	
>++	lwz     r11,0(sp)			# clean up the stack
>++	lwz     r0,4(r11)
>++	mtlr    r0
>++	mr      sp,r11
>++	blr
>+--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_freebsd.cpp.orig	2009-09-26 22:23:56.000000000 +0200
>++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_freebsd.cpp	2009-09-27 09:58:59.000000000 +0200
>+@@ -0,0 +1,141 @@
>++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
>++/* ***** BEGIN LICENSE BLOCK *****
>++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
>++ *
>++ * The contents of this file are subject to the Mozilla Public License Version
>++ * 1.1 (the "License"); you may not use this file except in compliance with
>++ * the License. You may obtain a copy of the License at
>++ * http://www.mozilla.org/MPL/
>++ *
>++ * Software distributed under the License is distributed on an "AS IS" basis,
>++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
>++ * for the specific language governing rights and limitations under the
>++ * License.
>++ *
>++ * The Original Code is mozilla.org code.
>++ *
>++ * The Initial Developer of the Original Code is
>++ * Netscape Communications Corporation.
>++ * Portions created by the Initial Developer are Copyright (C) 1998
>++ * the Initial Developer. All Rights Reserved.
>++ *
>++ * Contributor(s):
>++ *   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
>++ *   beard@netscape.com (Patrick Beard)
>++ *   waterson@netscape.com (Chris Waterson)
>++ *
>++ * Alternatively, the contents of this file may be used under the terms of
>++ * either of the GNU General Public License Version 2 or later (the "GPL"),
>++ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
>++ * in which case the provisions of the GPL or the LGPL are applicable instead
>++ * of those above. If you wish to allow use of your version of this file only
>++ * under the terms of either the GPL or the LGPL, and not to allow others to
>++ * use your version of this file under the terms of the MPL, indicate your
>++ * decision by deleting the provisions above and replace them with the notice
>++ * and other provisions required by the GPL or the LGPL. If you do not delete
>++ * the provisions above, a recipient may use your version of this file under
>++ * the terms of any one of the MPL, the GPL or the LGPL.
>++ *
>++ * ***** END LICENSE BLOCK ***** */
>++
>++// Platform specific code to invoke XPCOM methods on native objects
>++
>++// The purpose of NS_InvokeByIndex_P() is to map a platform
>++// indepenpent call to the platform ABI. To do that,
>++// NS_InvokeByIndex_P() has to determine the method to call via vtable
>++// access. The parameters for the method are read from the
>++// nsXPTCVariant* and prepared for th native ABI.  For the Linux/PPC
>++// ABI this means that the first 8 integral and floating point
>++// parameters are passed in registers.
>++
>++#include "xptcprivate.h"
>++
>++// 8 integral parameters are passed in registers
>++#define GPR_COUNT     8
>++
>++// 8 floating point parameters are passed in registers, floats are
>++// promoted to doubles when passed in registers
>++#define FPR_COUNT     8
>++
>++extern "C" PRUint32
>++invoke_count_words(PRUint32 paramCount, nsXPTCVariant* s)
>++{
>++  return PRUint32(((paramCount * 2) + 3) & ~3);
>++}
>++
>++extern "C" void
>++invoke_copy_to_stack(PRUint32* d,
>++                     PRUint32 paramCount,
>++                     nsXPTCVariant* s, 
>++                     PRUint32* gpregs,
>++                     double* fpregs)
>++{
>++    PRUint32 gpr = 1; // skip one GP reg for 'that'
>++    PRUint32 fpr = 0;
>++    PRUint32 tempu32;
>++    PRUint64 tempu64;
>++    
>++    for(uint32 i = 0; i < paramCount; i++, s++) {
>++        if(s->IsPtrData())
>++            tempu32 = (PRUint32) s->ptr;
>++        else {
>++            switch(s->type) {
>++            case nsXPTType::T_FLOAT:                                  break;
>++            case nsXPTType::T_DOUBLE:                                 break;
>++            case nsXPTType::T_I8:     tempu32 = s->val.i8;            break;
>++            case nsXPTType::T_I16:    tempu32 = s->val.i16;           break;
>++            case nsXPTType::T_I32:    tempu32 = s->val.i32;           break;
>++            case nsXPTType::T_I64:    tempu64 = s->val.i64;           break;
>++            case nsXPTType::T_U8:     tempu32 = s->val.u8;            break;
>++            case nsXPTType::T_U16:    tempu32 = s->val.u16;           break;
>++            case nsXPTType::T_U32:    tempu32 = s->val.u32;           break;
>++            case nsXPTType::T_U64:    tempu64 = s->val.u64;           break;
>++            case nsXPTType::T_BOOL:   tempu32 = s->val.b;             break;
>++            case nsXPTType::T_CHAR:   tempu32 = s->val.c;             break;
>++            case nsXPTType::T_WCHAR:  tempu32 = s->val.wc;            break;
>++            default:                  tempu32 = (PRUint32) s->val.p;  break;
>++            }
>++        }
>++
>++        if (!s->IsPtrData() && s->type == nsXPTType::T_DOUBLE) {
>++            if (fpr < FPR_COUNT)
>++                fpregs[fpr++]    = s->val.d;
>++            else {
>++                if ((PRUint32) d & 4) d++; // doubles are 8-byte aligned on stack
>++                *((double*) d) = s->val.d;
>++                d += 2;
>++            }
>++        }
>++        else if (!s->IsPtrData() && s->type == nsXPTType::T_FLOAT) {
>++            if (fpr < FPR_COUNT)
>++                fpregs[fpr++]   = s->val.f; // if passed in registers, floats are promoted to doubles
>++            else
>++                *((float*) d++) = s->val.f;
>++        }
>++        else if (!s->IsPtrData() && (s->type == nsXPTType::T_I64
>++                                     || s->type == nsXPTType::T_U64)) {
>++            if ((gpr + 1) < GPR_COUNT) {
>++                if (gpr & 1) gpr++; // longlongs are aligned in odd/even register pairs, eg. r5/r6
>++                *((PRUint64*) &gpregs[gpr]) = tempu64;
>++                gpr += 2;
>++            }
>++            else {
>++                if ((PRUint32) d & 4) d++; // longlongs are 8-byte aligned on stack
>++                *((PRUint64*) d)            = tempu64;
>++                d += 2;
>++            }
>++        }
>++        else {
>++            if (gpr < GPR_COUNT)
>++                gpregs[gpr++] = tempu32;
>++            else
>++                *d++          = tempu32;
>++        }
>++        
>++    }
>++}
>++
>++extern "C"
>++EXPORT_XPCOM_API(nsresult)
>++NS_InvokeByIndex_P(nsISupports* that, PRUint32 methodIndex,
>++                   PRUint32 paramCount, nsXPTCVariant* params);
>+--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_freebsd.s.orig	2009-09-26 22:23:56.000000000 +0200
>++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_freebsd.s	2009-09-26 22:23:56.000000000 +0200
>+@@ -0,0 +1,89 @@
>++# -*- Mode: Asm -*-
>++#
>++# The contents of this file are subject to the Netscape Public
>++# License Version 1.1 (the "License"); you may not use this file
>++# except in compliance with the License. You may obtain a copy of
>++# the License at http://www.mozilla.org/NPL/
>++#
>++# Software distributed under the License is distributed on an "AS
>++# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
>++# implied. See the License for the specific language governing
>++# rights and limitations under the License.
>++#
>++# The Original Code is mozilla.org code.
>++#
>++# The Initial Developer of the Original Code is Netscape
>++# Communications Corporation.  Portions created by Netscape are
>++# Copyright (C) 1999 Netscape Communications Corporation. All
>++# Rights Reserved.
>++#
>++# Contributor(s): 
>++#   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
>++#   beard@netscape.com (Patrick Beard)
>++#   waterson@netscape.com (Chris Waterson)
>++#
>++
>++.set r0,0; .set sp,1; .set RTOC,2; .set r3,3; .set r4,4
>++.set r5,5; .set r6,6; .set r7,7; .set r8,8; .set r9,9
>++.set r10,10; .set r11,11; .set r12,12; .set r13,13; .set r14,14
>++.set r15,15; .set r16,16; .set r17,17; .set r18,18; .set r19,19
>++.set r20,20; .set r21,21; .set r22,22; .set r23,23; .set r24,24
>++.set r25,25; .set r26,26; .set r27,27; .set r28,28; .set r29,29
>++.set r30,30; .set r31,31
>++.set f0,0; .set f1,1; .set f2,2; .set f3,3; .set f4,4
>++.set f5,5; .set f6,6; .set f7,7; .set f8,8; .set f9,9
>++.set f10,10; .set f11,11; .set f12,12; .set f13,13; .set f14,14
>++.set f15,15; .set f16,16; .set f17,17; .set f18,18; .set f19,19
>++.set f20,20; .set f21,21; .set f22,22; .set f23,23; .set f24,24
>++.set f25,25; .set f26,26; .set f27,27; .set f28,28; .set f29,29
>++.set f30,30; .set f31,31
>++
>++        .section ".text"
>++        .align 2
>++	.globl SharedStub
>++	.type  SharedStub,@function
>++
>++SharedStub:
>++        stwu	sp,-112(sp)			# room for 
>++						# linkage (8),
>++						# gprData (32),
>++						# fprData (64), 
>++						# stack alignment(8)
>++        mflr	r0
>++	stw	r0,116(sp)			# save LR backchain
>++
>++	stw	r4,12(sp)			# save GP registers
>++	stw	r5,16(sp)			# (n.b. that we don't save r3
>++	stw	r6,20(sp)			# because PrepareAndDispatch() is savvy)
>++	stw	r7,24(sp)
>++	stw	r8,28(sp)
>++	stw	r9,32(sp)
>++	stw	r10,36(sp)
>++
>++	stfd	f1,40(sp)			# save FP registers
>++	stfd	f2,48(sp)
>++	stfd	f3,56(sp)
>++	stfd	f4,64(sp)
>++	stfd	f5,72(sp)
>++	stfd	f6,80(sp)
>++	stfd	f7,88(sp)
>++	stfd	f8,96(sp)
>++
>++						# r3 has the 'self' pointer already
>++	
>++	mr      r4,r11				# r4 <= methodIndex selector, passed
>++						# via r11 in the nsXPTCStubBase::StubXX() call
>++	
>++	addi	r5,sp,120			# r5 <= pointer to callers args area,
>++						# beyond r3-r10/f1-f8 mapped range
>++	
>++	addi	r6,sp,8				# r6 <= gprData
>++	addi	r7,sp,40			# r7 <= fprData
>++      
>++	bl	PrepareAndDispatch@local	# Go!
>++    
>++	lwz	r0,116(sp)			# restore LR
>++	mtlr	r0
>++	la	sp,112(sp)			# clean up the stack
>++	blr
>++
>+--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_freebsd.cpp.orig	2009-09-26 22:23:56.000000000 +0200
>++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_freebsd.cpp	2009-09-26 22:43:57.000000000 +0200
>+@@ -0,0 +1,228 @@
>++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
>++/* ***** BEGIN LICENSE BLOCK *****
>++ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
>++ *
>++ * The contents of this file are subject to the Mozilla Public License Version
>++ * 1.1 (the "License"); you may not use this file except in compliance with
>++ * the License. You may obtain a copy of the License at
>++ * http://www.mozilla.org/MPL/
>++ *
>++ * Software distributed under the License is distributed on an "AS IS" basis,
>++ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
>++ * for the specific language governing rights and limitations under the
>++ * License.
>++ *
>++ * The Original Code is mozilla.org code.
>++ *
>++ * The Initial Developer of the Original Code is
>++ * Netscape Communications Corporation.
>++ * Portions created by the Initial Developer are Copyright (C) 1999
>++ * the Initial Developer. All Rights Reserved.
>++ *
>++ * Contributor(s):
>++ *   Franz.Sirl-kernel@lauterbach.com (Franz Sirl)
>++ *   beard@netscape.com (Patrick Beard)
>++ *   waterson@netscape.com (Chris Waterson)
>++ *
>++ * Alternatively, the contents of this file may be used under the terms of
>++ * either of the GNU General Public License Version 2 or later (the "GPL"),
>++ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
>++ * in which case the provisions of the GPL or the LGPL are applicable instead
>++ * of those above. If you wish to allow use of your version of this file only
>++ * under the terms of either the GPL or the LGPL, and not to allow others to
>++ * use your version of this file under the terms of the MPL, indicate your
>++ * decision by deleting the provisions above and replace them with the notice
>++ * and other provisions required by the GPL or the LGPL. If you do not delete
>++ * the provisions above, a recipient may use your version of this file under
>++ * the terms of any one of the MPL, the GPL or the LGPL.
>++ *
>++ * ***** END LICENSE BLOCK ***** */
>++
>++// Implement shared vtbl methods.
>++
>++#include "xptcprivate.h"
>++#include "xptiprivate.h"
>++
>++// The PPC/SYSV ABI passes the first 8 integral
>++// parameters and the first 8 floating point parameters in registers
>++// (r3-r10 and f1-f8), no stack space is allocated for these by the
>++// caller.  The rest of the parameters are passed in the callers stack
>++// area. The stack pointer has to retain 16-byte alignment, longlongs
>++// and doubles are aligned on 8-byte boundaries.
>++
>++#define PARAM_BUFFER_COUNT     16
>++#define GPR_COUNT               8
>++#define FPR_COUNT               8
>++
>++// PrepareAndDispatch() is called by SharedStub() and calls the actual method.
>++//
>++// - 'args[]' contains the arguments passed on stack
>++// - 'gprData[]' contains the arguments passed in integer registers
>++// - 'fprData[]' contains the arguments passed in floating point registers
>++// 
>++// The parameters are mapped into an array of type 'nsXPTCMiniVariant'
>++// and then the method gets called.
>++
>++extern "C" nsresult
>++PrepareAndDispatch(nsXPTCStubBase* self,
>++                   PRUint32 methodIndex,
>++                   PRUint32* args,
>++                   PRUint32 *gprData,
>++                   double *fprData)
>++{
>++    nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT];
>++    nsXPTCMiniVariant* dispatchParams = NULL;
>++    const nsXPTMethodInfo* info = NULL;
>++    PRUint32 paramCount;
>++    PRUint32 i;
>++    nsresult result = NS_ERROR_FAILURE;
>++
>++    NS_ASSERTION(self,"no self");
>++
>++    self->mEntry->GetMethodInfo(PRUint16(methodIndex), &info);
>++    NS_ASSERTION(info,"no method info");
>++    if (! info)
>++        return NS_ERROR_UNEXPECTED;
>++
>++    paramCount = info->GetParamCount();
>++
>++    // setup variant array pointer
>++    if(paramCount > PARAM_BUFFER_COUNT)
>++        dispatchParams = new nsXPTCMiniVariant[paramCount];
>++    else
>++        dispatchParams = paramBuffer;
>++
>++    NS_ASSERTION(dispatchParams,"no place for params");
>++    if (! dispatchParams)
>++        return NS_ERROR_OUT_OF_MEMORY;
>++
>++    PRUint32* ap = args;
>++    PRUint32 gpr = 1;    // skip one GPR register
>++    PRUint32 fpr = 0;
>++    PRUint32 tempu32;
>++    PRUint64 tempu64;
>++
>++    for(i = 0; i < paramCount; i++) {
>++        const nsXPTParamInfo& param = info->GetParam(i);
>++        const nsXPTType& type = param.GetType();
>++        nsXPTCMiniVariant* dp = &dispatchParams[i];
>++	
>++        if (!param.IsOut() && type == nsXPTType::T_DOUBLE) {
>++            if (fpr < FPR_COUNT)
>++                dp->val.d = fprData[fpr++];
>++            else {
>++                if ((PRUint32) ap & 4) ap++; // doubles are 8-byte aligned on stack
>++                dp->val.d = *(double*) ap;
>++                ap += 2;
>++            }
>++            continue;
>++        }
>++        else if (!param.IsOut() && type == nsXPTType::T_FLOAT) {
>++            if (fpr < FPR_COUNT)
>++                dp->val.f = (float) fprData[fpr++]; // in registers floats are passed as doubles
>++            else
>++                dp->val.f = *(float*) ap++;
>++            continue;
>++        }
>++        else if (!param.IsOut() && (type == nsXPTType::T_I64
>++                                    || type == nsXPTType::T_U64)) {
>++            if (gpr & 1) gpr++; // longlongs are aligned in odd/even register pairs, eg. r5/r6
>++            if ((gpr + 1) < GPR_COUNT) {
>++                tempu64 = *(PRUint64*) &gprData[gpr];
>++                gpr += 2;
>++            }
>++            else {
>++                if ((PRUint32) ap & 4) ap++; // longlongs are 8-byte aligned on stack
>++                tempu64 = *(PRUint64*) ap;
>++                ap += 2;
>++            }
>++        }
>++        else {
>++            if (gpr < GPR_COUNT)
>++                tempu32 = gprData[gpr++];
>++            else
>++                tempu32 = *ap++;
>++        }
>++
>++        if(param.IsOut() || !type.IsArithmetic()) {
>++            dp->val.p = (void*) tempu32;
>++            continue;
>++        }
>++
>++        switch(type) {
>++        case nsXPTType::T_I8:      dp->val.i8  = (PRInt8)   tempu32; break;
>++        case nsXPTType::T_I16:     dp->val.i16 = (PRInt16)  tempu32; break;
>++        case nsXPTType::T_I32:     dp->val.i32 = (PRInt32)  tempu32; break;
>++        case nsXPTType::T_I64:     dp->val.i64 = (PRInt64)  tempu64; break;
>++        case nsXPTType::T_U8:      dp->val.u8  = (PRUint8)  tempu32; break;
>++        case nsXPTType::T_U16:     dp->val.u16 = (PRUint16) tempu32; break;
>++        case nsXPTType::T_U32:     dp->val.u32 = (PRUint32) tempu32; break;
>++        case nsXPTType::T_U64:     dp->val.u64 = (PRUint64) tempu64; break;
>++        case nsXPTType::T_BOOL:    dp->val.b   = (PRBool)   tempu32; break;
>++        case nsXPTType::T_CHAR:    dp->val.c   = (char)     tempu32; break;
>++        case nsXPTType::T_WCHAR:   dp->val.wc  = (wchar_t)  tempu32; break;
>++
>++        default:
>++            NS_ASSERTION(0, "bad type");
>++            break;
>++        }
>++    }
>++
>++    result = self->mOuter->CallMethod((PRUint16)methodIndex,
>++                                      info,
>++                                      dispatchParams);
>++    
>++    if (dispatchParams != paramBuffer)
>++        delete [] dispatchParams;
>++
>++    return result;
>++
>++}
>++
>++// Load r11 with the constant 'n' and branch to SharedStub().
>++
>++// As G++3 ABI contains the length of the functionname in the mangled
>++// name, it is difficult to get a generic assembler mechanism like
>++// in the G++ 2.95 case.
>++// Create names would be like:
>++// _ZN14nsXPTCStubBase5Stub1Ev
>++// _ZN14nsXPTCStubBase6Stub12Ev
>++// _ZN14nsXPTCStubBase7Stub123Ev
>++// _ZN14nsXPTCStubBase8Stub1234Ev
>++// etc.
>++// Use assembler directives to get the names right...
>++
>++# define STUB_ENTRY(n)							\
>++__asm__ (								\
>++	".align	2 \n\t"							\
>++	".if	"#n" < 10 \n\t"						\
>++	".globl	_ZN14nsXPTCStubBase5Stub"#n"Ev \n\t"			\
>++	".type	_ZN14nsXPTCStubBase5Stub"#n"Ev,@function \n\n"		\
>++"_ZN14nsXPTCStubBase5Stub"#n"Ev: \n\t"					\
>++									\
>++	".elseif "#n" < 100 \n\t"					\
>++	".globl	_ZN14nsXPTCStubBase6Stub"#n"Ev \n\t"			\
>++	".type	_ZN14nsXPTCStubBase6Stub"#n"Ev,@function \n\n"		\
>++"_ZN14nsXPTCStubBase6Stub"#n"Ev: \n\t"					\
>++									\
>++	".elseif "#n" < 1000 \n\t"					\
>++	".globl	_ZN14nsXPTCStubBase7Stub"#n"Ev \n\t"			\
>++	".type	_ZN14nsXPTCStubBase7Stub"#n"Ev,@function \n\n"		\
>++"_ZN14nsXPTCStubBase7Stub"#n"Ev: \n\t"					\
>++									\
>++	".else \n\t"							\
>++	".err	\"stub number "#n" >= 1000 not yet supported\"\n"	\
>++	".endif \n\t"							\
>++									\
>++	"li	11,"#n" \n\t"						\
>++	"b	SharedStub@local \n"					\
>++);
>++
>++#define SENTINEL_ENTRY(n)                            \
>++nsresult nsXPTCStubBase::Sentinel##n()               \
>++{                                                    \
>++  NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \
>++  return NS_ERROR_NOT_IMPLEMENTED;                   \
>++}
>++
>++#include "xptcstubsdef.inc"
>Index: www/libxul/files/patch-xulrunner_app_mozilla.in
>===================================================================
>RCS file: www/libxul/files/patch-xulrunner_app_mozilla.in
>diff -N www/libxul/files/patch-xulrunner_app_mozilla.in
>--- www/libxul/files/patch-xulrunner_app_mozilla.in	10 Apr 2009 05:56:28 -0000	1.1
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,18 +0,0 @@
>---- xulrunner/app/mozilla.in.orig	Wed Oct 11 18:25:16 2006
>-+++ xulrunner/app/mozilla.in	Wed Oct 11 18:25:48 2006
>-@@ -193,12 +193,12 @@
>- done #others arg
>- 
>- #???: needs check if othersopt begin with -* ?
>--if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a $ -f "${_optLast}" -o -d "${_optLast}" $ ]; then
>-+if [ `expr X"${_optLast}" : 'X.*:/.*'` -eq 0 -a $ -f "${_optLast}" -o -d "${_optLast}" $ ]; then
>- 	# Last argument seems to be a local file/directory
>- 	# Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
>- 	# If it is just "relatively" (./file) specified, make it absolutely
>--	[ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
>--elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before...
>-+	[ `expr -e X"${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
>-+elif [ `expr -e X"${_optLast}" : '.*:/.*'` -gt 0 -o -n X"${_optOthers}" ]; then #???? like before...
>- 	_NEW_WINDOW=1
>- fi
>- 
>Index: www/libxul/files/patch-xulrunner_installer_libxul.pc.in
>===================================================================
>RCS file: /home/pcvs/ports/www/libxul/files/patch-xulrunner_installer_libxul.pc.in,v
>retrieving revision 1.1
>diff -u -r1.1 patch-xulrunner_installer_libxul.pc.in
>--- www/libxul/files/patch-xulrunner_installer_libxul.pc.in	10 Apr 2009 05:56:28 -0000	1.1
>+++ www/libxul/files/patch-xulrunner_installer_libxul.pc.in	18 Jul 2010 11:53:19 -0000
>@@ -1,11 +1,9 @@
>---- xulrunner/installer/libxul.pc.in.orig	2007-08-03 10:46:28.000000000 -0400
>-+++ xulrunner/installer/libxul.pc.in	2009-03-29 15:17:17.000000000 -0400
>-@@ -12,5 +12,5 @@ Name: libxul
>+--- xulrunner/installer/libxul.pc.in.orig	2010-01-21 04:31:27.000000000 +0100
>++++ xulrunner/installer/libxul.pc.in	2010-06-21 19:39:57.000000000 +0200
>+@@ -7,5 +7,5 @@
>  Description: The Mozilla Runtime and Embedding Engine
>  Version: %MOZILLA_VERSION%
>  Requires: %NSPR_NAME% >= %NSPR_VERSION%
> -Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
>--Cflags: -I${includedir}/${includetype} -fshort-wchar
>-\ No newline at end of file
> +Libs: -L${sdkdir}/lib -L%%MOZ_LIBDIR%% -lxpcomglue_s -lxul -lxpcom
>-+Cflags: -I${includedir}/${includetype} -fshort-wchar
>+ Cflags: -I${includedir} %WCHAR_CFLAGS%
>Index: www/libxul/files/releng6_pulseaudio
>===================================================================
>RCS file: www/libxul/files/releng6_pulseaudio
>diff -N www/libxul/files/releng6_pulseaudio
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ www/libxul/files/releng6_pulseaudio	18 Jul 2010 11:53:19 -0000
>@@ -0,0 +1,32 @@
>+--- media/libsydneyaudio/src/Makefile.in.orig	2009-08-11 17:22:08.000000000 +0200
>++++ media/libsydneyaudio/src/Makefile.in	2009-08-11 17:22:36.000000000 +0200
>+@@ -45,6 +45,12 @@
>+ LIBRARY_NAME	= sydneyaudio
>+ FORCE_STATIC_LIB= 1
>+ 
>++ifeq ($(OS_ARCH),FreeBSD)
>++CSRCS		= \
>++		sydney_audio_pulseaudio.c \
>++		$(NULL)
>++endif
>++
>+ ifeq ($(OS_ARCH),Linux)
>+ CSRCS		= \
>+ 		sydney_audio_alsa.c \
>+--- toolkit/library/Makefile.in.orig	2009-08-11 17:22:45.000000000 +0200
>++++ toolkit/library/Makefile.in	2009-08-11 17:23:22.000000000 +0200
>+@@ -231,12 +231,12 @@
>+ endif
>+ 
>+ ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
>+-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
>++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0  -lpulse -lpthread
>+ EXTRA_DSO_LDOPTS += $(FT2_LIBS)
>+ endif
>+ 
>+ ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
>+-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0
>++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -lpulse -lpthread
>+ EXTRA_DSO_LDOPTS += $(FT2_LIBS)
>+ endif
>+

Actions: View | Diff

Attachments on bug 149044: 108218 | 108219