* Update to 1.7.5

* Add i18n support [1]
* Don't delete lib/browser_plugins if it was installed by another instance
  of Mozilla [2]

PR:		73841 [1]
Submitted by:	Jose M Rodriguez <josemi@freebsd.jazztel.es> [1]
		ahze [2]

4 files changed, 42 insertions, 26 deletions

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 16c8efd009cf..ea66737e1b40 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -6,18 +6,17 @@
 #
 
 PORTNAME?=	mozilla
-PORTVERSION=	1.7.3
-PORTREVISION?=	3
+PORTVERSION=	1.7.5
 PORTEPOCH?=	2
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \
 		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION}/src \
+MASTER_SITE_SUBDIR=	mozilla/releases/${PORTNAME}${PORTVERSION}/source \
 			adamw/:local
 DISTFILES=	${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX}
-.if !defined(WITH_CAIRO_RENDER)
-DISTFILES+=	libart_lgpl${EXTRACT_SUFX}:local
-.endif
+#.if !defined(WITH_CAIRO_RENDER)
+#DISTFILES+=	libart_lgpl${EXTRACT_SUFX}:local
+#.endif
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The open source, standards compliant web browser
@@ -35,12 +34,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 MOZILLA?=	mozilla
 MOZ_SUFX?=
 
-.if defined(WITH_GTK1)
-PKGNAMESUFFIX=	-gtk1
-USE_GNOME=	gtk12 orbit
-.else
 USE_GNOME=	gtk20 libidl
-.endif
 
 LATEST_LINK=	${MOZILLA}
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
@@ -91,11 +85,7 @@ CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
-.if defined(WITH_GTK1)
-CONFIGURE_ARGS+=	--enable-default-toolkit=gtk
-.else
 CONFIGURE_ARGS+=	--enable-default-toolkit=gtk2
-.endif
 
 ESD_LIB=	libesd.so.2
 FREETYPE_LIB=	libfreetype.so.9
@@ -254,6 +244,8 @@ post-patch:
 		${WRKSRC}/js/src/Makefile.in
 	@${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|${ESD_LIB}|g' \
 		${WRKSRC}/widget/src/gtk2/nsSound.cpp
+	@${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.no|g' \
+		${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp
 	@${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \
 		${WRKSRC}/modules/libpref/src/init/all.js
 	@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
@@ -304,8 +296,9 @@ pre-install:
 				break; \
 			fi; \
 		done; \
-		${ECHO_CMD} @dirrm lib/browser_plugins >> ${PLIST} ; \
 	fi
+	${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST}
+	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST}
 	${ECHO_CMD} lib/${MOZILLA}/mozilla >> ${PLIST}
 	${ECHO_CMD} lib/${MOZILLA}/mozilla-config >> ${PLIST}
 .if !defined(WITHOUT_MAILNEWS)
@@ -339,6 +332,7 @@ do-install:
 	if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \
 		${MKDIR} ${PREFIX}/lib/browser_plugins ; \
 	fi
+	${TOUCH} -f ${PREFIX}/lib/browser_plugins/.${PORTNAME}.keep
 	if [ ! -L ${PREFIX}/lib/browser_plugins/libjavaplugin_oji.so ]; then \
 		for jpi in ${JPI_LIST}; do \
 			if [ -f $${jpi} ]; then \
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index 090bcb860698..a8ffe6243946 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,4 +1,2 @@
-MD5 (mozilla-source-1.7.3.tar.bz2) = 15cb68da1d58f055f871b77ff655df77
-SIZE (mozilla-source-1.7.3.tar.bz2) = 29716200
-MD5 (libart_lgpl.tar.bz2) = d681e7528aa30b6c615e571a54db2242
-SIZE (libart_lgpl.tar.bz2) = 103000
+MD5 (mozilla-source-1.7.5.tar.bz2) = e5994f3e801cd834966367c6a12f8aeb
+SIZE (mozilla-source-1.7.5.tar.bz2) = 30440393
diff --git a/www/mozilla/files/mozilla.sh b/www/mozilla/files/mozilla.sh
index 3eae0f5cbae3..16d043f29665 100644
--- a/www/mozilla/files/mozilla.sh
+++ b/www/mozilla/files/mozilla.sh
@@ -6,6 +6,22 @@ LOCATION='new-tab'
 
 cd $MOZILLA_DIR                                     || exit 1
 
+# LANG, MOZILLA_UILOCALE, MOZILLA_REGION
+if [ -n "$LANG" -a ! -n "${MOZILLA_UILOCALE}" ]; then
+    _locale="${LANG%%.*}"
+    if [ "${_locale}" != "en_US" -a "${_locale}" != "C" ]; then
+	_region="${_locale##*_}"
+	_locale="${_locale%_*}"
+	[ -r chrome/${_locale}-${_region}.jar ] && \
+	    MOZILLA_EXEC="${MOZILLA_EXEC} -UILocale ${_locale}-${_region}"
+    fi
+elif [ -n "${MOZILLA_UILOCALE}" ]; then
+    MOZILLA_EXEC="${MOZILLA_EXEC} -UILocale ${MOZILLA_UILOCALE}"
+    if [ -n "${MOZILLA_UIREGION}" ]; then
+	MOZILLA_EXEC="${MOZILLA_EXEC} -UIRegion ${MOZILLA_UIREGION}"
+    fi
+fi
+
 case $1 in
     -browser)
     	REMOTE_COMMAND="xfeDoCommand (openBrowser)"
diff --git a/www/mozilla/files/patch-extensions_negotiateauth_Makefile.in b/www/mozilla/files/patch-extensions_negotiateauth_Makefile.in
index ca1f969ce5fe..6c938617fb7f 100644
--- a/www/mozilla/files/patch-extensions_negotiateauth_Makefile.in
+++ b/www/mozilla/files/patch-extensions_negotiateauth_Makefile.in
@@ -1,12 +1,20 @@
---- extensions/negotiateauth/Makefile.in.orig	Tue Apr 13 12:19:44 2004
-+++ extensions/negotiateauth/Makefile.in	Tue Apr 13 12:19:53 2004
-@@ -68,8 +68,8 @@
+--- extensions/negotiateauth/Makefile.in.orig	Mon Jul 12 15:18:06 2004
++++ extensions/negotiateauth/Makefile.in	Sat Dec 18 16:10:49 2004
+@@ -64,7 +64,6 @@
  		$(NULL)
  
  EXTRA_DSO_LDOPTS = \
 -		$(MOZ_COMPONENT_LIBS) \
- 		$(GSSAPI_LIBS) \
-+		$(MOZ_COMPONENT_LIBS) \
  		$(NULL)
  
- # make sure this component is never statically linked into the main
+ ifneq (,$(GSSAPI_LIBS))
+@@ -81,6 +80,9 @@
+ # to install GSSAPI libraries in order to use the rest of mozilla ;-)
+ FORCE_SHARED_LIB  = 1
+ endif
++
++EXTRA_DSO_LDOPTS = \
++		   $(MOZ_COMPONENT_LIBS)
+ 
+ ifeq ($(OS_ARCH),WINNT)
+ LOCAL_INCLUDES	  = -DUSE_SSPI