Update to 1.1. This fixes the font problem as well as the chatzilla bug. A

full list of changes can be found in the Mozilla 1.1 release notes from:

http://www.mozilla.org/releases/mozilla1.1/

PR:		42068

7 files changed, 61 insertions, 132 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 08fc786..9bc3db9 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	mozilla
-PORTVERSION=	1.0
-PORTREVISION=	2
+PORTVERSION=	1.1
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
-		http://people.FreeBSD.org/~sobomax/:local
+		http://people.FreeBSD.org/~marcus/:local
 MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \
-		sobomax/:local
+		marcus/:local
 DISTFILES=	${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \
 		libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local
 
@@ -28,9 +27,8 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-WITHOUT_CHATZILLA=	"Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249"
+#WITHOUT_CHATZILLA=	"Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249"
 
-USE_BZIP2=	yes
 EXTRACT_AFTER_ARGS=	| tar -xf - -X ${FILESDIR}/tar-exclude
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
@@ -114,9 +112,8 @@ post-build:
 		${FILESDIR}/mozilla.sh >${WRKSRC}/mozilla
 	(cd ${WRKSRC}/dist/bin; \
 	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \
-	  ${ECHO_CMD} skin,install,select,classic/1.0 >> chrome/installed-chrome.txt; \
-	  ${ECHO_CMD} locale,install,select,en-US >> chrome/installed-chrome.txt; \
-	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome)
+	  ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome; \
+	  ${TOUCH} ./chrome/user-skins.rdf ./chrome/user-locales.rdf)
 	${FIND} ${WRKSRC}/dist/bin -type d | /usr/bin/sort -r | \
 		${XARGS} ${RMDIR} 2> /dev/null || ${TRUE}
 
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index e145e24..9d2cce2 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla-source-1.0.tar.bz2) = 033da936e48336aa2c5d8bf0aa039056
-MD5 (libart_lgpl-1.0.tar.bz2) = f332c3c026adc1c2c0ceb3ac5847d5f5
+MD5 (mozilla-source-1.1.tar.gz) = f23ae90817506559da3bdf07fdf7c2a8
+MD5 (libart_lgpl-1.1.tar.gz) = 276f65c384d020c36003260689806735
diff --git a/www/mozilla/files/patch-Makefile.in b/www/mozilla/files/patch-Makefile.in
index f65ae1b..43fa346 100644
--- a/www/mozilla/files/patch-Makefile.in
+++ b/www/mozilla/files/patch-Makefile.in
@@ -1,25 +1,22 @@
-
-$FreeBSD$
-
---- Makefile.in	2001/12/25 21:00:23	1.1
-+++ Makefile.in	2001/12/26 06:40:16
-@@ -64,8 +64,7 @@
- DIRS = $(NSPRPUB_DIR) \
+--- Makefile.in.orig	Thu May 30 20:39:07 2002
++++ Makefile.in	Wed Aug 28 13:55:32 2002
+@@ -70,8 +70,7 @@
  	$(tier_0_dirs) \
  	$(tier_1_dirs) \
+ 	$(tier_2_dirs) \
 -	$(tier_9_dirs) \
 -	$(NULL)
 +	$(tier_9_dirs)
  
- ifdef MOZ_LDAP_XPCOM
- DIRS += directory/c-sdk/ldap
-@@ -81,7 +80,8 @@
+ ifdef GC_LEAK_DETECTOR
+ DIRS += gc/boehm
+@@ -90,7 +89,8 @@
  DIRS += $(tier_98_dirs)
  endif
  
 -DIRS	+= $(tier_99_dirs)
 +DIRS	+= $(tier_99_dirs) \
-+	    $(NULL)
++		$(NULL)
  
  #
  # tier 0 - base build config dirs
