8 files changed, 220 insertions, 210 deletions

diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index 7b7401082a03..bc13044b9e9d 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -1,42 +1,18 @@
 # New ports collection Makefile for:    exmh2
-# Version required:		2.0.2
-# Date released:		1 Jan 97
+# Version required:		2.1.0
+# Date created:			1 Jan 97
 # Whom:				Peter Wemm <peter@freebsd.org>
 #
 # $FreeBSD$
 #
 
 # "?=" lines are for sharing this Makefile with japanese/exmh2.
-DISTNAME=	exmh-2.0.2
+DISTNAME=	exmh-2.1.0
 CATEGORIES?=	mail tk80
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/exmh/
-EXTRACT_SUFX=	.tar.Z
-
-PATCH_SITES=	http://www.beedub.com/exmh/patches/2.0.2/ \
-		http://www.beedub.com/exmh/patches/2.0.1/
-#PATCHFILES=	utils.patch folderNew.patch extrasInit.patch exec.patch \
-#		app-defaults.patch pgpMisc.patch seditMime.patch mime.patch \
-#		bindings.patch html_bindings.patch find.patch mh.patch \
-#		pgp.patch
-
-# User contributed and "new features".  Some not useable as-is.
-PATCHFILES+=	seditpost.patch inc.patch next.patch \
-		uri.patch extrasInit.patch folder.patch seditExtras.patch
-# XXX pgpExec.patch has got confused paths	(supplied as patch-as)
-# XXX newsgroups.patch is relative to a different directory (patch-at)
-# XXX MDN.patch doesn't apply			(patch-au)
-# XXX post.from.patch doesn't apply		(patch-av)
-# XXX date.patch doesn't apply (spammed whitespace) (patch-ax)
-.if defined(PATCH_DEBUG)
-PATCH_DIST_ARGS= -d ${WRKSRC}/lib -E ${PATCH_DIST_STRIP}
-.else
-PATCH_DIST_ARGS= -d ${WRKSRC}/lib --forward --quiet -E ${PATCH_DIST_STRIP}
-.endif
 
 MAINTAINER?=	peter@FreeBSD.org
 
-DIST_SUBDIR=	${DISTNAME}
-
 .if defined(JAPANESE_EXMH)
 RUN_DEPENDS=	wish8.0jp:${PORTSDIR}/japanese/tk80
 BUILD_DEPENDS=	tclsh8.0jp:${PORTSDIR}/japanese/tcl80
@@ -67,7 +43,9 @@ RUN_DEPENDS+=	mmencode:${PORTSDIR}/mail/metamail
 # Additionally, exmh will use the following ports if present:
 # lang/expect
 # misc/glimpse
+# security/gnupg
 # security/pgp
+# security/pgp5
 # mail/faces
 # audio/rplay
 
diff --git a/mail/exmh2/distinfo b/mail/exmh2/distinfo
index a5be6f423f3e..506e061a4432 100644
--- a/mail/exmh2/distinfo
+++ b/mail/exmh2/distinfo
@@ -1,8 +1 @@
-MD5 (exmh-2.0.2/exmh-2.0.2.tar.Z) = 2e4d0e7aa57570c9c68c7383a201bd08
-MD5 (exmh-2.0.2/seditpost.patch) = a3181a3878bb5705762b4f4954ea6c51
-MD5 (exmh-2.0.2/inc.patch) = 075c71257a13c90d7e77ee46afa7b55b
-MD5 (exmh-2.0.2/next.patch) = 9286b98e2967654cf864f0a889bbe8d7
-MD5 (exmh-2.0.2/uri.patch) = 4957606b4c81a28c17df0ad7a72662e5
-MD5 (exmh-2.0.2/extrasInit.patch) = 4b564e5398a404fb467cba53355e8f0b
-MD5 (exmh-2.0.2/folder.patch) = 62255d71c19026a15a3d53c1c72ed03a
-MD5 (exmh-2.0.2/seditExtras.patch) = 1b2c50f9e81444df0e81b0473005ae52
+MD5 (exmh-2.1.0.tar.gz) = d82848213c5fbcd4c446c67a67540d6c
diff --git a/mail/exmh2/files/config.mh b/mail/exmh2/files/config.mh
index 5693fe1682e2..7fd7281d9871 100644
--- a/mail/exmh2/files/config.mh
+++ b/mail/exmh2/files/config.mh
@@ -15,7 +15,9 @@ set faces(set,unknown) {domains unknown}
 set faces(set,news) {news}
 set faces(defaultDomain) !!DOMAIN!!
 set faces(suffix) {xpm gif xbm}
