- Update to 1.2 release to support seamonkey 2.1 and thunderbird 5.0,

  though it currently doesn't build (we are working to fix it)
- Update build commands
- Add PORTSCOUT knobs

6 files changed, 35 insertions, 31 deletions

diff --git a/mail/enigmail-seamonkey/Makefile b/mail/enigmail-seamonkey/Makefile
index 26ede9dde923..efe0b7bd5a5e 100644
--- a/mail/enigmail-seamonkey/Makefile
+++ b/mail/enigmail-seamonkey/Makefile
@@ -5,15 +5,12 @@
 # $FreeBSD$
 #
 
-PORTVERSION=	0.96.0
-PORTREVISION=	2
-
 COMMENT=	A GnuPG extension for the Seamonkey mail client
 
 MASTERDIR=	${.CURDIR}/../enigmail
 
 GECKO=		seamonkey
 GECKO_PORTDIR=	www/${GECKO}
-GECKO_WRKSRC=	${WRKDIR}/../../../${GECKO_PORTDIR}/work/mozilla
+GECKO_EXTDIR=	comm-2.0
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/enigmail-seamonkey2/Makefile b/mail/enigmail-seamonkey2/Makefile
index 6b4edffd4f9a..d0a95c1e7273 100644
--- a/mail/enigmail-seamonkey2/Makefile
+++ b/mail/enigmail-seamonkey2/Makefile
@@ -5,6 +5,9 @@
 # $FreeBSD$
 #
 
+PORTVERSION=	1.0.1
+PORTREVISION=	1
+
 COMMENT=	A GnuPG extension for the Seamonkey mail client
 
 MASTERDIR=	${.CURDIR}/../enigmail
@@ -13,4 +16,6 @@ GECKO=		seamonkey2
 GECKO_PORTDIR=	www/${GECKO}
 GECKO_EXTDIR=	comm-1.9.1
 
+PORTSCOUT=	ignore:1
+
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/enigmail-thunderbird/Makefile b/mail/enigmail-thunderbird/Makefile
index cedfd35a5c58..8b59f127434d 100644
--- a/mail/enigmail-thunderbird/Makefile
+++ b/mail/enigmail-thunderbird/Makefile
@@ -5,18 +5,15 @@
 # $FreeBSD$
 #
 
-PORTVERSION=	1.1.2
-
 COMMENT=	A GnuPG extension for the Thunderbird mail client
 
-EXTRACT_DEPENDS=autoconf-2.13:${PORTSDIR}/devel/autoconf213
+EXTRACT_DEPENDS=autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
+		yasm:${PORTSDIR}/devel/yasm
 
 MASTERDIR=	${.CURDIR}/../enigmail
 
 GECKO=		thunderbird
 GECKO_PORTDIR=	mail/${GECKO}
-GECKO_EXTDIR=	comm-1.9.2
-
-MAKE_JOBS_UNSAFE=	yes
+GECKO_EXTDIR=	comm-miramar
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/enigmail-thunderbird3/Makefile b/mail/enigmail-thunderbird3/Makefile
index 2277721146ea..d5791ea4a50c 100644
--- a/mail/enigmail-thunderbird3/Makefile
+++ b/mail/enigmail-thunderbird3/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+PORTVERSION=	1.1.2
+
 COMMENT=	A GnuPG extension for the Thunderbird mail client
 
 EXTRACT_DEPENDS=autoconf-2.13:${PORTSDIR}/devel/autoconf213
@@ -13,6 +15,8 @@ MASTERDIR=	${.CURDIR}/../enigmail
 
 GECKO=		thunderbird3
 GECKO_PORTDIR=	mail/${GECKO}
-GECKO_EXTDIR=	comm-1.9.1
+GECKO_EXTDIR=	comm-1.9.2
+
+PORTSCOUT=	ignore:1
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/enigmail/Makefile b/mail/enigmail/Makefile
index 7ec9df605e5b..5041d0840745 100644
--- a/mail/enigmail/Makefile
+++ b/mail/enigmail/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	enigmail
-PORTVERSION?=	1.0.1
-PORTREVISION=	1
+PORTVERSION?=	1.2
+PORTREVISION?=	0
 CATEGORIES=	mail security
 MASTER_SITES=	http://www.mozilla-enigmail.org/download/source/
 PKGNAMEPREFIX=	${GECKO}-
