Update to 0.9.6. Surprisingly, this update doesn't break Galeon/Nautilus.

8 files changed, 72 insertions, 44 deletions

diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index edd38ac..c322cee 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.6
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
diff --git a/www/mozilla-devel/distinfo b/www/mozilla-devel/distinfo
index 3fac335..0e59edc 100644
--- a/www/mozilla-devel/distinfo
+++ b/www/mozilla-devel/distinfo
@@ -1 +1 @@
-MD5 (mozilla-source-0.9.5.tar.bz2) = 1d0062ce61a3ad4baa92bdcad496c682
+MD5 (mozilla-source-0.9.6.tar.bz2) = b1f02fe3f01c700147237de92ef11000
diff --git a/www/mozilla-devel/files/patch-aq b/www/mozilla-devel/files/patch-aq
index 4e5ff87..0c63e6b 100644
--- a/www/mozilla-devel/files/patch-aq
+++ b/www/mozilla-devel/files/patch-aq
@@ -1,6 +1,9 @@
---- nsprpub/pr/include/md/_pth.h.orig	Mon Apr  3 17:25:43 2000
-+++ nsprpub/pr/include/md/_pth.h	Fri Feb 16 00:30:46 2001
-@@ -183,7 +183,7 @@
+
+$FreeBSD$
+
+--- nsprpub/pr/include/md/_pth.h.orig	Fri Oct 26 07:54:00 2001
++++ nsprpub/pr/include/md/_pth.h	Wed Nov 21 14:16:07 2001
+@@ -224,7 +224,7 @@
  #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
  #endif /* defined(_PR_DCETHREADS) */
  
@@ -9,12 +12,12 @@
  #define PT_PRIO_MIN            sched_get_priority_min(SCHED_OTHER)
  #define PT_PRIO_MAX            sched_get_priority_max(SCHED_OTHER)
  #elif defined(NTO)
-@@ -203,7 +203,7 @@
+@@ -244,7 +244,7 @@
   */
  #define PT_PRIO_MIN            1
  #define PT_PRIO_MAX            127
 -#elif defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) \
 +#elif defined(NETBSD) || defined(OPENBSD) \
- 	|| defined(BSDI) || defined(RHAPSODY) /* XXX */
+ 	|| defined(BSDI) || defined(DARWIN) /* XXX */
  #define PT_PRIO_MIN            0
  #define PT_PRIO_MAX            126
diff --git a/www/mozilla-devel/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h b/www/mozilla-devel/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h
new file mode 100644
index 0000000..8da7246
--- /dev/null
+++ b/www/mozilla-devel/files/patch-directory::c-sdk::ldap::libraries::liblber::lber-int.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- directory/c-sdk/ldap/libraries/liblber/lber-int.h	2001/11/21 14:24:09	1.1
++++ directory/c-sdk/ldap/libraries/liblber/lber-int.h	2001/11/21 14:24:31
+@@ -48,7 +48,7 @@
+ #ifdef macintosh
+ # include "ldap-macos.h"
+ #else /* macintosh */
+-#if !defined(BSDI) && !defined(DARWIN)
++#if !defined(BSDI) && !defined(DARWIN) && !defined(FREEBSD)
+ # include <malloc.h>
+ #endif
+ # include <errno.h>
diff --git a/www/mozilla-devel/files/patch-directory::xpcom::base::src::Makefile.in b/www/mozilla-devel/files/patch-directory::xpcom::base::src::Makefile.in
deleted file mode 100644
index d2ef636..0000000
--- a/www/mozilla-devel/files/patch-directory::xpcom::base::src::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- directory/xpcom/base/src/Makefile.in.orig	Thu Sep 20 15:30:57 2001
-+++ directory/xpcom/base/src/Makefile.in	Thu Oct 25 15:37:03 2001
-@@ -80,6 +80,5 @@
- 
- include $(topsrcdir)/config/rules.mk
- 
--CFLAGS		+= $(LDAP_CFLAGS)
--CXXFLAGS	+= $(LDAP_CFLAGS)
-+DEFINES		+= $(LDAP_CFLAGS)
- 
diff --git a/www/mozilla-devel/files/patch-qt b/www/mozilla-devel/files/patch-qt
index ba6cdced..9166753 100644
--- a/www/mozilla-devel/files/patch-qt
+++ b/www/mozilla-devel/files/patch-qt
@@ -1,18 +1,9 @@
 
 $FreeBSD$
 