diff --git a/www/mozilla/files/patch-nsFontMetricsGTK.cpp b/www/mozilla/files/patch-nsFontMetricsGTK.cpp
deleted file mode 100644
index 3bab909..0000000
--- a/www/mozilla/files/patch-nsFontMetricsGTK.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-$FreeBSD$
-
-As reported by Mikko Rapeli and Tom Vogt at
-http://bugzilla.mozilla.org/show_bug.cgi?id=115788 and
-http://bugzilla.mozilla.org/show_bug.cgi?id=150339 the X server can
-abort when Mozilla requests a huge (scalable) font.  This is also
-likely to happen to the X font server, or to Xvnc.
-
-This patch is from
-http://bugzilla.mozilla.org/attachment.cgi?id=87432&action=view
-.
-
---- gfx/src/gtk/nsFontMetricsGTK.cpp	Mon Jun 10 01:02:08 2002
-+++ gfx/src/gtk/nsFontMetricsGTK.cpp	Thu Jun 13 00:06:33 2002
-@@ -87,6 +87,12 @@
- #undef USER_DEFINED
- #define USER_DEFINED "x-user-def"
- 
-+// This is the scaling factor that we keep fonts limited to against
-+// the display size.  If a pixel size is requested that is more than
-+// this factor larger than the height of the display, it's clamped to
-+// that value instead of the requested size.
-+#define FONT_MAX_FONT_SCALE 2
-+
- #undef NOISY_FONTS
- #undef REALLY_NOISY_FONTS
- 
-@@ -1276,7 +1282,12 @@
- 
-   float app2dev;
-   mDeviceContext->GetAppUnitsToDevUnits(app2dev);
-+
-   mPixelSize = NSToIntRound(app2dev * mFont->size);
-+  // Make sure to clamp the pixel size to something reasonable so we
-+  // don't make the X server blow up.
-+  mPixelSize = PR_MIN(gdk_screen_height() * FONT_MAX_FONT_SCALE, mPixelSize);
-+
-   mStretchIndex = 4; // normal
-   mStyleIndex = mFont->style;
- 
diff --git a/www/mozilla/files/patch-nsFontMetricsXlib.cpp b/www/mozilla/files/patch-nsFontMetricsXlib.cpp
deleted file mode 100644
index fd470f6..0000000
--- a/www/mozilla/files/patch-nsFontMetricsXlib.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-$FreeBSD$
-
-As reported by Mikko Rapeli and Tom Vogt at
-http://bugzilla.mozilla.org/show_bug.cgi?id=115788 and
-http://bugzilla.mozilla.org/show_bug.cgi?id=150339 the X server can
-abort when Mozilla requests a huge (scalable) font.  This is also
-likely to happen to the X font server, or to Xvnc.
-
-This patch is from
-http://bugzilla.mozilla.org/attachment.cgi?id=87432&action=view
-.
-
---- gfx/src/xlib/nsFontMetricsXlib.cpp	Tue Jun 11 16:20:31 2002
-+++ gfx/src/xlib/nsFontMetricsXlib.cpp	Thu Jun 13 00:05:47 2002
-@@ -99,6 +99,12 @@
- #undef USER_DEFINED
- #define USER_DEFINED "x-user-def"
- 
-+// This is the scaling factor that we keep fonts limited to against
-+// the display size.  If a pixel size is requested that is more than
-+// this factor larger than the height of the display, it's clamped to
-+// that value instead of the requested size.
-+#define FONT_MAX_FONT_SCALE 2
-+
- #undef NOISY_FONTS
- #undef REALLY_NOISY_FONTS
- 
-@@ -1480,7 +1486,12 @@
- 
-   float app2dev;
-   mDeviceContext->GetAppUnitsToDevUnits(app2dev);
-+
-   mPixelSize = NSToIntRound(app2dev * mFont->size);
-+  // Make sure to clamp the pixel size to something reasonable so we
-+  // don't make the X server blow up.
-+  mPixelSize = PR_MIN(XHeightOfScreen(xxlib_rgb_get_screen(gXlibRgbHandle)) * FONT_MAX_FONT_SCALE, mPixelSize);
-+
-   mStretchIndex = 4; // Normal
-   mStyleIndex = mFont->style;
- 
diff --git a/www/mozilla/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h b/www/mozilla/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h
deleted file mode 100644
index 2224e67..0000000
--- a/www/mozilla/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/pkg-plist b/www/mozilla/pkg-plist
index 1eaf934..5b76f71 100644
--- a/www/mozilla/pkg-plist
+++ b/www/mozilla/pkg-plist
@@ -21,6 +21,40 @@ lib/mozilla/chrome/en-unix.jar
 lib/mozilla/chrome/en-win.jar
 lib/mozilla/chrome/forms.jar
 lib/mozilla/chrome/help.jar
