ports/73359: [PATCH] Upgrade enigmail to 0.86.1

[Doug Barton]

>Number:         73359
>Category:       ports
>Synopsis:       [PATCH] Upgrade enigmail to 0.86.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 31 21:20:11 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Doug Barton
>Release:        FreeBSD 6.0-CURRENT-1023 i386
>Organization:
AAAG
>Environment:
System: FreeBSD 6.0-CURRENT-1023


>Description:
This patch will upgrade enigmail to the latest version (9.86.1) and add some
nice new stuff:

1. Download the PGP signature files
2. Pet portlint s/file/f/
3. Update the filename to patch in the c-sdk directory. Without this patch
I can't build the port at all. With this change it builds and runs fine.

>How-To-Repeat:
	N/A
>Fix:
Apply the following patch:


Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/enigmail/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- Makefile	5 Jul 2004 12:34:25 -0000	1.19
+++ Makefile	31 Oct 2004 21:13:53 -0000
@@ -6,17 +6,20 @@
 #
 
 PORTNAME=	enigmail
-PORTVERSION?=	0.84.2
+PORTVERSION?=	0.86.1
 PORTREVISION?=	0
 CATEGORIES=	mail security
-MASTER_SITES=	http://www.brunschwig.net/enigmail/src/ \
-		http://mozdev.secsup.org/enigmail/src/ \
+MASTER_SITES=	http://mozdev.secsup.org/enigmail/src/ \
 		http://downloads.us-east3.mozdev.org/enigmail/src/ \
 		http://mozdev.oregonstate.edu/enigmail/src/ \
 		http://mozdev.sweetooth.org/enigmail/src/ \
 		http://ftp.heanet.ie/pub/mozdev/enigmail/src/ \
 		http://mirror.meisterwerk.net/rmozdev/enigmail/src/
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}.asc \
+		ipc-${IPCVERSION}${EXTRACT_SUFX} \
+		ipc-${IPCVERSION}${EXTRACT_SUFX}.asc
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		ipc-${IPCVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	ale at FreeBSD.org
@@ -49,14 +52,14 @@
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 	@${CP} -R ${WRKDIR}/../../../${LOCAL_SRCDIR}/work/mozilla ${WRKSRC}
-	@for file in ${EXTRACT_ONLY}; do \
-		cd ${WRKSRC}/extensions && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$file ${EXTRACT_AFTER_ARGS}; \
+	@for f in ${EXTRACT_ONLY}; do \
+		cd ${WRKSRC}/extensions && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/$$f ${EXTRACT_AFTER_ARGS}; \
 	done
 
 pre-patch:
 	@${REINPLACE_CMD} -e "s|${LOCAL_SRCDIR}|mail/enigmail${PKGNAMESUFFIX}|g" \
 		${WRKSRC}/config/autoconf.mk \
-		${WRKSRC}/directory/c-sdk/config/autoconf.mk \
+		${WRKSRC}/directory/c-sdk/config/autoconf.mk.in \
 		${WRKSRC}/nsprpub/config/autoconf.mk
 
 do-build:
@@ -69,14 +72,14 @@
 	@(cd ${WRKSRC}/extensions/enigmail; ./makemake -r; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS});
 
 do-install:
-	@for file in ${COMPONENTS}; do \
-		${INSTALL_DATA} ${WRKSRC}/dist/bin/components/$$file ${LOCAL_PREFIX}/components; \
+	@for f in ${COMPONENTS}; do \
+		${INSTALL_DATA} ${WRKSRC}/dist/bin/components/$$f ${LOCAL_PREFIX}/components; \
 	done
-	@for file in ${CHROME}; do \
-		${INSTALL_DATA} ${WRKSRC}/dist/bin/chrome/$$file ${LOCAL_PREFIX}/chrome; \
+	@for f in ${CHROME}; do \
+		${INSTALL_DATA} ${WRKSRC}/dist/bin/chrome/$$f ${LOCAL_PREFIX}/chrome; \
 	done
-	@for file in ${PREF}; do \
-		${INSTALL_DATA} ${WRKSRC}/dist/bin/defaults/pref/$$file ${LOCAL_PREFIX}/defaults/pref; \
+	@for f in ${PREF}; do \
+		${INSTALL_DATA} ${WRKSRC}/dist/bin/defaults/pref/$$f ${LOCAL_PREFIX}/defaults/pref; \
 	done
 
 post-install:
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/mail/enigmail/distinfo,v
retrieving revision 1.12
diff -u -r1.12 distinfo
--- distinfo	5 Jul 2004 12:34:25 -0000	1.12
+++ distinfo	31 Oct 2004 21:13:53 -0000
@@ -1,6 +1,12 @@
-MD5 (enigmail-0.84.2.tar.gz) = f758f640fb6acffedfe593bc430238e7
-SIZE (enigmail-0.84.2.tar.gz) = 316666
+MD5 (enigmail-0.86.1.tar.gz) = e4253e97b0039c987f0650aca4caa973
+SIZE (enigmail-0.86.1.tar.gz) = 330970
+MD5 (enigmail-0.86.1.tar.gz.asc) = f413fe9c64af47c09a95e73b3f6f2940
+SIZE (enigmail-0.86.1.tar.gz.asc) = 194
 MD5 (ipc-1.0.5.tar.gz) = 457f8277b12f3e37defa71dc186f83b4
 SIZE (ipc-1.0.5.tar.gz) = 137083
+MD5 (ipc-1.0.5.tar.gz.asc) = bc2032321c6415b407cf2e10d4c5a506
+SIZE (ipc-1.0.5.tar.gz.asc) = 189
 MD5 (ipc-1.0.7.tar.gz) = f605ba029ff4c71dcc10c29635c1c79e
 SIZE (ipc-1.0.7.tar.gz) = 104193
+MD5 (ipc-1.0.7.tar.gz.asc) = 2ed558e6cd4bfa242a54232e9ffeba4e
+SIZE (ipc-1.0.7.tar.gz.asc) = 197
>Release-Note:
>Audit-Trail:
>Unformatted: