6 files changed, 19 insertions, 28 deletions

diff --git a/www/mozilla+ipv6/Makefile b/www/mozilla+ipv6/Makefile
index 812f32544ec2..1a00c8ee850c 100644
--- a/www/mozilla+ipv6/Makefile
+++ b/www/mozilla+ipv6/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.2
+PORTVERSION=	0.9.3
 PORTEPOCH=	1
 PKGNAMESUFFIX=	+ipv6
 CATEGORIES=	www ipv6
@@ -45,7 +45,7 @@ CONFIGURE_ARGS=					\
 		--enable-editor			\
 		--enable-mailnews		\
 		--enable-mathml			\
-		--enable-optimize		\
+		--enable-optimize="${CFLAGS}"	\
 		--enable-pics			\
 		--enable-svg			\
 		--enable-tests			\
@@ -57,8 +57,10 @@ CONFIGURE_ARGS=					\
 		--with-mng=${LOCALBASE}		\
 		--with-pthreads
 CONFIGURE_ENV=	BSD_PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		MOZ_OPTIMIZE_FLAGS=""
-MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin MALLOC_OPTIONS=j
+		CFLAGS="" CXXFLAGS=""
+MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin \
+		CFLAGS="" CXXFLAGS="" \
+		MALLOC_OPTIONS=j
 
 post-build:
 	@${SED} -e "s;@PREFIX@;${PREFIX};g" \