+lib/mozilla/chrome/icons/default/abcardWindow.xpm
+lib/mozilla/chrome/icons/default/abcardWindow16.xpm
+lib/mozilla/chrome/icons/default/addressbookWindow.xpm
+lib/mozilla/chrome/icons/default/addressbookWindow16.xpm
+lib/mozilla/chrome/icons/default/bmPropsWindow.xpm
+lib/mozilla/chrome/icons/default/bmPropsWindow16.xpm
+lib/mozilla/chrome/icons/default/bookmark-window.xpm
+lib/mozilla/chrome/icons/default/bookmark-window16.xpm
+lib/mozilla/chrome/icons/default/calendar-window.xpm
+lib/mozilla/chrome/icons/default/calendar-window16.xpm
+lib/mozilla/chrome/icons/default/chatzilla-window.xpm
+lib/mozilla/chrome/icons/default/chatzilla-window16.xpm
+lib/mozilla/chrome/icons/default/downloadManager.xpm
+lib/mozilla/chrome/icons/default/downloadManager16.xpm
+lib/mozilla/chrome/icons/default/editorWindow.xpm
+lib/mozilla/chrome/icons/default/editorWindow16.xpm
+lib/mozilla/chrome/icons/default/findBookmarkWindow.xpm
+lib/mozilla/chrome/icons/default/findBookmarkWindow16.xpm
+lib/mozilla/chrome/icons/default/findHistoryWindow.xpm
+lib/mozilla/chrome/icons/default/findHistoryWindow16.xpm
+lib/mozilla/chrome/icons/default/history-window.xpm
+lib/mozilla/chrome/icons/default/history-window16.xpm
+lib/mozilla/chrome/icons/default/jsconsoleWindow.xpm
+lib/mozilla/chrome/icons/default/jsconsoleWindow16.xpm
+lib/mozilla/chrome/icons/default/main-window.xpm
+lib/mozilla/chrome/icons/default/main-window16.xpm
+lib/mozilla/chrome/icons/default/messengerWindow.xpm
+lib/mozilla/chrome/icons/default/messengerWindow16.xpm
+lib/mozilla/chrome/icons/default/msgcomposeWindow.xpm
+lib/mozilla/chrome/icons/default/msgcomposeWindow16.xpm
+lib/mozilla/chrome/icons/default/venkman-window.xpm
+lib/mozilla/chrome/icons/default/venkman-window16.xpm
+lib/mozilla/chrome/icons/default/winInspectorMain.xpm
+lib/mozilla/chrome/icons/default/winInspectorMain16.xpm
 lib/mozilla/chrome/inspector.jar
 lib/mozilla/chrome/installed-chrome.txt
 %%MOZILLAMAILNEWS%%lib/mozilla/chrome/messenger.jar
@@ -35,8 +69,9 @@ lib/mozilla/chrome/pipnss.jar
 lib/mozilla/chrome/pippki.jar
 lib/mozilla/chrome/toolkit.jar
 lib/mozilla/chrome/venkman.jar
+lib/mozilla/chrome/user-locales.rdf
+lib/mozilla/chrome/user-skins.rdf
 lib/mozilla/chrome/xmlterm.jar
-lib/mozilla/component.reg
 %%MOZILLAMAILNEWS%%lib/mozilla/components/absync.xpt
 lib/mozilla/components/accessibility.xpt
 %%MOZILLAMAILNEWS%%lib/mozilla/components/addrbook.xpt
@@ -50,10 +85,11 @@ lib/mozilla/components/chardet.xpt
 lib/mozilla/components/chrome.xpt
 lib/mozilla/components/commandhandler.xpt
 lib/mozilla/components/composer.xpt
+lib/mozilla/components/compreg.dat
 lib/mozilla/components/content.xpt
+lib/mozilla/components/content_xslt.xpt
 lib/mozilla/components/content_base.xpt
 lib/mozilla/components/content_html.xpt
-lib/mozilla/components/content_xsl.xpt
 lib/mozilla/components/cookie.xpt
 lib/mozilla/components/directory.xpt
 lib/mozilla/components/docshell.xpt
@@ -125,6 +161,7 @@ lib/mozilla/components/libimglib2.so
 lib/mozilla/components/libimgmng.so
 lib/mozilla/components/libimgpng.so
 lib/mozilla/components/libimgppm.so