+set gpg(path) !!GPG!!
 set pgp(path) !!PGP!!
+set pgp5(path) !!PGP5!!
 set glimpse(path) !!GLIMPSE!!
 set sound(cmd) !!PLAY!!
 set exmh(library) !!PREFIX!!/lib/exmh-!!VERSION!!
diff --git a/mail/exmh2/files/config.nmh b/mail/exmh2/files/config.nmh
index c9338be6c9e6..6aa44310ad90 100644
--- a/mail/exmh2/files/config.nmh
+++ b/mail/exmh2/files/config.nmh
@@ -15,7 +15,9 @@ set faces(set,unknown) {domains unknown}
 set faces(set,news) {news}
 set faces(defaultDomain) !!DOMAIN!!
 set faces(suffix) {xpm gif xbm}
+set gpg(path) !!GPG!!
 set pgp(path) !!PGP!!
+set pgp5(path) !!PGP5!!
 set glimpse(path) !!GLIMPSE!!
 set sound(cmd) !!PLAY!!
 set exmh(library) !!PREFIX!!/lib/exmh-!!VERSION!!
diff --git a/mail/exmh2/pkg-descr b/mail/exmh2/pkg-descr
index 456b9847cde6..4cac8b490754 100644
--- a/mail/exmh2/pkg-descr
+++ b/mail/exmh2/pkg-descr
@@ -1,10 +1,5 @@
 exmh is a TCL/TK based interface to the MH mail system.
 
-IMPORTANT: exmh depends on the TK send facility for its background
-processing.  With TK 3.3, send now uses xauthority mechanisms by default,
-unless you compile TK with -DTK_NO_SECURITY.  Generally, this means that
-you **MUST** must run xdm to start your Xserver.
-
 FEATURES: As well as providing the usual layer on top of MH commands, exmh
 has a number of other features:
 
@@ -21,3 +16,8 @@ has a number of other features:
        and search for messages by content.
     User preferences.  You can tune exmh through a dialog box.
     User hacking support.  A user library of TCL routines is supported.
+
+IMPORTANT: exmh depends on the TK send facility for its background
+processing.  With TK 3.3, send now uses xauthority mechanisms by default,
+unless you compile TK with -DTK_NO_SECURITY.  Generally, this means that
+you **MUST** must run xdm to start your Xserver.
diff --git a/mail/exmh2/pkg-plist b/mail/exmh2/pkg-plist
index cd0e6be78997..c4383e8c0ec9 100644
--- a/mail/exmh2/pkg-plist
+++ b/mail/exmh2/pkg-plist
@@ -2,171 +2,194 @@ bin/exmh
 bin/exmh-async
 bin/exmh-bg
 bin/ftp.expect
-lib/exmh-2.0.2/PgpDecryptExpect
-lib/exmh-2.0.2/addr.tcl
-lib/exmh-2.0.2/aliases.tcl
-lib/exmh-2.0.2/app-defaults
-lib/exmh-2.0.2/app-defaults-color
-lib/exmh-2.0.2/app-defaults-mono
-lib/exmh-2.0.2/audit.tcl
-lib/exmh-2.0.2/autorefile.tcl
-lib/exmh-2.0.2/background.tcl
-lib/exmh-2.0.2/base64.tcl
-lib/exmh-2.0.2/bindings.tcl
-lib/exmh-2.0.2/busy.tcl
-lib/exmh-2.0.2/buttons.tcl
-lib/exmh-2.0.2/clink.au
-lib/exmh-2.0.2/crypt.tcl
-lib/exmh-2.0.2/cutbuffer.tcl
-lib/exmh-2.0.2/dragNdrop.tcl
-lib/exmh-2.0.2/drip.au
-lib/exmh-2.0.2/editor.tcl
-lib/exmh-2.0.2/env.tcl
-lib/exmh-2.0.2/error.tcl
-lib/exmh-2.0.2/exec.tcl
-lib/exmh-2.0.2/exmh.bitmap
-lib/exmh-2.0.2/extrasInit.tcl
-lib/exmh-2.0.2/exwin.tcl
-lib/exmh-2.0.2/faces.tcl
-lib/exmh-2.0.2/fcache.tcl
-lib/exmh-2.0.2/fdisp.tcl
-lib/exmh-2.0.2/fdispColor.tcl
-lib/exmh-2.0.2/fdispPopup.tcl
-lib/exmh-2.0.2/fileselect.tcl
-lib/exmh-2.0.2/find.tcl
-lib/exmh-2.0.2/flag.tcl
-lib/exmh-2.0.2/flagdown.bitmap
-lib/exmh-2.0.2/flagup.bitmap
-lib/exmh-2.0.2/flist.tcl
-lib/exmh-2.0.2/folder.tcl
-lib/exmh-2.0.2/folderNew.tcl
-lib/exmh-2.0.2/fontsel.tcl
-lib/exmh-2.0.2/ftoc.tcl
-lib/exmh-2.0.2/ftocColor.tcl
-lib/exmh-2.0.2/ftocFind.tcl
-lib/exmh-2.0.2/getnews.tcl
-lib/exmh-2.0.2/glimpse.tcl
-lib/exmh-2.0.2/help.tcl
-lib/exmh-2.0.2/hourglass.bitmap
-lib/exmh-2.0.2/hourglass.mask
-lib/exmh-2.0.2/hourglass1.bitmap
-lib/exmh-2.0.2/hourglass2.bitmap
-lib/exmh-2.0.2/hourglass2.mask
-lib/exmh-2.0.2/html.tcl
-lib/exmh-2.0.2/html/AddrEdit.html
-lib/exmh-2.0.2/html/AddressBk.html
-lib/exmh-2.0.2/html/AliasAddr.html
-lib/exmh-2.0.2/html/Aliases.html
-lib/exmh-2.0.2/html/Bindings.html
-lib/exmh-2.0.2/html/Font.html
-lib/exmh-2.0.2/html/Import.html
-lib/exmh-2.0.2/html/Intro.html
-lib/exmh-2.0.2/html/Keys.html
-lib/exmh-2.0.2/html/Lists.html
-lib/exmh-2.0.2/html/PGP.html
-lib/exmh-2.0.2/html/Preferences.html
-lib/exmh-2.0.2/html/Reply.html
-lib/exmh-2.0.2/html/Search.html
-lib/exmh-2.0.2/html/Sedit.html
-lib/exmh-2.0.2/html/Seditpref.html
-lib/exmh-2.0.2/html/blu-ball.gif
-lib/exmh-2.0.2/html/copyright.html
-lib/exmh-2.0.2/html/exmh-custom.n.html
-lib/exmh-2.0.2/html/exmh-fans.html
-lib/exmh-2.0.2/html/exmh-faq.html
-lib/exmh-2.0.2/html/exmh-ref.n.html
-lib/exmh-2.0.2/html/exmh-use.n.html
-lib/exmh-2.0.2/html/exmh.README.html
-lib/exmh-2.0.2/html/exmh.n.html
-lib/exmh-2.0.2/html/exmh.pref.gif
-lib/exmh-2.0.2/html/exmh.snap1.gif
-lib/exmh-2.0.2/html/index.html
-lib/exmh-2.0.2/html/left-arrow.gif
-lib/exmh-2.0.2/html/maillist.html
-lib/exmh-2.0.2/html/overview.html
-lib/exmh-2.0.2/html/ppp.howto.html
-lib/exmh-2.0.2/html/red-ball.gif
-lib/exmh-2.0.2/html/right-arrow.gif
-lib/exmh-2.0.2/html/software.html
-lib/exmh-2.0.2/html/whatis.html
-lib/exmh-2.0.2/html/yel-ball.gif
-lib/exmh-2.0.2/html_cache.tcl
-lib/exmh-2.0.2/html_content.tcl
-lib/exmh-2.0.2/html_dpackage.tcl
-lib/exmh-2.0.2/html_formtag.tcl
-lib/exmh-2.0.2/html_frame.tcl
-lib/exmh-2.0.2/html_get_http.tcl
-lib/exmh-2.0.2/html_head.tcl
-lib/exmh-2.0.2/html_hr.tcl
-lib/exmh-2.0.2/html_images.tcl
-lib/exmh-2.0.2/html_links.tcl
-lib/exmh-2.0.2/html_maps.tcl
-lib/exmh-2.0.2/html_stubs.tcl
-lib/exmh-2.0.2/html_tags.tcl
-lib/exmh-2.0.2/html_text.tcl
-lib/exmh-2.0.2/http_proxy.tcl
-lib/exmh-2.0.2/import.tcl
-lib/exmh-2.0.2/inc.tcl
-lib/exmh-2.0.2/ispell.tcl
-lib/exmh-2.0.2/labels.tcl
-lib/exmh-2.0.2/linethru.bitmap
-lib/exmh-2.0.2/mailcap.tcl
-lib/exmh-2.0.2/main.tcl
-lib/exmh-2.0.2/mbempty.bitmap
-lib/exmh-2.0.2/mbtidy.bitmap
-lib/exmh-2.0.2/mbuntidy.bitmap
-lib/exmh-2.0.2/mh.tcl
-lib/exmh-2.0.2/mime.tcl
-lib/exmh-2.0.2/mime.types
-lib/exmh-2.0.2/mimeSun.tcl
-lib/exmh-2.0.2/mosaic.tcl
-lib/exmh-2.0.2/msg.tcl
-lib/exmh-2.0.2/msgShow.tcl
-lib/exmh-2.0.2/partial.tcl
-lib/exmh-2.0.2/pgp.tcl
-lib/exmh-2.0.2/pgpEWN.tcl
-lib/exmh-2.0.2/pgpExec.tcl
-lib/exmh-2.0.2/pgpMatch.tcl
-lib/exmh-2.0.2/pgpMisc.tcl
-lib/exmh-2.0.2/pgpwww.tcl
-lib/exmh-2.0.2/pick.tcl
-lib/exmh-2.0.2/post.tcl
-lib/exmh-2.0.2/preferences.tcl
-lib/exmh-2.0.2/print.tcl
-lib/exmh-2.0.2/ps.tcl
-lib/exmh-2.0.2/quote.tcl
-lib/exmh-2.0.2/receipt.tcl
-lib/exmh-2.0.2/report.tcl
-lib/exmh-2.0.2/rich2tk.tcl
-lib/exmh-2.0.2/scan.tcl
-lib/exmh-2.0.2/sedit.tcl
-lib/exmh-2.0.2/seditBind.tcl
-lib/exmh-2.0.2/seditCompose.tcl
-lib/exmh-2.0.2/seditEnriched.tcl
-lib/exmh-2.0.2/seditExtras.tcl
-lib/exmh-2.0.2/seditMime.tcl
-lib/exmh-2.0.2/seditQP.tcl
-lib/exmh-2.0.2/seditSel.tcl
-lib/exmh-2.0.2/select.tcl
-lib/exmh-2.0.2/send.tcl
-lib/exmh-2.0.2/sound.tcl
-lib/exmh-2.0.2/source.tcl
-lib/exmh-2.0.2/tclIndex
-lib/exmh-2.0.2/text.tcl
-lib/exmh-2.0.2/textButton.tcl
-lib/exmh-2.0.2/textSelect.tcl
-lib/exmh-2.0.2/thread.tcl
-lib/exmh-2.0.2/timer.bitmap
-lib/exmh-2.0.2/tioga.tcl
-lib/exmh-2.0.2/unseenwin.tcl
-lib/exmh-2.0.2/uri.tcl
-lib/exmh-2.0.2/url.bitmap
-lib/exmh-2.0.2/user.tcl
-lib/exmh-2.0.2/utils.tcl
-lib/exmh-2.0.2/widgetMenu.tcl
-lib/exmh-2.0.2/widgetText.tcl
-lib/exmh-2.0.2/widgets.tcl
-lib/exmh-2.0.2/xns.tcl
-lib/exmh-2.0.2/xnsgetmail.exp
-@dirrm lib/exmh-2.0.2/html
-@dirrm lib/exmh-2.0.2
+lib/exmh-2.1.0/PgpDecryptExpect
+lib/exmh-2.1.0/addr.tcl
+lib/exmh-2.1.0/aliases.tcl
+lib/exmh-2.1.0/app-defaults
+lib/exmh-2.1.0/app-defaults-color
+lib/exmh-2.1.0/app-defaults-mono
+lib/exmh-2.1.0/audit.tcl
+lib/exmh-2.1.0/autorefile.tcl
+lib/exmh-2.1.0/background.tcl
+lib/exmh-2.1.0/base64.tcl
+lib/exmh-2.1.0/bindings.tcl
+lib/exmh-2.1.0/busy.tcl
+lib/exmh-2.1.0/buttons.tcl
+lib/exmh-2.1.0/clink.au
+lib/exmh-2.1.0/crypt.tcl
+lib/exmh-2.1.0/cutbuffer.tcl
+lib/exmh-2.1.0/dragNdrop.tcl
+lib/exmh-2.1.0/drip.au
+lib/exmh-2.1.0/editor.tcl
+lib/exmh-2.1.0/env.tcl
+lib/exmh-2.1.0/error.tcl
+lib/exmh-2.1.0/exec.tcl
+lib/exmh-2.1.0/exmh.bitmap
+lib/exmh-2.1.0/extrasInit.tcl
+lib/exmh-2.1.0/exwin.tcl
+lib/exmh-2.1.0/faces.tcl
+lib/exmh-2.1.0/fcache.tcl
+lib/exmh-2.1.0/fdisp.tcl
+lib/exmh-2.1.0/fdispColor.tcl
+lib/exmh-2.1.0/fdispPopup.tcl
+lib/exmh-2.1.0/fileselect.tcl
+lib/exmh-2.1.0/find.tcl
+lib/exmh-2.1.0/flag.tcl
+lib/exmh-2.1.0/flagdown.bitmap
+lib/exmh-2.1.0/flagdown.gif
+lib/exmh-2.1.0/flagdown.mask
+lib/exmh-2.1.0/flagspool.bitmap
+lib/exmh-2.1.0/flagspool.gif
+lib/exmh-2.1.0/flagspool.mask
+lib/exmh-2.1.0/flagup.bitmap
+lib/exmh-2.1.0/flagup.gif
+lib/exmh-2.1.0/flagup.mask
+lib/exmh-2.1.0/flist.tcl
+lib/exmh-2.1.0/folder.tcl
+lib/exmh-2.1.0/folderNew.tcl
+lib/exmh-2.1.0/fontsel.tcl
+lib/exmh-2.1.0/ftoc.tcl
+lib/exmh-2.1.0/ftocColor.tcl
+lib/exmh-2.1.0/ftocFind.tcl
+lib/exmh-2.1.0/ftp_get.tcl
+lib/exmh-2.1.0/getnews.tcl
+lib/exmh-2.1.0/glimpse.tcl
+lib/exmh-2.1.0/help.tcl
+lib/exmh-2.1.0/hourglass.bitmap
+lib/exmh-2.1.0/hourglass.mask
+lib/exmh-2.1.0/hourglass1.bitmap
+lib/exmh-2.1.0/hourglass2.bitmap
+lib/exmh-2.1.0/hourglass2.mask
+lib/exmh-2.1.0/html/AddrEdit.html
+lib/exmh-2.1.0/html/AddressBk.html
+lib/exmh-2.1.0/html/AliasAddr.html
+lib/exmh-2.1.0/html/Aliases.html
+lib/exmh-2.1.0/html/Bindings.html
+lib/exmh-2.1.0/html/DSN-MDN.html
+lib/exmh-2.1.0/html/Font.html
+lib/exmh-2.1.0/html/Import.html
+lib/exmh-2.1.0/html/Intro.html
+lib/exmh-2.1.0/html/Keys.html
+lib/exmh-2.1.0/html/Lists.html
+lib/exmh-2.1.0/html/PGP.html
+lib/exmh-2.1.0/html/Preferences.html
+lib/exmh-2.1.0/html/Reply.html
+lib/exmh-2.1.0/html/Search.html
+lib/exmh-2.1.0/html/Sedit.html
+lib/exmh-2.1.0/html/Seditpref.html
+lib/exmh-2.1.0/html/Y2K.html
+lib/exmh-2.1.0/html/blu-ball.gif
+lib/exmh-2.1.0/html/bugfixes.html
+lib/exmh-2.1.0/html/copyright.html
+lib/exmh-2.1.0/html/custom.html
+lib/exmh-2.1.0/html/exmh-fans.html
+lib/exmh-2.1.0/html/exmh-faq.html
+lib/exmh-2.1.0/html/exmh.README.html
+lib/exmh-2.1.0/html/exmh.pref.gif
+lib/exmh-2.1.0/html/exmh.snap1.gif
+lib/exmh-2.1.0/html/guide.html
+lib/exmh-2.1.0/html/index.html
+lib/exmh-2.1.0/html/left-arrow.gif
+lib/exmh-2.1.0/html/maillist.html
+lib/exmh-2.1.0/html/mime.attack.html
+lib/exmh-2.1.0/html/newfeatures.html
+lib/exmh-2.1.0/html/overview.html
+lib/exmh-2.1.0/html/ppp.howto.html
+lib/exmh-2.1.0/html/red-ball.gif
+lib/exmh-2.1.0/html/reference.html
+lib/exmh-2.1.0/html/right-arrow.gif
+lib/exmh-2.1.0/html/software.html
+lib/exmh-2.1.0/html/tutorial.html
+lib/exmh-2.1.0/html/whatis.html
+lib/exmh-2.1.0/html/yel-ball.gif
+lib/exmh-2.1.0/html.tcl
+lib/exmh-2.1.0/html_cache.tcl
+lib/exmh-2.1.0/html_content.tcl
+lib/exmh-2.1.0/html_dpackage.tcl
+lib/exmh-2.1.0/html_formtag.tcl
+lib/exmh-2.1.0/html_frame.tcl
+lib/exmh-2.1.0/html_get_http.tcl
+lib/exmh-2.1.0/html_head.tcl
+lib/exmh-2.1.0/html_hr.tcl
+lib/exmh-2.1.0/html_images.tcl
+lib/exmh-2.1.0/html_links.tcl
+lib/exmh-2.1.0/html_maps.tcl
+lib/exmh-2.1.0/html_stubs.tcl
+lib/exmh-2.1.0/html_tags.tcl
+lib/exmh-2.1.0/html_text.tcl
+lib/exmh-2.1.0/http_proxy.tcl
+lib/exmh-2.1.0/import.tcl
+lib/exmh-2.1.0/inc.tcl
+lib/exmh-2.1.0/ispell.tcl
+lib/exmh-2.1.0/labels.tcl
+lib/exmh-2.1.0/linethru.bitmap
+lib/exmh-2.1.0/loaderror.ppm
+lib/exmh-2.1.0/loading.ppm
+lib/exmh-2.1.0/mailcap.tcl
+lib/exmh-2.1.0/main.tcl
+lib/exmh-2.1.0/mbempty.bitmap
+lib/exmh-2.1.0/mbtidy.bitmap
+lib/exmh-2.1.0/mbuntidy.bitmap
+lib/exmh-2.1.0/mh.tcl
+lib/exmh-2.1.0/mime.tcl
+lib/exmh-2.1.0/mime.types
+lib/exmh-2.1.0/mimeSun.tcl
+lib/exmh-2.1.0/mosaic.tcl
+lib/exmh-2.1.0/msg.tcl
+lib/exmh-2.1.0/msgShow.tcl
+lib/exmh-2.1.0/partial.tcl
+lib/exmh-2.1.0/pgpBase.tcl
+lib/exmh-2.1.0/pgpEWN.tcl
+lib/exmh-2.1.0/pgpExec.tcl
+lib/exmh-2.1.0/pgpGpg.tcl
+lib/exmh-2.1.0/pgpMain.tcl
+lib/exmh-2.1.0/pgpMatch.tcl
+lib/exmh-2.1.0/pgpMisc.tcl
+lib/exmh-2.1.0/pgpOld.tcl
+lib/exmh-2.1.0/pgpPgp2.tcl
+lib/exmh-2.1.0/pgpPgp5.tcl
+lib/exmh-2.1.0/pgpShared.tcl
+lib/exmh-2.1.0/pgpWWW.tcl
+lib/exmh-2.1.0/pick.tcl
+lib/exmh-2.1.0/pop.tcl
+lib/exmh-2.1.0/post.tcl
+lib/exmh-2.1.0/preferences.tcl
+lib/exmh-2.1.0/print.tcl
+lib/exmh-2.1.0/ps.tcl
+lib/exmh-2.1.0/quote.tcl
+lib/exmh-2.1.0/receipt.tcl
+lib/exmh-2.1.0/report.tcl
+lib/exmh-2.1.0/rich2tk.tcl
+lib/exmh-2.1.0/scan.tcl
+lib/exmh-2.1.0/sedit.tcl
+lib/exmh-2.1.0/seditBind.tcl
+lib/exmh-2.1.0/seditCompose.tcl
+lib/exmh-2.1.0/seditEnriched.tcl
+lib/exmh-2.1.0/seditExtras.tcl
+lib/exmh-2.1.0/seditMime.tcl
+lib/exmh-2.1.0/seditQP.tcl
+lib/exmh-2.1.0/seditSel.tcl
+lib/exmh-2.1.0/select.tcl
+lib/exmh-2.1.0/send.tcl
+lib/exmh-2.1.0/sound.tcl
+lib/exmh-2.1.0/source.tcl
+lib/exmh-2.1.0/tclIndex
+lib/exmh-2.1.0/text.tcl
+lib/exmh-2.1.0/textButton.tcl
+lib/exmh-2.1.0/textSelect.tcl
+lib/exmh-2.1.0/thread.tcl
+lib/exmh-2.1.0/timer.bitmap
+lib/exmh-2.1.0/tioga.tcl
+lib/exmh-2.1.0/unseenwin.tcl
+lib/exmh-2.1.0/uri.tcl
+lib/exmh-2.1.0/url.bitmap
+lib/exmh-2.1.0/urlFace.tcl
+lib/exmh-2.1.0/user.tcl
+lib/exmh-2.1.0/utils.tcl
+lib/exmh-2.1.0/widgetMenu.tcl
+lib/exmh-2.1.0/widgetText.tcl
+lib/exmh-2.1.0/widgets.tcl
+lib/exmh-2.1.0/xns.tcl
+lib/exmh-2.1.0/xnsgetmail.exp
+@dirrm lib/exmh-2.1.0/html
+@dirrm lib/exmh-2.1.0
diff --git a/mail/exmh2/scripts/build b/mail/exmh2/scripts/build
index 4ca3a47ec5c9..400d7e2a1bc9 100644
--- a/mail/exmh2/scripts/build
+++ b/mail/exmh2/scripts/build
@@ -17,7 +17,9 @@ EXPECT="{}"
 EXPECTK="{}"
 FACES="{}"
 DOMAIN="{}"
