* Instead of using Xvfb, and evil black magic to create the extensions

  repository, use the hidden "-register" option instead.  This has the
  advantage of not requiring an X DISPLAY and not modifying any
  preferences.
* Add i18n support to the Thunderbird startup script [1]
* Link nss with -Bsymbolic to avoid symbol conflicts with OpenSSL.  This
  should help alleviate the CUPS printing problem

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

4 files changed, 55 insertions, 9 deletions

diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
index 11e5c1c0250c..f5c642866820 100644
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	thunderbird
 PORTVERSION=	0.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	thunderbird/releases/${PORTVERSION}
@@ -21,7 +21,6 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		nspr4.1:${PORTSDIR}/devel/nspr
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-RUN_DEPENDS=	Xvfb:${X_VFBSERVER_PORT}
 
 USE_X_PREFIX=	yes
 
diff --git a/mail/thunderbird-esr/files/patch-mail_app_mozilla.in b/mail/thunderbird-esr/files/patch-mail_app_mozilla.in
new file mode 100644
index 000000000000..12eed67ff3ef
--- /dev/null
+++ b/mail/thunderbird-esr/files/patch-mail_app_mozilla.in
@@ -0,0 +1,34 @@
+--- mail/app/mozilla.in.orig	Thu Nov 11 23:14:17 2004
++++ mail/app/mozilla.in	Thu Nov 11 23:15:43 2004
+@@ -218,12 +218,31 @@
+       script_args="$script_args -d $2"
+       shift 2
+       ;;
++    -UILocale)
++      moreargs="$moreargs -UILocale $2"
++      _done_locale="YES"
++      shift 2
++      ;;
++    -UIRegion)
++      if [ -n "${_done_locale}" ]; then
++        moreargs="$moreargs -UIRegion $2"
++      fi
++      shift 2
++      ;;
+     *)
+       moreargs="$moreargs \"$1\""
+       shift 1
+       ;;
+   esac
+ done
++
++if [ ! -n "${_done_locale}" -a -n "${MOZILLA_UILOCALE}" ]; then
++    moreargs="$moreargs -UILocale ${MOZILLA_UILOCALE}"
++    if [ -n "${MOZILLA_UIREGION}" ]; then
++      moreargs="$moreargs -UIRegion ${MOZILLA_UIREGION}"
++    fi
++fi
++unset _done_locale
+ 
+ export MRE_HOME
+ eval "set -- $moreargs"
diff --git a/mail/thunderbird-esr/files/patch-security-coreconf-FreeBSD.mk b/mail/thunderbird-esr/files/patch-security-coreconf-FreeBSD.mk
index 4f6bccff7cec..3e0e14acaaf2 100644
--- a/mail/thunderbird-esr/files/patch-security-coreconf-FreeBSD.mk
+++ b/mail/thunderbird-esr/files/patch-security-coreconf-FreeBSD.mk
@@ -1,12 +1,28 @@
---- security/coreconf/FreeBSD.mk	Thu Oct 16 23:03:47 2003
-+++ security/coreconf/FreeBSD.mk	Thu Oct 16 22:53:11 2003
-@@ -44,5 +44,9 @@
+--- security/coreconf/FreeBSD.mk.orig	Wed Mar 26 20:17:25 2003
++++ security/coreconf/FreeBSD.mk	Sun Nov 21 22:59:49 2004
+@@ -43,8 +43,12 @@
+ ifeq ($(OS_TEST),alpha)
  CPU_ARCH		= alpha
  else
 +ifeq ($(OS_TEST),amd64)
 +CPU_ARCH		= amd64
 +else
  CPU_ARCH		= x86
+ endif
 +endif
+ 
+ OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+ 
+@@ -71,7 +75,11 @@
+ DLL_SUFFIX		= so.1.0
  endif
  
+-MKSHLIB			= $(CC) $(DSO_LDOPTS)
++ifneq (,$(filter alpha ia64,$(OS_TEST)))
++MKSHLIB			= $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@
++else
++MKSHLIB			= $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@
++endif
+ ifdef MAPFILE
+ # Add LD options to restrict exported symbols to those in the map file
+ endif
diff --git a/mail/thunderbird-esr/pkg-install.in b/mail/thunderbird-esr/pkg-install.in
index c507611b72aa..0413486236fe 100644
--- a/mail/thunderbird-esr/pkg-install.in
+++ b/mail/thunderbird-esr/pkg-install.in
@@ -27,9 +27,6 @@ rm -rf ${MOZDIR}/extensions
 cd ${MOZDIR} || exit 1
 ./run-mozilla.sh ${REGXPCOM} || true
 ./run-mozilla.sh ${REGCHROME} || true
-
-# Instantiate the extension space as root.
-su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${THUNDERBIRD} -install-global-extension -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
-su - root -c "env PATH=${PATH} %%X11BASE%%/bin/xinit %%MOZDIR%%/run-mozilla.sh ${THUNDERBIRD} -install-global-theme -- %%X11BASE%%/bin/Xvfb :1001" > /dev/null 2>&1
+./run-mozilla.sh ${THUNDERBIRD} -register > /dev/null 2>&1
 
 exit 0