diff --git a/www/mozilla+ipv6/distinfo b/www/mozilla+ipv6/distinfo
index c86fee07f92f..c6e38e48e28e 100644
--- a/www/mozilla+ipv6/distinfo
+++ b/www/mozilla+ipv6/distinfo
@@ -1 +1 @@
-MD5 (mozilla-source-0.9.2.tar.bz2) = a71fcbaf10ca0855f146526fbb76203e
+MD5 (mozilla-source-0.9.3.tar.bz2) = 8f98a2d73df28b2cee3da47c0df1dd22
diff --git a/www/mozilla+ipv6/files/patch-directory::c-sdk::ldap::include::portable.h b/www/mozilla+ipv6/files/patch-directory::c-sdk::ldap::include::portable.h
deleted file mode 100644
index 61ca91b71140..000000000000
--- a/www/mozilla+ipv6/files/patch-directory::c-sdk::ldap::include::portable.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- directory/c-sdk/ldap/include/portable.h	2001/07/17 16:08:33	1.1
-+++ directory/c-sdk/ldap/include/portable.h	2001/07/17 16:10:15
-@@ -249,7 +249,7 @@
-     defined(NCR) || defined(OSF1) || defined(NEC) || defined(VMS) || \
-     ( defined(HPUX10) && !defined(_REENTRANT)) || defined(HPUX11) || \
-     defined(UnixWare) || defined(LINUX) || defined(NETBSD) || \
--    (defined(AIX) && !defined(USE_REENTRANT_LIBC))
-+    defined (FREEBSD) || (defined(AIX) && !defined(USE_REENTRANT_LIBC))
- #define GETHOSTBYNAME( n, r, b, l, e )  gethostbyname( n )
- #elif defined(AIX)
- /* Maybe this is for another version of AIX?
diff --git a/www/mozilla+ipv6/files/patch-mi b/www/mozilla+ipv6/files/patch-mi
index 796e9905088e..6d0b3de29ce6 100644
--- a/www/mozilla+ipv6/files/patch-mi
+++ b/www/mozilla+ipv6/files/patch-mi
@@ -11,7 +11,7 @@
 +
 +# During FreeBSD port build, CFLAGS contains all of the optimizations
 +# flags desired...
-+OPTIMIZER		=
++OPTIMIZER		= $(MOZ_OPTIMIZE_FLAGS)
  
  ifeq ($(OS_TEST),alpha)
  CPU_ARCH		= alpha
diff --git a/www/mozilla+ipv6/files/patch-qt b/www/mozilla+ipv6/files/patch-qt
index e20338515c68..ba6cdced59b7 100644
--- a/www/mozilla+ipv6/files/patch-qt
+++ b/www/mozilla+ipv6/files/patch-qt
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Wed Jun 27 01:21:19 2001
-+++ configure	Mon Jul  2 10:51:16 2001
-@@ -6681,7 +6681,7 @@
+--- configure.orig	Wed Jul 25 08:44:09 2001
++++ configure	Sat Aug  4 11:18:33 2001
+@@ -6528,7 +6528,7 @@
      echo "$ac_t""$HOST_MOC" 1>&6
      MOC=$HOST_MOC
  
@@ -12,7 +12,7 @@ $FreeBSD$
      QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
  
      # Check whether --with-static-qt or --without-static-qt was given.
-@@ -8777,6 +8777,9 @@
+@@ -8587,6 +8587,9 @@
  os2*)
      LIBS=
      ;;
@@ -22,7 +22,7 @@ $FreeBSD$
  esac
  for ac_hdr in sys/byteorder.h compat.h getopt.h
  do
-@@ -9506,8 +9509,6 @@
+@@ -9316,8 +9319,6 @@
  	if test $? -eq 0; then
  		if test -z "`egrep -i '(unrecognize|unknown)' conftest.out | grep pthread`" && test -z "`egrep -i '(error|incorrect)' conftest.out`" ; then
  			ac_cv_have_dash_pthread=yes
@@ -31,7 +31,7 @@ $FreeBSD$
  		fi
  	fi
  	rm -f conftest*
-@@ -9541,7 +9542,7 @@
+@@ -9351,7 +9352,7 @@
  EOF
  
  						if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -40,7 +40,7 @@ $FreeBSD$
  			else
  				_PTHREAD_LDFLAGS="-lc_r"
  			fi
-@@ -14107,6 +14108,7 @@
+@@ -13701,6 +13702,7 @@
          ;;
      *)
          NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs`
diff --git a/www/mozilla+ipv6/pkg-plist b/www/mozilla+ipv6/pkg-plist
index 6d8b7987b902..790e5ce59a09 100644
--- a/www/mozilla+ipv6/pkg-plist
+++ b/www/mozilla+ipv6/pkg-plist
@@ -31,6 +31,7 @@ lib/mozilla/TestCOMPtr
 lib/mozilla/TestCOMPtrEq
 lib/mozilla/TestCRT
 lib/mozilla/TestCSSPropertyLookup
+lib/mozilla/TestCallTemplates
 lib/mozilla/TestCallbacks
 lib/mozilla/TestColorNames
 lib/mozilla/TestCookie
@@ -52,6 +53,7 @@ lib/mozilla/TestObserverService
 lib/mozilla/TestOutSinks.pl
 lib/mozilla/TestOutput
 lib/mozilla/TestOverlappedIO
+lib/mozilla/TestPageLoad
 lib/mozilla/TestPipes
 lib/mozilla/TestProtocols
 lib/mozilla/TestRect
@@ -79,6 +81,7 @@ lib/mozilla/chrome/comm.jar
 lib/mozilla/chrome/content-packs.jar
 lib/mozilla/chrome/embed.jar
 lib/mozilla/chrome/en-US.jar
+lib/mozilla/chrome/en-mac.jar
 lib/mozilla/chrome/en-unix.jar
 lib/mozilla/chrome/en-win.jar
 lib/mozilla/chrome/help.jar
@@ -116,6 +119,7 @@ lib/mozilla/components/dom_events.xpt
 lib/mozilla/components/dom_html.xpt
 lib/mozilla/components/dom_range.xpt
 lib/mozilla/components/dom_stylesheets.xpt
+lib/mozilla/components/dom_traversal.xpt
 lib/mozilla/components/dom_views.xpt
 lib/mozilla/components/dom_xbl.xpt
 lib/mozilla/components/dom_xul.xpt
@@ -369,7 +373,6 @@ lib/mozilla/libnssckbi.so
 lib/mozilla/libnullplugin.so
 lib/mozilla/libplc4.so
 lib/mozilla/libplds4.so
-lib/mozilla/libxlibrgb.so
 lib/mozilla/libxpcom.so
 lib/mozilla/libxpistub.so
 lib/mozilla/lots