@@ -24,6 +24,10 @@ BUILD_DEPENDS=	${GECKO:C/[0-9]//}:${PORTSDIR}/${GECKO_PORTDIR}
 RUN_DEPENDS=	${GECKO:C/[0-9]//}:${PORTSDIR}/${GECKO_PORTDIR} \
 		gpg:${PORTSDIR}/security/gnupg
 
+.if ${PORTVERSION} == "1.2"
+IGNORE=		doesn't currently build
+.endif
+
 .if !defined(GECKO)
 GECKO=		libxul
 GECKO_PORTDIR=	www/${GECKO}
@@ -48,12 +52,6 @@ XPI_FILE=	${DISTNAME}-${GECKO}-freebsd${OSVERSION:C/([0-9]).+/\1/}-${ARCH}.xpi
 PLIST_FILES=	%%DATADIR%%/${XPI_FILE}
 PLIST_DIRS=	%%DATADIR%%
 
-.if ${ARCH} == "sparc64"
-.if ${GECKO} == "seamonkey" || ${GECKO} == "thunderbird"
-BROKEN=		Does not install on sparc64
-.endif
-.endif
-
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
@@ -67,13 +65,19 @@ pre-patch:
 		`${FIND} ${WRKSRC} -name autoconf.mk`
 
 do-build:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} export)
-	@(cd ${MOZSRC}/modules/libreg; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS})
-	@(cd ${MOZSRC}/xpcom/string; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS})
-	@(cd ${MOZSRC}/xpcom; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS})
-	@(cd ${MOZSRC}/xpcom/obsolete; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS})
-	@(cd ${WRKSRC}/mailnews/extensions/enigmail; ./makemake -r; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS});
-	@(cd ${WRKSRC}/mailnews/extensions/enigmail; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} xpi);
+	@(${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC} tier_base)
+	@(${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC} tier_nspr)
+	@(${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC} tier_js)
+	@(${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC} export)
+	@(${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC}/modules/libreg)
+	@(${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC}/xpcom/string)
+	@(${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC}/xpcom)
+.if ${PORTVERSION} == "1.0.1"
+	@(${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC}/xpcom/obsolete)
+.endif
+	@(cd ${WRKSRC}/mailnews/extensions/enigmail; ./makemake -r);
+	@(cd ${WRKSRC}/mailnews/extensions/enigmail; ${SETENV} ${MAKE_ENV} ${GMAKE});
+	@(cd ${WRKSRC}/mailnews/extensions/enigmail; ${SETENV} ${MAKE_ENV} ${GMAKE} xpi);
 
 do-install:
 	${MKDIR} ${DATADIR}
diff --git a/mail/enigmail/distinfo b/mail/enigmail/distinfo
index 3ba653afeb88..d03b59a97cee 100644
--- a/mail/enigmail/distinfo
+++ b/mail/enigmail/distinfo
@@ -1,9 +1,6 @@
-MD5 (enigmail-0.96.0.tar.gz) = cf8c38e8d33965706df383ab33b3923c
-SHA256 (enigmail-0.96.0.tar.gz) = 80ad781236f43d9a291205eefd92cf49e75a5836826198f46d3cb90b7eae09d1
-SIZE (enigmail-0.96.0.tar.gz) = 1231329
-MD5 (enigmail-1.0.1.tar.gz) = 508ca9ab0396afb49e82eda88014924b
 SHA256 (enigmail-1.0.1.tar.gz) = 7bc8541eef483d67246f3d83682ba13263f001fa94b5982c0cfbe54e5bdfd32a
 SIZE (enigmail-1.0.1.tar.gz) = 1201945
-MD5 (enigmail-1.1.2.tar.gz) = 7d329d5e8afbbb28214ca1995beb09c9
 SHA256 (enigmail-1.1.2.tar.gz) = dd6206f6622081b595d7bde7aaa8f63ca2c3f9db2acd13c751c7dd941def9e41
 SIZE (enigmail-1.1.2.tar.gz) = 1280923
+SHA256 (enigmail-1.2.tar.gz) = e5e51685d09eb5a87bd21f80b4b64eeb8d75d6424b21cfeaea7b9c16723c9cc4
+SIZE (enigmail-1.2.tar.gz) = 1326482