Merge some fixes from mozilla-devel.

* Allow one to override JPI_LIST
* Fix some potential lock-ups related to esound
* Fix some potential pthread problems
* Fix libiconv support
* Use built-in libical
* Use included libart_lgpl
* Use SIZE

3 files changed, 60 insertions, 13 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 63b38a9403a2..370676a4e8b7 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -7,15 +7,12 @@
 
 PORTNAME?=	mozilla
 PORTVERSION=	1.6
-PORTREVISION?=	2
+PORTREVISION?=	3
 PORTEPOCH?=	2
 CATEGORIES?=	www
-MASTER_SITES=	${MASTER_SITE_MOZILLA} \
-		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION}/src \
-		marcus/:local
-DISTFILES=	${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \
-		libart_lgpl${EXTRACT_SUFX}:local
+MASTER_SITES=	${MASTER_SITE_MOZILLA}
+MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION}/src
+DISTFILES=	${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
@@ -117,7 +114,8 @@ MOZ_EXTENSIONS:=	${MOZ_EXTENSIONS},irc
 MOZ_EXTENSIONS:=	${MOZ_EXTENSIONS},xmlterm
 .endif
 CONFIGURE_ARGS+=	--enable-extensions=${MOZ_EXTENSIONS}
-CONFIGURE_ENV=	MOZ_INTERNAL_LIBART_LGPL=1
+CONFIGURE_ENV=	MOZ_INTERNAL_LIBART_LGPL=1 \
+		LOCALBASE=${LOCALBASE}
 
 .if defined(WITH_JAVASCRIPT_DEBUGGER)
 CONFIGURE_ARGS+=	--enable-jsd \
@@ -128,7 +126,6 @@ CONFIGURE_ARGS+=	--disable-jsd \
 .endif
 
 .if defined(WITH_CALENDAR)
-CONFIGURE_ENV+=		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=	--enable-calendar
 .endif
 
@@ -148,11 +145,13 @@ CONFIGURE_ARGS+=	--enable-xft
 CONFIGURE_ARGS+=	--disable-xft
 .endif
 
+ESD_LIB=	libesd.so.2
+FREETYPE_LIB=	libfreetype.so.9
 PKGCONFIG_FILES=mozilla-gtkmozembed mozilla-js mozilla-xpcom \
 		mozilla-nspr mozilla-nss mozilla-plugin
 
 # JPI stuff.  List paths to Java Plug-ins here in the order to try.
-JPI_LIST=\
+JPI_LIST?=\
 	${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \
 	${LOCALBASE}/jdk1.4.1/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \
 	${LOCALBASE}/diablo-jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \
@@ -208,7 +207,8 @@ post-patch:
 			${WRKSRC}/config/autoconf.mk.in
 	@${FIND} ${WRKSRC}/other-licenses/libical -name "*.c" | ${XARGS} \
 		${REINPLACE_CMD} 's|<malloc.h>|<stdlib.h>|g'
-	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
+		s|-lpthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/configure \
 		${WRKSRC}/nsprpub/configure
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
@@ -216,6 +216,17 @@ post-patch:
 		${WRKSRC}/security/coreconf/FreeBSD.mk \
 		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
 		${WRKSRC}/js/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|libesd\.so\.0|${ESD_LIB}|g' \
+		${WRKSRC}/widget/src/gtk2/nsSound.cpp
+	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \
+		${WRKSRC}/modules/libpref/src/init/all.js \
+		${WRKSRC}/calendar/sunbird/app/profile/all.js
+	@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
+		${WRKSRC}/configure \
+		${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
+		${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
+	@${REINPLACE_CMD} -e 's|libfreetype.so.6|${FREETYPE_LIB}|g' \
+		${WRKSRC}/modules/libpref/src/init/all.js
 	@for pcfile in ${PKGCONFIG_FILES}; do \
 		${REINPLACE_CMD} -e 's|mozilla-xpcom|mozilla-xpcom${MOZ_SUFX}${PKGNAMESUFFIX}|g ; \
 			s|mozilla-nspr|mozilla-nspr${MOZ_SUFX}${PKGNAMESUFFIX}|g' \
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index f66b161dab43..dbbf6dbc75b3 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,2 +1,2 @@
 MD5 (mozilla-source-1.6.tar.bz2) = da612f8768320dbafd0bfb3c254c2788
-MD5 (libart_lgpl.tar.bz2) = f332c3c026adc1c2c0ceb3ac5847d5f5
+SIZE (mozilla-source-1.6.tar.bz2) = 31037452
diff --git a/www/mozilla/files/patch-qt b/www/mozilla/files/patch-qt
index f4b74769e8d4..5420fec2679a 100644
--- a/www/mozilla/files/patch-qt
+++ b/www/mozilla/files/patch-qt
@@ -1,5 +1,41 @@
 --- configure.orig	Thu Dec 11 18:32:02 2003
-+++ configure	Fri Jan 16 22:46:30 2004
++++ configure	Thu Mar 11 00:51:58 2004
+@@ -9181,7 +9181,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-liconv  $LIBS"
++LIBS="-L$LOCALBASE/lib -liconv  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 9187 "configure"
+ #include "confdefs.h"
+@@ -9212,7 +9212,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  _ICONV_LIBS="$_ICONV_LIBS -liconv"
++  _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6
+@@ -9222,7 +9222,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-liconv  $LIBS"
++LIBS="-L$LOCALBASE/lib -liconv  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 9228 "configure"
+ #include "confdefs.h"
+@@ -9253,7 +9253,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  _ICONV_LIBS="$_ICONV_LIBS -liconv"
++  _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv"
+ else
+   echo "$ac_t""no" 1>&6
+ fi
 @@ -11969,9 +11969,9 @@