- Update to 3.1.1

Thanks to:	Andreas Tobler <andreast-list AT fgznet.ch>

1 files changed, 72 insertions, 46 deletions

diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index c8013b9ca1dd..ce93d8308411 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -3,93 +3,119 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/mail/thunderbird/Makefile,v 1.18 2009/01/02 21:16:20 mezz Exp $
 #
 
 PORTNAME=	thunderbird
-DISTVERSION=	2.0.0.24
-PORTREVISION=	1
+DISTVERSION=	3.1.1
 CATEGORIES=	mail ipv6
-MASTER_SITES=	${MASTER_SITE_MOZILLA_EXTENDED}
-MASTER_SITE_SUBDIR=	thunderbird/releases/${DISTVERSION}/source
-DISTNAME=	${PORTNAME}-${DISTVERSION}-source
+MASTER_SITES=	${MASTER_SITE_MOZILLA}
+MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${DISTVERSION}/source
+DISTNAME=	${PORTNAME}-${DISTVERSION}.source
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Mozilla Thunderbird is standalone mail and news that stands above
 
-DEPRECATED=	Upstream support dropped. Please consider using mail/thunderbird3 instead
-CONFLICTS=	lightning-0.[0-9]* thunderbird-3*
+BUILD_DEPENDS=	nspr>=4.8:${PORTSDIR}/devel/nspr
+
+USE_AUTOTOOLS=	autoconf:213
+USE_GECKO=	gecko
+CONFLICTS=	thunderbird-3.0*
+USE_MOZILLA=	-png -nss -dbm -jpeg -xft
+MOZ_TOOLKIT=	cairo-gtk2
+
+MAKE_JOBS_SAFE=	yes
 WANT_GNOME=	yes
 ALL_TARGET=	default
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE}
+MAKE_ENV=	PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GECKO=	gecko
-WANT_PERL=	yes
 
-MOZ_EXTENSIONS=	wallet,spellcheck,xmlextras,webservices,auth,transformiix
-MOZ_PROTOCOLS=	http,ftp,file,jar,viewsource,res,data
+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
-MOZ_MK_OPTIONS=	MOZ_MOZ_THUNDERBIRD=1
-MOZ_EXPORT=	MOZ_THUNDERBIRD=1
-
-PORTNAME_ICON=	${PREFIX}/lib/${PORTNAME}/icons/default.xpm
-
-SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js
+	--enable-single-profile --disable-profilesharing \
+	--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
+MOZ_PKGCONFIG_FILES=
+
+PORTNAME_ICON=	${PORTNAME}.png
+PORTNAME_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
+
+SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
 MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
 
 OPTIONS=
 
 .include <bsd.port.pre.mk>
 
-GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED
-} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
+WRKSRC=		${WRKDIR}/comm-1.9.2
+MOZSRC:=	${WRKSRC}/mozilla
+
+.if ${OSVERSION} < 700000
+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+EXTRA_PATCHES=	${FILESDIR}/releng6_pulseaudio
+.else
+EXTRA_PATCHES=	${FILESDIR}/liboggplay_oss
+.endif
+
+GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE}
+
+.if ${HAVE_GNOME:Mlibgnomeui}!=""
+USE_GNOME+=	libgnomeui
+MOZ_OPTIONS+=	--enable-gnomeui
+.else
+MOZ_OPTIONS+=	--disable-gnomeui
+.endif
 
-.if (${ARCH}=="sparc64" && ${OSVERSION} < 601101)
-IGNORE=	core dumps on ${ARCH}, kern.osreldate>=601101 needed
+.if defined(WITHOUT_DBUS)
+MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
+.else
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		notify.1:${PORTSDIR}/devel/libnotify
 .endif
 
 post-extract::
-	@${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
-		<${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop
+	${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \
+		<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
 
 post-patch:
+	${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
+		${MOZSRC}/storage/build/Makefile.in \
+		${MOZSRC}/db/sqlite3/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-		${WRKSRC}/security/manager/ssl/src/Makefile.in
-	@${REINPLACE_CMD} -e 's|--without-nss||' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \
-		${WRKSRC}/storage/build/Makefile.in
-	@${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \
-		-e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \
-		${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp
-	@${FIND} ${WRKSRC} -name all.js | ${XARGS} ${REINPLACE_CMD} -e \
-		'/accessibility.typeaheadfind.enablesound/s/true/false/ ; \
-		/dom.disable_window_open_feature.toolbar/s/false/true/'
-	@${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \
-		${WRKSRC}/configure \
-		${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \
-		${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp
+		${MOZSRC}/security/manager/ssl/src/Makefile.in \
+		${MOZSRC}/js/src/config/mkdepend/Makefile.in \
+		${MOZSRC}/js/src/config/config.mk
+	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
+		s|-lpthread|${PTHREAD_LIBS}|g ; \
+		s|echo aout|echo elf|g ; \
+		s|/usr/X11R6|${LOCALBASE}|g' \
+		${MOZSRC}/js/src/configure
+
+pre-configure:
+	(cd ${WRKSRC} && ${AUTOCONF})
+	(cd ${MOZSRC} && ${AUTOCONF})
+	(cd ${MOZSRC}/js/src/ && ${AUTOCONF})
 
 port-pre-install:
 	${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
-	${FAKEDIR}/bin/thunderbird-config ${FAKEDIR}/bin/thunderbird
+	${FAKEDIR}/bin/thunderbird
 	${RM} -f ${FAKEDIR}/bin/*.bak
 	${MKDIR} ${FAKEDIR}/lib/${PORTNAME}/defaults
-	${CP} -RL ${WRKSRC}/dist/bin/isp \
-		${FAKEDIR}/lib/${PORTNAME}
 
 pre-install:
 	@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
+	@${ECHO_CMD} 'share/pixmaps/${PORTNAME_ICON}' >> ${PLIST}
 	@${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST}
 
 post-install:
 	${MKDIR} ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \
-		${PORTNAME_ICON}
+	${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${PREFIX}/share/applications
+	${LN} -sf ${PORTNAME_ICON_SRC} ${PREFIX}/share/pixmaps/${PORTNAME_ICON}
 
 .include <bsd.port.post.mk>