+GPG="{}"
 PGP="{}"
+PGP5="{}"
 GLIMPSE="{}"
 PLAY="{}"
 
@@ -37,10 +39,18 @@ if [ -d ${PREFIX}/share/faces ]; then
   fi
 fi
 
+if [ -f ${PREFIX}/bin/gpg ]; then
+  GPG=${PREFIX}/bin			#bindir
+fi
+
 if [ -f ${PREFIX}/bin/pgp ]; then
   PGP=${PREFIX}/bin			#bindir
 fi
 
+if [ -f ${PREFIX}/bin/pgp5 ]; then
+  PGP5=${PREFIX}/bin			#bindir
+fi
+
 if [ -f ${PREFIX}/bin/glimpse ]; then
   GLIMPSE=${PREFIX}/bin			#bindir
 fi
@@ -62,7 +72,9 @@ sed <${FILESDIR}/${CONFIGFILE} \
 	-e "s+!!EXPECTK!!+${EXPECTK}+g" \
 	-e "s+!!FACES!!+${FACES}+g" \
 	-e "s+!!DOMAIN!!+${DOMAIN}+g" \
+	-e "s+!!GPG!!+${GPG}+g" \
 	-e "s+!!PGP!!+${PGP}+g" \
+	-e "s+!!PGP5!!+${PGP5}+g" \
 	-e "s+!!GLIMPSE!!+${GLIMPSE}+g" \
 	-e "s+!!PLAY!!+${PLAY}+g" \
 	-e "s+!!VERSION!!+${VERSION}+g" \