+lib/mozilla/components/libimgxbm.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libimpComm4xMail.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libimpText.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libimport.so
@@ -143,7 +180,6 @@ lib/mozilla/components/libmork.so
 lib/mozilla/components/libmozbrwsr.so
 lib/mozilla/components/libmozfind.so
 %%MOZILLALDAP%%lib/mozilla/components/libmozldap.so
-lib/mozilla/components/libmozxfer.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libmsgcompose.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libmsgdb.so
 %%MOZILLAMAILNEWS%%lib/mozilla/components/libmsgimap.so
@@ -200,7 +236,6 @@ lib/mozilla/components/mimetype.xpt
 lib/mozilla/components/mozbrwsr.xpt
 lib/mozilla/components/mozfind.xpt
 %%MOZILLALDAP%%lib/mozilla/components/mozldap.xpt
-lib/mozilla/components/mozxfer.xpt
 %%MOZILLAMAILNEWS%%lib/mozilla/components/msgbase.xpt
 %%MOZILLAMAILNEWS%%lib/mozilla/components/msgcompose.xpt
 %%MOZILLAMAILNEWS%%lib/mozilla/components/msgdb.xpt
@@ -256,7 +291,6 @@ 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
 lib/mozilla/components/uconv.xpt
 lib/mozilla/components/unicharutil.xpt
 lib/mozilla/components/uriloader.xpt
@@ -270,6 +304,7 @@ 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/windowds.xpt
 lib/mozilla/components/windowwatcher.xpt
 lib/mozilla/components/xml-rpc.xpt
 lib/mozilla/components/xmlextras.xpt
@@ -289,11 +324,10 @@ lib/mozilla/components/xpti.dat
 lib/mozilla/components/xremoteservice.xpt
 lib/mozilla/components/xuldoc.xpt
 lib/mozilla/components/xultmpl.xpt
+lib/mozilla/defaults/autoconfig/platform.js
 lib/mozilla/defaults/autoconfig/prefcalls.js
 lib/mozilla/defaults/pref/all.js
-lib/mozilla/defaults/pref/config.js
 lib/mozilla/defaults/pref/editor.js
-lib/mozilla/defaults/pref/initpref.js
 lib/mozilla/defaults/pref/inspector.js
 lib/mozilla/defaults/pref/mailnews.js
 %%MOZILLAMAILNEWS%%lib/mozilla/defaults/pref/mdn.js
@@ -364,7 +398,6 @@ lib/mozilla/res/arrowd.gif
 lib/mozilla/res/broken-image.gif
 lib/mozilla/res/builtin/htmlBindings.xml
 lib/mozilla/res/builtin/platformHTMLBindings.xml
-lib/mozilla/res/builtin/xbl-forms.css
 lib/mozilla/res/charsetData.properties
 lib/mozilla/res/charsetalias.properties
 lib/mozilla/res/cmessage.txt
@@ -375,6 +408,7 @@ lib/mozilla/res/entityTables/html40Latin1.properties
 lib/mozilla/res/entityTables/html40Special.properties
 lib/mozilla/res/entityTables/html40Symbols.properties
 lib/mozilla/res/entityTables/htmlEntityVersions.properties
+lib/mozilla/res/entityTables/mathml20.properties
 lib/mozilla/res/entityTables/transliterate.properties
 lib/mozilla/res/fonts/mathfont.properties
 lib/mozilla/res/fonts/mathfontCMEX10.properties
@@ -551,7 +585,7 @@ lib/mozilla/xpidl
 lib/mozilla/xpt_dump
 lib/mozilla/xpt_link
 @unexec rm -f %D/lib/mozilla/chrome/chrome.rdf || true
-@unexec rm -f %D/lib/mozilla/component.reg || true
+@unexec rm -f %D/lib/mozilla/compreg.dat || true
 @unexec rm -f %D/lib/mozilla/components/xpti.dat || true
 @dirrm lib/mozilla/searchplugins
 @dirrm lib/mozilla/res/throbber
@@ -590,5 +624,7 @@ lib/mozilla/xpt_link
 @dirrm lib/mozilla/chrome/overlayinfo/communicator/content
 @dirrm lib/mozilla/chrome/overlayinfo/communicator
 @dirrm lib/mozilla/chrome/overlayinfo
+@dirrm lib/mozilla/chrome/icons/default
+@dirrm lib/mozilla/chrome/icons
 @dirrm lib/mozilla/chrome
 @dirrm lib/mozilla