svn commit: r428676 - in head: . mail/thunderbird www/firefox www/seamonkey www/seamonkey/files
Jan Beich
jbeich at FreeBSD.org
Fri Dec 16 13:18:11 UTC 2016
Author: jbeich
Date: Fri Dec 16 13:18:09 2016
New Revision: 428676
URL: https://svnweb.freebsd.org/changeset/ports/428676
Log:
Oops, restore Lightning build after r428672
addons.mozilla.org version still cannot be used due to binary components
that aren't provided for any Tier3 platform.
Added:
head/www/seamonkey/files/patch-bug1231349 (contents, props changed)
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 Fri Dec 16 13:07:26 2016 (r428675)
+++ head/UPDATING Fri Dec 16 13:18:09 2016 (r428676)
@@ -13,9 +13,6 @@ you update your ports collection, before
dropped binary components in 1.9. Go to Tools -> Add-ons Manager
then type "enigmail" in the search box to install.
- LIGHTNING is now only built as a system addon (disabled by default)
- using upstream build glue. Go to Tools -> Add-ons Manager to enable.
-
20161213:
AFFECTS: users of devel/skalibs, lang/execline, sysutils/s6
AUTHOR: Colin Booth <colin-ports at heliocat.net>
Modified: head/mail/thunderbird/Makefile
==============================================================================
--- head/mail/thunderbird/Makefile Fri Dec 16 13:07:26 2016 (r428675)
+++ head/mail/thunderbird/Makefile Fri Dec 16 13:18:09 2016 (r428676)
@@ -3,7 +3,7 @@
PORTNAME= thunderbird
DISTVERSION= 45.5.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= mail news net-im ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
@@ -53,10 +53,10 @@ PORTNAME_ICON_SRC= ${PREFIX}/lib/${MOZIL
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 GTK2
+OPTIONS_DEFAULT=BUNDLED_CAIRO CANBERRA GTK2 LIGHTNING
.include "${.CURDIR}/../../www/firefox/Makefile.options"
.include <bsd.port.pre.mk>
@@ -66,9 +66,16 @@ MOZSRC:= ${WRKSRC}/mozilla
XPI_LIBDIR= ${PREFIX}/lib/xpi
+.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}|' \
<${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop
+
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/mail/app/nsMailApp.cpp
Modified: head/www/firefox/Makefile.options
==============================================================================
--- head/www/firefox/Makefile.options Fri Dec 16 13:07:26 2016 (r428675)
+++ head/www/firefox/Makefile.options Fri Dec 16 13:18:09 2016 (r428676)
@@ -25,4 +25,5 @@ CANBERRA_DESC?= Sound theme alerts
GNOMEUI_DESC?= libgnomeui support module
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 Fri Dec 16 13:07:26 2016 (r428675)
+++ head/www/seamonkey/Makefile Fri Dec 16 13:18:09 2016 (r428676)
@@ -4,7 +4,7 @@
PORTNAME= seamonkey
DISTVERSION= 2.46
MOZILLA_VER= 49 # above + 3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= www mail news editors irc ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build9/source
@@ -46,10 +46,10 @@ MOZ_PKGCONFIG_FILES=
BROKEN_aarch64= Fails to link: error adding symbols: File in wrong format
-OPTIONS_DEFINE= LDAP RUST
+OPTIONS_DEFINE= LDAP LIGHTNING RUST
OPTIONS_SINGLE= TOOLKIT
OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3
-OPTIONS_DEFAULT=CANBERRA GTK2 LDAP
+OPTIONS_DEFAULT=CANBERRA GTK2 LDAP LIGHTNING
LDAP_DESC?= LDAP support for Mailnews
@@ -66,6 +66,11 @@ 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' \
Added: head/www/seamonkey/files/patch-bug1231349
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/seamonkey/files/patch-bug1231349 Fri Dec 16 13:18:09 2016 (r428676)
@@ -0,0 +1,16 @@
+diff --git a/suite/installer/package-manifest.in b/suite/installer/package-manifest.in
+--- suite/installer/package-manifest.in
++++ suite/installer/package-manifest.in
+@@ -911,3 +956,12 @@
+ @RESPATH@/extensions/debugQA at mozilla.org/chrome/debugqa at JAREXT@
+ #endif
+ #endif
++
++#ifdef MOZ_CALENDAR
++[calendar]
++#ifdef NIGHTLY_BUILD
++ at RESPATH@/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
++#else
++ at RESPATH@/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
++#endif
++#endif
More information about the svn-ports-all
mailing list