Update to 1.2a.

6 files changed, 43 insertions, 79 deletions

diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index 26cd94194c3f..a4a02764eabb 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	1.1
-PORTREVISION=	2
+PORTVERSION=	1.2a
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
-		http://people.FreeBSD.org/~marcus/:local
+		http://people.FreeBSD.org/~sobomax/:local
 MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \
 		marcus/:local
 DISTFILES=	${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \
@@ -33,6 +32,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 WITHOUT_CHATZILLA=	"Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249"
 
 EXTRACT_AFTER_ARGS=	| tar -xf - -X ${FILESDIR}/tar-exclude
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
@@ -60,6 +60,7 @@ CONFIGURE_ARGS=					\
 		--disable-tests			\
 		--disable-xterm-updates		\
 		--enable-xinerama		\
+		--enable-xft 			\
 		--with-system-jpeg=${LOCALBASE}	\
 		--with-system-mng=${LOCALBASE}	\
 		--with-system-png=${LOCALBASE}	\
diff --git a/www/mozilla-devel/distinfo b/www/mozilla-devel/distinfo
index c1329ca724a4..470634fa8ea6 100644
--- a/www/mozilla-devel/distinfo
+++ b/www/mozilla-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla-source-1.1.tar.gz) = 4fa54be2a540d584e428f50eaedfac76
-MD5 (libart_lgpl-1.1.tar.gz) = 276f65c384d020c36003260689806735
+MD5 (mozilla-source-1.2a.tar.bz2) = 165a66d2a2ef5ad78972b66643fd3c4b
+MD5 (libart_lgpl-1.2a.tar.bz2) = f15e59e61e20cf8ec3618e7bb9ddfb21
diff --git a/www/mozilla-devel/files/patch-embedding::config::basebrowser-unix b/www/mozilla-devel/files/patch-embedding::config::basebrowser-unix
deleted file mode 100644
index 5eae8879b0ca..000000000000
--- a/www/mozilla-devel/files/patch-embedding::config::basebrowser-unix
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- embedding/config/basebrowser-unix.orig	Thu Feb  7 23:50:19 2002
-+++ embedding/config/basebrowser-unix	Tue Mar 12 17:06:08 2002
-@@ -119,6 +119,7 @@
- 
- ; layout
- components/libgkcontent.so
-+libmoz_art_lgpl.so
- res/dtd/*
- components/libgklayout.so                   
- components/libhtmlpars.so                 
-@@ -203,12 +204,12 @@
- components/unicharutil.xpt
- components/libchardet.so
- ; optional - on english only systems
--; components/libucvja.so for japanese
--; components/libucvko.so for korean
--; components/libucvcn.so for simplified chinese
--; components/libucvtw.so for traditional chinese
--; components/libucvtw2.so for traditional chinese
--; components/libucvibm.so for ibm
-+components/libucvja.so
-+components/libucvko.so
-+components/libucvcn.so
-+components/libucvtw.so
-+components/libucvtw2.so
-+components/libucvibm.so
- 
- 
- res/language.properties
diff --git a/www/mozilla-devel/files/patch-qt b/www/mozilla-devel/files/patch-qt
index acec8e26f297..d7b8248d7a34 100644
--- a/www/mozilla-devel/files/patch-qt
+++ b/www/mozilla-devel/files/patch-qt
@@ -1,6 +1,9 @@
---- configure.orig	Wed May  8 22:24:05 2002
-+++ configure	Mon May 13 01:18:53 2002
-@@ -7489,7 +7489,7 @@
+
+$FreeBSD$
+
+--- configure.orig	Wed Sep  4 01:40:24 2002
++++ configure	Sat Oct 19 17:57:59 2002
+@@ -7899,7 +7899,7 @@
  EOF
  
  						if test "$ac_cv_have_dash_pthread" = "yes"; then
@@ -9,7 +12,7 @@
  			else
  				_PTHREAD_LDFLAGS="-lc_r"
  			fi
-@@ -9967,7 +9967,7 @@
+@@ -10561,7 +10561,7 @@
      fi
      MOC=$HOST_MOC
  
@@ -18,19 +21,31 @@
      QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11"
  
      # Check whether --with-static-qt or --without-static-qt was given.
-@@ -10836,13 +10836,13 @@
+@@ -11422,9 +11422,9 @@
  
  
  
--MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector irc universalchardet"
-+MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector universalchardet"
+-MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector irc universalchardet typeaheadfind"
++MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help pref transformiix venkman inspector universalchardet typeaheadfind"
  
- if test -n "$SUNCTL"; then
-   MOZ_EXTENSIONS_DEFAULT="$MOZ_EXTENSIONS_DEFAULT ctl"
- fi
- 
--MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm access-builtin ctl p3p interfaceinfo" 
-+MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm access-builtin ctl p3p interfaceinfo" 
+-MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm access-builtin p3p interfaceinfo datetime finger" 
++MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm access-builtin p3p interfaceinfo datetime finger" 
  
  # Check whether --enable-extensions or --disable-extensions was given.
  if test "${enable_extensions+set}" = set; then
+@@ -15704,10 +15704,11 @@
+       *) # Relative path.
+         ac_sub_cache_file="$ac_dots$cache_file" ;;
+       esac
+-  case "$ac_given_INSTALL" in
+-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+-        esac
++      INSTALL=""
++#  case "$ac_given_INSTALL" in
++#        [/$]*) INSTALL="$ac_given_INSTALL" ;;
++#        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
++#        esac
+ 
+       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+       # The eval makes quoting arguments work.
diff --git a/www/mozilla-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h b/www/mozilla-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h
deleted file mode 100644
index 2224e67cc95b..000000000000
--- a/www/mozilla-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig	Fri Jun 21 01:12:40 2002
-+++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h	Fri Jun 21 01:41:51 2002
-@@ -94,8 +94,16 @@
-  * gcc is that the system gcc defines __FreeBSD_cc_version.  This variable
-  * can also identify the period of time that 4.0-CURRENT used thunks.
-  */
--#if defined(__FreeBSD_cc_version) && \
--    (__FreeBSD_cc_version < 400002 || __FreeBSD_cc_version > 400003)
-+
-+/* It seems we need to use thunks in FreeBSD -CURRENT after gcc-3.1 was merged.
-+ * This solves a problem wherein regxpcom and/or regchrome would seg fault
-+ * after running for a while.  This problem has also exhibited itself on 
-+ * the alpha platform.  Therefore, use thunks on all versions of
-+ * -CURRENT that are using gcc-3.1.
-+ */
-+#if defined(__FreeBSD_cc_version) && \
-+    (__FreeBSD_cc_version < 400002 || __FreeBSD_cc_version > 400003) && \
-+    (__FreeBSD_cc_version < 500003)
- #define CFRONT_STYLE_THIS_ADJUST
- #else
- #define THUNK_BASED_THIS_ADJUST
diff --git a/www/mozilla-devel/pkg-plist b/www/mozilla-devel/pkg-plist
index f9421ddc9d91..ffc15753165f 100644
--- a/www/mozilla-devel/pkg-plist
+++ b/www/mozilla-devel/pkg-plist
@@ -67,6 +67,7 @@ lib/mozilla-devel/chrome/overlayinfo/messenger/content/overlays.rdf
 lib/mozilla-devel/chrome/overlayinfo/navigator/content/overlays.rdf
 lib/mozilla-devel/chrome/pipnss.jar
 lib/mozilla-devel/chrome/pippki.jar
