Behind-the-scenes repository copy, and update to exmh-2.0beta!

There is some major new stuff here over v1.6.9, including:
HTTP, HTML support (a functional www browser!), including proxy support.
News posting.
Message threading. (like news threading)
Display MIME images inline as well as text/html and enriched text etc.
DSN support.
Unseen-only display window.
multipart/signature support, "Intelligent signatures"
PGP key management can talk directly to the key servers over the web,
  eliminating the email based query delays
Address book stuff, aliases etc.

5 files changed, 187 insertions, 137 deletions

diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index b69d4dc7427a..0ada445ce93a 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -1,12 +1,12 @@
-# New ports collection Makefile for:    exmh
-# Version required:		1.6.9
-# Date released:		10 Oct 96
+# New ports collection Makefile for:    exmh2
+# Version required:		2.0beta
+# Date released:		1 Jan 97
 # Whom:				Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.3 1996/11/10 21:31:21 obrien Exp $
+# $Id: Makefile,v 1.4 1996/11/17 07:42:28 obrien Exp $
 #
 
-DISTNAME=	exmh-1.6.9
+DISTNAME=	exmh-2.0beta
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.sunlabs.com/pub/tcl/exmh/
 EXTRACT_SUFX=	.tar.Z
@@ -26,15 +26,10 @@ RUN_DEPENDS+=	mmencode:${PORTSDIR}/mail/metamail
 # lang/expect
 # misc/glimpse
 # security/pgp
+# mail/faces
+# audio/rplay
 
