* Update to 1.4.1

* Add new CLI options to mozilla startup script [1]
* Make XMLTerm optional [2]
* Don't accidentally include mozilla in the plist twice [3]

PR:		55412 [1]
		55330 [2]
		56210 [3]
Submitted by:	bland [1] [2]

5 files changed, 41 insertions, 29 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index be20bbbe9414..403380aa4dc6 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME?=	mozilla
-PORTVERSION=	1.4
+PORTVERSION=	1.4.1
 PORTEPOCH?=	2
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 	      	${MASTER_SITE_LOCAL:S/$/:local/}
 MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \
 		marcus/:local
-DISTFILES=	${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \
+DISTFILES=	${PORTNAME}-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \
 		libart_lgpl${EXTRACT_SUFX}:local
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -109,12 +109,15 @@ CONFIGURE_ARGS+=	--enable-ldap --enable-mailnews
 .endif
 .endif
 
+MOZ_EXTENSIONS=		default
 .if !defined(WITHOUT_CHATZILLA)
-CONFIGURE_ARGS+=	--enable-extensions=default,irc,xmlterm
-.else
-CONFIGURE_ARGS+=	--enable-extensions=default,xmlterm
+MOZ_EXTENSIONS:=	${MOZ_EXTENSIONS},irc
+.endif
+.if !defined(WITHOUT_XMLTERM)
+MOZ_EXTENSIONS:=	${MOZ_EXTENSIONS},xmlterm
 .endif
-CONFIGURE_ENV=	MOZ_INTERNAL_LIBART_LGPL=1
+CONFIGURE_ARGS+=	--enable-extensions=${MOZ_EXTENSIONS}
+CONFIGURE_ENV=		MOZ_INTERNAL_LIBART_LGPL=1
 
 .if defined(WITH_JAVASCRIPT_DEBUGGER)
 CONFIGURE_ARGS+=	--enable-jsd \
@@ -179,6 +182,7 @@ pre-everything::
 	@${ECHO_MSG} "	WITHOUT_COMPOSER=yes	Disables the HTML Composer module"
 	@${ECHO_MSG} "	WITHOUT_LDAP=yes	Disables LDAP support within the Mailnews module"
 	@${ECHO_MSG} "	WITHOUT_CHATZILLA=yes	Disable the Chatzilla IRC module"
+	@${ECHO_MSG} "	WITHOUT_XMLTERM=yes	Disable the XMLTerm module"
 	@${ECHO_MSG} "	WITH_JAVASCRIPT_DEBUGGER=yes		Enable the DTD and JavaScript debuggers"
 	@${ECHO_MSG} "	WITH_OPTIMIZED_CFLAGS=yes	Enable -O2 optimization"
 	@${ECHO_MSG} ""
@@ -220,7 +224,9 @@ pre-install:
 	if [ ! -x ${PREFIX}/bin/mozilla -a ! -L ${PREFIX}/bin/mozilla ]; then \
 	    ${ECHO_CMD} bin/mozilla >> ${PLIST} ; \
 	fi
-	${ECHO_CMD} bin/${MOZILLA} >> ${PLIST}
+	if [ "${MOZILLA}" != "mozilla" ]; then \
+	    ${ECHO_CMD} bin/${MOZILLA} >> ${PLIST} ; \
+	fi
 	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
 	    ${ECHO_CMD} lib/browser_plugins/libjavaplugin_oji.so >> ${PLIST} ; \
 	    ${ECHO_CMD} @dirrm lib/browser_plugins >> ${PLIST} ; \
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index ae95264fd17f..4a114b021cfd 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,2 +1,2 @@
-MD5 (mozilla-source-1.4.tar.bz2) = a4644caeeeb323d0d8b59758b67d4454
+MD5 (mozilla-1.4.1.tar.bz2) = a1b72d97981cabb6160526d8c8d97ac1
 MD5 (libart_lgpl.tar.bz2) = f332c3c026adc1c2c0ceb3ac5847d5f5
diff --git a/www/mozilla/files/mozilla.sh b/www/mozilla/files/mozilla.sh
index bbc7d2568bc6..c839ef1a9ff4 100644
--- a/www/mozilla/files/mozilla.sh
+++ b/www/mozilla/files/mozilla.sh
@@ -7,9 +7,15 @@ LOCATION='new-tab'
 cd $MOZILLA_DIR                                     || exit 1
 
 case $1 in
+    -browser)
+    	REMOTE_COMMAND="xfeDoCommand (openBrowser)"
+	;;
     -mail)
     	REMOTE_COMMAND="xfeDoCommand (openInbox)"
 	;;