+lib/mozilla-devel/chrome/typeaheadfind.jar
 lib/mozilla-devel/chrome/toolkit.jar
 lib/mozilla-devel/chrome/venkman.jar
 lib/mozilla-devel/chrome/user-locales.rdf
@@ -204,16 +205,9 @@ lib/mozilla-devel/components/libshistory.so
 lib/mozilla-devel/components/libstrres.so
 lib/mozilla-devel/components/libtransformiix.so
 lib/mozilla-devel/components/libtxmgr.so
-lib/mozilla-devel/components/libtxtsvc.so
+lib/mozilla-devel/components/libtypeaheadfind.so
 lib/mozilla-devel/components/libuconv.so
-lib/mozilla-devel/components/libucvcn.so
-lib/mozilla-devel/components/libucvibm.so
-lib/mozilla-devel/components/libucvja.so
-lib/mozilla-devel/components/libucvko.so
-lib/mozilla-devel/components/libucvlatin.so
 lib/mozilla-devel/components/libucvmath.so
-lib/mozilla-devel/components/libucvtw.so
-lib/mozilla-devel/components/libucvtw2.so
 lib/mozilla-devel/components/libunicharutil.so
 lib/mozilla-devel/components/libuniversalchardet.so
 lib/mozilla-devel/components/liburiloader.so
