7 files changed, 13 insertions, 35 deletions
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
index ae4187e5db5..f6d057d9357 100644
--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2000/10/08 07:05:39 tron Exp $
+# $NetBSD: Makefile,v 1.17 2000/10/15 21:54:54 tron Exp $
 
-DISTNAME=	WMMail.app-0.63a
-PKGNAME=	wmmail-0.63a
+DISTNAME=	WMMail.app-0.64
+PKGNAME=	wmmail-0.64
 CATEGORIES=	mail x11
-MASTER_SITES=	http://www.eecg.utoronto.ca/~chanb/
+MASTER_SITES=	http://www.eecg.utoronto.ca/~chanb/WMMail.app/
 
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.eecg.toronto.edu/cgi-bin/cgiwrap/chanb/index.cgi?wmmail
diff --git a/mail/wmmail/files/md5 b/mail/wmmail/files/md5
index 0ef1816b380..c5e23e395f3 100644
--- a/mail/wmmail/files/md5
+++ b/mail/wmmail/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/06/27 10:51:49 tron Exp $
+$NetBSD: md5,v 1.3 2000/10/15 21:54:55 tron Exp $
 
-MD5 (WMMail.app-0.63a.tar.gz) = c1f3faf0ecc9123413088c06acebf177
+MD5 (WMMail.app-0.64.tar.gz) = fc596db9f2f6b52eec3a303178106c8e
diff --git a/mail/wmmail/files/patch-sum b/mail/wmmail/files/patch-sum
index bd699f9e95c..1cda7370031 100644
--- a/mail/wmmail/files/patch-sum
+++ b/mail/wmmail/files/patch-sum
@@ -1,6 +1,5 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:07 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/10/15 21:54:55 tron Exp $
 
-MD5 (patch-aa) = dcdece7bc4836788b1009cb5a337c3fa
-MD5 (patch-ab) = 7d2366fff1c19934a4e783b95082327d
+MD5 (patch-aa) = 1066b4e06f8004f0326295c69dbc5adb
 MD5 (patch-ac) = 645f8d1e2b966b1b27f9acd489f6d4fc
 MD5 (patch-ad) = e5f363fb63df42bd65a223af516c98c9
diff --git a/mail/wmmail/patches/patch-aa b/mail/wmmail/patches/patch-aa
index 7e65e94c9c5..e1449f16b19 100644
--- a/mail/wmmail/patches/patch-aa
+++ b/mail/wmmail/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 1999/06/27 10:51:49 tron Exp $
+$NetBSD: patch-aa,v 1.4 2000/10/15 21:54:55 tron Exp $
 
---- Makefile.in.orig	Wed Mar 31 05:34:59 1999
-+++ Makefile.in	Sun Jun 27 12:42:49 1999
+--- src/Makefile.in.orig	Wed Mar 31 05:34:59 1999
++++ src/Makefile.in	Sun Jun 27 12:42:49 1999
 @@ -90,13 +90,13 @@
  DEFS = @DEFS@ -I. -I$(srcdir) 
  CPPFLAGS = @CPPFLAGS@
diff --git a/mail/wmmail/patches/patch-ab b/mail/wmmail/patches/patch-ab
deleted file mode 100644
index e51f979aa78..00000000000
--- a/mail/wmmail/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.2 1999/06/27 10:51:49 tron Exp $
-
---- wmutil.c.orig	Sat Jan 16 05:50:25 1999
-+++ wmutil.c	Sun Jun 27 12:37:41 1999
-@@ -319,15 +320,12 @@
-     if (path = check_file(prefix, folders, resource))
-       return path;
- 
--  if (path = check_file("/usr/local/GNUstep", folders, resource))
-+  if (path = check_file(PREFIX "/GNUstep", folders, resource))
-     return path;
- 
-   if (prefix = getenv("GNUSTEP_SYSTEM_ROOT"))
-     if (path = check_file(prefix, folders, resource))
-       return path;
--
--  if (path = check_file("/usr/GNUstep", folders, resource))
--    return path;
- 
-   return (char *) NULL;
- }
diff --git a/mail/wmmail/patches/patch-ac b/mail/wmmail/patches/patch-ac
index 0bf9b1fbf36..141d4f1cb73 100644
--- a/mail/wmmail/patches/patch-ac
+++ b/mail/wmmail/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 1999/06/27 11:10:30 tron Exp $
+$NetBSD: patch-ac,v 1.6 2000/10/15 21:54:55 tron Exp $
 
 --- Defaults/Makefile.in.orig	Wed Mar 31 05:34:59 1999
 +++ Defaults/Makefile.in	Sun Jun 27 13:05:21 1999
diff --git a/mail/wmmail/patches/patch-ad b/mail/wmmail/patches/patch-ad
index 911186bcfcc..3db9978bdd6 100644
--- a/mail/wmmail/patches/patch-ad
+++ b/mail/wmmail/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 1999/06/27 11:10:31 tron Exp $
+$NetBSD: patch-ad,v 1.2 2000/10/15 21:54:55 tron Exp $
 
 --- Defaults/WMMail.in.orig	Mon Mar 29 13:55:08 1999
 +++ Defaults/WMMail.in	Sun Jun 27 13:03:50 1999