+    -compose)
+    	REMOTE_COMMAND="xfeDoCommand (composeMessage)"
+	;;
     -*)
     	exec ./$MOZILLA_EXEC "$@"
 	;;
diff --git a/www/mozilla/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/mozilla/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
index d64b52875aaa..0b0e08247101 100644
--- a/www/mozilla/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
+++ b/www/mozilla/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp
@@ -1,32 +1,32 @@
---- gfx/src/gtk/nsFontMetricsXft.cpp.orig	Thu May 29 19:10:54 2003
-+++ gfx/src/gtk/nsFontMetricsXft.cpp	Mon Jun 30 23:11:39 2003
-@@ -90,6 +90,7 @@
+--- gfx/src/gtk/nsFontMetricsXft.cpp.save	Thu Aug  7 12:14:49 2003
++++ gfx/src/gtk/nsFontMetricsXft.cpp	Thu Aug  7 12:33:45 2003
+@@ -106,6 +106,7 @@
      FcPattern *mPattern;
      FcPattern *mFontName;
      FcCharSet *mCharset;
 +    int        mNotXft;
  };
  
- struct MozXftLangGroup {
-@@ -774,7 +775,7 @@
+ class nsFontXftInfo;
+@@ -1051,7 +1052,7 @@
      // font in our loaded list that supports the character
      for (PRInt32 i = 0, end = mLoadedFonts.Count(); i < end; ++i) {
          nsFontXft *font = (nsFontXft *)mLoadedFonts.ElementAt(i);
--        if (FcCharSetHasChar(font->mCharset, aChar))
-+        if (FcCharSetHasChar(font->mCharset, aChar) && font->GetXftFont())
+-        if (font->HasChar(PRUint32(aChar)))
++        if (font->HasChar(PRUint32(aChar)) && font->GetXftFont())
              return font;
      }
  
-@@ -1196,7 +1197,7 @@
+@@ -1492,7 +1493,7 @@
+         // this character.
          for (PRInt32 j = 0, end = mLoadedFonts.Count(); j < end; ++j) {
-             nsFontXft *font;
              font = (nsFontXft *)mLoadedFonts.ElementAt(j);
--            if (FcCharSetHasChar(font->mCharset, c)) {
-+            if (FcCharSetHasChar(font->mCharset, c) && font->GetXftFont()) {
-                 foundFont = font;
-                 break;
+-            if (font->HasChar(c)) {
++            if (font->HasChar(c) && font->GetXftFont()) {
+                 currFont = font;
+                 goto FoundFont; // for speed -- avoid "if" statement
              }
-@@ -1566,6 +1567,7 @@
+@@ -1922,6 +1923,7 @@
      FcPatternReference(mFontName);
  
      mXftFont = nsnull;
@@ -34,7 +34,7 @@
  
      // set up our charset
      mCharset = nsnull;
-@@ -1592,7 +1594,7 @@
+@@ -1948,7 +1950,7 @@
  XftFont *
  nsFontXft::GetXftFont(void)
  {
@@ -43,7 +43,7 @@
          FcPattern *pat = FcFontRenderPrepare(0, mPattern, mFontName);
          if (!pat)
              return nsnull;
-@@ -1611,8 +1613,10 @@
+@@ -1967,8 +1969,10 @@
              FcPatternDel(pat, FC_SPACING);
  
          mXftFont = XftFontOpenPattern(GDK_DISPLAY(), pat);
diff --git a/www/mozilla/files/patch-qt b/www/mozilla/files/patch-qt
index eae02f50f39f..c72d0a591c4c 100644
--- a/www/mozilla/files/patch-qt
+++ b/www/mozilla/files/patch-qt
@@ -1,11 +1,11 @@
---- configure.orig	Mon Jun 16 15:15:10 2003
-+++ configure	Mon Jun 30 23:21:49 2003
-@@ -11992,9 +11992,9 @@
+--- configure.orig	Wed Aug 27 11:00:21 2003
++++ configure	Sat Oct 11 12:22:54 2003
+@@ -11896,9 +11896,9 @@
  
  
  
--MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices"
-+MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices"
+-MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector irc universalchardet typeaheadfind webservices spellcheck"
++MOZ_EXTENSIONS_DEFAULT=" cookie wallet content-packs xml-rpc xmlextras help p3p pref transformiix venkman inspector universalchardet typeaheadfind webservices spellcheck"
  
 -MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT xmlterm access-builtin datetime finger cview" 
 +MOZ_EXTENSIONS_ALL="$MOZ_EXTENSIONS_DEFAULT irc xmlterm access-builtin datetime finger cview"