Update to Exmh 2.7.2:

* 2.7.2 More bug fixes, plus some performance improvements for the new
        sequences code added in 2.6. The exmh-strip utility is integrated as
        "Save/Extract Attachments".
* 2.7.1 (Wasn't officially released in tarball form.)
* 2.7.0 Accumulates over a year of minor fixes in the CVS tree.

Also fix some pkglint complaints, and take maintainership.

4 files changed, 22 insertions, 21 deletions

diff --git a/mail/exmh/Makefile b/mail/exmh/Makefile
index bb5be1bfaf7..5a23bb4aeee 100644
--- a/mail/exmh/Makefile
+++ b/mail/exmh/Makefile
@@ -1,25 +1,23 @@
-# $NetBSD: Makefile,v 1.43 2006/10/19 07:52:34 markd Exp $
+# $NetBSD: Makefile,v 1.44 2006/10/20 08:15:14 dsainty Exp $
 
-DISTNAME=	exmh-2.6.3
-PKGREVISION=	1
+DISTNAME=	exmh-2.7.2
 CATEGORIES=	mail tk
-MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/exmh/
+MASTER_SITES=	ftp://ftp.tcl.tk/pub/tcl/exmh/
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	dsainty@NetBSD.org
 HOMEPAGE=	http://www.beedub.com/exmh/
 COMMENT=	X11/TK based mail reader front end to MH
 
-DEPENDS+=	tk>=8.3.2:../../x11/tk
 DEPENDS+=	nmh>=1.0:../../mail/nmh
 DEPENDS+=	metamail>=2.7:../../mail/metamail
 
+USE_TOOLS+=	tclsh
+USE_TOOLS+=	wish:run
+
 .include "../../mk/bsd.prefs.mk"
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
-WISH=		wish
-TCLSH=		tclsh
-
 # Additionally, exmh will use the following packages if present:
 # lang/expect
 # textproc/glimpse
@@ -28,16 +26,14 @@ TCLSH=		tclsh
 # mail/faces
 # audio/rplay
 
-.include "../../mk/x11.buildlink3.mk"
-
 do-build:
-	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} TCLSH=${TCLSH} \
-		WISH=${PREFIX}/bin/${WISH} WRKSRC=${WRKSRC} \
+	cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} TCLSH=${TCLSH:Q} \
+		WISH=${WISH:Q} WRKSRC=${WRKSRC} \
 		FILESDIR=${FILESDIR} ${SH} ${FILESDIR}/build
 
 do-install:
 	${INSTALL_MAN} ${WRKSRC}/exmh.l ${PREFIX}/man/man1/exmh.1
-	for binfile in exmh-async exmh-bg exmh ftp.expect; do \
+	for binfile in exmh-async exmh-bg exmh-strip exmh ftp.expect; do \
 		${INSTALL_SCRIPT} ${WRKSRC}/$$binfile ${PREFIX}/bin; \
 	done
 	vers=`sed -ne 's/^set vers \(.*\)/\1/p' ${WRKSRC}/exmh.install`; \
@@ -57,4 +53,6 @@ do-install:
 		${INSTALL_DATA} $$hfile ${PREFIX}/lib/exmh-$${vers}/html; \
 	done
 
+.include "../../x11/tk/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/exmh/PLIST b/mail/exmh/PLIST
index c010ff23159..9450447c6b5 100644
--- a/mail/exmh/PLIST
+++ b/mail/exmh/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2003/05/12 20:40:17 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/10/20 08:15:14 dsainty Exp $
 bin/exmh
 bin/exmh-async
 bin/exmh-bg
+bin/exmh-strip
 bin/ftp.expect
 lib/${PKGNAME}/PgpDecryptExpect
 lib/${PKGNAME}/addr.tcl
@@ -14,6 +15,7 @@ lib/${PKGNAME}/autorefile.tcl
 lib/${PKGNAME}/background.tcl
 lib/${PKGNAME}/base64.tcl
 lib/${PKGNAME}/bindings.tcl
+lib/${PKGNAME}/bogo.tcl
 lib/${PKGNAME}/busy.tcl
 lib/${PKGNAME}/buttons.tcl
 lib/${PKGNAME}/clink.au
@@ -136,6 +138,7 @@ lib/${PKGNAME}/mh.tcl
 lib/${PKGNAME}/mime.tcl
 lib/${PKGNAME}/mime.types
 lib/${PKGNAME}/mimeSun.tcl
+lib/${PKGNAME}/mimencode.tcl
 lib/${PKGNAME}/mosaic.tcl
 lib/${PKGNAME}/msg.tcl
 lib/${PKGNAME}/msgShow.tcl
diff --git a/mail/exmh/distinfo b/mail/exmh/distinfo
index bf90356d497..50b26359ae0 100644
--- a/mail/exmh/distinfo
+++ b/mail/exmh/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:59:22 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/10/20 08:15:14 dsainty Exp $
 
-SHA1 (exmh-2.6.3/exmh-2.6.3.tar.gz) = 3d41d4c735b7248cb10937950ea2adb0e3f4033c
-RMD160 (exmh-2.6.3/exmh-2.6.3.tar.gz) = 3ccb20b27bed115b73e55351ef6633d30044b551
-Size (exmh-2.6.3/exmh-2.6.3.tar.gz) = 910556 bytes
+SHA1 (exmh-2.7.2/exmh-2.7.2.tar.gz) = 0e8e11c29c7e1b9371d5a72b4cb2bf6085f20edf
+RMD160 (exmh-2.7.2/exmh-2.7.2.tar.gz) = fd0d8689304cdb6dcbcd341ec5ba5f8f5b2f9712
+Size (exmh-2.7.2/exmh-2.7.2.tar.gz) = 1081601 bytes
 SHA1 (patch-aw) = 396ef41611de11a9ba48f15711e20f4e44f73da9
diff --git a/mail/exmh/files/build b/mail/exmh/files/build
index 6d29e93f097..992651a4b63 100644
--- a/mail/exmh/files/build
+++ b/mail/exmh/files/build
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: build,v 1.1 2001/10/26 11:46:55 agc Exp $
+# $NetBSD: build,v 1.2 2006/10/20 08:15:15 dsainty Exp $
 # FreeBSD Id: build,v 1.5 1997/08/21 08:09:56 peter Exp
 #
 
@@ -83,7 +83,7 @@ sed <${FILESDIR}/config \
 	-e "s+!!DATE!!+${DATE}+g" \
  | sed -e 's/$/\\/' >> ${SEDFILE}
 
-for i in exmh-async exmh-bg exmh ftp.expect
+for i in exmh-async exmh-bg exmh-strip exmh ftp.expect
 do
 	echo "sed -f ${SEDFILE} < $i.MASTER > $i"
 	sed -f ${SEDFILE} < $i.MASTER > $i