3 files changed, 172 insertions, 188 deletions

diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index 834c1eb5ca6d..3c5693644ba4 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -1,29 +1,20 @@
 # New ports collection Makefile for:    exmh2
-# Version required:		2.0zeta
+# Version required:		2.0
 # Date released:		1 Jan 97
 # Whom:				Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.17 1997/10/06 06:49:45 peter Exp $
+# $Id: Makefile,v 1.18 1997/11/22 19:50:03 jseger Exp $
 #
 
-DISTNAME=	exmh-2.0zeta
-PKGNAME=	exmh-2.0z
+DISTNAME=	exmh-2.0
+PKGNAME=	exmh-2.0
 CATEGORIES=	mail tk80
 MASTER_SITES=	ftp://ftp.sunlabs.com/pub/tcl/exmh/
 EXTRACT_SUFX=	.tar.Z
 
-PATCH_SITES=	http://www.sunlabs.com/~bwelch/exmh/patches/2.0zeta/
-PATCHFILES=	ispell.patch koir.patch mime.patch seditMime.patch scan.patch \
-		addr.patch html.patch html_dpackage.patch pgpExec.patch
-
-.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
 
+# There are likely to be distributed patches again.
 DIST_SUBDIR=	${PKGNAME}
 
 RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11/tk80
diff --git a/mail/exmh2/distinfo b/mail/exmh2/distinfo
index 3d14dd0b99b4..c77fe40406a9 100644
--- a/mail/exmh2/distinfo
+++ b/mail/exmh2/distinfo
@@ -1,10 +1 @@
-MD5 (exmh-2.0z/exmh-2.0zeta.tar.Z) = 9a8c1026c57357ce3b4aa9ae6f612d3c
-MD5 (exmh-2.0z/ispell.patch) = ee3bdbdf2a1f3ef7fce911d5836bde27
-MD5 (exmh-2.0z/koir.patch) = faf27cf0a7e986631de58f872dd60f84
-MD5 (exmh-2.0z/mime.patch) = c4ca30bb6c553243a193850a192c8586
-MD5 (exmh-2.0z/seditMime.patch) = 74006191c5ed6fe50a0b38e90f9b1a56
-MD5 (exmh-2.0z/scan.patch) = 9f610082a0871fc35c6817b0f06ea234
-MD5 (exmh-2.0z/addr.patch) = a57c3391f853a1fafd80c6db249370a0
-MD5 (exmh-2.0z/html.patch) = 95fc62a5397bf22669c7436f1d0e89ae
-MD5 (exmh-2.0z/html_dpackage.patch) = 8ba20db08bef2673cdfb4676000b5892
-MD5 (exmh-2.0z/pgpExec.patch) = 9dd6df806ba0df56c48350ce08037608
+MD5 (exmh-2.0/exmh-2.0.tar.Z) = df93d836c61e8b5e33df609ba57c1185
diff --git a/mail/exmh2/pkg-plist b/mail/exmh2/pkg-plist
index 3f9e961435ba..bb3610f51250 100644
--- a/mail/exmh2/pkg-plist
+++ b/mail/exmh2/pkg-plist
@@ -2,168 +2,170 @@ bin/exmh
 bin/exmh-async
 bin/exmh-bg
 bin/ftp.expect
