Date: Wed, 24 Jul 2013 21:01:25 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323618 - in head/www/seamonkey: . files Message-ID: <201307242101.r6OL1PZe020181@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Wed Jul 24 21:01:25 2013 New Revision: 323618 URL: http://svnweb.freebsd.org/changeset/ports/323618 Log: Fix the ENIGMAIL build and enable to option by default again. Obtained from: landry@OpenBSD via Mozilla Bugzilla Added: head/www/seamonkey/files/extra-bug886095 (contents, props changed) Modified: head/www/seamonkey/Makefile Modified: head/www/seamonkey/Makefile ============================================================================== --- head/www/seamonkey/Makefile Wed Jul 24 20:59:28 2013 (r323617) +++ head/www/seamonkey/Makefile Wed Jul 24 21:01:25 2013 (r323618) @@ -3,6 +3,7 @@ PORTNAME= seamonkey DISTVERSION= 2.19 +PORTREVISION= 1 CATEGORIES?= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} @@ -47,7 +48,7 @@ MOZ_PKGCONFIG_FILES= NOT_FOR_ARCHS= ia64 OPTIONS_DEFINE= CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS WEBRTC -OPTIONS_DEFAULT=CHATZILLA COMPOSER LDAP LIGHTNING MAILNEWS WEBRTC +OPTIONS_DEFAULT=CHATZILLA COMPOSER ENIGMAIL LDAP LIGHTNING MAILNEWS WEBRTC CHATZILLA_DESC?=Chatzilla IRC module COMPOSER_DESC?= HTML Composer module @@ -83,7 +84,6 @@ MOZ_OPTIONS+= --disable-ldap --enable-ma MOZ_OPTIONS+= --enable-ldap --enable-mailnews .endif .if ${PORT_OPTIONS:MENIGMAIL} -BROKEN= Does not build see https://bugzilla.mozilla.org/show_bug.cgi?id=886095 MASTER_SITES+= http://www.enigmail.net/download/source/:enigmail DISTFILES+= ${EM_DISTFILE}:enigmail RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg @@ -95,7 +95,8 @@ 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/enigmailCommon.jsm -EXTRA_PATCHES+= ${FILESDIR}/extrapatch-enigmail-ipc-src-Makefile +EXTRA_PATCHES+= ${FILESDIR}/extrapatch-enigmail-ipc-src-Makefile \ + ${FILESDIR}/extra-bug886095 .endif .endif Added: head/www/seamonkey/files/extra-bug886095 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/seamonkey/files/extra-bug886095 Wed Jul 24 21:01:25 2013 (r323618) @@ -0,0 +1,18 @@ +https://bugzilla.mozilla.org/show_bug.cgi?id=886095 +--- mailnews/extensions/enigmail/genxpi.orig Wed Jul 3 13:21:33 2013 ++++ mailnews/extensions/enigmail/genxpi Thu Jul 11 09:33:44 2013 +@@ -78,6 +78,7 @@ fi + subprocessDll=${libPrefix}subprocess${dllSuffix} + spDllFile=platform/${platform}/lib/${libPrefix}subprocess-${xpcomAbi}${dllSuffix} + ++cp ${targetDir}/chrome.manifest ${targetDir}/chrome.manifest.save + # Prepare chrome.manifest + cat ${srcDir}/package/chrome.manifest | \ + sed 's/##ENIGMIMEDLL-PLACEHOLDER##/binary-component platform\/'${platform}'\/components\/'`basename ${enigDllFile}`' ABI='${platform}'/' \ +@@ -151,4 +152,5 @@ zip ${xpiFile} \ + chrome.manifest \ + install.rdf + +-rm install.rdf chrome.manifest ++rm install.rdf ++mv chrome.manifest.save chrome.manifest
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307242101.r6OL1PZe020181>