Date: Fri, 16 Dec 2016 10:57:48 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r428672 - in head: . mail/thunderbird www/firefox www/seamonkey Message-ID: <201612161057.uBGAvmEs043766@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Dec 16 10:57:48 2016 New Revision: 428672 URL: https://svnweb.freebsd.org/changeset/ports/428672 Log: gecko: drop ENIGMAIL, LIGHTNING to simplify updates ENIGMAIL can still return as www/xpi-enigmail but, alas, xpi-* ports and their framework are mostly unmaintained. PR: 209155 (for tracking) Modified: head/UPDATING head/mail/thunderbird/Makefile (contents, props changed) head/mail/thunderbird/distinfo (contents, props changed) head/www/firefox/Makefile.options (contents, props changed) head/www/seamonkey/Makefile (contents, props changed) head/www/seamonkey/distinfo (contents, props changed) Modified: head/UPDATING ============================================================================== --- head/UPDATING Fri Dec 16 10:57:33 2016 (r428671) +++ head/UPDATING Fri Dec 16 10:57:48 2016 (r428672) @@ -5,6 +5,17 @@ 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. +20161216: + AFFECTS: mail/thunderbird, www/seamonkey + AUTHOR: gecko@FreeBSD.org + + ENIGMAIL is no longer provided as part of the ports after upstream + 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@heliocat.net> Modified: head/mail/thunderbird/Makefile ============================================================================== --- head/mail/thunderbird/Makefile Fri Dec 16 10:57:33 2016 (r428671) +++ head/mail/thunderbird/Makefile Fri Dec 16 10:57:48 2016 (r428672) @@ -3,7 +3,7 @@ PORTNAME= thunderbird DISTVERSION= 45.5.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail news net-im ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source @@ -31,9 +31,6 @@ BUILD_DEPENDS= nspr>=4.12:devel/nspr \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l -EM_VERSION= 1.9.6.1 -L_VERSION= 4.7.5.1 - SSP_UNSAFE= yes USE_GECKO= gecko USE_MOZILLA= # empty @@ -56,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= ENIGMAIL LIGHTNING RUST +OPTIONS_DEFINE= RUST OPTIONS_SINGLE= TOOLKIT OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3 -OPTIONS_DEFAULT=BUNDLED_CAIRO CANBERRA ENIGMAIL GTK2 LIGHTNING +OPTIONS_DEFAULT=BUNDLED_CAIRO CANBERRA GTK2 .include "${.CURDIR}/../../www/firefox/Makefile.options" .include <bsd.port.pre.mk> @@ -69,93 +66,23 @@ MOZSRC:= ${WRKSRC}/mozilla XPI_LIBDIR= ${PREFIX}/lib/xpi -.if ${PORT_OPTIONS:MENIGMAIL} -MASTER_SITES+= https://www.enigmail.net/download/source/:enigmail -DISTFILES+= ${EM_DISTFILE}:enigmail -RUN_DEPENDS+= gpg2:security/gnupg -EM_DISTNAME= enigmail-${EM_VERSION} -EM_DISTFILE= ${EM_DISTNAME}.tar.gz -EM_XPI_FILE= ${WRKSRC}/mailnews/extensions/enigmail/build/${EM_DISTNAME}.xpi -EM_ORIG_ID= {847b3a00-7ab1-11d4-8f02-006008948af5} -EM_ID= ${PORTNAME}@mozilla-enigmail.org -EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/install.rdf \ - ${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \ - ${XPI_LIBDIR}/${EM_ID}/modules/app.jsm -.endif - -.if ${PORT_OPTIONS:MLIGHTNING} -MOZ_OPTIONS+= --enable-calendar -MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar -LIGHTNING_DIR= share/lightning -XPI_FILE= ${MOZ_OBJDIR}/dist/xpi-stage/lightning-${L_VERSION}.en-US.${OPSYS:tl}${OSREL}-${ARCH:S/amd64/x86_64/}.xpi -XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} -XPI_ID= lightning@thunderbird.mozilla.org -.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 -.if ${PORT_OPTIONS:MENIGMAIL} - @${TAR} -xf ${_DISTDIR}/${EM_DISTFILE} \ - -C ${WRKSRC}/mailnews/extensions -.endif - post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/mail/app/nsMailApp.cpp -.if ${PORT_OPTIONS:MENIGMAIL} - @${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},' \ - ${WRKSRC}/mailnews/extensions/enigmail/util/fixlang.pl \ - ${WRKSRC}/mailnews/extensions/enigmail/util/make-lang-xpi.pl - @${REINPLACE_CMD} -e '/^xpi/s/$$/ all/' \ - -e '/^all/s/ xpi//' \ - -e '/^XPI_MODULE_VERS/s/= .*/= ${EM_VERSION}/' \ - ${WRKSRC}/mailnews/extensions/enigmail/Makefile - @${REINPLACE_CMD} -e '/em:version/s,>[^<]*<,>${EM_VERSION}<,' \ - -e '/em:maxVersion/s/pre//' \ - ${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf -.endif pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) -.if ${PORT_OPTIONS:MENIGMAIL} -post-configure: - cd ${WRKSRC}/mailnews/extensions/enigmail/ && \ - ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ./configure - -post-build: - ${DO_MAKE_BUILD:N-j*:S,${MAKEFILE},Makefile,} all xpi \ - -C ${WRKSRC}/mailnews/extensions/enigmail -.endif - port-pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/defaults post-install: ${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${STAGEDIR}${PREFIX}/share/applications ${LN} -sf ${PORTNAME_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME_ICON} -.if ${PORT_OPTIONS:MLIGHTNING} - @${MKDIR} ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/thunderbird - @(cd ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID}; ${TAR} -xf ${XPI_FILE}) - @${REINPLACE_CMD} -i "" "s/${XPI_ORIG_ID}/${XPI_ID}/" ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID}/install.rdf - @${CHMOD} -R a+rX,go-w ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID} - @${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/thunderbird 2>/dev/null || true - @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${XPI_ID} ${LOCALBASE}/lib/thunderbird/extensions 2>/dev/null || true' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec ${RM} ${LOCALBASE}/lib/thunderbird/extensions/${XPI_ID}' >> ${TMPPLIST} -.endif -.if ${PORT_OPTIONS:MENIGMAIL} - @${MKDIR} ${STAGEDIR}${XPI_LIBDIR}/${EM_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/${PORTNAME} - @(cd ${STAGEDIR}${XPI_LIBDIR}/${EM_ID}; ${TAR} -xf ${EM_XPI_FILE}) - @${REINPLACE_CMD} -i "" "s/${EM_ORIG_ID}/${EM_ID}/" ${EM_ID_RFILES:S/^/${STAGEDIR}/} - @${CHMOD} -R a+rX,go-w ${STAGEDIR}${XPI_LIBDIR}/${EM_ID} - @${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/${PORTNAME} 2>/dev/null || true - @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec ${RM} ${LOCALBASE}/lib/${PORTNAME}/extensions/${EM_ID}' >> ${TMPPLIST} -.endif .include <bsd.port.post.mk> Modified: head/mail/thunderbird/distinfo ============================================================================== --- head/mail/thunderbird/distinfo Fri Dec 16 10:57:33 2016 (r428671) +++ head/mail/thunderbird/distinfo Fri Dec 16 10:57:48 2016 (r428672) @@ -1,5 +1,3 @@ TIMESTAMP = 1480587562 SHA256 (thunderbird-45.5.1.source.tar.xz) = 15088086ab8643275f04775002aca02701e30b4d61f108d5380b6e6b7582a24c SIZE (thunderbird-45.5.1.source.tar.xz) = 201116636 -SHA256 (enigmail-1.9.6.1.tar.gz) = 3874331e981aed864443d3c965d856e003fd84f73e5a89fd5004ced9dc29b96f -SIZE (enigmail-1.9.6.1.tar.gz) = 1745021 Modified: head/www/firefox/Makefile.options ============================================================================== --- head/www/firefox/Makefile.options Fri Dec 16 10:57:33 2016 (r428671) +++ head/www/firefox/Makefile.options Fri Dec 16 10:57:48 2016 (r428672) @@ -22,9 +22,7 @@ OPTIONS_EXCLUDE+= ${OPTIONS_EXCLUDE_${OP BUNDLED_CAIRO_DESC?= Use bundled fork of cairo-1.9.5 CANBERRA_DESC?= Sound theme alerts -ENIGMAIL_DESC?= Enigmail extension 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 10:57:33 2016 (r428671) +++ head/www/seamonkey/Makefile Fri Dec 16 10:57:48 2016 (r428672) @@ -4,6 +4,7 @@ PORTNAME= seamonkey DISTVERSION= 2.46 MOZILLA_VER= 49 # above + 3 +PORTREVISION= 1 CATEGORIES?= www mail news editors irc ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build9/source @@ -31,9 +32,6 @@ BUILD_DEPENDS= nspr>=4.12:devel/nspr \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l -EM_VERSION= 1.9.6.1 -L_VERSION= 5.1 - SSP_UNSAFE= yes USE_GECKO= gecko USE_GL= gl @@ -48,10 +46,10 @@ MOZ_PKGCONFIG_FILES= BROKEN_aarch64= Fails to link: error adding symbols: File in wrong format -OPTIONS_DEFINE= ENIGMAIL LDAP LIGHTNING RUST +OPTIONS_DEFINE= LDAP RUST OPTIONS_SINGLE= TOOLKIT OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3 -OPTIONS_DEFAULT=CANBERRA ENIGMAIL GTK2 LDAP LIGHTNING +OPTIONS_DEFAULT=CANBERRA GTK2 LDAP LDAP_DESC?= LDAP support for Mailnews @@ -68,36 +66,6 @@ MOZ_OPTIONS+= --disable-ldap .else MOZ_OPTIONS+= --enable-ldap .endif -.if ${PORT_OPTIONS:MENIGMAIL} -MASTER_SITES+= https://www.enigmail.net/download/source/:enigmail -DISTFILES+= ${EM_DISTFILE}:enigmail -RUN_DEPENDS+= gpg2:security/gnupg -EM_DISTNAME= enigmail-${EM_VERSION} -EM_DISTFILE= ${EM_DISTNAME}.tar.gz -EM_XPI_FILE= ${WRKSRC}/mailnews/extensions/enigmail/build/${EM_DISTNAME}.xpi -EM_ORIG_ID= {847b3a00-7ab1-11d4-8f02-006008948af5} -EM_ID= ${PORTNAME}@mozilla-enigmail.org -EM_ID_RFILES= ${XPI_LIBDIR}/${EM_ID}/install.rdf \ - ${XPI_LIBDIR}/${EM_ID}/components/enigmail.js \ - ${XPI_LIBDIR}/${EM_ID}/modules/app.jsm -.endif - -.if ${PORT_OPTIONS:MLIGHTNING} -MOZ_OPTIONS+= --enable-calendar -MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar -LIGHTNING_DIR= share/lightning -XPI_FILE= ${MOZ_OBJDIR}/dist/xpi-stage/lightning-${L_VERSION}.en-US.${OPSYS:tl}${OSREL}-${ARCH:S/amd64/x86_64/}.xpi -XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103} -XPI_ID= lightning@seamonkey.mozilla.org -.else -MOZ_OPTIONS+= --disable-calendar -.endif - -.if ${PORT_OPTIONS:MENIGMAIL} -post-extract: - @${TAR} -xf ${_DISTDIR}/${EM_DISTFILE} \ - -C ${WRKSRC}/mailnews/extensions -.endif post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ @@ -107,57 +75,15 @@ post-patch: @${SED} -e 's|%%MOZILLA%%|${MOZILLA}|g' \ < ${FILESDIR}/seamonkey.desktop.in > \ ${WRKDIR}/${MOZILLA}.desktop -.if ${PORT_OPTIONS:MENIGMAIL} - @${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},' \ - ${WRKSRC}/mailnews/extensions/enigmail/util/fixlang.pl \ - ${WRKSRC}/mailnews/extensions/enigmail/util/make-lang-xpi.pl - @${REINPLACE_CMD} -e '/^xpi/s/$$/ all/' \ - -e '/^all/s/ xpi//' \ - -e '/^XPI_MODULE_VERS/s/= .*/= ${EM_VERSION}/' \ - ${WRKSRC}/mailnews/extensions/enigmail/Makefile - @${REINPLACE_CMD} -e '/em:version/s,>[^<]*<,>${EM_VERSION}<,' \ - -e '/em:maxVersion/s/pre//' \ - ${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf -.endif pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${MOZSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) -.if ${PORT_OPTIONS:MENIGMAIL} -post-configure: - cd ${WRKSRC}/mailnews/extensions/enigmail/ && \ - ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ./configure -.endif - -.if ${PORT_OPTIONS:MENIGMAIL} -post-build: - ${DO_MAKE_BUILD:N-j*:S,${MAKEFILE},Makefile,} all xpi \ - -C ${WRKSRC}/mailnews/extensions/enigmail -.endif - post-install: ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${STAGEDIR}${PREFIX}/share/applications/ ${LN} -sf ${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png -.if ${PORT_OPTIONS:MLIGHTNING} - @${MKDIR} ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/seamonkey - @(cd ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID}; ${TAR} -xf ${XPI_FILE}) - @${REINPLACE_CMD} -i "" "s/${XPI_ORIG_ID}/${XPI_ID}/" ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID}/install.rdf - @${CHMOD} -R a+rX,go-w ${STAGEDIR}${XPI_LIBDIR}/${XPI_ID} - @${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/seamonkey 2>/dev/null || true - @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${XPI_ID} ${LOCALBASE}/lib/seamonkey/extensions 2>/dev/null || true' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec ${RM} ${LOCALBASE}/lib/seamonkey/extensions/${XPI_ID}' >> ${TMPPLIST} -.endif -.if ${PORT_OPTIONS:MENIGMAIL} - @${MKDIR} ${STAGEDIR}${XPI_LIBDIR}/${EM_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/${PORTNAME} - @(cd ${STAGEDIR}${XPI_LIBDIR}/${EM_ID}; ${TAR} -xf ${EM_XPI_FILE}) - @${REINPLACE_CMD} -i "" "s/${EM_ORIG_ID}/${EM_ID}/" ${EM_ID_RFILES:S/^/${STAGEDIR}/g} - @${CHMOD} -R a+rX,go-w ${STAGEDIR}${XPI_LIBDIR}/${EM_ID} - @${LN} -sf ${XPI_LIBDIR}/${EM_ID} ${STAGEDIR}${XPI_LIBDIR}/symlinks/${PORTNAME} 2>/dev/null || true - @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${EM_ID} ${LOCALBASE}/lib/${PORTNAME}/extensions 2>/dev/null || true' >> ${TMPPLIST} - @${ECHO_CMD} '@unexec ${RM} ${LOCALBASE}/lib/${PORTNAME}/extensions/${EM_ID}' >> ${TMPPLIST} -.endif .include <bsd.port.mk> Modified: head/www/seamonkey/distinfo ============================================================================== --- head/www/seamonkey/distinfo Fri Dec 16 10:57:33 2016 (r428671) +++ head/www/seamonkey/distinfo Fri Dec 16 10:57:48 2016 (r428672) @@ -1,5 +1,3 @@ TIMESTAMP = 1481682190 SHA256 (seamonkey-2.46.source.tar.xz) = 39c84ce6fa1ed7c30152473e0dcd858df07437e84b29e5a18973db437a28a912 SIZE (seamonkey-2.46.source.tar.xz) = 204913776 -SHA256 (enigmail-1.9.6.1.tar.gz) = 3874331e981aed864443d3c965d856e003fd84f73e5a89fd5004ced9dc29b96f -SIZE (enigmail-1.9.6.1.tar.gz) = 1745021
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612161057.uBGAvmEs043766>