-# It will use these commands to view faces or play audio, we dont have ports.
-# faces
-# play
-
-MAN1=		exmh-custom.1 exmh-ref.1 exmh-use.1 exmh.1
-
-post-extract:
-	@rm -rf ${WRKSRC}/lib/*.orig
+MAN1=		exmh.1
 
 do-build:
 	@cd ${WRKSRC} && ${SETENV} PREFIX=${PREFIX} \
diff --git a/mail/exmh2/distinfo b/mail/exmh2/distinfo
index 17173603a37e..1e54ebc88589 100644
--- a/mail/exmh2/distinfo
+++ b/mail/exmh2/distinfo
@@ -1 +1 @@
-MD5 (exmh-1.6.9.tar.Z) = 5e2af4d6bb5588c730b7ba000d095efc
+MD5 (exmh-2.0beta.tar.Z) = 6d5beff406d565ad45b918b9fa986880
diff --git a/mail/exmh2/pkg-plist b/mail/exmh2/pkg-plist
index 531c87067285..fa4e03a81b00 100644
--- a/mail/exmh2/pkg-plist
+++ b/mail/exmh2/pkg-plist
@@ -2,118 +2,162 @@ bin/exmh
 bin/exmh-async
 bin/exmh-bg
 bin/ftp.expect
-lib/exmh-1.6.9/aliases.tcl
-lib/exmh-1.6.9/app-defaults
-lib/exmh-1.6.9/app-defaults-color
-lib/exmh-1.6.9/app-defaults-mono
-lib/exmh-1.6.9/audit.tcl
-lib/exmh-1.6.9/background.tcl
-lib/exmh-1.6.9/bindings.tcl
-lib/exmh-1.6.9/busy.tcl
-lib/exmh-1.6.9/buttons.tcl
-lib/exmh-1.6.9/clink.au
-lib/exmh-1.6.9/cutbuffer.tcl
-lib/exmh-1.6.9/dragNdrop.tcl
-lib/exmh-1.6.9/drip.au
-lib/exmh-1.6.9/editor.tcl
-lib/exmh-1.6.9/env.tcl
-lib/exmh-1.6.9/error.tcl
-lib/exmh-1.6.9/exmh.bitmap
-lib/exmh-1.6.9/extrasInit.tcl
-lib/exmh-1.6.9/exwin.tcl
-lib/exmh-1.6.9/faces.tcl
-lib/exmh-1.6.9/fcache.tcl
-lib/exmh-1.6.9/fdisp.tcl
-lib/exmh-1.6.9/fdispColor.tcl
-lib/exmh-1.6.9/fdispPopup.tcl
-lib/exmh-1.6.9/fileselect.tcl
-lib/exmh-1.6.9/find.tcl
-lib/exmh-1.6.9/flag.tcl
-lib/exmh-1.6.9/flagdown.bitmap
-lib/exmh-1.6.9/flagup.bitmap
-lib/exmh-1.6.9/flist.tcl
-lib/exmh-1.6.9/folder.tcl
-lib/exmh-1.6.9/folderNew.tcl
-lib/exmh-1.6.9/fontsel.tcl
-lib/exmh-1.6.9/ftoc.tcl
-lib/exmh-1.6.9/ftocColor.tcl
-lib/exmh-1.6.9/ftocFind.tcl
-lib/exmh-1.6.9/glimpse.tcl
-lib/exmh-1.6.9/help.Aliases
-lib/exmh-1.6.9/help.Bindings
-lib/exmh-1.6.9/help.FAQ
-lib/exmh-1.6.9/help.Font
-lib/exmh-1.6.9/help.Import
-lib/exmh-1.6.9/help.Intro
-lib/exmh-1.6.9/help.Lists
-lib/exmh-1.6.9/help.PGP
-lib/exmh-1.6.9/help.Preferences
-lib/exmh-1.6.9/help.Reply
-lib/exmh-1.6.9/help.Search
-lib/exmh-1.6.9/help.Sedit
-lib/exmh-1.6.9/help.Seditpref
-lib/exmh-1.6.9/help.tcl
-lib/exmh-1.6.9/hourglass.bitmap
-lib/exmh-1.6.9/hourglass.mask
-lib/exmh-1.6.9/hourglass1.bitmap
-lib/exmh-1.6.9/hourglass2.bitmap
-lib/exmh-1.6.9/hourglass2.mask
-lib/exmh-1.6.9/import.tcl
-lib/exmh-1.6.9/inc.tcl
-lib/exmh-1.6.9/labels.tcl
-lib/exmh-1.6.9/linethru.bitmap
-lib/exmh-1.6.9/mailcap.tcl
-lib/exmh-1.6.9/main.tcl
-lib/exmh-1.6.9/mbempty.bitmap
-lib/exmh-1.6.9/mbtidy.bitmap
-lib/exmh-1.6.9/mbuntidy.bitmap
-lib/exmh-1.6.9/mh.tcl
-lib/exmh-1.6.9/mime.tcl
-lib/exmh-1.6.9/mime.types
-lib/exmh-1.6.9/mimeSun.tcl
-lib/exmh-1.6.9/mosaic.tcl
-lib/exmh-1.6.9/msg.tcl
-lib/exmh-1.6.9/msgShow.tcl
-lib/exmh-1.6.9/partial.tcl
-lib/exmh-1.6.9/pgp.tcl
-lib/exmh-1.6.9/pgpEWN.tcl
-lib/exmh-1.6.9/pgpExec.tcl
-lib/exmh-1.6.9/pgpMatch.tcl
-lib/exmh-1.6.9/pgpMisc.tcl
-lib/exmh-1.6.9/pick.tcl
-lib/exmh-1.6.9/preferences.tcl
-lib/exmh-1.6.9/print.tcl
-lib/exmh-1.6.9/ps.tcl
-lib/exmh-1.6.9/report.tcl
-lib/exmh-1.6.9/rich2tk.tcl
-lib/exmh-1.6.9/scan.tcl
-lib/exmh-1.6.9/sedit.tcl
-lib/exmh-1.6.9/seditBind.tcl
-lib/exmh-1.6.9/seditCompose.tcl
-lib/exmh-1.6.9/seditEnriched.tcl
-lib/exmh-1.6.9/seditExtras.tcl
-lib/exmh-1.6.9/seditMime.tcl
-lib/exmh-1.6.9/seditQP.tcl
-lib/exmh-1.6.9/select.tcl
-lib/exmh-1.6.9/send.tcl
-lib/exmh-1.6.9/sound.tcl
-lib/exmh-1.6.9/tclIndex
-lib/exmh-1.6.9/text.tcl
-lib/exmh-1.6.9/textButton.tcl
-lib/exmh-1.6.9/textSelect.tcl
-lib/exmh-1.6.9/thread.tcl
-lib/exmh-1.6.9/timer.bitmap
-lib/exmh-1.6.9/tioga.tcl
-lib/exmh-1.6.9/uri.tcl
-lib/exmh-1.6.9/url.bitmap
-lib/exmh-1.6.9/user.tcl
-lib/exmh-1.6.9/widgetMenu.tcl
-lib/exmh-1.6.9/widgetText.tcl
-lib/exmh-1.6.9/widgets.tcl
-lib/exmh-1.6.9/xns.tcl
-lib/exmh-1.6.9/xnsgetmail.exp
-@dirrm lib/exmh-1.6.9
-man/man1/exmh-custom.1.gz
-man/man1/exmh-ref.1.gz
-man/man1/exmh-use.1.gz
+lib/exmh-2.0beta/SeditSelFmt.tcl
+lib/exmh-2.0beta/SeditSelSpell.tcl
+lib/exmh-2.0beta/addr.tcl
+lib/exmh-2.0beta/aliases.tcl
+lib/exmh-2.0beta/app-defaults
+lib/exmh-2.0beta/app-defaults-color
+lib/exmh-2.0beta/app-defaults-mono
+lib/exmh-2.0beta/audit.tcl
+lib/exmh-2.0beta/autorefile.tcl
+lib/exmh-2.0beta/background.tcl
+lib/exmh-2.0beta/bindings.tcl
+lib/exmh-2.0beta/busy.tcl
+lib/exmh-2.0beta/buttons.tcl
+lib/exmh-2.0beta/clink.au
+lib/exmh-2.0beta/crypt.tcl
+lib/exmh-2.0beta/cutbuffer.tcl
+lib/exmh-2.0beta/dragNdrop.tcl
+lib/exmh-2.0beta/drip.au
+lib/exmh-2.0beta/editor.tcl
+lib/exmh-2.0beta/env.tcl
+lib/exmh-2.0beta/error.tcl
+lib/exmh-2.0beta/exmh.bitmap
+lib/exmh-2.0beta/extrasInit.tcl
+lib/exmh-2.0beta/exwin.tcl
+lib/exmh-2.0beta/faces.tcl
+lib/exmh-2.0beta/fcache.tcl
+lib/exmh-2.0beta/fdisp.tcl
+lib/exmh-2.0beta/fdispColor.tcl
+lib/exmh-2.0beta/fdispPopup.tcl
+lib/exmh-2.0beta/fileselect.tcl
+lib/exmh-2.0beta/find.tcl
+lib/exmh-2.0beta/flag.tcl
+lib/exmh-2.0beta/flagdown.bitmap
+lib/exmh-2.0beta/flagup.bitmap
+lib/exmh-2.0beta/flist.tcl
+lib/exmh-2.0beta/folder.tcl
+lib/exmh-2.0beta/folderNew.tcl
+lib/exmh-2.0beta/fontsel.tcl
+lib/exmh-2.0beta/ftoc.tcl
+lib/exmh-2.0beta/ftocColor.tcl
+lib/exmh-2.0beta/ftocFind.tcl
+lib/exmh-2.0beta/glimpse.tcl
+lib/exmh-2.0beta/help.tcl
+lib/exmh-2.0beta/hourglass.bitmap
+lib/exmh-2.0beta/hourglass.mask
+lib/exmh-2.0beta/hourglass1.bitmap
+lib/exmh-2.0beta/hourglass2.bitmap
+lib/exmh-2.0beta/hourglass2.mask
+lib/exmh-2.0beta/html.tcl
+lib/exmh-2.0beta/html/Aliases.html
+lib/exmh-2.0beta/html/Bindings.html
+lib/exmh-2.0beta/html/Font.html
+lib/exmh-2.0beta/html/Import.html
+lib/exmh-2.0beta/html/Intro.html
+lib/exmh-2.0beta/html/Keys.html
+lib/exmh-2.0beta/html/Lists.html
+lib/exmh-2.0beta/html/PGP.html
+lib/exmh-2.0beta/html/Preferences.html
+lib/exmh-2.0beta/html/Reply.html
+lib/exmh-2.0beta/html/Search.html
+lib/exmh-2.0beta/html/Sedit.html
+lib/exmh-2.0beta/html/Seditpref.html
+lib/exmh-2.0beta/html/blu-ball.gif
+lib/exmh-2.0beta/html/copyright.html
+lib/exmh-2.0beta/html/exmh-custom.n.html
+lib/exmh-2.0beta/html/exmh-fans.html
+lib/exmh-2.0beta/html/exmh-faq.html
+lib/exmh-2.0beta/html/exmh-ref.n.html
+lib/exmh-2.0beta/html/exmh-use.n.html
+lib/exmh-2.0beta/html/exmh.README.html
+lib/exmh-2.0beta/html/exmh.n.html
+lib/exmh-2.0beta/html/exmh.pref.gif
+lib/exmh-2.0beta/html/exmh.snap1.gif
+lib/exmh-2.0beta/html/index.html
+lib/exmh-2.0beta/html/left-arrow.gif
+lib/exmh-2.0beta/html/maillist.html
+lib/exmh-2.0beta/html/overview.html
+lib/exmh-2.0beta/html/red-ball.gif
+lib/exmh-2.0beta/html/right-arrow.gif
+lib/exmh-2.0beta/html/software.html
+lib/exmh-2.0beta/html/whatis.html
+lib/exmh-2.0beta/html/yel-ball.gif
+lib/exmh-2.0beta/html_cache.tcl
+lib/exmh-2.0beta/html_content.tcl
+lib/exmh-2.0beta/html_dpackage.tcl
+lib/exmh-2.0beta/html_formtag.tcl
+lib/exmh-2.0beta/html_frame.tcl
+lib/exmh-2.0beta/html_get_http.tcl
+lib/exmh-2.0beta/html_head.tcl
+lib/exmh-2.0beta/html_hr.tcl
+lib/exmh-2.0beta/html_images.tcl
+lib/exmh-2.0beta/html_links.tcl
+lib/exmh-2.0beta/html_maps.tcl
+lib/exmh-2.0beta/html_stubs.tcl
+lib/exmh-2.0beta/html_tags.tcl
+lib/exmh-2.0beta/html_text.tcl
+lib/exmh-2.0beta/http_proxy.tcl
+lib/exmh-2.0beta/import.tcl
+lib/exmh-2.0beta/inc.tcl
+lib/exmh-2.0beta/labels.tcl
+lib/exmh-2.0beta/linethru.bitmap
+lib/exmh-2.0beta/mailcap.tcl
+lib/exmh-2.0beta/main.tcl
+lib/exmh-2.0beta/mbempty.bitmap
+lib/exmh-2.0beta/mbtidy.bitmap
+lib/exmh-2.0beta/mbuntidy.bitmap
+lib/exmh-2.0beta/mh.tcl
+lib/exmh-2.0beta/mime.tcl
+lib/exmh-2.0beta/mime.types
+lib/exmh-2.0beta/mimeSun.tcl
+lib/exmh-2.0beta/mosaic.tcl
+lib/exmh-2.0beta/msg.tcl
+lib/exmh-2.0beta/msgShow.tcl
+lib/exmh-2.0beta/partial.tcl
+lib/exmh-2.0beta/pgp.tcl
+lib/exmh-2.0beta/pgpEWN.tcl
+lib/exmh-2.0beta/pgpExec.tcl
+lib/exmh-2.0beta/pgpMatch.tcl
+lib/exmh-2.0beta/pgpMisc.tcl
+lib/exmh-2.0beta/pgpwww.tcl
+lib/exmh-2.0beta/pick.tcl
+lib/exmh-2.0beta/post.tcl
+lib/exmh-2.0beta/preferences.tcl
+lib/exmh-2.0beta/print.tcl
+lib/exmh-2.0beta/ps.tcl
+lib/exmh-2.0beta/receipt.tcl
+lib/exmh-2.0beta/report.tcl
+lib/exmh-2.0beta/rich2tk.tcl
+lib/exmh-2.0beta/scan.tcl
+lib/exmh-2.0beta/sedit.tcl
+lib/exmh-2.0beta/seditBind.tcl
+lib/exmh-2.0beta/seditCompose.tcl
+lib/exmh-2.0beta/seditEnriched.tcl
+lib/exmh-2.0beta/seditExtras.tcl
+lib/exmh-2.0beta/seditMime.tcl
+lib/exmh-2.0beta/seditQP.tcl
+lib/exmh-2.0beta/select.tcl
+lib/exmh-2.0beta/send.tcl
+lib/exmh-2.0beta/sound.tcl
+lib/exmh-2.0beta/tclIndex
+lib/exmh-2.0beta/text.tcl
+lib/exmh-2.0beta/textButton.tcl
+lib/exmh-2.0beta/textSelect.tcl
+lib/exmh-2.0beta/thread.tcl
+lib/exmh-2.0beta/timer.bitmap
+lib/exmh-2.0beta/tioga.tcl
+lib/exmh-2.0beta/unseenwin.tcl
+lib/exmh-2.0beta/uri.tcl
+lib/exmh-2.0beta/url.bitmap
+lib/exmh-2.0beta/user.tcl
+lib/exmh-2.0beta/utils.tcl
+lib/exmh-2.0beta/widgetMenu.tcl
+lib/exmh-2.0beta/widgetText.tcl
+lib/exmh-2.0beta/widgets.tcl
+lib/exmh-2.0beta/xns.tcl
+lib/exmh-2.0beta/xnsgetmail.exp
+@dirrm lib/exmh-2.0beta/html
+@dirrm lib/exmh-2.0beta
 man/man1/exmh.1.gz
diff --git a/mail/exmh2/scripts/build b/mail/exmh2/scripts/build
index c7a301040b31..9a1f98158e98 100644
--- a/mail/exmh2/scripts/build
+++ b/mail/exmh2/scripts/build
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $Id$
+# $Id: build,v 1.1.1.1 1996/10/10 15:00:53 peter Exp $
 #
 
 VERSION="`sed -ne 's/^set vers \(.*\)/\1/p' ${WRKSRC}/exmh.install`"
@@ -19,10 +19,10 @@ if [ -f ${PREFIX}/bin/expect ]; then
   EXPECT=${PREFIX}/bin/expect		#executable
 fi
 
-if [ -f ${PREFIX}/faces/faces ]; then
-  FACES=${PREFIX}/faces/faces		#dir
+if [ -d ${PREFIX}/share/faces ]; then
+  FACES=${PREFIX}/share/faces		#dir
   shortname="`hostname -s`"
-  domain="`hostname | sed -e s/^${shortname}// -e s/^.//`"
+  domain="`hostname | sed -e s/^${shortname}// -e s/^.// | tr A-Z a-z`"
   if [ "${domain}" != "" ]; then
     DOMAIN="{${domain}}"
   fi
@@ -36,11 +36,14 @@ if [ -f ${PREFIX}/bin/glimpse ]; then
   GLIMPSE=${PREFIX}/bin			#bindir
 fi
 
-if [ -f ${PREFIX}/bin/play ]; then
-  PLAY=${PREFIX}/bin/play		#executable
+if [ -f ${PREFIX}/bin/rplay ]; then
+  PLAY=${PREFIX}/bin/rplay		#executable
 fi
 
 echo "s@^#!wish@#!${WISH}@" >${SEDFILE}
+if [ "${EXPECT}" != "{}" ]; then
+  echo "s@^#!expect@#!${EXPECT}@" >>${SEDFILE}
+fi
 echo "/^#CONFIGURATION/a\\" >>${SEDFILE}
 
 sed <${FILESDIR}/config \
diff --git a/mail/exmh2/scripts/install b/mail/exmh2/scripts/install
index 72d8f603b1df..796553a06b82 100644
--- a/mail/exmh2/scripts/install
+++ b/mail/exmh2/scripts/install
@@ -1,12 +1,12 @@
 #! /bin/sh
 #
-# $Id$
+# $Id: install,v 1.1.1.1 1996/10/10 15:00:53 peter Exp $
 #
 
 VERSION="`sed -ne 's/^set vers \(.*\)/\1/p' ${WRKSRC}/exmh.install`"
 
 # Rename while installing..
-for i in exmh-custom exmh-ref exmh-use exmh
+for i in exmh
 do
 	echo "install -c -o bin -g bin -m 444 $i.l ${PREFIX}/man/man1/$i.1"
 	install -c -o bin -g bin -m 444 $i.l ${PREFIX}/man/man1/$i.1
@@ -23,8 +23,16 @@ then
 	mkdir ${PREFIX}/lib/exmh-${VERSION}
 fi
 
-LIBFILES='lib/*.tcl lib/*.bitmap lib/help.* lib/*.FAQ lib/tclIndex lib/app-defaults* lib/*.mask lib/*.exp lib/mime.types lib/*.au'
+LIBFILES='lib/*.tcl lib/*.bitmap lib/help.* lib/tclIndex lib/app-defaults* lib/*.mask lib/*.exp lib/mime.types lib/*.au'
 
 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}
 
+if [ ! -d ${PREFIX}/lib/exmh-${VERSION}/html ]
+then
+	echo "mkdir ${PREFIX}/lib/exmh-${VERSION}/html"
+	mkdir ${PREFIX}/lib/exmh-${VERSION}/html
+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