update to 3.1.11 as mail/thunderbird will be updated to 5.0

11 files changed, 65 insertions, 102 deletions

diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile
index a6faa5b2a516..fea7ad6d9c77 100644
--- a/mail/thunderbird3/Makefile
+++ b/mail/thunderbird3/Makefile
@@ -1,15 +1,15 @@
-# New ports collection makefile for:    mozilla-thunderbird
-# Date created:         4 September 2003
-# Whom:             Joe Marcus Clarke <marcus@FreeBSD.org>
+# New ports collection makefile for:	mozilla-thunderbird
+# Date created:			4 September 2003
+# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	thunderbird
-DISTVERSION=	3.0.11
+DISTVERSION=	3.1.11
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source/
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
 DISTNAME=	${PORTNAME}-${DISTVERSION}.source
 
 MAINTAINER=	gecko@FreeBSD.org
@@ -17,11 +17,10 @@ COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 
 BUILD_DEPENDS=	nspr>=4.8:${PORTSDIR}/devel/nspr
 
-DEPRECATED=	Upstream support dropped. Please consider using mail/thunderbird instead
 USE_AUTOTOOLS=	autoconf213
 LATEST_LINK=	thunderbird3
 USE_GECKO=	gecko
-CONFLICTS_INSTALL=	thunderbird-3.1*
+CONFLICTS_INSTALL=	thunderbird-5.0*
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft
 MOZ_TOOLKIT=	cairo-gtk2
 
@@ -38,7 +37,8 @@ MOZ_PROTOCOLS=	http,ftp,file,viewsource,res,data
 MOZ_GRAPHICS=	default,-xbm
 MOZ_OPTIONS=	--with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \
 	--enable-single-profile --disable-profilesharing \
-	--enable-application=mail --enable-official-branding
+	--enable-application=mail --enable-official-branding \
+	--disable-updater --disable-necko-wifi
 MOZ_MK_OPTIONS=	MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
 MOZ_EXPORT=		MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1
 MOZILLA_PLIST_DIRS=	bin lib
@@ -54,7 +54,7 @@ OPTIONS=
 
 .include <bsd.port.pre.mk>
 
-WRKSRC=		${WRKDIR}/comm-1.9.1
+WRKSRC=		${WRKDIR}/comm-1.9.2
 MOZSRC:=	${WRKSRC}/mozilla
 
 .if ${OSVERSION} < 700000
@@ -64,6 +64,15 @@ EXTRA_PATCHES=	${FILESDIR}/releng6_pulseaudio
 EXTRA_PATCHES=	${FILESDIR}/liboggplay_oss
 .endif
 
+.if ${ARCH} == powerpc64
+.if ${OSVERSION} < 900033
+BROKEN=		Needs binutils 2.17.50 to build
+.else
+CONFIGURE_ENV+=	UNAME_m="powerpc64"
+CFLAGS+=	-mminimal-toc
+.endif
+.endif
+
 GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
 
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
@@ -74,9 +83,10 @@ MOZ_OPTIONS+=	--disable-gnomeui
 .endif
 
 .if defined(WITHOUT_DBUS)
-MOZ_OPTIONS+=	--disable-dbus
+MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .else
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		notify.1:${PORTSDIR}/devel/libnotify
 .endif
 
 post-extract::
