Index: head/mail/enigmail/Makefile
===================================================================
--- head/mail/enigmail/Makefile	(revision 279306)
+++ head/mail/enigmail/Makefile	(revision 279307)
@@ -1,93 +1,93 @@
 # New ports collection makefile for:	enigmail
 # Date created:			20 January 2004
 # Whom:				Alex Dupre <ale@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	enigmail
-PORTVERSION?=	1.2
+PORTVERSION?=	1.2.1
 PORTREVISION?=	0
 CATEGORIES=	mail security
 MASTER_SITES=	http://www.mozilla-enigmail.org/download/source/
 PKGNAMEPREFIX=	${GECKO}-
 
 MAINTAINER=	ale@FreeBSD.org
 COMMENT?=	A GnuPG extension for the Mozilla mail clients
 
 EXTRACT_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/${GECKO_PORTDIR}:${GECKO_TARGET} \
 		${GECKO:C/[0-9]//}:${PORTSDIR}/${GECKO_PORTDIR} \
 		gmake:${PORTSDIR}/devel/gmake \
 		intltool-extract:${PORTSDIR}/textproc/intltool \
 		${LOCALBASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto
 BUILD_DEPENDS=	${GECKO:C/[0-9]//}:${PORTSDIR}/${GECKO_PORTDIR}
 RUN_DEPENDS=	${GECKO:C/[0-9]//}:${PORTSDIR}/${GECKO_PORTDIR} \
 		gpg:${PORTSDIR}/security/gnupg
 
 .if !defined(GECKO)
 GECKO=		libxul
 GECKO_PORTDIR=	www/${GECKO}
 IGNORE=		is an abstract port: use one of the slave ports
 .endif
 
-.if ${PORTVERSION} == "1.2"
-GECKO_TARGET=	build
-.else
+.if ${PORTVERSION} == "1.0.1" || ${PORTVERSION} == "1.1.2"
 GECKO_TARGET=	configure
+.else
+GECKO_TARGET=	build
 .endif
 
 .if defined(GECKO_EXTDIR)
 GECKO_WRKSRC=	${WRKDIR}/../../../${GECKO_PORTDIR}/work/${GECKO_EXTDIR}
 WRKSRC=		${WRKDIR}/${GECKO_EXTDIR}
 MOZSRC=		${WRKSRC}/mozilla
 .else
 GECKO_WRKSRC=	${WRKDIR}/../../../${GECKO_PORTDIR}/work/mozilla
 WRKSRC=		${WRKDIR}/mozilla
 MOZSRC=		${WRKSRC}
 .endif
 
 USE_GMAKE=	yes
 
 .include <bsd.port.pre.mk>
 
 XPI_FILE=	${DISTNAME}-${GECKO}-freebsd${OSVERSION:C/([0-9]).+/\1/}-${ARCH}.xpi
 PLIST_FILES=	%%DATADIR%%/${XPI_FILE}
 PLIST_DIRS=	%%DATADIR%%
 
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 	@${CP} -Rp ${GECKO_WRKSRC} ${WRKDIR}
 	@for f in ${EXTRACT_ONLY}; do \
 		cd ${WRKSRC}/mailnews/extensions && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$f ${EXTRACT_AFTER_ARGS}; \
 	done
 
 pre-patch:
 	@${REINPLACE_CMD} -e "s|${GECKO_PORTDIR}|mail/enigmail-${GECKO}|g" \
 		`${FIND} ${WRKSRC} -name autoconf.mk`
 
 do-build:
 .if ${GECKO_TARGET} == "configure"
 	${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
 .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}
-	${INSTALL_DATA} ${MOZSRC}/dist/bin/${DISTNAME:C/1.0.[0-9]/1.0/}-freebsd-${ARCH}.xpi ${DATADIR}/${XPI_FILE}
+	${INSTALL_DATA} ${MOZSRC}/dist/bin/${DISTNAME:C/1.([02]).[0-9]/1.\1/}-freebsd-${ARCH}.xpi ${DATADIR}/${XPI_FILE}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/mail/enigmail/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.57
\ No newline at end of property
+1.58
\ No newline at end of property
Index: head/mail/enigmail/distinfo
===================================================================
--- head/mail/enigmail/distinfo	(revision 279306)
+++ head/mail/enigmail/distinfo	(revision 279307)
@@ -1,8 +1,6 @@
 SHA256 (enigmail-1.0.1.tar.gz) = 7bc8541eef483d67246f3d83682ba13263f001fa94b5982c0cfbe54e5bdfd32a
 SIZE (enigmail-1.0.1.tar.gz) = 1201945
 SHA256 (enigmail-1.1.2.tar.gz) = dd6206f6622081b595d7bde7aaa8f63ca2c3f9db2acd13c751c7dd941def9e41
 SIZE (enigmail-1.1.2.tar.gz) = 1280923
-SHA256 (enigmail-1.2a2.tar.gz) = 18863773132340ed66884e1f825899d624a21d89e37dec3417b9cbc8af617f87
-SIZE (enigmail-1.2a2.tar.gz) = 1325188
-SHA256 (enigmail-1.2.tar.gz) = e5e51685d09eb5a87bd21f80b4b64eeb8d75d6424b21cfeaea7b9c16723c9cc4
-SIZE (enigmail-1.2.tar.gz) = 1326482
+SHA256 (enigmail-1.2.1.tar.gz) = b13eec1418240aefb64e27f4f02b3026edd1782524ea524c9af233086c7c7f45
+SIZE (enigmail-1.2.1.tar.gz) = 1463012

Property changes on: head/mail/enigmail/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.26
\ No newline at end of property
+1.27
\ No newline at end of property
Index: head/mail/enigmail-seamonkey/Makefile
===================================================================
--- head/mail/enigmail-seamonkey/Makefile	(revision 279306)
+++ head/mail/enigmail-seamonkey/Makefile	(revision 279307)
@@ -1,22 +1,19 @@
 # New ports collection makefile for:	enigmail
 # Date created:			15 January 2006
 # Whom:				Alex Dupre <ale@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTVERSION=	1.2a2
-
 COMMENT=	A GnuPG extension for the Seamonkey mail client
 
+EXTRACT_DEPENDS=autoconf-2.13:${PORTSDIR}/devel/autoconf213 \
+		yasm:${PORTSDIR}/devel/yasm
+
 MASTERDIR=	${.CURDIR}/../enigmail
 
 GECKO=		seamonkey
 GECKO_PORTDIR=	www/${GECKO}
-GECKO_EXTDIR=	comm-2.0
-
-PORTSCOUT=	skipv:1.2
-
-IGNORE=		is for seamonkey 2.1, not yet in the ports tree
+GECKO_EXTDIR=	comm-release
 
 .include "${MASTERDIR}/Makefile"

Property changes on: head/mail/enigmail-seamonkey/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property