Update to 0.9.2.

PR:		28610
Submitted by:	Nick Sayer <nsayer@quack.kfu.com>, sf

4 files changed, 25 insertions, 24 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 7cb247d2733e..09a15350802e 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	0.9.1
+PORTVERSION=	0.9.2
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -55,7 +55,8 @@ CONFIGURE_ARGS=					\
 		--with-png=${LOCALBASE}		\
 		--with-mng=${LOCALBASE}		\
 		--with-pthreads
-CONFIGURE_ENV=	BSD_PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV=	BSD_PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		MOZ_OPTIMIZE_FLAGS=""
 MAKE_ENV=	LD_LIBRARY_PATH=${WRKSRC}/dist/bin
 
 post-build:
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index 248f289acc8c..c86fee07f92f 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1 +1 @@
-MD5 (mozilla-source-0.9.1.tar.bz2) = 21d313a471e6bee622c7bb009a18faf5
+MD5 (mozilla-source-0.9.2.tar.bz2) = a71fcbaf10ca0855f146526fbb76203e
diff --git a/www/mozilla/files/patch-qt b/www/mozilla/files/patch-qt
index 5558e352edee..e20338515c68 100644
--- a/www/mozilla/files/patch-qt
+++ b/www/mozilla/files/patch-qt
@@ -1,18 +1,18 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Apr 24 01:59:58 2001
-+++ configure	Mon May 14 21:48:26 2001
-@@ -6596,7 +6596,7 @@
- fi
+--- configure.orig	Wed Jun 27 01:21:19 2001
++++ configure	Mon Jul  2 10:51:16 2001
+@@ -6681,7 +6681,7 @@
+     echo "$ac_t""$HOST_MOC" 1>&6
+     MOC=$HOST_MOC
  
- 
--    QT_CFLAGS="-I${QTDIR}/include -DQT_GENUINE_STR"
+-    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.
-@@ -8703,6 +8703,9 @@
+@@ -8777,6 +8777,9 @@
  os2*)
      LIBS=
      ;;
@@ -22,7 +22,7 @@ $FreeBSD$
  esac
  for ac_hdr in sys/byteorder.h compat.h getopt.h
  do
-@@ -9392,8 +9395,6 @@
+@@ -9506,8 +9509,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*
-@@ -9427,7 +9428,7 @@
+@@ -9541,7 +9542,7 @@
  EOF
  
  						if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -40,7 +40,7 @@ $FreeBSD$
  			else
  				_PTHREAD_LDFLAGS="-lc_r"
  			fi
-@@ -13902,6 +13903,7 @@
+@@ -14107,6 +14108,7 @@
          ;;
      *)
          NSPR_LIBS=`./nsprpub/config/nspr-config --prefix=$MOZ_BUILD_ROOT/dist --exec-prefix=$MOZ_BUILD_ROOT/dist --libs`
diff --git a/www/mozilla/pkg-plist b/www/mozilla/pkg-plist
index 0106d5c58e1d..6d8b7987b902 100644
--- a/www/mozilla/pkg-plist
+++ b/www/mozilla/pkg-plist
@@ -76,6 +76,7 @@ lib/mozilla/chrome/all-packages.rdf
 lib/mozilla/chrome/all-skins.rdf
 lib/mozilla/chrome/classic.jar
 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-unix.jar
@@ -151,6 +152,7 @@ lib/mozilla/components/libembedcomponents.so
 lib/mozilla/components/libgfx2.so
 lib/mozilla/components/libgfx_gtk.so
 lib/mozilla/components/libgfxps.so
+lib/mozilla/components/libgfxxprint.so
 lib/mozilla/components/libgkcontent.so
 lib/mozilla/components/libgklayout.so
 lib/mozilla/components/libgkplugin.so
@@ -201,7 +203,7 @@ lib/mozilla/components/librdf.so
 lib/mozilla/components/libregviewer.so
 lib/mozilla/components/libsample.so
 lib/mozilla/components/libshistory.so
-lib/mozilla/components/libsmime.so
+lib/mozilla/components/libsmimestb.so
 lib/mozilla/components/libstrres.so
 lib/mozilla/components/libtestdynamic.so
 lib/mozilla/components/libtimer_gtk.so
@@ -261,6 +263,7 @@ lib/mozilla/components/npsimple.xpt
 lib/mozilla/components/nsDictionary.js
 lib/mozilla/components/nsFilePicker.js
 lib/mozilla/components/nsHelperAppDlg.js
+lib/mozilla/components/nsLDAPPrefsService.js
 lib/mozilla/components/nsProxyAutoConfig.js
 lib/mozilla/components/nsSample.js
 lib/mozilla/components/nsSidebar.js
@@ -325,11 +328,15 @@ lib/mozilla/defaults/pref/security-prefs.js
 lib/mozilla/defaults/pref/unix.js
 lib/mozilla/defaults/pref/xpinstall.js
 lib/mozilla/defaults/profile/US/bookmarks.html
+lib/mozilla/defaults/profile/US/chrome/userChrome.css
+lib/mozilla/defaults/profile/US/chrome/userContent.css
 lib/mozilla/defaults/profile/US/localstore.rdf
 lib/mozilla/defaults/profile/US/mimeTypes.rdf
 lib/mozilla/defaults/profile/US/panels.rdf
 lib/mozilla/defaults/profile/US/search.rdf
 lib/mozilla/defaults/profile/bookmarks.html
+lib/mozilla/defaults/profile/chrome/userChrome.css
+lib/mozilla/defaults/profile/chrome/userContent.css
 lib/mozilla/defaults/profile/localstore.rdf
 lib/mozilla/defaults/profile/mimeTypes.rdf
 lib/mozilla/defaults/profile/panels.rdf
@@ -362,6 +369,7 @@ 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
@@ -374,10 +382,6 @@ lib/mozilla/nsIFileTest
 lib/mozilla/nsTestSample
 lib/mozilla/nsinstall
 lib/mozilla/plugins/libnullplugin.so
-lib/mozilla/profile/defaults/profile/US/chrome/userChrome.css
-lib/mozilla/profile/defaults/profile/US/chrome/userContent.css
-lib/mozilla/profile/defaults/profile/chrome/userChrome.css
-lib/mozilla/profile/defaults/profile/chrome/userContent.css
 lib/mozilla/proxytests
 lib/mozilla/rdfcat
 lib/mozilla/rdfpoll
@@ -587,16 +591,12 @@ lib/mozilla/xpt_link
 @dirrm lib/mozilla/res/entityTables
 @dirrm lib/mozilla/res/builtin
 @dirrm lib/mozilla/res
-@dirrm lib/mozilla/profile/defaults/profile/chrome
-@dirrm lib/mozilla/profile/defaults/profile/US/chrome
-@dirrm lib/mozilla/profile/defaults/profile/US
-@dirrm lib/mozilla/profile/defaults/profile
-@dirrm lib/mozilla/profile/defaults
-@dirrm lib/mozilla/profile
 @dirrm lib/mozilla/plugins
 @dirrm lib/mozilla/icons
 @dirrm lib/mozilla/dtd
 @dirrm lib/mozilla/defaults/wallet
+@dirrm lib/mozilla/defaults/profile/chrome
+@dirrm lib/mozilla/defaults/profile/US/chrome
 @dirrm lib/mozilla/defaults/profile/US
 @dirrm lib/mozilla/defaults/profile
 @dirrm lib/mozilla/defaults/pref