kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix the ENIGMAIL build and enable to option by default again.

Browse source 
Obtained from:	landry@OpenBSD via Mozilla Bugzilla
This commit is contained in:
Florian Smeets 2013-07-24 21:01:25 +00:00
parent 26252acebd
commit 518b51f536
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=323618
2 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
www/seamonkey/Makefile
View file

@ -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

18
www/seamonkey/files/extra-bug886095 Normal file
View file

@ -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