diff --git a/mail/exmh2/scripts/install b/mail/exmh2/scripts/install
index dd651a6a2271..3c91c06a1c29 100644
--- a/mail/exmh2/scripts/install
+++ b/mail/exmh2/scripts/install
@@ -23,7 +23,7 @@ then
 	mkdir ${PREFIX}/lib/exmh-${VERSION}
 fi
 
-LIBFILES='lib/*.tcl lib/*.bitmap lib/help.* lib/tclIndex lib/app-defaults lib/app-defaults-* lib/*.mask lib/*.exp lib/mime.types lib/*.au lib/PgpDecryptExpect'
+LIBFILES='lib/*.tcl lib/*.bitmap lib/*.gif lib/*.ppm lib/help.* lib/tclIndex lib/app-defaults lib/app-defaults-* lib/*.mask lib/*.exp lib/mime.types lib/*.au lib/PgpDecryptExpect'
 
 echo "install -c -o bin -g bin -m 444 ${LIBFILES} ${PREFIX}/lib/exmh-${VERSION}"
 install -c -o bin -g bin -m 444 ${LIBFILES} ${PREFIX}/lib/exmh-${VERSION}
@@ -35,4 +35,4 @@ then
 fi
 
 echo "install -c -o bin -g bin -m 444 lib/html/* ${PREFIX}/lib/exmh-${VERSION}/html"
-install -c -o bin -g bin -m 444 lib/html/* ${PREFIX}/lib/exmh-${VERSION}/html
+install -c -o bin -g bin -m 444 lib/html/*.html lib/html/*.gif ${PREFIX}/lib/exmh-${VERSION}/html