- Update firefox to 1.5

- Add Makefile.common
  o A new build/install system for gecko ports, Makefile.common
    includes many generic routines and common tasks.
  o Fix ld-run-path in all gecko's by using -Wl,-rpath,${moz_libdir}
    thus removing the need to have a startup script for ports that
    depend on gecko. [2]
  o Use system libm, nss, nspr in all gecko ports

- Add bsd.gecko.mk
  o This is the predecessor to WITH_MOZILLA=[mozilla|firefox|...]
    with a more robust way of detecting a gecko a end user wishs to
    use.
  o bsd.gecko.mk abstracts the selection of gecko-based backends. It
    allows users and porters to support any available gecko backend
    without needing to build many conditional tests. ${USE_GECKO} is the
    list of backends that your port can handle, and ${GECKO} is set by
    bsd.gecko.mk to be the chosen backend. Users set ${WITH_GECKO} to the
    list of gecko backends they want on their system.

  Port Makefile example:

  USE_GECKO=firefox mozilla seamonkey thunderbird
  .include <bsd.port.pre.mk>
  .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk"

  End user example:
  WITH_GECKO=seamonkey firefox

  We highly recommend moving away from using WITH_MOZILLA and switching to
  USE/WITH_GECKO.

PR:		89052 [2]
Submitted by:	vs [2]
Obtained from:	www/firefox
Thanks to:	adamw, marcus, and mezz for ideas, bug squashing, and more
		sajd from irc.freenode.org/#FreeBSD-Gnome for
		 pointing out many bugs

7 files changed, 51 insertions, 296 deletions

diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile
index 72b75f3eb7d9..5138cc9459fa 100644
--- a/mail/thunderbird3/Makefile
+++ b/mail/thunderbird3/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports-stable/mail/thunderbird/Makefile,v 1.11 2005/08/20 20:56:53 mezz Exp $
+#    $MCom: ports/mail/thunderbird/Makefile,v 1.13 2005/11/24 01:43:41 ahze Exp $
 #
 
 PORTNAME=	thunderbird
 PORTVERSION=	1.0.7
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}/source
@@ -17,86 +17,30 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg	\
-		nspr4:${PORTSDIR}/devel/nspr	\
-		png:${PORTSDIR}/graphics/png	\
-		nss3:${PORTSDIR}/security/nss
-BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip
-
+WANT_GNOME=	yes
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
-FAKEDIR=	${WRKDIR}/fake
-USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
-PLIST=		${WRKDIR}/plist
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 libidl
-USE_ICONV=	yes
-USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/mozilla
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/* \
-			--exclude */macbuild/*\
-			--exclude */nsprpub/*\
-			--exclude */package/* \
-			--exclude */zlib/ \
-			--exclude mozilla/modules/libimg/png \
-			--exclude mozilla/jpeg \
-			--exclude mozilla/dbm \
-			--exclude mozilla/js/src/fdlibm \
-			--exclude mozilla/security/nss	\
-			--exclude mozilla/gc/boehm	\
-			--exclude .cvsignore \
-			--exclude makefile.win \
-			--exclude MANIFEST
+MOZ_EXTENSIONS=	wallet,spellcheck,xmlextras,webservices
+MOZ_PROTOCOLS=	http,file,jar,viewsource,res,data
+MOZ_GRAPHICS=	default,-xbm
+MOZ_OPTIONS=	--enable-single-profile --disable-profilesharing \
+		--enable-official-branding
+MOZ_EXPORT=	MOZ_THUNDERBIRD=1
+MOZ_MK_OPTIONS=	MOZ_MOZ_THUNDERBIRD=1
 
 PORTNAME_ICON=	${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm
-
-PKGCONFIG_FILES=${PORTNAME}-gtkmozembed ${PORTNAME}-js ${PORTNAME}-xpcom \
-		${PORTNAME}-plugin
-
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js
-SCRIPTS_DIR=	${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}
-MOZ_PIS_SCRIPTS=S50cleanhome
-MOZ_PIS_DIR=	${SCRIPTS_DIR}/init.d
+MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
 
-OPTIONS=	DEBUG "Build a debugging image" off \
-		LOGGING "Enable additional log messages" off \
-		OPTIMIZED_CFLAGS "Enable some additional optimizations" off \
-		XFT "Enable support for anti-aliased fonts" on
+CONFLICTS=	thunerbird*-1.5*
 
 .include <bsd.port.pre.mk>
-
-.if defined(WITH_DEBUG)
-WITH_LOGGING=		yes
-CONFIGURE_ENV+=		WITH_DEBUG=yes
-.endif # defined(WITH_DEBUG)
-
-.if defined(WITH_OPTIMIZED_CFLAGS)
-CFLAGS:=		-O2 -fno-strict-aliasing ${CFLAGS:N-O*}
-.else
-CFLAGS:=		-O ${CFLAGS:N-O*:N-m*}
-CONFIGURE_ENV+=		WITH_OPTIMIZE=-O
-.endif # defined(WITH_OPTIMIZED_CFLAGS)
-
-.if defined(WITH_LOGGING)
-CONFIGURE_ENV+=	WITH_LOGGING=yes
-.endif # defined(WITH_LOGGING)
-
-.if defined(WITHOUT_XFT)
-CONFIGURE_ENV+=	WITHOUT_XFT=yes
-.else
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
-.endif # !defined(WITHOUT_XFT)
-
-CPPFLAGS+=		-I${X11BASE}/include
-CFLAGS+=		${PTHREAD_CFLAGS}
-LDFLAGS+=		-L${X11BASE}/lib
-LIBS+=			${PTHREAD_LIBS}
+.include "${.CURDIR}/../../www/mozilla/Makefile.common"
 
 .if ${ARCH} == "alpha" && ${OSVERSION} < 500035
 IGNORE=	core dumps at runtime
@@ -106,54 +50,11 @@ IGNORE=	core dumps at runtime
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config_make-jars.pl
 .endif # ${PERL_LEVEL} < 500600
 
-pre-extract::
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Extracting source (this takes a while) ..."
-	@${ECHO_MSG}
-
 post-extract::
-	@${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|'		\
-		-e 's|@CFLAGS@|${CFLAGS}|'		\
-		-e 's|@LDFLAGS@|${LDFLAGS}|'		\
-		-e 's|@LIBS@|${LIBS}|'			\
-		-e 's|@X11BASE@|${X11BASE}|'		\
-		-e 's|@LOCALBASE@|${LOCALBASE}|'	\
-		-e 's|@FAKEDIR@|${FAKEDIR}|'		\
-		-e 's|@PERL@|${PERL5}|'			\
-		<${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig
 	@${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
 		<${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop
 
 post-patch:
-	@${REINPLACE_CMD} -e  's/%{idldir}/%idldir%/g ; \
-		s|"%FULL_NSPR_CFLAGS%"|`nspr-config --cflags`|g ; \
-		s|"%FULL_NSPR_LIBS%"|`nspr-config --libs`|g' \
-			${WRKSRC}/build/unix/mozilla-config.in
-	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g ; \
-		s|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g' \
-		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
-	@${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g' \
-		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
-.for ii in ${MOZ_PIS_SCRIPTS}
-	@${SED} -e 's|%%MOZILLA%%|${PORTNAME}|g ; \
-		s|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g' \
-		< ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii}
-.endfor
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
-		${WRKSRC}/build/unix/run-mozilla.sh
-	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
-		s|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/security/coreconf/FreeBSD.mk \
-		${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \
-		${WRKSRC}/js/src/Makefile.in
-	@${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|libesd.so|g' \
-		${WRKSRC}/widget/src/gtk2/nsSound.cpp
-	@${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \
-		${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp
 	@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \
 		-e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
 		${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp
@@ -165,81 +66,11 @@ post-patch:
 		${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
 		${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
 
-pre-configure:
-	@if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \
-		${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \
-		${FALSE}; \
-	fi
-
 pre-install:
-	@${RM} -rf ${FAKEDIR} ${PLIST}
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
-		Makefile ${MAKE_ARGS} ${INSTALL_TARGET}
-	@${MKDIR} ${SCRIPTS_DIR}
-	@${MKDIR} ${MOZ_PIS_DIR}
 	${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
 	${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
-	${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \
-		s|${PORTNAME}-${PORTVERSION}|${PORTNAME}|' \
-		${FAKEDIR}/bin/${PORTNAME} \
-		${FAKEDIR}/bin/${PORTNAME}-config
-	${ECHO_CMD} bin/${PORTNAME} >> ${PLIST}
-	${ECHO_CMD} bin/${PORTNAME}-config >> ${PLIST}
-.for ii in ${MOZ_PIS_SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii}
-.endfor
-	@${MKDIR} ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults
-	@${CP} -RL ${WRKSRC}/dist/bin/defaults/isp \
-		${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults
-	cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|lib/${PORTNAME}/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm lib/${PORTNAME}/|' >> ${PLIST}
-	${ECHO_CMD} @dirrm lib/${PORTNAME} >> ${PLIST}
-	for pcfile in ${PKGCONFIG_FILES}; do \
-		${REINPLACE_CMD} -e 's|${PORTNAME}-${PORTVERSION}|${PORTNAME}|g; \
-			s|${FAKEDIR}|${PREFIX}|g ; \
-			s|${PORTNAME}-nspr = ${PORTVERSION}|nspr >= 4.6.0|g' \
-			${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \
-		${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \
-	done
-	cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's|^|include/${PORTNAME}/|' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's|^|@dirrm include/${PORTNAME}/|' >> ${PLIST}
-	${ECHO_CMD} @dirrm include/${PORTNAME} >> ${PLIST}
-	cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} \
-		&& ${FIND} -s * -type f -o -type l | \
-		${SED} -e 's:^:share/idl/${PORTNAME}/:' >> ${PLIST} \
-		&& ${FIND} -d * -type d | \
-		${SED} -e 's:^:@dirrm share/idl/${PORTNAME}/:' >> ${PLIST}
-		${ECHO_CMD} "@dirrm share/idl/${PORTNAME}" >> ${PLIST}
-		${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || true" >> ${PLIST}
-
-do-install:
-	${MKDIR} ${PREFIX}/lib/${PORTNAME}
-	${CHMOD} 755 ${PREFIX}/lib/${PORTNAME}
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME}-config ${PREFIX}/bin
-	for pcfile in ${PKGCONFIG_FILES}; do \
-		${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc \
-			${PREFIX}/libdata/pkgconfig/$${pcfile}.pc ; \
-	done
-	-${RM} -fr ${PREFIX}/include/${PORTNAME}
-	${MKDIR} ${PREFIX}/include/${PORTNAME}
-	${CHMOD} 755 ${PREFIX}/include/${PORTNAME}
-	cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${PORTNAME}
-	cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${PORTNAME}
-	${MKDIR} ${PREFIX}/share/idl/${PORTNAME}
-	cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} && ${FIND} . | \
-		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${PORTNAME}
 
 post-install:
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
 	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \
diff --git a/mail/thunderbird3/files/mozconfig.in b/mail/thunderbird3/files/mozconfig.in
deleted file mode 100644
index d99ebe20a3da..000000000000
--- a/mail/thunderbird3/files/mozconfig.in
+++ /dev/null
@@ -1,75 +0,0 @@
-# .mozconfig.in -*-shell-script-*-
-# $FreeBSD$
-######################################################################
-# standard opts from README
-export MOZ_THUNDERBIRD=1
-mk_add_options MOZ_MOZ_THUNDERBIRD=1
-ac_add_options --enable-crypto
-ac_add_options --disable-mathml
-ac_add_options --disable-activex
-ac_add_options --disable-activex-scripting
-ac_add_options --disable-oji
-ac_add_options --disable-necko-disk-cache
-ac_add_options --disable-tests
-ac_add_options --disable-profilesharing
-ac_add_options --enable-single-profile
-ac_add_options --disable-freetype2
-ac_add_options --enable-extensions=wallet,spellcheck,xmlextras,webservices
-ac_add_options --enable-necko-protocols=http,file,jar,viewsource,res,data
-ac_add_options --enable-image-decoders=default,-xbm
-ac_add_options --enable-default-toolkit=gtk2
-# See the following URL for approval email for using official branding
-# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt
-ac_add_options --enable-official-branding
-######################################################################
-# FBSD specific
-export CPPFLAGS="@CPPFLAGS@"
-export CFLAGS="@CFLAGS@"
-export LIBS="@LIBS@"
-export LDFLAGS="@LDFLAGS@"
-export CONFIG_SH=/bin/sh
-export XP_UNIX=1
-mk_add_options XP_UNIX=1
-export PERL="@PERL@"
-mk_add_options PERL=$PERL
-# Configure options for installation
-ac_add_options --prefix=@FAKEDIR@
-######################################################################
-# Use ports for these libraries
-ac_add_options --with-system-jpeg=@LOCALBASE@
-ac_add_options --with-system-zlib
-ac_add_options --with-system-png=@LOCALBASE@
-ac_add_options --with-system-nspr
-######################################################################
-# set compile/link features
-ac_add_options --with-pthreads
-######################################################################
-# conditional from port Makefile
-#if test -n "$WITH_REORDER"; then
-#    ac_add_options --enable-reorder
-#else
-#    ac_add_options --disable-reorder
-#fi # test -n "$WITH_REORDER"
-if test -n "$WITH_DEBUG"; then
-    ac_add_options --enable-debug
-    ac_add_options --disable-strip
-else
-    ac_add_options --disable-debug
-    ac_add_options --enable-optimize=${WITH_OPTIMIZE}
-    ac_add_options --enable-strip
-    export BUILD_OFFICIAL=1
-    export MOZILLA_OFFICIAL=1
-    mk_add_options BUILD_OFFICIAL=1
-    mk_add_options MOZILLA_OFFICIAL=1
-fi # test -n "$WITH_DEBUG"
-if test -n "$WITH_LOGGING"; then
-    ac_add_options --enable-logging
-else
-    ac_add_options --disable-logging
-fi # test -n "$WITH_LOGGING"
-if test -z "$WITHOUT_XFT"; then
-    ac_add_options --enable-xft
-else
-    ac_add_options --disable-xft
-fi # test -z "$WITHOUT_XFT"
-######################################################################
diff --git a/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh b/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh
index 28bbd1a1154e..37af6d18a089 100644
--- a/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh
+++ b/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh
@@ -5,7 +5,7 @@
  ##
  ## Set LD_LIBRARY_PATH
 -LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
-+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
++LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:%%PREFIX%%/lib/browser_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"}
  if [ -n "$LD_LIBRARYN32_PATH" ]
  then
  	LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"}
diff --git a/mail/thunderbird3/files/patch-config_autoconf.mk.in b/mail/thunderbird3/files/patch-config_autoconf.mk.in
new file mode 100644
index 000000000000..29fe7f8fbde0
--- /dev/null
+++ b/mail/thunderbird3/files/patch-config_autoconf.mk.in
@@ -0,0 +1,18 @@
+--- config/autoconf.mk.in.orig	Thu Jul 14 00:50:06 2005
++++ config/autoconf.mk.in	Thu Jul 14 00:50:40 2005
+@@ -50,13 +50,13 @@
+ prefix		= @prefix@
+ exec_prefix	= @exec_prefix@
+ bindir		= @bindir@
+-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++includedir	= @includedir@/%%MOZILLA%%
+ libdir		= @libdir@
+ datadir		= @datadir@
+ mandir		= @mandir@
+ idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ 
+-mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
++mozappdir	= $(libdir)/%%MOZILLA%%
+ mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
+ mrelibdir	= $(mredir)/lib
+ 
diff --git a/mail/thunderbird3/files/patch-configure b/mail/thunderbird3/files/patch-configure
index 9e60372adb33..cdf04c84af86 100644
--- a/mail/thunderbird3/files/patch-configure
+++ b/mail/thunderbird3/files/patch-configure
@@ -1,38 +1,17 @@
---- configure.orig	Fri Feb 13 01:06:29 2004
-+++ configure	Fri Feb 13 01:07:17 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
+--- configure.orig	Wed Nov 23 13:17:02 2005
++++ configure	Wed Nov 23 13:17:20 2005
+@@ -11417,12 +11417,12 @@
+ 
+             echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6
+ echo "configure:11420: checking MOZ_GTK2_CFLAGS" >&5
+-            MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"`
++            MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7" "pangox >= 1.1.0"`
+             echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6
+ 
+             echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6
+ echo "configure:11425: checking MOZ_GTK2_LIBS" >&5
+-            MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7"`
++            MOZ_GTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 1.3.7" "pangox >= 1.1.0"`
+             echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6
+         else
+             MOZ_GTK2_CFLAGS=""
diff --git a/mail/thunderbird3/pkg-deinstall.in b/mail/thunderbird3/pkg-deinstall.in
index b9b0ca220fbc..c34ce2411f39 100644
--- a/mail/thunderbird3/pkg-deinstall.in
+++ b/mail/thunderbird3/pkg-deinstall.in
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
+#    $MCom: ports/mail/thunderbird/pkg-deinstall.in,v 1.7 2005/11/14 04:12:06 ahze Exp $
 #
 # Date created:			Mon Nov 29, 2003
 # Whom:				Thierry Thomas (<thierry@pompo.net>)
diff --git a/mail/thunderbird3/pkg-install.in b/mail/thunderbird3/pkg-install.in
index 0413486236fe..1c3cfd284ce2 100644
--- a/mail/thunderbird3/pkg-install.in
+++ b/mail/thunderbird3/pkg-install.in
@@ -1,6 +1,7 @@
 #!/bin/sh
 #
 # $FreeBSD$
+#    $MCom: ports/mail/thunderbird/pkg-install.in,v 1.7 2005/11/14 04:12:06 ahze Exp $
 #
 # Date created:			Mon Nov 29, 2003
 # Whom:				Thierry Thomas (<thierry@pompo.net>)