@@ -276,6 +270,7 @@ lib/mozilla-devel/components/pipnss.xpt
 lib/mozilla-devel/components/pippki.xpt
 lib/mozilla-devel/components/plugin.xpt
 lib/mozilla-devel/components/pref.xpt
+lib/mozilla-devel/components/prefetch.xpt
 lib/mozilla-devel/components/prefmigr.xpt
 lib/mozilla-devel/components/profile.xpt
 lib/mozilla-devel/components/progressDlg.xpt
@@ -291,6 +286,7 @@ lib/mozilla-devel/components/signonviewer.xpt
 lib/mozilla-devel/components/timebomb.xpt
 lib/mozilla-devel/components/transformiix.xpt
 lib/mozilla-devel/components/txmgr.xpt
+lib/mozilla-devel/components/typeaheadfind.xpt
 lib/mozilla-devel/components/uconv.xpt
 lib/mozilla-devel/components/unicharutil.xpt
 lib/mozilla-devel/components/uriloader.xpt
@@ -334,6 +330,7 @@ lib/mozilla-devel/defaults/pref/mailnews.js
 lib/mozilla-devel/defaults/pref/security-prefs.js
 %%MOZILLAMAILNEWS%%lib/mozilla-devel/defaults/pref/smime.js
 lib/mozilla-devel/defaults/pref/unix.js
+lib/mozilla-devel/defaults/pref/typeaheadfind.js
 lib/mozilla-devel/defaults/pref/xpinstall.js
 lib/mozilla-devel/defaults/profile/US/bookmarks.html
 lib/mozilla-devel/defaults/profile/US/chrome/userChrome-example.css
@@ -525,6 +522,8 @@ lib/mozilla-devel/res/samples/treeTest1.xul
 lib/mozilla-devel/res/samples/widgets.xul
 lib/mozilla-devel/res/samples/xpmenu.xul
 lib/mozilla-devel/res/samples/xulTest.css
+lib/mozilla-devel/res/xml/XMLPrettyPrint.css
+lib/mozilla-devel/res/xml/XMLPrettyPrint.xsl
 lib/mozilla-devel/res/throbber/anim.gif
 lib/mozilla-devel/res/throbber/anims00.gif
 lib/mozilla-devel/res/throbber/anims01.gif
@@ -579,6 +578,7 @@ lib/mozilla-devel/xcat
 lib/mozilla-devel/xenv
 lib/mozilla-devel/xls
 lib/mozilla-devel/xmlterm
+lib/mozilla-devel/xmlwf
 lib/mozilla-devel/xpcshell
 lib/mozilla-devel/xpicleanup
 lib/mozilla-devel/xpidl
@@ -589,6 +589,7 @@ lib/mozilla-devel/xpt_link
 @unexec rm -f %D/lib/mozilla-devel/components/xpti.dat || true
 @dirrm lib/mozilla-devel/searchplugins
 @dirrm lib/mozilla-devel/res/throbber
+@dirrm lib/mozilla-devel/res/xml
 @dirrm lib/mozilla-devel/res/samples/sampleimages
 @dirrm lib/mozilla-devel/res/samples
 @dirrm lib/mozilla-devel/res/rdf