* Update to 1.5 beta 2 [1]

* Add support of ports-installed Kerberos [2]
* Enable all default extensions [3]

PR:		86961 [3]
Submitted by:	mnag [1]
		David W. Hankins <David_Hankins@isc.org> [2]


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4931 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 11 insertions, 108 deletions

diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index 37f6058a3..2b284994b 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Alan Eldridge <alane@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/firefox-devel/Makefile,v 1.19 2005/09/12 21:05:12 marcus Exp $
+#   $MCom: ports/www/firefox-devel/Makefile,v 1.20 2005/09/23 20:49:57 mezz Exp $
 #
 
 PORTNAME=	firefox
-DISTVERSION=	1.5b1
-PORTREVISION=	2
+DISTVERSION=	1.5b2
 PORTEPOCH=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
@@ -37,9 +36,11 @@ USE_GNOME=	gtk20 libidl desktopfileutils
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
+USE_GCC=	3.4+
 WRKSRC=		${WRKDIR}/mozilla
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+KRB5_HOME?=	/usr
 
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
 			--exclude */macbuild/*\
@@ -51,7 +52,7 @@ EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
 FIREFOX=	${PORTNAME}
 FF_SUFX=	-devel
 FF=		${FIREFOX}${FF_SUFX}
-FF_VER=		1.4
+FF_VER=		1.4.1
 #FF_VER=	${PORTVERSION}
 
 FIREFOX_ICON=		${FF}.xpm
@@ -110,10 +111,6 @@ IGNORE=	core dumps on alpha during post-build
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
 .endif
 
-.if ${OSVERSION} < 500000
-USE_GCC=	3.4
-.endif
-
 pre-extract::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Extracting source (this takes a while) ..."
@@ -128,6 +125,7 @@ post-extract::
 		-e 's|@LOCALBASE@|${LOCALBASE}|'	\
 		-e 's|@FAKEDIR@|${FAKEDIR}|'		\
 		-e 's|@PERL@|${PERL5}|'			\
+		-e 's|@KRB5_HOME|${KRB5_HOME}|'		\
 		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \
 		<${FILESDIR}/firefox.desktop.in >${WRKDIR}/${FF}.desktop
diff --git a/www/firefox-devel/distinfo b/www/firefox-devel/distinfo
index d2ee0e01a..2ae372af8 100644
--- a/www/firefox-devel/distinfo
+++ b/www/firefox-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (firefox-1.5b1-source.tar.bz2) = a1b2549a31c74e7366213bb2ba76876f
-SIZE (firefox-1.5b1-source.tar.bz2) = 34203376
+MD5 (firefox-1.5b2-source.tar.bz2) = 08eb51cbab8050ebfd3d53e6592fc0f0
+SIZE (firefox-1.5b2-source.tar.bz2) = 34329054
diff --git a/www/firefox-devel/files/mozconfig.in b/www/firefox-devel/files/mozconfig.in
index fab66b550..9b081ef66 100644
--- a/www/firefox-devel/files/mozconfig.in
+++ b/www/firefox-devel/files/mozconfig.in
@@ -1,6 +1,6 @@
 # .mozconfig.in -*-shell-script-*-
 # $FreeBSD$
-#   $MCom: ports/www/firefox/files/mozconfig.in,v 1.5 2005/06/28 05:40:11 adamw Exp $
+#   $MCom: ports/www/firefox-devel/files/mozconfig.in,v 1.6 2005/07/14 05:25:43 ahze Exp $
 ######################################################################
 # standard opts from README
 ac_add_options --enable-application=browser
@@ -33,7 +33,7 @@ ac_add_options --with-system-jpeg=@LOCALBASE@
 ac_add_options --with-system-zlib
 ac_add_options --with-system-png=@LOCALBASE@
 ac_add_options --without-system-nspr
-ac_add_options --with-gssapi=/usr
+ac_add_options --with-gssapi=@KRB5_HOME@
 ######################################################################
 # set compile/link features
 ac_add_options --with-pthreads
@@ -50,7 +50,7 @@ ac_add_options --disable-installer
 ac_add_options --enable-single-profile
 ac_add_options --disable-profilesharing
 ac_add_options --enable-image-decoders=png,gif,jpeg,bmp
-ac_add_options --enable-extensions="cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,p3p,gnomevfs"
+ac_add_options --enable-extensions="default"
 ######################################################################
 # conditional from port Makefile
 #if test -n "$WITH_REORDER"; then
diff --git a/www/firefox-devel/files/patch-CAN-2005-2871 b/www/firefox-devel/files/patch-CAN-2005-2871
deleted file mode 100644
index ad32e3738..000000000
--- a/www/firefox-devel/files/patch-CAN-2005-2871
+++ /dev/null
@@ -1,95 +0,0 @@
-#
-# https://bugzilla.mozilla.org/show_bug.cgi?query_format=specific&order=relevance+desc&bug_status=__open__&id=307259
-#
-Index: nsStandardURL.cpp
-===================================================================
-RCS file: /cvs/mozilla/netwerk/base/src/nsStandardURL.cpp,v
-retrieving revision 1.82
-diff -p -u -1 -2 -r1.82 nsStandardURL.cpp
---- netwerk/base/src/nsStandardURL.cpp	20 Jun 2005 05:23:20 -0000	1.82
-+++ netwerk/base/src/nsStandardURL.cpp	9 Sep 2005 16:34:42 -0000
-@@ -458,24 +458,25 @@ nsStandardURL::AppendToBuf(char *buf, PR
- //  4- update url segment positions and lengths
- nsresult
- nsStandardURL::BuildNormalizedSpec(const char *spec)
- {
-     // Assumptions: all member URLSegments must be relative the |spec| argument
-     // passed to this function.
- 
-     // buffers for holding escaped url segments (these will remain empty unless
-     // escaping is required).
-     nsCAutoString encUsername;
-     nsCAutoString encPassword;
-     nsCAutoString encHost;
-+    PRBool useEncHost;
-     nsCAutoString encDirectory;
-     nsCAutoString encBasename;
-     nsCAutoString encExtension;
-     nsCAutoString encParam;
-     nsCAutoString encQuery;
-     nsCAutoString encRef;
- 
-     //
-     // escape each URL segment, if necessary, and calculate approximate normalized
-     // spec length.
-     //
-     PRInt32 approxLen = 3; // includes room for "://"
-@@ -497,25 +498,25 @@ nsStandardURL::BuildNormalizedSpec(const
-         approxLen += encoder.EncodeSegmentCount(spec, mParam,     esc_Param,         encParam);
-         approxLen += encoder.EncodeSegmentCount(spec, mQuery,     esc_Query,         encQuery);
-         approxLen += encoder.EncodeSegmentCount(spec, mRef,       esc_Ref,           encRef);
-     }
- 
-     // do not escape the hostname, if IPv6 address literal, mHost will
-     // already point to a [ ] delimited IPv6 address literal.
-     // However, perform Unicode normalization on it, as IDN does.
-     mHostEncoding = eEncoding_ASCII;
-     if (mHost.mLen > 0) {
-         const nsCSubstring& tempHost =
-             Substring(spec + mHost.mPos, spec + mHost.mPos + mHost.mLen);
--        if (NormalizeIDN(tempHost, encHost))
-+        if ((useEncHost = NormalizeIDN(tempHost, encHost)))
-             approxLen += encHost.Length();
-         else
-             approxLen += mHost.mLen;
-     }
- 
-     //
-     // generate the normalized URL string
-     //
-     mSpec.SetLength(approxLen + 32);
-     char *buf;
-     mSpec.BeginWriting(buf);
-     PRUint32 i = 0;
-@@ -530,25 +531,30 @@ nsStandardURL::BuildNormalizedSpec(const
-     mAuthority.mPos = i;
- 
-     // append authority
-     if (mUsername.mLen > 0) {
-         i = AppendSegmentToBuf(buf, i, spec, mUsername, &encUsername);
-         if (mPassword.mLen >= 0) {
-             buf[i++] = ':';
-             i = AppendSegmentToBuf(buf, i, spec, mPassword, &encPassword);
-         }
-         buf[i++] = '@';
-     }
-     if (mHost.mLen > 0) {
--        i = AppendSegmentToBuf(buf, i, spec, mHost, &encHost);
-+        if (useEncHost) {
-+            mHost.mPos = i;
-+            mHost.mLen = encHost.Length();
-+            i = AppendToBuf(buf, i, encHost.get(), mHost.mLen);
-+        } else
-+            i = AppendSegmentToBuf(buf, i, spec, mHost);
-         net_ToLowerCase(buf + mHost.mPos, mHost.mLen);
-         if (mPort != -1 && mPort != mDefaultPort) {
-             nsCAutoString portbuf;
-             portbuf.AppendInt(mPort);
-             buf[i++] = ':';
-             i = AppendToBuf(buf, i, portbuf.get(), portbuf.Length());
-         }
-     }
- 
-     // record authority length
-     mAuthority.mLen = i - mAuthority.mPos;
-