Update exmh to 2.3.1. This release was made primarily to fix a symlink

vulnerability reported to bugtraq.  Mostly a bugfix release although a few
new features (filtering in sedit, optional expect-based inc wrapper,
optional bitmap buttons) have been added.

FreeBSD-specific parts to this commit:  Removed patchfiles that were
imported from the exmh CVS repository as they are now a part of the
exmh-2.3.1 release.  Fixed pkg-descr to quiet a few portlint warnings.
Changed port to use wish-8.3 rather than wish-8.2 (suggested by markm).

9 files changed, 48 insertions, 142 deletions

diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index 548301d7f24c..15e25af07435 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -7,9 +7,8 @@
 
 # "+=" and "?=" lines are for sharing this Makefile with japanese/exmh2.
 PORTNAME=	exmh
-PORTVERSION=	2.2
-PORTREVISION=	1
-CATEGORIES+=	mail tk82
+PORTVERSION=	2.3.1
+CATEGORIES+=	mail tk83
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
@@ -21,10 +20,10 @@ BUILD_DEPENDS=	tclsh8.0jp:${PORTSDIR}/japanese/tcl80
 WISH=		wish8.0jp
 TCLSH=		tclsh8.0jp
 .else
-RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
-BUILD_DEPENDS=	tclsh8.2:${PORTSDIR}/lang/tcl82
-WISH=		wish8.2
-TCLSH=		tclsh8.2
+RUN_DEPENDS=	wish8.3:${PORTSDIR}/x11-toolkits/tk83
+BUILD_DEPENDS=	tclsh8.3:${PORTSDIR}/lang/tcl83
+WISH=		wish8.3
+TCLSH=		tclsh8.3
 .endif
 
 # exmh is pretty useless without this, but it's not needed to build it.