diff --git a/mail/thunderbird3/distinfo b/mail/thunderbird3/distinfo
index 049e5462a5b6..5a7887b45123 100644
--- a/mail/thunderbird3/distinfo
+++ b/mail/thunderbird3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (thunderbird-3.0.11.source.tar.bz2) = cc85e992ef191618e6951bada702b3e30a816ba4648201a4fd77b088fe7db55b
-SIZE (thunderbird-3.0.11.source.tar.bz2) = 60655740
+SHA256 (thunderbird-3.1.11.source.tar.bz2) = 3e78284661b1be1d35753550b7a183d583d7ee68c8bac683283d3931f90fdd1a
+SIZE (thunderbird-3.1.11.source.tar.bz2) = 68716700
diff --git a/mail/thunderbird3/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in b/mail/thunderbird3/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in
deleted file mode 100644
index b71a03a4567b..000000000000
--- a/mail/thunderbird3/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- directory/c-sdk/ldap/libraries/libldap/Makefile.in.orig	2009-11-10 09:56:42.000000000 +0100
-+++ directory/c-sdk/ldap/libraries/libldap/Makefile.in	2009-11-10 09:58:15.000000000 +0100
-@@ -254,6 +254,10 @@
- EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe
- endif
- 
-+ifeq ($(OS_ARCH), FreeBSD)
-+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
-+endif
-+
- ifeq ($(OS_ARCH), NetBSD)
- EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME)
- endif
diff --git a/mail/thunderbird3/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in b/mail/thunderbird3/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in
deleted file mode 100644
index ebf7f94ace1e..000000000000
--- a/mail/thunderbird3/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig	2008-09-11 16:38:35.000000000 +0200
-+++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in	2009-12-09 08:53:46.000000000 +0100
-@@ -147,6 +147,11 @@
- CUSTOM_LIBS=1
- endif
- 
-+ifeq ($(OS_ARCH), FreeBSD)
-+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread
-+CUSTOM_LIBS=1
-+endif
-+
- # no extra libs on HP-UX
- ifeq ($(OS_ARCH), HP-UX)
- CUSTOM_LIBS=1
diff --git a/mail/thunderbird3/files/patch-mozilla-js-src-config-config.mk b/mail/thunderbird3/files/patch-mozilla-js-src-config-config.mk
deleted file mode 100644
index a7cc0b915aeb..000000000000
--- a/mail/thunderbird3/files/patch-mozilla-js-src-config-config.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/js/src/config/config.mk.orgi	2009-04-21 15:12:51.000000000 +0200
-+++ mozilla/js/src/config/config.mk	2009-04-21 15:15:37.000000000 +0200
-@@ -490,7 +490,7 @@
- INCLUDES	= $(LOCAL_INCLUDES) $(REQ_INCLUDES) $(REQ_INCLUDES_SDK) -I$(PUBLIC) $(OS_INCLUDES)
- 
- ifndef MOZILLA_INTERNAL_API
--INCLUDES	+= -I$(LIBXUL_DIST)/sdk/include
-+INCLUDES	+= -I$(LIBXUL_DIST)/sdk/include -I%%LOCALBASE%%/include
- endif
- 
- include $(topsrcdir)/config/static-checking-config.mk
diff --git a/mail/thunderbird3/files/patch-mozilla-js-src-config-mkdepend-Makefile.in b/mail/thunderbird3/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
index 898c898fdbd9..6129066e1afd 100644
--- a/mail/thunderbird3/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
+++ b/mail/thunderbird3/files/patch-mozilla-js-src-config-mkdepend-Makefile.in
@@ -1,11 +1,11 @@
---- mozilla/js/src/config/mkdepend/Makefile.in.orig	2009-03-05 22:31:53.000000000 +0100
-+++ mozilla/js/src/config/mkdepend/Makefile.in	2009-04-21 14:10:27.000000000 +0200
-@@ -72,7 +72,7 @@
+--- mozilla/js/src/config/mkdepend/Makefile.in.orig	2010-01-19 21:27:45.000000000 +0100
++++ mozilla/js/src/config/mkdepend/Makefile.in	2010-01-20 21:55:56.000000000 +0100
+@@ -71,7 +71,7 @@
  
  include $(topsrcdir)/config/rules.mk
  
 -HOST_CFLAGS	+= -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS	+= -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS	+= -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
  
  ifdef GNU_CC
  _GCCDIR		= $(shell $(CC) -print-file-name=include)
