diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2013-07-24 21:01:25 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2013-07-24 21:01:25 +0000 |
| commit | 518b51f53658728fd154ed1469ddd16a676ed721 (patch) | |
| tree | 3567740ae1f4eb93115c0c56ae6c6a28c5201232 /www/seamonkey | |
| parent | 26252acebd2da1bb3dd560d11537d248b75a181a (diff) | |
| download | ports-518b51f53658728fd154ed1469ddd16a676ed721.tar.gz ports-518b51f53658728fd154ed1469ddd16a676ed721.zip | |
Fix the ENIGMAIL build and enable to option by default again.
Obtained from: landry@OpenBSD via Mozilla Bugzilla
Notes
Notes:
svn path=/head/; revision=323618
Diffstat (limited to 'www/seamonkey')
| -rw-r--r-- | www/seamonkey/Makefile | 7 | ||||
| -rw-r--r-- | www/seamonkey/files/extra-bug886095 | 18 |
2 files changed, 22 insertions, 3 deletions
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 9cee72b35980..5d53b41c988e 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -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-mailnews 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 diff --git a/www/seamonkey/files/extra-bug886095 b/www/seamonkey/files/extra-bug886095 new file mode 100644 index 000000000000..7f0b7d411cdd --- /dev/null +++ b/www/seamonkey/files/extra-bug886095 @@ -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 |