-lib/exmh-2.0zeta/addr.tcl
-lib/exmh-2.0zeta/aliases.tcl
-lib/exmh-2.0zeta/app-defaults
-lib/exmh-2.0zeta/app-defaults-color
-lib/exmh-2.0zeta/app-defaults-mono
-lib/exmh-2.0zeta/audit.tcl
-lib/exmh-2.0zeta/autorefile.tcl
-lib/exmh-2.0zeta/background.tcl
-lib/exmh-2.0zeta/base64.tcl
-lib/exmh-2.0zeta/bindings.tcl
-lib/exmh-2.0zeta/busy.tcl
-lib/exmh-2.0zeta/buttons.tcl
-lib/exmh-2.0zeta/clink.au
-lib/exmh-2.0zeta/crypt.tcl
-lib/exmh-2.0zeta/cutbuffer.tcl
-lib/exmh-2.0zeta/dragNdrop.tcl
-lib/exmh-2.0zeta/drip.au
-lib/exmh-2.0zeta/editor.tcl
-lib/exmh-2.0zeta/env.tcl
-lib/exmh-2.0zeta/error.tcl
-lib/exmh-2.0zeta/exmh.bitmap
-lib/exmh-2.0zeta/extrasInit.tcl
-lib/exmh-2.0zeta/exwin.tcl
-lib/exmh-2.0zeta/faces.tcl
-lib/exmh-2.0zeta/fcache.tcl
-lib/exmh-2.0zeta/fdisp.tcl
-lib/exmh-2.0zeta/fdispColor.tcl
-lib/exmh-2.0zeta/fdispPopup.tcl
-lib/exmh-2.0zeta/fileselect.tcl
-lib/exmh-2.0zeta/find.tcl
-lib/exmh-2.0zeta/flag.tcl
-lib/exmh-2.0zeta/flagdown.bitmap
-lib/exmh-2.0zeta/flagup.bitmap
-lib/exmh-2.0zeta/flist.tcl
-lib/exmh-2.0zeta/folder.tcl
-lib/exmh-2.0zeta/folderNew.tcl
-lib/exmh-2.0zeta/fontsel.tcl
-lib/exmh-2.0zeta/ftoc.tcl
-lib/exmh-2.0zeta/ftocColor.tcl
-lib/exmh-2.0zeta/ftocFind.tcl
-lib/exmh-2.0zeta/getnews.tcl
-lib/exmh-2.0zeta/glimpse.tcl
-lib/exmh-2.0zeta/help.tcl
-lib/exmh-2.0zeta/hourglass.bitmap
-lib/exmh-2.0zeta/hourglass.mask
-lib/exmh-2.0zeta/hourglass1.bitmap
-lib/exmh-2.0zeta/hourglass2.bitmap
-lib/exmh-2.0zeta/hourglass2.mask
-lib/exmh-2.0zeta/html.tcl
-lib/exmh-2.0zeta/html/AddrEdit.html
-lib/exmh-2.0zeta/html/AddressBk.html
-lib/exmh-2.0zeta/html/AliasAddr.html
-lib/exmh-2.0zeta/html/Aliases.html
-lib/exmh-2.0zeta/html/Bindings.html
-lib/exmh-2.0zeta/html/Font.html
-lib/exmh-2.0zeta/html/Import.html
-lib/exmh-2.0zeta/html/Intro.html
-lib/exmh-2.0zeta/html/Keys.html
-lib/exmh-2.0zeta/html/Lists.html
-lib/exmh-2.0zeta/html/PGP.html
-lib/exmh-2.0zeta/html/Preferences.html
-lib/exmh-2.0zeta/html/Reply.html
-lib/exmh-2.0zeta/html/Search.html
-lib/exmh-2.0zeta/html/Sedit.html
-lib/exmh-2.0zeta/html/Seditpref.html
-lib/exmh-2.0zeta/html/blu-ball.gif
-lib/exmh-2.0zeta/html/copyright.html
-lib/exmh-2.0zeta/html/exmh-custom.n.html
-lib/exmh-2.0zeta/html/exmh-fans.html
-lib/exmh-2.0zeta/html/exmh-faq.html
-lib/exmh-2.0zeta/html/exmh-ref.n.html
-lib/exmh-2.0zeta/html/exmh-use.n.html
-lib/exmh-2.0zeta/html/exmh.README.html
-lib/exmh-2.0zeta/html/exmh.n.html
-lib/exmh-2.0zeta/html/exmh.pref.gif
-lib/exmh-2.0zeta/html/exmh.snap1.gif
-lib/exmh-2.0zeta/html/index.html
-lib/exmh-2.0zeta/html/left-arrow.gif
-lib/exmh-2.0zeta/html/maillist.html
-lib/exmh-2.0zeta/html/overview.html
-lib/exmh-2.0zeta/html/red-ball.gif
-lib/exmh-2.0zeta/html/right-arrow.gif
-lib/exmh-2.0zeta/html/software.html
-lib/exmh-2.0zeta/html/whatis.html
-lib/exmh-2.0zeta/html/yel-ball.gif
-lib/exmh-2.0zeta/html_cache.tcl
-lib/exmh-2.0zeta/html_content.tcl
-lib/exmh-2.0zeta/html_dpackage.tcl
-lib/exmh-2.0zeta/html_formtag.tcl
-lib/exmh-2.0zeta/html_frame.tcl
-lib/exmh-2.0zeta/html_get_http.tcl
-lib/exmh-2.0zeta/html_head.tcl
-lib/exmh-2.0zeta/html_hr.tcl
-lib/exmh-2.0zeta/html_images.tcl
-lib/exmh-2.0zeta/html_links.tcl
-lib/exmh-2.0zeta/html_maps.tcl
-lib/exmh-2.0zeta/html_stubs.tcl
-lib/exmh-2.0zeta/html_tags.tcl
-lib/exmh-2.0zeta/html_text.tcl
-lib/exmh-2.0zeta/http_proxy.tcl
-lib/exmh-2.0zeta/import.tcl
-lib/exmh-2.0zeta/inc.tcl
-lib/exmh-2.0zeta/ispell.tcl
-lib/exmh-2.0zeta/labels.tcl
-lib/exmh-2.0zeta/linethru.bitmap
-lib/exmh-2.0zeta/mailcap.tcl
-lib/exmh-2.0zeta/main.tcl
-lib/exmh-2.0zeta/mbempty.bitmap
-lib/exmh-2.0zeta/mbtidy.bitmap
-lib/exmh-2.0zeta/mbuntidy.bitmap
-lib/exmh-2.0zeta/mh.tcl
-lib/exmh-2.0zeta/mime.tcl
-lib/exmh-2.0zeta/mime.types
-lib/exmh-2.0zeta/mimeSun.tcl
-lib/exmh-2.0zeta/mosaic.tcl
-lib/exmh-2.0zeta/msg.tcl
-lib/exmh-2.0zeta/msgShow.tcl
-lib/exmh-2.0zeta/partial.tcl
-lib/exmh-2.0zeta/pgp.tcl
-lib/exmh-2.0zeta/pgpEWN.tcl
-lib/exmh-2.0zeta/pgpExec.tcl
-lib/exmh-2.0zeta/pgpMatch.tcl
-lib/exmh-2.0zeta/pgpMisc.tcl
-lib/exmh-2.0zeta/pgpwww.tcl
-lib/exmh-2.0zeta/pick.tcl
-lib/exmh-2.0zeta/post.tcl
-lib/exmh-2.0zeta/preferences.tcl
-lib/exmh-2.0zeta/print.tcl
-lib/exmh-2.0zeta/ps.tcl
-lib/exmh-2.0zeta/quote.tcl
-lib/exmh-2.0zeta/receipt.tcl
-lib/exmh-2.0zeta/report.tcl
-lib/exmh-2.0zeta/rich2tk.tcl
-lib/exmh-2.0zeta/scan.tcl
-lib/exmh-2.0zeta/sedit.tcl
-lib/exmh-2.0zeta/seditBind.tcl
-lib/exmh-2.0zeta/seditCompose.tcl
-lib/exmh-2.0zeta/seditEnriched.tcl
-lib/exmh-2.0zeta/seditExtras.tcl
-lib/exmh-2.0zeta/seditMime.tcl
-lib/exmh-2.0zeta/seditQP.tcl
-lib/exmh-2.0zeta/seditSel.tcl
-lib/exmh-2.0zeta/select.tcl
-lib/exmh-2.0zeta/send.tcl
-lib/exmh-2.0zeta/sound.tcl
-lib/exmh-2.0zeta/tclIndex
-lib/exmh-2.0zeta/text.tcl
-lib/exmh-2.0zeta/textButton.tcl
-lib/exmh-2.0zeta/textSelect.tcl
-lib/exmh-2.0zeta/thread.tcl
-lib/exmh-2.0zeta/timer.bitmap
-lib/exmh-2.0zeta/tioga.tcl
-lib/exmh-2.0zeta/unseenwin.tcl
-lib/exmh-2.0zeta/uri.tcl
-lib/exmh-2.0zeta/url.bitmap
-lib/exmh-2.0zeta/user.tcl
-lib/exmh-2.0zeta/utils.tcl
-lib/exmh-2.0zeta/widgetMenu.tcl
-lib/exmh-2.0zeta/widgetText.tcl
-lib/exmh-2.0zeta/widgets.tcl
-lib/exmh-2.0zeta/xns.tcl
-lib/exmh-2.0zeta/xnsgetmail.exp
+lib/exmh-2.0/addr.tcl
+lib/exmh-2.0/aliases.tcl
+lib/exmh-2.0/app-defaults
+lib/exmh-2.0/app-defaults-color
+lib/exmh-2.0/app-defaults-mono
+lib/exmh-2.0/audit.tcl
+lib/exmh-2.0/autorefile.tcl
+lib/exmh-2.0/background.tcl
+lib/exmh-2.0/base64.tcl
+lib/exmh-2.0/bindings.tcl
+lib/exmh-2.0/busy.tcl
+lib/exmh-2.0/buttons.tcl
+lib/exmh-2.0/clink.au
+lib/exmh-2.0/crypt.tcl
+lib/exmh-2.0/cutbuffer.tcl
+lib/exmh-2.0/dragNdrop.tcl
+lib/exmh-2.0/drip.au
+lib/exmh-2.0/editor.tcl
+lib/exmh-2.0/env.tcl
+lib/exmh-2.0/error.tcl
+lib/exmh-2.0/exec.tcl
+lib/exmh-2.0/exmh.bitmap
+lib/exmh-2.0/extrasInit.tcl
+lib/exmh-2.0/exwin.tcl
+lib/exmh-2.0/faces.tcl
+lib/exmh-2.0/fcache.tcl
+lib/exmh-2.0/fdisp.tcl
+lib/exmh-2.0/fdispColor.tcl
+lib/exmh-2.0/fdispPopup.tcl
+lib/exmh-2.0/fileselect.tcl
+lib/exmh-2.0/find.tcl
+lib/exmh-2.0/flag.tcl
+lib/exmh-2.0/flagdown.bitmap
+lib/exmh-2.0/flagup.bitmap
+lib/exmh-2.0/flist.tcl
+lib/exmh-2.0/folder.tcl
+lib/exmh-2.0/folderNew.tcl
+lib/exmh-2.0/fontsel.tcl
+lib/exmh-2.0/ftoc.tcl
+lib/exmh-2.0/ftocColor.tcl
+lib/exmh-2.0/ftocFind.tcl
+lib/exmh-2.0/getnews.tcl
+lib/exmh-2.0/glimpse.tcl
+lib/exmh-2.0/help.tcl
+lib/exmh-2.0/hourglass.bitmap
+lib/exmh-2.0/hourglass.mask
+lib/exmh-2.0/hourglass1.bitmap
+lib/exmh-2.0/hourglass2.bitmap
+lib/exmh-2.0/hourglass2.mask
+lib/exmh-2.0/html.tcl
+lib/exmh-2.0/html/AddrEdit.html
+lib/exmh-2.0/html/AddressBk.html
+lib/exmh-2.0/html/AliasAddr.html
+lib/exmh-2.0/html/Aliases.html
+lib/exmh-2.0/html/Bindings.html
+lib/exmh-2.0/html/Font.html
+lib/exmh-2.0/html/Import.html
+lib/exmh-2.0/html/Intro.html
+lib/exmh-2.0/html/Keys.html
+lib/exmh-2.0/html/Lists.html
+lib/exmh-2.0/html/PGP.html
+lib/exmh-2.0/html/Preferences.html
+lib/exmh-2.0/html/Reply.html
+lib/exmh-2.0/html/Search.html
+lib/exmh-2.0/html/Sedit.html
+lib/exmh-2.0/html/Seditpref.html
+lib/exmh-2.0/html/blu-ball.gif
+lib/exmh-2.0/html/copyright.html
+lib/exmh-2.0/html/exmh-custom.n.html
+lib/exmh-2.0/html/exmh-fans.html
+lib/exmh-2.0/html/exmh-faq.html
+lib/exmh-2.0/html/exmh-ref.n.html
+lib/exmh-2.0/html/exmh-use.n.html
+lib/exmh-2.0/html/exmh.README.html
+lib/exmh-2.0/html/exmh.n.html
+lib/exmh-2.0/html/exmh.pref.gif
+lib/exmh-2.0/html/exmh.snap1.gif
+lib/exmh-2.0/html/index.html
+lib/exmh-2.0/html/left-arrow.gif
+lib/exmh-2.0/html/maillist.html
+lib/exmh-2.0/html/overview.html
+lib/exmh-2.0/html/ppp.howto.html
+lib/exmh-2.0/html/red-ball.gif
+lib/exmh-2.0/html/right-arrow.gif
+lib/exmh-2.0/html/software.html
+lib/exmh-2.0/html/whatis.html
+lib/exmh-2.0/html/yel-ball.gif
+lib/exmh-2.0/html_cache.tcl
+lib/exmh-2.0/html_content.tcl
+lib/exmh-2.0/html_dpackage.tcl
+lib/exmh-2.0/html_formtag.tcl
+lib/exmh-2.0/html_frame.tcl
+lib/exmh-2.0/html_get_http.tcl
+lib/exmh-2.0/html_head.tcl
+lib/exmh-2.0/html_hr.tcl
+lib/exmh-2.0/html_images.tcl
+lib/exmh-2.0/html_links.tcl
+lib/exmh-2.0/html_maps.tcl
+lib/exmh-2.0/html_stubs.tcl
+lib/exmh-2.0/html_tags.tcl
+lib/exmh-2.0/html_text.tcl
+lib/exmh-2.0/http_proxy.tcl
+lib/exmh-2.0/import.tcl
+lib/exmh-2.0/inc.tcl
+lib/exmh-2.0/ispell.tcl
+lib/exmh-2.0/labels.tcl
+lib/exmh-2.0/linethru.bitmap
+lib/exmh-2.0/mailcap.tcl
+lib/exmh-2.0/main.tcl
+lib/exmh-2.0/mbempty.bitmap
+lib/exmh-2.0/mbtidy.bitmap
+lib/exmh-2.0/mbuntidy.bitmap
+lib/exmh-2.0/mh.tcl
+lib/exmh-2.0/mime.tcl
+lib/exmh-2.0/mime.types
+lib/exmh-2.0/mimeSun.tcl
+lib/exmh-2.0/mosaic.tcl
+lib/exmh-2.0/msg.tcl
+lib/exmh-2.0/msgShow.tcl
+lib/exmh-2.0/partial.tcl
+lib/exmh-2.0/pgp.tcl
+lib/exmh-2.0/pgpEWN.tcl
+lib/exmh-2.0/pgpExec.tcl
+lib/exmh-2.0/pgpMatch.tcl
+lib/exmh-2.0/pgpMisc.tcl
+lib/exmh-2.0/pgpwww.tcl
+lib/exmh-2.0/pick.tcl
+lib/exmh-2.0/post.tcl
+lib/exmh-2.0/preferences.tcl
+lib/exmh-2.0/print.tcl
+lib/exmh-2.0/ps.tcl
+lib/exmh-2.0/quote.tcl
+lib/exmh-2.0/receipt.tcl
+lib/exmh-2.0/report.tcl
+lib/exmh-2.0/rich2tk.tcl
+lib/exmh-2.0/scan.tcl
+lib/exmh-2.0/sedit.tcl
+lib/exmh-2.0/seditBind.tcl
+lib/exmh-2.0/seditCompose.tcl
+lib/exmh-2.0/seditEnriched.tcl
+lib/exmh-2.0/seditExtras.tcl
+lib/exmh-2.0/seditMime.tcl
+lib/exmh-2.0/seditQP.tcl
+lib/exmh-2.0/seditSel.tcl
+lib/exmh-2.0/select.tcl
+lib/exmh-2.0/send.tcl
+lib/exmh-2.0/sound.tcl
+lib/exmh-2.0/tclIndex
+lib/exmh-2.0/text.tcl
+lib/exmh-2.0/textButton.tcl
+lib/exmh-2.0/textSelect.tcl
+lib/exmh-2.0/thread.tcl
+lib/exmh-2.0/timer.bitmap
+lib/exmh-2.0/tioga.tcl
+lib/exmh-2.0/unseenwin.tcl
+lib/exmh-2.0/uri.tcl
+lib/exmh-2.0/url.bitmap
+lib/exmh-2.0/user.tcl
+lib/exmh-2.0/utils.tcl
+lib/exmh-2.0/widgetMenu.tcl
+lib/exmh-2.0/widgetText.tcl
+lib/exmh-2.0/widgets.tcl
+lib/exmh-2.0/xns.tcl
+lib/exmh-2.0/xnsgetmail.exp
 man/man1/exmh.1.gz
-@dirrm lib/exmh-2.0zeta/html
-@dirrm lib/exmh-2.0zeta
+@dirrm lib/exmh-2.0/html
+@dirrm lib/exmh-2.0