---- 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
- 
--    QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR"
-+    QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR"
-     QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
- 
-     # Check whether --with-static-qt or --without-static-qt was given.
-@@ -8587,6 +8587,9 @@
+--- configure.orig	Fri Nov  9 05:13:03 2001
++++ configure	Wed Nov 21 14:22:13 2001
+@@ -5931,6 +5931,9 @@
  os2*)
      LIBS=
      ;;
@@ -22,7 +13,7 @@ $FreeBSD$
  esac
  for ac_hdr in sys/byteorder.h compat.h getopt.h
  do
-@@ -9316,8 +9319,6 @@
+@@ -6987,8 +6990,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 +22,7 @@ $FreeBSD$
  		fi
  	fi
  	rm -f conftest*
-@@ -9351,7 +9352,7 @@
+@@ -7022,7 +7023,7 @@
  EOF
  
  						if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -40,7 +31,24 @@ $FreeBSD$
  			else
  				_PTHREAD_LDFLAGS="-lc_r"
  			fi
-@@ -13701,6 +13702,7 @@
+@@ -8365,6 +8366,7 @@
+         ;;
+     *)
+         NSPR_LIBS='`$(DEPTH)/nsprpub/config/nspr-config --prefix=$(DIST) --libs`'
++        NSPR_LIBS="$NSPR_LIBS $BSD_PTHREAD_LIBS"
+         ;;
+     esac
+ fi
+@@ -9421,7 +9423,7 @@
+     fi
+     MOC=$HOST_MOC
+ 
+-    QT_CFLAGS="-I${QTDIR}${QTINCDIR} -DQT_GENUINE_STR"
++    QT_CFLAGS="-I${QTDIR}/include/X11/qt -DQT_GENUINE_STR"
+     QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
+ 
+     # Check whether --with-static-qt or --without-static-qt was given.
+@@ -13233,6 +13235,7 @@
          ;;
      *)
          NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs`
diff --git a/www/mozilla-devel/files/patch-xpcom::ds::plvector.c b/www/mozilla-devel/files/patch-xpcom::ds::plvector.c
new file mode 100644
index 0000000..645751f
--- /dev/null
+++ b/www/mozilla-devel/files/patch-xpcom::ds::plvector.c
@@ -0,0 +1,19 @@
+
+$FreeBSD$
+
+--- xpcom/ds/plvector.c	2001/11/21 12:36:30	1.1
++++ xpcom/ds/plvector.c	2001/11/21 12:43:54
+@@ -177,11 +177,12 @@
+ PL_VectorCompact(PLVector* v)
+ {
+     if (v->size != v->maxSize) {
++        void ** newData = NULL;
++
+         /* shrink to desired size */
+ #ifdef SIZE_T_MAX
+         PR_ASSERT(v->size <= SIZE_T_MAX/sizeof(void *)); /* no overflow */
+ #endif
+-        void ** newData = NULL;
+         if (v->size != 0) {
+             newData = (void **)PR_Malloc(v->size * sizeof(void *));
+             /* copy new data from old */
diff --git a/www/mozilla-devel/pkg-plist b/www/mozilla-devel/pkg-plist
index 9059b4d..e6b4e0c 100644
--- a/www/mozilla-devel/pkg-plist
+++ b/www/mozilla-devel/pkg-plist
@@ -55,6 +55,7 @@ lib/mozilla/TestObserverService
 lib/mozilla/TestOutSinks.pl
 lib/mozilla/TestOutput
 lib/mozilla/TestPageLoad
+lib/mozilla/TestPermanentAtoms
 lib/mozilla/TestPipes
 lib/mozilla/TestProtocols
 lib/mozilla/TestRect
@@ -62,6 +63,7 @@ lib/mozilla/TestServMgr
 lib/mozilla/TestSocketIO
 lib/mozilla/TestSocketInput
 lib/mozilla/TestSocketTransport
+lib/mozilla/TestSpaceManager
 lib/mozilla/TestStreamConv
 lib/mozilla/TestTXMgr
 lib/mozilla/TestThreads
@@ -76,6 +78,7 @@ lib/mozilla/chrome/US.jar
 lib/mozilla/chrome/all-locales.rdf
 lib/mozilla/chrome/all-packages.rdf
 lib/mozilla/chrome/all-skins.rdf
+lib/mozilla/chrome/chromelist.txt
 lib/mozilla/chrome/classic.jar
 lib/mozilla/chrome/comm.jar
 lib/mozilla/chrome/content-packs.jar
@@ -166,6 +169,7 @@ lib/mozilla/components/libgklayout.so
 lib/mozilla/components/libgkplugin.so
 lib/mozilla/components/libgkview.so
 lib/mozilla/components/libhtmlpars.so
+lib/mozilla/components/libimgbmp.so
 lib/mozilla/components/libimggif.so
 lib/mozilla/components/libimgjpeg.so
 lib/mozilla/components/libimglib2.so
@@ -242,7 +246,6 @@ lib/mozilla/components/mailnews.xpt
 lib/mozilla/components/mime.xpt
 lib/mozilla/components/mimetype.xpt
 lib/mozilla/components/mozbrwsr.xpt
-lib/mozilla/components/mozcomps.xpt
 lib/mozilla/components/mozfind.xpt
 lib/mozilla/components/mozldap.xpt
 lib/mozilla/components/mozxfer.xpt
@@ -286,14 +289,11 @@ lib/mozilla/components/proxytest.xpt
 lib/mozilla/components/rdf.xpt
 lib/mozilla/components/regviewer.xpt
 lib/mozilla/components/related.xpt
-lib/mozilla/components/remote.xpt
-lib/mozilla/components/remoteControl.js
 lib/mozilla/components/sample.xpt
 lib/mozilla/components/search.xpt
 lib/mozilla/components/shistory.xpt
 lib/mozilla/components/sidebar.xpt
 lib/mozilla/components/signonviewer.xpt
-lib/mozilla/components/timebomb.xpt
 lib/mozilla/components/transformiix.xpt
 lib/mozilla/components/txmgr.xpt
 lib/mozilla/components/txtsvc.xpt
@@ -307,6 +307,7 @@ lib/mozilla/components/wallet.xpt
 lib/mozilla/components/walleteditor.xpt
 lib/mozilla/components/walletpreview.xpt
 lib/mozilla/components/webBrowser_core.xpt
+lib/mozilla/components/webbrowserpersist.xpt
 lib/mozilla/components/webshell_idls.xpt
 lib/mozilla/components/widget.xpt
 lib/mozilla/components/windowwatcher.xpt
@@ -322,7 +323,6 @@ lib/mozilla/components/xpconnect.xpt
 lib/mozilla/components/xpconnect_tests.xpt
 lib/mozilla/components/xpinstall.xpt
 lib/mozilla/components/xpti.dat
-lib/mozilla/components/xptitemp.dat
 lib/mozilla/components/xremoteservice.xpt
 lib/mozilla/components/xuldoc.xpt
 lib/mozilla/components/xultmpl.xpt
@@ -357,7 +357,6 @@ lib/mozilla/defaults/wallet/StateSchema.tbl
 lib/mozilla/defaults/wallet/VcardSchema.tbl
 lib/mozilla/dirver
 lib/mozilla/dtd/mathml.dtd
-lib/mozilla/gtkEmbed
 lib/mozilla/htmlrobot
 lib/mozilla/icons/mozicon16.xpm
 lib/mozilla/icons/mozicon50.xpm
@@ -395,7 +394,6 @@ lib/mozilla/rdfpoll
 lib/mozilla/regExport
 lib/mozilla/regchrome
 lib/mozilla/regxpcom
-lib/mozilla/res/acceptlanguage.properties
 lib/mozilla/res/arrow.gif
 lib/mozilla/res/builtin/htmlBindings.xml
 lib/mozilla/res/builtin/platformHTMLBindings.xml
@@ -431,6 +429,7 @@ lib/mozilla/res/html/gopher-movie.gif
 lib/mozilla/res/html/gopher-telnet.gif
 lib/mozilla/res/html/gopher-text.gif
 lib/mozilla/res/html/gopher-unknown.gif
+lib/mozilla/res/html/loading-image.gif
 lib/mozilla/res/langGroups.properties
 lib/mozilla/res/language.properties
 lib/mozilla/res/mathml.css
@@ -580,8 +579,6 @@ lib/mozilla/searchplugins/lxrmozilla.src
 lib/mozilla/searchplugins/mozilla.gif
 lib/mozilla/searchplugins/mozilla.src
 lib/mozilla/splash.xpm
-lib/mozilla/startup-test.html
-lib/mozilla/timebombgen
 lib/mozilla/urltest
 lib/mozilla/viewer
 lib/mozilla/viewer_gtk