From c7ee3e7470740af684465ccde84bf1b95dcc5181 Mon Sep 17 00:00:00 2001 From: Beat Gaetzi Date: Sat, 26 Jun 2010 14:24:53 +0000 Subject: - Fix arch detection (don't convert amd64 to x86_64). [1] - Discard version from installation paths. This is needed to unbreak thunderbird-dictionaries with Thunderbird 3. [2] - Bump PORTREVISION. Feature safe: yes Reported by: crsd on EFnet [1], Matthew Luckie [2] Obtained from: Patches from ale@ for seamonkey2 [1] --- mail/thunderbird3/Makefile | 7 +++---- mail/thunderbird3/files/patch-config-autoconf.mk.in | 21 +++++++++++++++++++++ .../files/patch-mozilla-build-autoconf-config.sub | 12 ++++++++++++ .../patch-mozilla-js-src-build-autoconf-config.sub | 12 ++++++++++++ .../files/patch-mozilla-js-src-configure.in | 15 ++++++++++++--- 5 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 mail/thunderbird3/files/patch-config-autoconf.mk.in create mode 100644 mail/thunderbird3/files/patch-mozilla-build-autoconf-config.sub create mode 100644 mail/thunderbird3/files/patch-mozilla-js-src-build-autoconf-config.sub (limited to 'mail') diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile index 756a9a77c1c4..00c887129ed2 100644 --- a/mail/thunderbird3/Makefile +++ b/mail/thunderbird3/Makefile @@ -7,6 +7,7 @@ PORTNAME= thunderbird DISTVERSION= 3.0.5 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source/ @@ -33,8 +34,6 @@ HAS_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -MOZILLA= ${PORTNAME}-${PORTVERSION} -MOZILLA_EXEC_NAME= ${PORTNAME} MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data MOZ_GRAPHICS= default,-xbm MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ @@ -48,7 +47,7 @@ MOZ_PKGCONFIG_FILES= PORTNAME_ICON= ${PORTNAME}.png PORTNAME_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png -SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js +SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome OPTIONS= @@ -107,7 +106,7 @@ port-pre-install: ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \ ${FAKEDIR}/bin/thunderbird ${RM} -f ${FAKEDIR}/bin/*.bak - ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults + ${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults pre-install: @${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} 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..877c48294fc6 --- /dev/null +++ b/mail/thunderbird3/files/patch-config-autoconf.mk.in @@ -0,0 +1,21 @@ +--- config/autoconf.mk.in.orig 2009-04-24 03:46:37.000000000 +0200 ++++ config/autoconf.mk.in 2009-05-11 15:03:26.000000000 +0200 +@@ -57,14 +57,14 @@ + 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) ++idldir = $(datadir)/idl/%%MOZILLA%% + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/%%MOZILLA%% ++sdkdir = $(libdir)/%%MOZILLA%% + + DIST = $(DEPTH)/dist + LIBXUL_SDK = @LIBXUL_SDK@ diff --git a/mail/thunderbird3/files/patch-mozilla-build-autoconf-config.sub b/mail/thunderbird3/files/patch-mozilla-build-autoconf-config.sub new file mode 100644 index 000000000000..12a704ade44b --- /dev/null +++ b/mail/thunderbird3/files/patch-mozilla-build-autoconf-config.sub @@ -0,0 +1,12 @@ +--- mozilla/build/autoconf/config.sub.orig 2010-01-05 12:26:13.000000000 +0100 ++++ mozilla/build/autoconf/config.sub 2010-01-05 12:26:46.000000000 +0100 +@@ -403,9 +403,6 @@ + amd64) + basic_machine=x86_64-pc + ;; +- amd64-*) +- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; + amdahl) + basic_machine=580-amdahl + os=-sysv diff --git a/mail/thunderbird3/files/patch-mozilla-js-src-build-autoconf-config.sub b/mail/thunderbird3/files/patch-mozilla-js-src-build-autoconf-config.sub new file mode 100644 index 000000000000..2cb48a88c0e9 --- /dev/null +++ b/mail/thunderbird3/files/patch-mozilla-js-src-build-autoconf-config.sub @@ -0,0 +1,12 @@ +--- mozilla/js/src/build/autoconf/config.sub.orig 2010-01-08 09:52:25.000000000 +0100 ++++ mozilla/js/src/build/autoconf/config.sub 2010-01-08 09:52:33.000000000 +0100 +@@ -403,9 +403,6 @@ + amd64) + basic_machine=x86_64-pc + ;; +- amd64-*) +- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; + amdahl) + basic_machine=580-amdahl + os=-sysv diff --git a/mail/thunderbird3/files/patch-mozilla-js-src-configure.in b/mail/thunderbird3/files/patch-mozilla-js-src-configure.in index 9d6f049f2362..fe78e75474bb 100644 --- a/mail/thunderbird3/files/patch-mozilla-js-src-configure.in +++ b/mail/thunderbird3/files/patch-mozilla-js-src-configure.in @@ -1,6 +1,15 @@ ---- mozilla/js/src/configure.in.orig 2009-09-17 11:09:10.000000000 +0200 -+++ mozilla/js/src/configure.in 2009-09-17 11:09:33.000000000 +0200 -@@ -2467,10 +2467,6 @@ +--- mozilla/js/src/configure.in.orig 2010-05-12 21:05:58.000000000 +0200 ++++ mozilla/js/src/configure.in 2010-06-22 16:17:20.000000000 +0200 +@@ -1218,7 +1218,7 @@ + CPU_ARCH=sparc + ;; + +-x86_64 | ia64) ++amd64 | x86_64 | ia64) + CPU_ARCH="$OS_TEST" + ;; + esac +@@ -2466,10 +2466,6 @@ ENABLE_JIT=1 NANOJIT_ARCH=ARM ;; -- cgit v1.2.3