4 files changed, 7 insertions, 38 deletions

diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index d8300ec7ad3d..1c8a5b493625 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -7,11 +7,10 @@
 
 # "+=" and "?=" lines are for sharing this Makefile with japanese/exmh2.
 PORTNAME=	exmh
-PORTVERSION=	2.5
-PORTREVISION=	1
+PORTVERSION=	2.6.3
+PORTREVISION=	0
 CATEGORIES+=	mail tk83
-MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/%SUBDIR%/
-MASTER_SITES+=	ftp://tcl.activestate.com/pub/tcl/%SUBDIR%/
+MASTER_SITES=	ftp://ftp.tcl.tk/pub/tcl/%SUBDIR%/
 MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
diff --git a/mail/exmh2/distinfo b/mail/exmh2/distinfo
index bdad7407b2dd..2ef7ad649197 100644
--- a/mail/exmh2/distinfo
+++ b/mail/exmh2/distinfo
@@ -1 +1 @@
-MD5 (exmh-2.5.tar.gz) = f40c3cebfe9102d66ec27a9098b4717e
+MD5 (exmh-2.6.3.tar.gz) = 5b04d70b7f827f4e520d8b68b28b3efe
diff --git a/mail/exmh2/files/patch-mh.tcl b/mail/exmh2/files/patch-mh.tcl
deleted file mode 100644
index 99eb7570fe56..000000000000
--- a/mail/exmh2/files/patch-mh.tcl
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: lib/mh.tcl
-===================================================================
-RCS file: /cvsroot/exmh/exmh/lib/mh.tcl,v
-retrieving revision 1.17
-retrieving revision 1.19
-diff -u -r1.17 -r1.19
---- lib/mh.tcl	2001/07/09 16:45:33	1.17
-+++ lib/mh.tcl	2001/11/21 06:32:08	1.19
-@@ -765,6 +765,13 @@
-     while {![eof $input]} {
- 	set numBytes [gets $input line]
- 	if {$numBytes > 0} {
-+	    if {[regexp {^\s+(.*)$} $line foo other]} {
-+		 # handle continued lines
-+		 if {[info exists key]} {
-+		     append mhProfile($key) " [string trim $other]"
-+		 }
-+		 continue
-+	    }
- 	    set parts [split $line :]
- 	    set key [string tolower [lindex $parts 0]]
- 	    set other [lindex $parts 1]
-@@ -772,6 +779,7 @@
- 	    set mhProfile($key) $value
- 	}
-     }
-+    close $input
-     if {![info exists mhProfile(path)]} {
- 	if {[info exists mhProfile(FAIL)]} {
- 	    puts stderr "No Path entry in your [file tail $mhProfile(profile)] file."
diff --git a/mail/exmh2/pkg-plist b/mail/exmh2/pkg-plist
index 81583003e77d..9218dac9d16b 100644
--- a/mail/exmh2/pkg-plist
+++ b/mail/exmh2/pkg-plist
@@ -73,7 +73,6 @@ lib/exmh-%%EXMH_VERSION%%/folder.tcl
 lib/exmh-%%EXMH_VERSION%%/folderNew.tcl
 lib/exmh-%%EXMH_VERSION%%/fontsel.tcl
 lib/exmh-%%EXMH_VERSION%%/ftoc.tcl
-lib/exmh-%%EXMH_VERSION%%/ftocColor.tcl
 lib/exmh-%%EXMH_VERSION%%/ftocFind.tcl
 lib/exmh-%%EXMH_VERSION%%/ftp_get.tcl
 lib/exmh-%%EXMH_VERSION%%/getnews.tcl
@@ -84,6 +83,7 @@ lib/exmh-%%EXMH_VERSION%%/hourglass.mask
 lib/exmh-%%EXMH_VERSION%%/hourglass1.bitmap
 lib/exmh-%%EXMH_VERSION%%/hourglass2.bitmap
 lib/exmh-%%EXMH_VERSION%%/hourglass2.mask
+lib/exmh-%%EXMH_VERSION%%/html.tcl
 lib/exmh-%%EXMH_VERSION%%/html/AddrEdit.html
 lib/exmh-%%EXMH_VERSION%%/html/AddressBk.html
 lib/exmh-%%EXMH_VERSION%%/html/AliasAddr.html
@@ -127,7 +127,6 @@ 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
-lib/exmh-%%EXMH_VERSION%%/html.tcl
 lib/exmh-%%EXMH_VERSION%%/html_cache.tcl
 lib/exmh-%%EXMH_VERSION%%/html_content.tcl
 lib/exmh-%%EXMH_VERSION%%/html_dpackage.tcl
@@ -197,6 +196,8 @@ lib/exmh-%%EXMH_VERSION%%/seditQP.tcl
 lib/exmh-%%EXMH_VERSION%%/seditSel.tcl
 lib/exmh-%%EXMH_VERSION%%/select.tcl
 lib/exmh-%%EXMH_VERSION%%/send.tcl
+lib/exmh-%%EXMH_VERSION%%/sequences.tcl
+lib/exmh-%%EXMH_VERSION%%/seqwin.tcl
 lib/exmh-%%EXMH_VERSION%%/sound.tcl
 lib/exmh-%%EXMH_VERSION%%/source.tcl
 lib/exmh-%%EXMH_VERSION%%/tclIndex
@@ -206,7 +207,6 @@ lib/exmh-%%EXMH_VERSION%%/textSelect.tcl
 lib/exmh-%%EXMH_VERSION%%/thread.tcl
 lib/exmh-%%EXMH_VERSION%%/timer.bitmap
 lib/exmh-%%EXMH_VERSION%%/tioga.tcl
-lib/exmh-%%EXMH_VERSION%%/unseenwin.tcl
 lib/exmh-%%EXMH_VERSION%%/uri.tcl
 lib/exmh-%%EXMH_VERSION%%/url.bitmap
 lib/exmh-%%EXMH_VERSION%%/urlFace.tcl