More fun patches to make exmh work better:

1.  Replace old, out-of-control preferences dialog with spiffy, sorted,
scrolling preferences dialog.

2.  Better PGP 6.5 compatibility.

PORTREVISION bump to mark these changes.

Obtained from:	exmh CVS repository

4 files changed, 89 insertions, 1 deletions

diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index 72ebba225ca8..06a99e897266 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -8,7 +8,7 @@
 # "+=" and "?=" lines are for sharing this Makefile with japanese/exmh2.
 PORTNAME=	exmh
 PORTVERSION=	2.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	mail tk83
 MASTER_SITES=	ftp://ftp.tcl.tk/pub/tcl/%SUBDIR%/
 MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE}
diff --git a/mail/exmh2/files/patch-pgpBase.tcl b/mail/exmh2/files/patch-pgpBase.tcl
new file mode 100644
index 000000000000..386399ba0749
--- /dev/null
+++ b/mail/exmh2/files/patch-pgpBase.tcl
@@ -0,0 +1,15 @@
+Index: lib/pgpBase.tcl
+===================================================================
+RCS file: /cvsroot/exmh/exmh/lib/pgpBase.tcl,v
+retrieving revision 1.7
+retrieving revision 1.8
+diff -r1.7 -r1.8
+8a9,12
+> # Revision 1.8  2003/05/20 03:43:30  welch
+> # pgpPgp65.tcl added version check improvement for PGP 6.5 (Neil Rickert)
+> #   (added . - and _ to the pattern, too (kre))
+> #
+205c209
+< set pgp(pgp6,pat_Version) "Version:\[ \t\]*6\.5.*"
+---
+> set pgp(pgp6,pat_Version) "Version:\[ \t-._A-Za-z\]*6\.5.*"
diff --git a/mail/exmh2/files/patch-pgpPgp65.tcl b/mail/exmh2/files/patch-pgpPgp65.tcl
new file mode 100644
index 000000000000..fef0c3a97b23
--- /dev/null
+++ b/mail/exmh2/files/patch-pgpPgp65.tcl
@@ -0,0 +1,17 @@
+Index: lib/pgpPgp65.tcl
+===================================================================
+RCS file: /cvsroot/exmh/exmh/lib/pgpPgp65.tcl,v
+retrieving revision 1.5
+retrieving revision 1.6
+diff -r1.5 -r1.6
+3a4,8
+> # Revision 1.6  2003/05/20 03:22:57  welch
+> # pgpPgp65.tcl - Added +compatible=off to batchmode flags (Neil Rickert)
+> # preferences.tcl - In the toplevel display,
+> #     changed row of unsorted buttons to a sorted listbox
+> #
+71c76,77
+< set pgp(pgp6,flags_batch) {+armorlines=0 "+comment=$pgp(pgp6,comment)" +batchmode=on +verbose=0 +pager=cat}
+---
+> # +compatible=off contributed by Neil Rickert
+> set pgp(pgp6,flags_batch) {+armorlines=0 "+comment=$pgp(pgp6,comment)" +batchmode=on +compatible=off +verbose=0 +pager=cat}
diff --git a/mail/exmh2/files/patch-preferences.tcl b/mail/exmh2/files/patch-preferences.tcl
new file mode 100644
index 000000000000..1aa9b6af0d10
--- /dev/null
+++ b/mail/exmh2/files/patch-preferences.tcl
@@ -0,0 +1,56 @@
+Index: lib/preferences.tcl
+===================================================================
+RCS file: /cvsroot/exmh/exmh/lib/preferences.tcl,v
+retrieving revision 1.10
+retrieving revision 1.11
+diff -u -r1.10 -r1.11
+--- lib/preferences.tcl	18 Apr 2000 15:08:17 -0000	1.10
++++ lib/preferences.tcl	20 May 2003 03:22:57 -0000	1.11
+@@ -309,6 +309,28 @@
+ 		set maxWidth $len
+ 	    }
+ 	}
++        FontWidget listbox $body.listbox \
++            -exportselection 0 \
++            -selectmode single \
++            -width $maxWidth \
++            -yscrollcommand "$body.scrollbar set"
++
++        scrollbar $body.scrollbar \
++                -command "$body.listbox yview"
++
++        $body.listbox insert end "The Top Ten"
++        foreach x [lsort [concat $pref(panes) Fonts]] {
++            if {$x != "The TopTen"} {
++              $body.listbox insert end $x
++            }
++        }
++        bind $body.listbox <Button-1> {PreferencesListboxHit %W %y}
++
++        pack $body.scrollbar -side right -fill y
++        pack $body.listbox -side left -fill both -expand true
++
++if {0} {
++  # Old Button List
+ 	Widget_AddBut $body font Fonts Font_Dialog	{top}
+ 	$body.font configure -width $maxWidth
+ 	set i 0
+@@ -318,8 +340,18 @@
+ 	    $body.but$i configure -width $maxWidth
+ 	    incr i
+ 	}
++}
++
+ 	wm protocol .pref WM_DELETE_WINDOW PreferencesDelete
+     }
++}
++proc PreferencesListboxHit {listbox y} {
++  set id [$listbox get @0,$y]
++  if {$id == "Fonts"} {
++      Font_Dialog
++  } else {
++      PreferencesSectionDialog $id
++  }
+ }
+ 
+ proc PreferencesSectionDialog { id } {