3 files changed, 93 insertions, 4 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 3813ffe87675..5e2b53870915 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	mozilla
 PORTVERSION=	1.3
+PORTREVISION?=	1
 PORTEPOCH?=	2
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
@@ -31,10 +32,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 MOZILLA?=	mozilla
 
 .if defined(WITH_GTK2)
-LIB_DEPENDS+=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
-		ORBit-2.0:${PORTSDIR}/devel/ORBit2
+USE_GNOME=	gtk20 libidl
 .else
-USE_GNOMENG=	yes
 USE_GNOME=	gtk12 orbit
 .endif
 
@@ -75,6 +74,10 @@ CONFIGURE_ARGS=					\
 		--disable-cpp-rtti		\
 		--enable-crypto			\
 		--disable-debug			\
+		--disable-gtktest		\
+		--disable-freetypetest		\
+		--disable-installer		\
+		--disable-glibtest		\
 		--enable-double-buffer		\
 		--enable-mathml			\
 		--disable-md			\
@@ -153,11 +156,13 @@ CONFIGURE_ARGS+=	--enable-reorder
 .endif
 
 .if !defined(WITHOUT_OPTIMIZE) && ${ARCH} != "alpha"
-CFLAGS+=	-O2
+CFLAGS+=		-O2
+CONFIGURE_ARGS+=	--enable-optimize=-O2
 .endif
 
 .if ${ARCH} == "alpha"
 CFLAGS+=	-O0
+CONFIGURE_ARGS+=	--disable-optimize
 BROKEN=	"core dumps on alpha during post-build"
 .endif
 
diff --git a/www/mozilla/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/mozilla/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
new file mode 100644
index 000000000000..c98dd9f63165
--- /dev/null
+++ b/www/mozilla/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
@@ -0,0 +1,73 @@
+--- gfx/src/gtk/nsFontMetricsXft.cpp.orig	Mon Mar 31 12:30:39 2003
++++ gfx/src/gtk/nsFontMetricsXft.cpp	Mon Mar 31 12:30:58 2003
+@@ -84,6 +84,7 @@
+     FcPattern *mPattern;
+     FcPattern *mFontName;
+     FcCharSet *mCharset;
++    int        mNotXft;
+ };
+ 
+ struct MozXftLangGroup {
+@@ -375,7 +376,7 @@
+         PRInt32 end = mLoadedFonts.Count();
+         for (PRInt32 j = 0; j < end; ++j) {
+             font = (nsFontXft *)mLoadedFonts.ElementAt(j);
+-            if (FcCharSetHasChar(font->mCharset, c)) {
++            if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) {
+                 currFont = font;
+                 goto FoundFont; // for speed -- avoid "if" statement
+             }
+@@ -635,7 +636,7 @@
+ 
+         for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
+             font = (nsFontXft *)mLoadedFonts.ElementAt(j);
+-            if (FcCharSetHasChar(font->mCharset, c)) {
++            if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) {
+                 currFont = font;
+                 goto FoundFont; // for speed -- avoid "if" statement
+             }
+@@ -888,7 +889,7 @@
+     // font in our loaded list that supports the character
+     for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) {
+         nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i);
+-        if (FcCharSetHasChar(font->mCharset, aChar))
++        if (FcCharSetHasChar(font->mCharset, aChar) && font->GetXftFont() != NULL)
+             return font;
+     }
+ 
+@@ -1051,7 +1052,7 @@
+ 
+         for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
+             font = (nsFontXft *)mLoadedFonts.ElementAt(j);
+-            if (FcCharSetHasChar(font->mCharset, c)) {
++            if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) {
+                 currFont = font;
+                 goto FoundFont; // for speed -- avoid "if" statement
+             }
+@@ -1461,6 +1462,7 @@
+     FcPatternReference(mFontName);
+ 
+     mXftFont = nsnull;
++    mNotXft  = 0;
+ 
+     // set up our charset
+     mCharset = nsnull;
+@@ -1487,14 +1489,16 @@
+ XftFont *
+ nsFontXft::GetXftFont(void)
+ {
+-    if (!mXftFont) {
++    if (!mXftFont && !mNotXft) {
+         FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
+         if (!pat)
+             return nsnull;
+ 
+         mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
+-        if (!mXftFont)
++        if (!mXftFont) { 
+             FcPatternDestroy(pat);
++	    mNotXft = 1;
++	}
+     }
+ 
+     return mXftFont;
diff --git a/www/mozilla/files/patch-nsprpub_pr_src_misc_prnetdb.c b/www/mozilla/files/patch-nsprpub_pr_src_misc_prnetdb.c
new file mode 100644
index 000000000000..d136e2e4ee42
--- /dev/null
+++ b/www/mozilla/files/patch-nsprpub_pr_src_misc_prnetdb.c
@@ -0,0 +1,11 @@
+--- nsprpub/pr/src/misc/prnetdb.c	16 Jan 2003 23:09:16 -0000	3.21.2.8
++++ nsprpub/pr/src/misc/prnetdb.c	25 Jan 2003 00:12:13 -0000
+@@ -319,7 +319,7 @@
+     PR_Free(buf);
+ }
+ 
+-#elif (defined(DARWIN) && defined(HAVE_GETIFADDRS))
++#elif (defined(DARWIN) && defined(HAVE_GETIFADDRS)) || defined(FREEBSD)
+ 
+ /*
+  * Use the BSD getifaddrs function.