diff options
Diffstat (limited to 'mail/thunderbird-esr/files')
| -rw-r--r-- | mail/thunderbird-esr/files/mozconfig.in | 75 | ||||
| -rw-r--r-- | mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh | 2 | ||||
| -rw-r--r-- | mail/thunderbird-esr/files/patch-config_autoconf.mk.in | 18 | ||||
| -rw-r--r-- | mail/thunderbird-esr/files/patch-configure | 55 |
4 files changed, 36 insertions, 114 deletions
diff --git a/mail/thunderbird-esr/files/mozconfig.in b/mail/thunderbird-esr/files/mozconfig.in deleted file mode 100644 index d99ebe20a3da..000000000000 --- a/mail/thunderbird-esr/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/thunderbird-esr/files/patch-build_unix_run-mozilla.sh b/mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh index 28bbd1a1154e..37af6d18a089 100644 --- a/mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh +++ b/mail/thunderbird-esr/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/thunderbird-esr/files/patch-config_autoconf.mk.in b/mail/thunderbird-esr/files/patch-config_autoconf.mk.in new file mode 100644 index 000000000000..29fe7f8fbde0 --- /dev/null +++ b/mail/thunderbird-esr/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/thunderbird-esr/files/patch-configure b/mail/thunderbird-esr/files/patch-configure index 9e60372adb33..cdf04c84af86 100644 --- a/mail/thunderbird-esr/files/patch-configure +++ b/mail/thunderbird-esr/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="" |