diff --git a/mail/exmh2/distinfo b/mail/exmh2/distinfo
index 261ead0737f1..6342730fc791 100644
--- a/mail/exmh2/distinfo
+++ b/mail/exmh2/distinfo
@@ -1 +1 @@
-MD5 (exmh-2.2.tar.gz) = 513e824b7eb0bfd1ec76b837b8f74de9
+MD5 (exmh-2.3.1.tar.gz) = 6c864681c157c03ce82c82876ca04e10
diff --git a/mail/exmh2/files/patch-env.tcl b/mail/exmh2/files/patch-env.tcl
deleted file mode 100644
index 1143f6cc2bb2..000000000000
--- a/mail/exmh2/files/patch-env.tcl
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: lib/env.tcl
-===================================================================
-RCS file: /cvsroot/exmh/exmh/lib/env.tcl,v
-retrieving revision 1.1
-retrieving revision 1.3
-diff -c -r1.1 -r1.3
-*** lib/env.tcl	1998/05/05 17:55:23	1.1
---- lib/env.tcl	2001/01/16 02:07:46	1.3
-***************
-*** 34,44 ****
-      }
-  
-      # Init TMPDIR
-!     if [info exists env(EXMHTMPDIR)] {
-  	set env(TMPDIR) $env(EXMHTMPDIR)
-      }
-!     if {![info exists env(TMPDIR)] || ![file isdirectory $env(TMPDIR)]} {
-! 	set env(TMPDIR) /tmp
-      }
-  
-      # Make sure MH is on the path
---- 34,45 ----
-      }
-  
-      # Init TMPDIR
-! 
-!     if {[info exists env(EXMHTMPDIR)]} {
-  	set env(TMPDIR) $env(EXMHTMPDIR)
-      }
-!     if {![info exists env(TMPDIR)]} {
-! 	set env(TMPDIR) /tmp/$env(USER)
-      }
-  
-      # Make sure MH is on the path
-***************
-*** 58,63 ****
---- 59,80 ----
-  
-  proc Env_Tmp {} {
-      global env
-+ 
-+     # Doing this every time we use the temp file directory ensures
-+     # no-one steals it without the user knowing it.
-+ 
-+     if {[catch {
-+ 	file mkdir $env(TMPDIR)
-+ 	if {$env(TMPDIR) != "/tmp"} {
-+ 	    file attributes $env(TMPDIR) -permissions 0700
-+ 	}
-+     } err]} {
-+ 	puts $err
-+ 	catch {puts stderr "WARNING: exmh using unsafe /tmp directory"}
-+ 	Exmh_Status "WARNING: exmh using unsafe /tmp directory" red
-+ 	set env(TMPDIR) /tmp
-+     }
-+ 
-      return $env(TMPDIR)
-  }
-  
diff --git a/mail/exmh2/files/patch-error.tcl b/mail/exmh2/files/patch-error.tcl
deleted file mode 100644
index 8c429f98ae90..000000000000
--- a/mail/exmh2/files/patch-error.tcl
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: lib/error.tcl
-===================================================================
-RCS file: /cvsroot/exmh/exmh/lib/error.tcl,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -c -r1.2 -r1.3
-*** error.tcl	1999/03/26 18:02:56	1.2
---- error.tcl	2001/01/03 23:51:59	1.3
-***************
-*** 118,123 ****
---- 118,126 ----
-  
-  proc ExmhMailError { w errInfo } {
-      global exmh
-+     if [file exists [Env_Tmp]/exmhErrorMsg] {
-+         file delete [Env_Tmp]/exmhErrorMsg
-+     }
-      if [catch {open [Env_Tmp]/exmhErrorMsg w} out] {
-  	Exmh_Status "Cannot open [Env_Tmp]/exmhErrorMsg" purple
-  	return
diff --git a/mail/exmh2/files/patch-pgpPgp5.tcl b/mail/exmh2/files/patch-pgpPgp5.tcl
deleted file mode 100644
index f58e6229b139..000000000000
--- a/mail/exmh2/files/patch-pgpPgp5.tcl
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: lib/pgpPgp5.tcl
-===================================================================
-RCS file: /cvsroot/exmh/exmh/lib/pgpPgp5.tcl,v
-retrieving revision 1.6
-retrieving revision 1.7
-diff -c -r1.6 -r1.7
-*** pgpPgp5.tcl	2000/04/18 18:38:33	1.6
---- pgpPgp5.tcl	2001/01/04 02:24:46	1.7
-***************
-*** 1,6 ****
---- 1,17 ----
-  # pgpPgp5.tcl
-  
-  # $Log: pgpPgp5.tcl,v $
-+ # Revision 1.7  2001/01/04 02:24:46  bmah
-+ # Add +force to PGP5 flags.  This fixes
-+ # a bug where PGP5 couldn't verify clearsigned messages under some
-+ # circumstances.  In my testing I was only able to make this happen
-+ # with clearsigned messages and multipart/mime, which produces some
-+ # rather strange output anyways.  But this doesn't seem to hurt
-+ # anything.
-+ #
-+ # Submitted-by:	Dave Tweten <tweten@nas.nasa.gov>, via the FreeBSD
-+ # 		Project
-+ #
-  # Revision 1.6  2000/04/18 18:38:33  valdis
-  # Fix quote character to use ascii rather than iso8859-ish one
-  #
-***************
-*** 88,94 ****
-  #############
-  # Exec_Batch
-  # Batchmode flags
-! set pgp(pgp5,flags_batch) {+armorlines=0 +batchmode=on +verbose=0}
-  #
-  proc Pgp_pgp5_PassFdSet {} {
-      global env
---- 99,105 ----
-  #############
-  # Exec_Batch
-  # Batchmode flags
-! set pgp(pgp5,flags_batch) {+armorlines=0 +batchmode=on +force +verbose=0}
-  #
-  proc Pgp_pgp5_PassFdSet {} {
-      global env
diff --git a/mail/exmh2/pkg-descr b/mail/exmh2/pkg-descr
index 5f5fc8f6f4b7..67c892de10c3 100644
--- a/mail/exmh2/pkg-descr
+++ b/mail/exmh2/pkg-descr
@@ -1,7 +1,5 @@
-exmh is a TCL/TK based interface to the MH mail system.
-
-FEATURES: As well as providing the usual layer on top of MH commands, exmh
-has a number of other features:
+exmh is a TCL/TK based interface to the MH mail system.  It provides 
+the usual layer on top of MH commands, as well as many other features:
 
     MIME support!  Displays richtext and enriched directly.
     Color feedback in the scan listing.
@@ -23,4 +21,3 @@ unless you compile TK with -DTK_NO_SECURITY.  Generally, this means that
 you **MUST** must run xdm to start your Xserver.
 
 WWW:  http://www.beedub.com/exmh/
-
diff --git a/mail/exmh2/pkg-plist b/mail/exmh2/pkg-plist
index 4841df30fcc7..bec8e04c55ad 100644
--- a/mail/exmh2/pkg-plist
+++ b/mail/exmh2/pkg-plist
@@ -2,6 +2,7 @@ bin/exmh
 bin/exmh-async
 bin/exmh-bg
 bin/ftp.expect
+bin/inc.expect
 lib/exmh-%%EXMH_VERSION%%/PgpDecryptExpect
 lib/exmh-%%EXMH_VERSION%%/addr.tcl
 lib/exmh-%%EXMH_VERSION%%/aliases.tcl
@@ -13,6 +14,28 @@ lib/exmh-%%EXMH_VERSION%%/autorefile.tcl
 lib/exmh-%%EXMH_VERSION%%/background.tcl
 lib/exmh-%%EXMH_VERSION%%/base64.tcl
 lib/exmh-%%EXMH_VERSION%%/bindings.tcl
+lib/exmh-%%EXMH_VERSION%%/bitmaps/abort.xbm
+lib/exmh-%%EXMH_VERSION%%/bitmaps/address.xbm
+lib/exmh-%%EXMH_VERSION%%/bitmaps/bind.xbm
+lib/exmh-%%EXMH_VERSION%%/bitmaps/bitmaps.defaults
+lib/exmh-%%EXMH_VERSION%%/bitmaps/commit.xbm
+lib/exmh-%%EXMH_VERSION%%/bitmaps/compose.xbm
+lib/exmh-%%EXMH_VERSION%%/bitmaps/delete.xbm
+lib/exmh-%%EXMH_VERSION%%/bitmaps/forward.xbm
+lib/exmh-%%EXMH_VERSION%%/bitmaps/getmail.xbm
+lib/exmh-%%EXMH_VERSION%%/bitmaps/help.xbm
+lib/exmh-%%EXMH_VERSION%%/bitmaps/link.xbm
+lib/exmh-%%EXMH_VERSION%%/bitmaps/move.xbm
+lib/exmh-%%EXMH_VERSION%%/bitmaps/new.xbm
+lib/exmh-%%EXMH_VERSION%%/bitmaps/phone.xbm
+lib/exmh-%%EXMH_VERSION%%/bitmaps/pref.xbm
+lib/exmh-%%EXMH_VERSION%%/bitmaps/quote.xbm
+lib/exmh-%%EXMH_VERSION%%/bitmaps/scan.xbm
+lib/exmh-%%EXMH_VERSION%%/bitmaps/search.xbm
+lib/exmh-%%EXMH_VERSION%%/bitmaps/send.xbm
+lib/exmh-%%EXMH_VERSION%%/bitmaps/sign.xbm
+lib/exmh-%%EXMH_VERSION%%/bitmaps/unmark.xbm
+lib/exmh-%%EXMH_VERSION%%/bitmaps/write.xbm
 lib/exmh-%%EXMH_VERSION%%/busy.tcl
 lib/exmh-%%EXMH_VERSION%%/buttons.tcl
 lib/exmh-%%EXMH_VERSION%%/clink.au
@@ -85,9 +108,7 @@ lib/exmh-%%EXMH_VERSION%%/html/custom.html
 lib/exmh-%%EXMH_VERSION%%/html/exmh-fans.html
 lib/exmh-%%EXMH_VERSION%%/html/exmh-faq.html
 lib/exmh-%%EXMH_VERSION%%/html/exmh.README.html
-lib/exmh-%%EXMH_VERSION%%/html/exmh.key.color.gif
 lib/exmh-%%EXMH_VERSION%%/html/exmh.pref.gif
-lib/exmh-%%EXMH_VERSION%%/html/exmh.snap.10.99.gif
 lib/exmh-%%EXMH_VERSION%%/html/exmh.snap1.gif
 lib/exmh-%%EXMH_VERSION%%/html/guide.html
 lib/exmh-%%EXMH_VERSION%%/html/index.html
@@ -101,6 +122,7 @@ lib/exmh-%%EXMH_VERSION%%/html/red-ball.gif
 lib/exmh-%%EXMH_VERSION%%/html/reference.html
 lib/exmh-%%EXMH_VERSION%%/html/right-arrow.gif
 lib/exmh-%%EXMH_VERSION%%/html/software.html
+lib/exmh-%%EXMH_VERSION%%/html/symlink.html
 lib/exmh-%%EXMH_VERSION%%/html/tutorial.html
 lib/exmh-%%EXMH_VERSION%%/html/whatis.html
 lib/exmh-%%EXMH_VERSION%%/html/yel-ball.gif
@@ -194,5 +216,6 @@ lib/exmh-%%EXMH_VERSION%%/widgetText.tcl
 lib/exmh-%%EXMH_VERSION%%/widgets.tcl
 lib/exmh-%%EXMH_VERSION%%/xns.tcl
 lib/exmh-%%EXMH_VERSION%%/xnsgetmail.exp
+@dirrm lib/exmh-%%EXMH_VERSION%%/bitmaps
 @dirrm lib/exmh-%%EXMH_VERSION%%/html
 @dirrm lib/exmh-%%EXMH_VERSION%%
diff --git a/mail/exmh2/scripts/build b/mail/exmh2/scripts/build
index 272083613718..7596a8eca8f9 100644
--- a/mail/exmh2/scripts/build
+++ b/mail/exmh2/scripts/build
@@ -87,7 +87,7 @@ sed <${FILESDIR}/${CONFIGFILE} \
 	-e "s+!!DATE!!+${DATE}+g" \
  | sed -e 's/$/\\/' -e '$ s/.$//' >> ${SEDFILE}
 
-for i in exmh-async exmh-bg exmh ftp.expect
+for i in exmh-async exmh-bg exmh ftp.expect inc.expect
 do
 	echo "sed -f ${SEDFILE} < $i.MASTER > $i"
 	sed -f ${SEDFILE} < $i.MASTER > $i
diff --git a/mail/exmh2/scripts/install b/mail/exmh2/scripts/install
index 3c91c06a1c29..a34869ac8a25 100644
--- a/mail/exmh2/scripts/install
+++ b/mail/exmh2/scripts/install
@@ -12,7 +12,7 @@ do
 	install -c -o bin -g bin -m 444 $i.l ${PREFIX}/man/man1/$i.1
 done
 
-BINS="exmh-async exmh-bg exmh ftp.expect"
+BINS="exmh-async exmh-bg exmh ftp.expect inc.expect"
 
 echo "install -c -o bin -g bin -m 755 ${BINS} ${PREFIX}/bin"
 install -c -o bin -g bin -m 755 ${BINS} ${PREFIX}/bin
@@ -34,5 +34,16 @@ then
 	mkdir ${PREFIX}/lib/exmh-${VERSION}/html
 fi
 
-echo "install -c -o bin -g bin -m 444 lib/html/* ${PREFIX}/lib/exmh-${VERSION}/html"
+echo "install -c -o bin -g bin -m 444 lib/html/* lib/html/*.gif ${PREFIX}/lib/exmh-${VERSION}/html"
 install -c -o bin -g bin -m 444 lib/html/*.html lib/html/*.gif ${PREFIX}/lib/exmh-${VERSION}/html
+
+if [ ! -d ${PREFIX}/lib/exmh-${VERSION}/bitmaps ]
+then
+	echo "mkdir ${PREFIX}/lib/exmh-${VERSION}/bitmaps"
+	mkdir ${PREFIX}/lib/exmh-${VERSION}/bitmaps
+fi
+
+echo "install -c -o bin -g bin -m 444 lib/bitmaps/bitmaps.defaults lib/bitmaps/*.xbm ${PREFIX}/lib/exmh-${VERSION}/bitmaps"
+install -c -o bin -g bin -m 444 lib/bitmaps/bitmaps.defaults lib/bitmaps/*.xbm ${PREFIX}/lib/exmh-${VERSION}/bitmaps
+
+