View | Details | Raw Unified | Return to bug 149044 | Differences between
and this patch

Collapse All | Expand All

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

Return to bug 149044