diff --git a/mail/thunderbird3/files/patch-mozilla-layout-generic-Makefile.in b/mail/thunderbird3/files/patch-mozilla-layout-generic-Makefile.in
index e3084b750b7b..afdc6fd8ae0f 100644
--- a/mail/thunderbird3/files/patch-mozilla-layout-generic-Makefile.in
+++ b/mail/thunderbird3/files/patch-mozilla-layout-generic-Makefile.in
@@ -1,9 +1,9 @@
---- mozilla/layout/generic/Makefile.in.orig	2008-06-19 12:29:06.000000000 -0500
-+++ mozilla/layout/generic/Makefile.in	2008-06-19 12:30:04.000000000 -0500
-@@ -188,9 +188,10 @@
+--- mozilla/layout/generic/Makefile.in.orig	2010-01-20 18:57:00.000000000 +0100
++++ mozilla/layout/generic/Makefile.in	2010-01-20 18:57:48.000000000 +0100
+@@ -191,9 +191,10 @@
  		-I$(srcdir)/../../content/base/src \
  		-I$(srcdir)/../../content/html/content/src \
- 		-I$(srcdir)/../../dom/src/base \
+ 		-I$(srcdir)/../../dom/base \
 -		$(MOZ_CAIRO_CFLAGS) \
  		$(NULL)
  
diff --git a/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk b/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk
index 3015445bfc08..39272d788b83 100644
--- a/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk
+++ b/mail/thunderbird3/files/patch-mozilla-security-coreconf-FreeBSD.mk
@@ -1,29 +1,22 @@
---- mozilla/security/coreconf/FreeBSD.mk.orig	2010-03-16 09:57:06.000000000 +0000
-+++ mozilla/security/coreconf/FreeBSD.mk	2010-03-20 17:40:12.000000000 +0000
-@@ -49,8 +49,20 @@
- ifeq ($(CPU_ARCH),pc98)
- CPU_ARCH		= x86
+--- mozilla/security/coreconf/FreeBSD.mk.orig	2010-04-30 19:44:32.000000000 +0000
++++ mozilla/security/coreconf/FreeBSD.mk	2010-05-10 13:04:45.000000000 +0000
+@@ -52,6 +52,15 @@
+ ifeq ($(CPU_ARCH),amd64)
+ CPU_ARCH		= x86_64
  endif
--ifeq ($(CPU_ARCH),amd64)
--CPU_ARCH		= x86_64
-+ifeq ($(OS_TEST),alpha)
-+CPU_ARCH		= alpha
-+endif
 +ifeq ($(OS_TEST),amd64)
 +CPU_ARCH		= amd64
 +endif
-+ifeq ($(OS_TEST),ia64) 
-+CPU_ARCH		= ia64
-+endif
 +ifeq ($(OS_TEST),powerpc)
 +CPU_ARCH		= powerpc
 +endif
 +ifeq ($(OS_TEST),sparc64)
 +CPU_ARCH		= sparc64
- endif
++endif
  
  OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
-@@ -78,7 +90,7 @@
+ 
+@@ -78,7 +87,7 @@
  DLL_SUFFIX		= so.1.0
  endif
  
@@ -32,7 +25,7 @@
  ifdef MAPFILE
  	MKSHLIB += -Wl,--version-script,$(MAPFILE)
  endif
-@@ -87,4 +99,4 @@
+@@ -87,4 +96,4 @@
  
  G++INCLUDES		= -I/usr/include/g++
  
