svn commit: r470674 - in head: . mail/thunderbird www/firefox www/seamonkey

[Jan Beich]

Author: jbeich
Date: Wed May 23 04:49:02 2018
New Revision: 470674
URL: https://svnweb.freebsd.org/changeset/ports/470674

Log:
  mail/thunderbird: back out r470673 as AMO version lacks libical
  
  PR:		226919
  Pointy hat to:	jbeich (too sleepy to wait for QA)

Modified:
  head/UPDATING
  head/mail/thunderbird/Makefile   (contents, props changed)
  head/www/firefox/Makefile.options   (contents, props changed)
  head/www/seamonkey/Makefile   (contents, props changed)

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Wed May 23 04:20:39 2018	(r470673)
+++ head/UPDATING	Wed May 23 04:49:02 2018	(r470674)
@@ -5,15 +5,6 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
-20180523:
-  AFFECTS: mail/thunderbird, www/seamonkey
-  AUTHOR: gecko at FreeBSD.org
-
-  LIGHTNING is no longer provided as part of the ports in order to
-  support independent updates and provide localization. Go to
-  Tools -> Add-ons Manager, remove existing Lightning extension
-  then type "lightning" in the search field to reinstall it.
-
 20180518:
   AFFECTS: users of sysutils/ansible*
   AUTHOR: lifanov at FreeBSD.org

Modified: head/mail/thunderbird/Makefile
==============================================================================
--- head/mail/thunderbird/Makefile	Wed May 23 04:20:39 2018	(r470673)
+++ head/mail/thunderbird/Makefile	Wed May 23 04:49:02 2018	(r470674)
@@ -3,7 +3,7 @@
 
 PORTNAME=	thunderbird
 DISTVERSION=	52.8.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
@@ -48,15 +48,21 @@ PORTNAME_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/ico
 SYSTEM_PREFS=	${FAKEDIR}/lib/${PORTNAME}/defaults/pref/${PORTNAME}.js
 MOZ_PIS_SCRIPTS=moz_pis_S50cleanhome
 
-OPTIONS_DEFINE=	RUST
+OPTIONS_DEFINE=	LIGHTNING RUST
 OPTIONS_SINGLE=	TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=	GTK2 GTK3
-OPTIONS_DEFAULT=BUNDLED_CAIRO CANBERRA GTK3
+OPTIONS_DEFAULT=BUNDLED_CAIRO CANBERRA GTK3 LIGHTNING
 
 .include "${.CURDIR}/../../www/firefox/Makefile.options"
 .include <bsd.port.pre.mk>
 
 MOZSRC:=	${WRKSRC}/mozilla
+
+.if ${PORT_OPTIONS:MLIGHTNING}
+MOZ_OPTIONS+=	--enable-calendar
+.else
+MOZ_OPTIONS+=	--disable-calendar
+.endif
 
 post-extract:
 	@${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|;s|@MOZILLA@|${MOZILLA}|' \

Modified: head/www/firefox/Makefile.options
==============================================================================
--- head/www/firefox/Makefile.options	Wed May 23 04:20:39 2018	(r470673)
+++ head/www/firefox/Makefile.options	Wed May 23 04:49:02 2018	(r470674)
@@ -28,4 +28,5 @@ BUNDLED_CAIRO_DESC?=	Use bundled fork of cairo-1.9.5
 CANBERRA_DESC?=		Sound theme alerts
 INTEGER_SAMPLES_DESC?=	Integer audio sample format
 LIBPROXY_DESC?=		Proxy support via libproxy
+LIGHTNING_DESC?=	Calendar extension
 RUST_DESC?=		Build with components written in Rust language

Modified: head/www/seamonkey/Makefile
==============================================================================
--- head/www/seamonkey/Makefile	Wed May 23 04:20:39 2018	(r470673)
+++ head/www/seamonkey/Makefile	Wed May 23 04:49:02 2018	(r470674)
@@ -3,7 +3,7 @@
 
 PORTNAME=	seamonkey
 DISTVERSION=	2.49.3
-PORTREVISION=	5
+PORTREVISION=	6
 MOZILLA_VER=	52 # above + 3
 CATEGORIES?=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
@@ -42,10 +42,10 @@ MOZ_OPTIONS+=	--enable-application=suite
 USE_MOZILLA=	-soundtouch
 MOZ_PKGCONFIG_FILES=
 
-OPTIONS_DEFINE=	LDAP RUST
+OPTIONS_DEFINE=	LDAP LIGHTNING RUST
 OPTIONS_SINGLE=	TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=	GTK2 GTK3
-OPTIONS_DEFAULT=CANBERRA GTK3 LDAP
+OPTIONS_DEFAULT=CANBERRA GTK3 LDAP LIGHTNING
 
 LDAP_DESC?=	LDAP support for Mailnews
 
@@ -59,6 +59,12 @@ MOZ_OPTIONS+=	--disable-ldap
 .else
 MOZ_OPTIONS+=	--enable-ldap
 .endif
+.if ${PORT_OPTIONS:MLIGHTNING}
+MOZ_OPTIONS+=	--enable-calendar
+.else
+MOZ_OPTIONS+=	--disable-calendar
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/suite/app/nsSuiteApp.cpp