As done in thunderbird, merge enigmail/seamonkey port into seamonkey

port so that seamonkey is not built twice, and enigmail-seamonkey is
built as a subpackage of seamonkey, like lightning...
add @conflict/@pkgpath markers to allow seamless updates from previous
enigmail-seamonkey packages.
This commit is contained in:
landry 2011-07-28 20:32:39 +00:00
parent 0130f973ee
commit 1437cd4c43
5 changed files with 100 additions and 6 deletions

View File

@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.83 2011/07/28 08:12:50 landry Exp $
# $OpenBSD: Makefile,v 1.84 2011/07/28 20:32:39 landry Exp $
COMMENT-main = Mozilla application suite
COMMENT-lightning = Mozilla Seamonkey calendar extension
COMMENT-enigmail = Mozilla Seamonkey GnuPG extension
BROKEN-sparc64 = https://bugzilla.mozilla.org/show_bug.cgi?id=577056
MOZILLA_VERSION= 2.2
@ -9,17 +10,19 @@ MOZILLA_BRANCH = release
MOZILLA_PROJECT = seamonkey
MOZILLA_CODENAME = suite
MULTI_PACKAGES = -main -lightning
MULTI_PACKAGES = -main -lightning -enigmail
PKGNAME-main = seamonkey-2.2
REVISION-main = 0
PKGNAME-lightning = lightning-seamonkey-1.0beta4
PKGNAME-enigmail = enigmail-seamonkey-1.2
REVISION-enigmail = 0
EPOCH-lightning = 0
# must be in sync with SO_VERSION in main/enigmail/seamonkey
SO_VERSION= 18.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
MOZILLA_LIBS = ldap60 ldif60 mozalloc prldap60 suite xpcom xul calbasecomps
MOZILLA_LIBS = ldap60 ldif60 mozalloc prldap60 suite xpcom xul calbasecomps enigmime ipc
CATEGORIES= www mail net news
@ -30,6 +33,7 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES0= http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/${MOZILLA_VERSION}/langpack/
MASTER_SITES1 = http://www.mozilla-enigmail.org/download/source/
LANGUAGES= ca \
cs \
@ -53,9 +57,12 @@ LANGUAGES= ca \
sv-SE \
tr
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \
enigmail-1.2.tar.gz
EXTRACT_CASES = enigmail-*.tar.gz) ${GZIP_CMD} -dc ${FULLDISTDIR}/$$archive | tar -C comm-${MOZILLA_BRANCH}/mailnews/extensions/ -xf -;;
DISTFILES+= ${EXTRACT_ONLY}
DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \
enigmail-1.2.tar.gz:1
.for language in ${LANGUAGES}
DISTFILES+= seamonkey-${MOZILLA_VERSION}.${language}.langpack.xpi:0
.endfor
@ -74,6 +81,10 @@ WANTLIB-lightning = lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/xpcom \
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/mozalloc \
c m stdc++ nspr4 plc4 plds4
RUN_DEPENDS-enigmail = security/gnupg
LIB_DEPENDS-enigmail = ${LIB_DEPENDS-lightning}
WANTLIB-enigmail = ${WANTLIB-lightning}
CONFIGURE_STYLE = autoconf no-autoheader
CONFIGURE_ENV += CPPFLAGS=-I${X11BASE}/include
CONFIGURE_ARGS += --enable-calendar
@ -87,10 +98,22 @@ ALL_TARGET= default
MOZILLA_AUTOCONF_DIRS = ldap/sdks/c-sdk mozilla mozilla/js/src
MOZILLA_SUBST_FILES += configure
ENIGMAIL_DIR = ${WRKSRC}/mailnews/extensions/enigmail
post-build:
# build enigmail
cd ${ENIGMAIL_DIR} && ./makemake -r
cd ${ENIGMAIL_DIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
cd ${MOB}/chrome/enigmail && zip -r ../enigmail.jar .
cd ${ENIGMAIL_DIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} xpi
GNU_ARCH = ${MACHINE_ARCH:S/amd64/x86_64/}
# guid for gdata-provider comes from em:id in install.rdf
GUIDS = gdata-provider {a62ef8ec-5fdc-40c2-873c-223b8a6925cc} \
lightning {e2fda1a4-762b-4020-b5ad-a41df1933103} \
calendar-timezones calendar-timezones@mozilla.org
calendar-timezones calendar-timezones@mozilla.org \
../bin/enigmail-1.2-openbsd-${GNU_ARCH} {847b3a00-7ab1-11d4-8f02-006008948af5}
EXTDIR = ${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/
post-install:

View File

@ -1,3 +1,4 @@
MD5 (mozilla/enigmail-1.2.tar.gz) = +LoVFkrcHA6DKFghRkYa7A==
MD5 (mozilla/seamonkey-2.2.ca.langpack.xpi) = 4od0XLdkHtQkqu0F0R73Yg==
MD5 (mozilla/seamonkey-2.2.cs.langpack.xpi) = uhjG3LlMS8uAIpxMHtHFkg==
MD5 (mozilla/seamonkey-2.2.de.langpack.xpi) = IbqgfXG0XFNTK10Nh1cJBw==
@ -20,6 +21,7 @@ MD5 (mozilla/seamonkey-2.2.sk.langpack.xpi) = AGFhXHUm/BvHwRi4yA3Bbw==
MD5 (mozilla/seamonkey-2.2.source.tar.bz2) = e1o9lB9v1VQOnorbBovXNw==
MD5 (mozilla/seamonkey-2.2.sv-SE.langpack.xpi) = BWZhXAepUcr236PS5sWgpg==
MD5 (mozilla/seamonkey-2.2.tr.langpack.xpi) = wM5oJjYqeLzdPRN81eNc0w==
RMD160 (mozilla/enigmail-1.2.tar.gz) = hoxzqihWaJXUtsa5y/RgLXXfCnM=
RMD160 (mozilla/seamonkey-2.2.ca.langpack.xpi) = U20DFJy8fPRfKsjMHSV9IMFeKqw=
RMD160 (mozilla/seamonkey-2.2.cs.langpack.xpi) = bkY+ZtEwOWYtdSlGrWnHdX0NEqg=
RMD160 (mozilla/seamonkey-2.2.de.langpack.xpi) = lvTl/unxDcalOup1thm4kk/lSB0=
@ -42,6 +44,7 @@ RMD160 (mozilla/seamonkey-2.2.sk.langpack.xpi) = JPU8Crm815KzZ4K4TacL5CZ5/vA=
RMD160 (mozilla/seamonkey-2.2.source.tar.bz2) = z60EYDV8NX33pZNsC9EDdMGOrAQ=
RMD160 (mozilla/seamonkey-2.2.sv-SE.langpack.xpi) = WSljgVw3IB5UWUqdwcED+tFH10M=
RMD160 (mozilla/seamonkey-2.2.tr.langpack.xpi) = Wsyr2VV2avL2qV7GoWL+fp/FB5A=
SHA1 (mozilla/enigmail-1.2.tar.gz) = BfuAqZVE+Vv6JTHmzVysjPHnh4A=
SHA1 (mozilla/seamonkey-2.2.ca.langpack.xpi) = Z9vP10wEd3W9SaKTJvmZvfs7eBI=
SHA1 (mozilla/seamonkey-2.2.cs.langpack.xpi) = /eNKcCfNKFtofnDhlbfyz+/iDTs=
SHA1 (mozilla/seamonkey-2.2.de.langpack.xpi) = L+t9PWvb5SKx64SBvqvUvKLjz+U=
@ -64,6 +67,7 @@ SHA1 (mozilla/seamonkey-2.2.sk.langpack.xpi) = k9N1ZcGUD7bwA3EqN7+KB7om1FY=
SHA1 (mozilla/seamonkey-2.2.source.tar.bz2) = uyGB+7tKoW5RiZtIOsrbMffgy7w=
SHA1 (mozilla/seamonkey-2.2.sv-SE.langpack.xpi) = c9yba2ondodxLbUj8m17xpfgy28=
SHA1 (mozilla/seamonkey-2.2.tr.langpack.xpi) = MTzbXAE/CeWTH8Mv+EMIsItxDI8=
SHA256 (mozilla/enigmail-1.2.tar.gz) = 5eUWhdCetah70h+AtLZO64111kJLIc/q6nucFnI8nMQ=
SHA256 (mozilla/seamonkey-2.2.ca.langpack.xpi) = QzpuHeqBodvp/F8ONghFr/tx3snjxaZpzDVSgfF9cNk=
SHA256 (mozilla/seamonkey-2.2.cs.langpack.xpi) = Zm1QTPLSFqeo3ooTiYcZ2omkIWbk7h1MLSv8tMnjm24=
SHA256 (mozilla/seamonkey-2.2.de.langpack.xpi) = E8Pwi82pR+XCARGnO+6ZXVrIvZfe/YrSNVMLYddd5yo=
@ -86,6 +90,7 @@ SHA256 (mozilla/seamonkey-2.2.sk.langpack.xpi) = ol544snmgpEL1vzcdjmseQLQf5msnMu
SHA256 (mozilla/seamonkey-2.2.source.tar.bz2) = C3E+L3iixROb8Wc2vRLocBfNvGdZSNSoiTo9g0v4wTo=
SHA256 (mozilla/seamonkey-2.2.sv-SE.langpack.xpi) = g7XnVy7VUOKZsoE6CCbTdg4Y/Um1aj6FLzvjLNEzofw=
SHA256 (mozilla/seamonkey-2.2.tr.langpack.xpi) = C7NC94RUk8NfdDs/hYnp+g1+0cKD9ADuuSlhfBPyb1Y=
SIZE (mozilla/enigmail-1.2.tar.gz) = 1326482
SIZE (mozilla/seamonkey-2.2.ca.langpack.xpi) = 811514
SIZE (mozilla/seamonkey-2.2.cs.langpack.xpi) = 814944
SIZE (mozilla/seamonkey-2.2.de.langpack.xpi) = 857283

View File

@ -0,0 +1,32 @@
$OpenBSD: patch-mailnews_extensions_enigmail_genxpi,v 1.1 2011/07/28 20:32:39 landry Exp $
Remove ABI=xxx marker and xpcomAbi from lib naming.
--- mailnews/extensions/enigmail/genxpi.orig Sun Jul 24 20:58:41 2011
+++ mailnews/extensions/enigmail/genxpi Sun Jul 24 20:58:42 2011
@@ -62,7 +62,7 @@ cd "$cwd"
if [ "$xpcomAbi" = "" ] ; then
xpcomAbi="unknown"
fi
-platform=${osArch}_${xpcomAbi}
+platform=${osArch}
# Pepare install.rdf
sed 's/<!-- targetPlatform placeholder -->/<em:targetPlatform>'${platform}'<\/em:targetPlatform>/' < ${srcDir}/package/install.rdf > ${targetDir}/install.rdf.t1
@@ -74,14 +74,14 @@ if [ ${platform} = OS2_x86-gcc3 ]; then
enigDllFile=platform/${platform}/components/${enigmimeDll}
ipcDllFile=platform/${platform}/components/${ipcDll}
else
- enigDllFile=platform/${platform}/components/${libPrefix}enigmime-${xpcomAbi}${dllSuffix}
- ipcDllFile=platform/${platform}/components/${libPrefix}ipc-${xpcomAbi}${dllSuffix}
+ enigDllFile=platform/${platform}/components/${libPrefix}enigmime${dllSuffix}
+ ipcDllFile=platform/${platform}/components/${libPrefix}ipc${dllSuffix}
fi
# Prepare chrome.manifest
cat ${srcDir}/package/chrome.manifest | \
-sed 's/##ENIGMIMEDLL-PLACEHOLDER##/binary-component platform\/'${platform}'\/components\/'`basename ${enigDllFile}`' ABI='${platform}'/' | \
-sed 's/##IPCDLL-PLACEHOLDER##/binary-component platform\/'${platform}'\/components\/'`basename ${ipcDllFile}`' ABI='${platform}'/' \
+sed 's/##ENIGMIMEDLL-PLACEHOLDER##/binary-component platform\/'${platform}'\/components\/'`basename ${enigDllFile}`'/' | \
+sed 's/##IPCDLL-PLACEHOLDER##/binary-component platform\/'${platform}'\/components\/'`basename ${ipcDllFile}`'/' \
> ${targetDir}/chrome.manifest
# Prepare languages other than en-US

View File

@ -0,0 +1,2 @@
Enigmail is an extension to Mozilla Thunderbird which allows users to
access the authentication and encryption features provided by GnuPG.

View File

@ -0,0 +1,32 @@
@comment $OpenBSD: PLIST-enigmail,v 1.1 2011/07/28 20:32:39 landry Exp $
@conflict enigmail-seamonkey-<=1.2
@pkgpath mail/enigmail/seamonkey
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome.manifest
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/chrome/enigmail.jar
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigMsgCompFields.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigmail.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigmail.xpt
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigmime.xpt
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/enigprefs-service.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/components/ipc.xpt
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/defaults/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/defaults/pref/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/defaults/pref/enigmail.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/defaults/preferences/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/defaults/preferences/enigmail.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/install.rdf
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/commonFuncs.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/enigmailCommon.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/modules/subprocess.jsm
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/OpenBSD/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/OpenBSD/components/
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/OpenBSD/components/libenigmime.so.${LIBenigmime_VERSION}
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/platform/OpenBSD/components/libipc.so.${LIBipc_VERSION}
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/wrappers/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/wrappers/gpg-agent-wrapper.sh
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{847b3a00-7ab1-11d4-8f02-006008948af5}/wrappers/gpg-wrapper.sh