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).

3 files changed, 0 insertions, 124 deletions

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