Update "wmmail" package to version 0.63a. Changes since version 0.62:

- fixed segfaults in wmmail.c
- added ability to use arbitrary TCP port for IMAP
- added ability to display message count when using multiple mailboxes;
  thanks to Justin Dolske <dolske@reston.wcom.net> for patch
- added preliminary POP3 support (don't even try to fix it!)
- change mbox.c to take care of dummy messages put in your mailbox
  by imapd, PINE, or whatever
- fixed imap.c to use CR-LF instead of just "\n"; thanks to Paul Bardo
  <pbardo@bridge.com> for pointing this out
- fixed installation
- WMMail.defaults changed and moved to Defaults/WMMail.in

6 files changed, 82 insertions, 91 deletions

diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
index 8266f948fd7..a6e95eec3b7 100644
--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@@ -1,27 +1,19 @@
-# $NetBSD: Makefile,v 1.12 1999/06/21 04:53:14 jlam Exp $
+# $NetBSD: Makefile,v 1.13 1999/06/27 10:51:48 tron Exp $
 
-DISTNAME=	WMMail.app-0.62
-PKGNAME=	wmmail-0.62
+DISTNAME=	WMMail.app-0.63a
+PKGNAME=	wmmail-0.63a
 CATEGORIES=	mail x11
 MASTER_SITES=	http://www.eecg.utoronto.ca/~chanb/
 
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.eecg.utoronto.ca/~chanb/wmmail.html
 
-BUILD_DEPENDS+=	automake:../../devel/automake
 DEPENDS+=	windowmaker-0.60.0:../../x11/windowmaker
 
-USE_X11BASE=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" SHELL="/bin/sh"
-
-post-install:
-		${SED} -e 's#@@X11BASE@@#${X11BASE}#g' \
-		       -e 's#@@LOCALBASE@@#${LOCALBASE}#g' \
-		       <${WRKSRC}/WMMail.defaults \
-		       >${PREFIX}/etc/WindowMaker/WMMail
+USE_X11BASE=		yes
+USE_GMAKE=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-PL-incs="-I${LOCALBASE}/include" \
+			--with-PL-libs="-L${LOCALBASE}/lib"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/wmmail/files/md5 b/mail/wmmail/files/md5
index 1ca5a179fb2..0ef1816b380 100644
--- a/mail/wmmail/files/md5
+++ b/mail/wmmail/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/01/23 14:24:04 tron Exp $
+$NetBSD: md5,v 1.2 1999/06/27 10:51:49 tron Exp $
 
-MD5 (WMMail.app-0.62.tar.gz) = fcbed0b87f7a0b5a8018f5e24d9ff3a3
+MD5 (WMMail.app-0.63a.tar.gz) = c1f3faf0ecc9123413088c06acebf177
diff --git a/mail/wmmail/patches/patch-aa b/mail/wmmail/patches/patch-aa
index 26b6a6770aa..7e65e94c9c5 100644
--- a/mail/wmmail/patches/patch-aa
+++ b/mail/wmmail/patches/patch-aa
@@ -1,49 +1,20 @@
-$NetBSD: patch-aa,v 1.2 1999/01/23 14:31:50 tron Exp $
+$NetBSD: patch-aa,v 1.3 1999/06/27 10:51:49 tron Exp $
 
---- WMMail.defaults.orig	Sat Jan 16 05:41:46 1999
-+++ WMMail.defaults	Sat Jan 23 15:30:07 1999
-@@ -6,24 +6,24 @@
-   DisplayFont = "-*-helvetica-medium-r-*-*-10-*-*-*-*-*-*-*";
-   DisplayLocation = (0, 10);
-   ExecuteOnClick = "xterm -geom 80x25 -name pine -T PINE -e pine -i";
--  ExecuteOnNew = "play /usr/local/GNUstep/Apps/WMMail.app/Sounds/doorbell.au";
-+  ExecuteOnNew = "play @@X11BASE@@/GNUstep/Apps/WMMail.app/Sounds/doorbell.au";
-   ExecuteOnNewOnce = No;
-   Animations = {
-     Empty = {
-       Delay = 10;
--      Frames = ("/usr/local/GNUstep/Apps/WMMail.app/Anims/NeXT/Mail1.xpm");
-+      Frames = ("@@X11BASE@@/GNUstep/Apps/WMMail.app/Anims/NeXT/Mail1.xpm");
-     };
-     Old = {
-       Delay = 10;
--      Frames = ("/usr/local/GNUstep/Apps/WMMail.app/Anims/NeXT/Mail1.xpm");
-+      Frames = ("@@X11BASE@@/GNUstep/Apps/WMMail.app/Anims/NeXT/Mail1.xpm");
-     };
-     New = {
-       Delay = 2;
-       Frames = (
--        "/usr/local/GNUstep/Apps/WMMail.app/Anims/NeXT/Mail1.xpm",
--        "/usr/local/GNUstep/Apps/WMMail.app/Anims/NeXT/Mail2.xpm",
--        "/usr/local/GNUstep/Apps/WMMail.app/Anims/NeXT/Mail3.xpm",
--        "/usr/local/GNUstep/Apps/WMMail.app/Anims/NeXT/Mail2.xpm"
-+        "@@X11BASE@@/GNUstep/Apps/WMMail.app/Anims/NeXT/Mail1.xpm",
-+        "@@X11BASE@@/GNUstep/Apps/WMMail.app/Anims/NeXT/Mail2.xpm",
-+        "@@X11BASE@@/GNUstep/Apps/WMMail.app/Anims/NeXT/Mail3.xpm",
-+        "@@X11BASE@@/GNUstep/Apps/WMMail.app/Anims/NeXT/Mail2.xpm"
-       );
-     };
-   };
-@@ -32,10 +32,10 @@
-       Name = "Home";
-       Type = mbox;
-       UpdateInterval = 15;
--      ExecuteOnUpdate = "/usr/local/bin/fetchmail";
-+      ExecuteOnUpdate = "@@LOCALBASE@@/bin/fetchmail";
-       Options = {
-         CheckTimeStampOnly = No;
--        Path = "/var/spool/mail/bryan";
-+        Path = "/var/mail/bryan";
-       };
-     },
-     {
+--- Makefile.in.orig	Wed Mar 31 05:34:59 1999
++++ Makefile.in	Sun Jun 27 12:42:49 1999
+@@ -90,13 +90,13 @@
+ DEFS = @DEFS@ -I. -I$(srcdir) 
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lSM -lICE
+ WMMail_OBJECTS =  global.o imap.o list.o maildir.o mbox.o mh.o net.o \
+ pop3.o properties.o std_icons.o wmmail.o wmutil.o
+ WMMail_LDADD = $(LDADD)
+ WMMail_DEPENDENCIES = 
+ WMMail_LDFLAGS = 
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -DPREFIX=\"@prefix@\"
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
diff --git a/mail/wmmail/patches/patch-ab b/mail/wmmail/patches/patch-ab
index 4268954547b..e51f979aa78 100644
--- a/mail/wmmail/patches/patch-ab
+++ b/mail/wmmail/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 1999/01/30 14:19:00 tron Exp $
+$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	Sat Jan 30 14:37:40 1999
-@@ -319,15 +319,12 @@
++++ wmutil.c	Sun Jun 27 12:37:41 1999
+@@ -319,15 +320,12 @@
      if (path = check_file(prefix, folders, resource))
        return path;
  
diff --git a/mail/wmmail/patches/patch-ac b/mail/wmmail/patches/patch-ac
deleted file mode 100644
index 75a7bacf6c0..00000000000
--- a/mail/wmmail/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.3 1999/02/22 01:53:15 tron Exp $
-
---- configure.orig	Sat Jan 16 06:30:00 1999
-+++ configure	Mon Feb 22 02:51:07 1999
-@@ -2459,12 +2459,13 @@
-  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
- $ac_vpsub
- $extrasub
--s%@CFLAGS@%$CFLAGS%g
-+s%@CFLAGS@%$CFLAGS -DPREFIX=\\"$prefix\\"%g
- s%@CPPFLAGS@%$CPPFLAGS%g
- s%@CXXFLAGS@%$CXXFLAGS%g
- s%@DEFS@%$DEFS%g
- s%@LDFLAGS@%$LDFLAGS%g
--s%@LIBS@%$LIBS%g
-+s%@LIBS@%$LIBS -lSM -lICE%g
-+s%@SHELL@%$SHELL%g
- s%@exec_prefix@%$exec_prefix%g
- s%@prefix@%$prefix%g
- s%@program_transform_name@%$program_transform_name%g
diff --git a/mail/wmmail/pkg/PLIST b/mail/wmmail/pkg/PLIST
index a2c4383e49c..a1815873686 100644
--- a/mail/wmmail/pkg/PLIST
+++ b/mail/wmmail/pkg/PLIST
@@ -1,4 +1,52 @@
-@comment $NetBSD: PLIST,v 1.3 1999/03/20 00:23:55 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 1999/06/27 10:51:49 tron Exp $
+GNUstep/Apps/WMMail.app/Anims/NeXT/Mail1.xpm
+GNUstep/Apps/WMMail.app/Anims/NeXT/Mail2.xpm
+GNUstep/Apps/WMMail.app/Anims/NeXT/Mail3.xpm
+GNUstep/Apps/WMMail.app/Anims/asmail/asmail-new.xpm
+GNUstep/Apps/WMMail.app/Anims/asmail/asmail-no.xpm
+GNUstep/Apps/WMMail.app/Anims/asmail/asmail-old.xpm
+GNUstep/Apps/WMMail.app/Anims/e/e-no.xpm
+GNUstep/Apps/WMMail.app/Anims/e/e0.xpm
+GNUstep/Apps/WMMail.app/Anims/e/e1.xpm
+GNUstep/Apps/WMMail.app/Anims/e/e10.xpm
+GNUstep/Apps/WMMail.app/Anims/e/e11.xpm
+GNUstep/Apps/WMMail.app/Anims/e/e2.xpm
+GNUstep/Apps/WMMail.app/Anims/e/e3.xpm
+GNUstep/Apps/WMMail.app/Anims/e/e4.xpm
+GNUstep/Apps/WMMail.app/Anims/e/e5.xpm
+GNUstep/Apps/WMMail.app/Anims/e/e6.xpm
+GNUstep/Apps/WMMail.app/Anims/e/e7.xpm
+GNUstep/Apps/WMMail.app/Anims/e/e8.xpm
+GNUstep/Apps/WMMail.app/Anims/e/e9.xpm
+GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e0.xpm
+GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e1.xpm
+GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e10.xpm
+GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e11.xpm
+GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e2.xpm
+GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e3.xpm
+GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e4.xpm
+GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e5.xpm
+GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e6.xpm
+GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e7.xpm
+GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e8.xpm
+GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-e9.xpm
+GNUstep/Apps/WMMail.app/Anims/monitor-e/monitor-no.xpm
+GNUstep/Apps/WMMail.app/Defaults/WMMail
+GNUstep/Apps/WMMail.app/Sounds/NewMail.au
+GNUstep/Apps/WMMail.app/Sounds/NoMail.au
+GNUstep/Apps/WMMail.app/Sounds/bark.au
+GNUstep/Apps/WMMail.app/Sounds/bass_snap.au
+GNUstep/Apps/WMMail.app/Sounds/clink.au
+GNUstep/Apps/WMMail.app/Sounds/doorbell.au
+GNUstep/Apps/WMMail.app/Sounds/drip.au
+GNUstep/Apps/WMMail.app/Sounds/hammer.au
+GNUstep/Apps/WMMail.app/Sounds/monkey.au
 GNUstep/Apps/WMMail.app/WMMail
-etc/WindowMaker/WMMail
+@dirrm GNUstep/Apps/WMMail.app/Sounds
+@dirrm GNUstep/Apps/WMMail.app/Defaults
+@dirrm GNUstep/Apps/WMMail.app/Anims/monitor-e
+@dirrm GNUstep/Apps/WMMail.app/Anims/e
+@dirrm GNUstep/Apps/WMMail.app/Anims/asmail
+@dirrm GNUstep/Apps/WMMail.app/Anims/NeXT
+@dirrm GNUstep/Apps/WMMail.app/Anims
 @dirrm GNUstep/Apps/WMMail.app