diff --git a/mail/thunderbird3/files/patch-mozilla-toolkit-mozapps-installer-packager.mk b/mail/thunderbird3/files/patch-mozilla-toolkit-mozapps-installer-packager.mk
deleted file mode 100644
index c5eea9f5fed9..000000000000
--- a/mail/thunderbird3/files/patch-mozilla-toolkit-mozapps-installer-packager.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- mozilla/toolkit/mozapps/installer/packager.mk.orig	2007-09-26 13:45:01.000000000 -0400
-+++ mozilla/toolkit/mozapps/installer/packager.mk	2007-09-26 13:47:29.000000000 -0400
-@@ -409,7 +409,7 @@
- 	(cd $(DIST)/sdk/include && tar $(TAR_CREATE_FLAGS) - .) | \
- 	  (cd $(DESTDIR)$(includedir)/stable && tar -xf -)
- # The dist/include has module subdirectories that we need to flatten
--	find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
-+	find $(DIST)/include -type f -o -type l -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \;
- # IDL directory is stable (dist/sdk/idl) and unstable (dist/idl)
- 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/stable 
- 	$(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable
diff --git a/mail/thunderbird3/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/mail/thunderbird3/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
index a6fb01850aaa..7dd5b80a1ced 100644
--- a/mail/thunderbird3/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
+++ b/mail/thunderbird3/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in
@@ -1,16 +1,16 @@
---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2009-03-05 22:32:55.000000000 +0100
-+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2009-04-21 14:15:46.135700268 +0200
-@@ -70,6 +70,9 @@
- ifeq (Darwin,$(OS_ARCH))
+--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2010-12-07 17:36:07.000000000 +0100
++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in	2011-02-26 21:30:36.000000000 +0100
+@@ -73,6 +73,9 @@
  DEFINES		+= -DKEEP_STACK_16_BYTE_ALIGNED
+ CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
  endif
 +ifeq (x86_64,$(OS_TEST))
 +CPPSRCS		:= xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp
 +endif
  endif
  endif
- #
-@@ -87,7 +90,7 @@
+ 
+@@ -96,7 +99,7 @@
  endif
  endif
  # IA64 Linux
@@ -19,8 +19,8 @@
  ifneq (,$(findstring ia64,$(OS_TEST)))
  CPPSRCS		:= xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp
  ASFILES		:= xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s
-@@ -100,6 +103,12 @@
- CPPSRCS		:= xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp
+@@ -115,6 +118,12 @@
+ CPPSRCS		:= xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp
  endif
  #
 +# FreeBSD/amd64
@@ -32,7 +32,7 @@
  # BeOS/Intel (uses the same unixish_x86 code)
  #
  ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC)
-@@ -150,9 +159,15 @@
+@@ -165,9 +174,15 @@
  ASFILES		:= xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s
  endif
  #
@@ -49,7 +49,7 @@
  CPPSRCS		:= xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp
  endif
  #
-@@ -307,7 +322,7 @@
+@@ -322,7 +337,7 @@
  #
  # Linux/PPC
  #
@@ -58,7 +58,16 @@
  CPPSRCS		:= xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp
  ASFILES		:= xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s
  AS		:= $(CC) -c -x assembler-with-cpp
-@@ -385,6 +400,15 @@
+@@ -331,7 +346,7 @@
+ #
+ # Linux/PPC64
+ #
+-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64)
++ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST)))
+ CPPSRCS                := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp
+ ASFILES                := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s
+ AS             := $(CC) -c -x assembler-with-cpp
+@@ -400,6 +415,15 @@
  ASFILES		:= xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s
  endif
  #
diff --git a/mail/thunderbird3/files/releng6_pulseaudio b/mail/thunderbird3/files/releng6_pulseaudio
index 2b82f93201ca..37203b52a5ee 100644
--- a/mail/thunderbird3/files/releng6_pulseaudio
+++ b/mail/thunderbird3/files/releng6_pulseaudio
@@ -13,14 +13,14 @@
  ifeq ($(OS_ARCH),Linux)
  CSRCS		= \
  		sydney_audio_alsa.c \
---- mozilla/toolkit/library/Makefile.in.orig	2009-08-20 21:45:20.000000000 +0200
-+++ mozilla/toolkit/library/Makefile.in	2009-08-20 21:46:25.000000000 +0200
-@@ -228,12 +228,12 @@
+--- mozilla/toolkit/library/Makefile.in.orig	2010-01-19 20:28:10.000000000 +0000
++++ mozilla/toolkit/library/Makefile.in	2010-01-25 09:38:40.000000000 +0000
+@@ -235,12 +235,12 @@
  endif
  
  ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
--EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc
+-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc
  EXTRA_DSO_LDOPTS += $(FT2_LIBS)
  endif