Update wmbiff to 0.3.1

Changes since 0.3.0:
  * Replaced /var/spool/mail with /var/mail, which is what the FHS mandates.
    All decent systems should have either the directory or a symlink pointing
    somewhere else. (Jordi Mallach)
  * I reformatted ths changelog, again.  I hope this is the last time I need
    to do this.  The CVS logs should be used for all changes, and this file
    should by updated for user-visible changes only, from now on.
    (Dwayne C. Litzenberger)
  * Updated the README to reflect that Gennady Belyakov died right after
    releasing wmBiff 0.2.  May your soul rest in peace, Gennady.
    (Dwayne C. Litzenberger)
  * Fixed the IMAP support, again. (Rob Funk)

2 files changed, 27 insertions, 25 deletions

diff --git a/mail/wmbiff/patches/patch-aa b/mail/wmbiff/patches/patch-aa
index 703ec26dbd5..4db2657843c 100644
--- a/mail/wmbiff/patches/patch-aa
+++ b/mail/wmbiff/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/05/29 05:45:40 tron Exp $
+$NetBSD: patch-aa,v 1.2 2001/07/04 19:04:16 magick Exp $
 
---- Makefile.orig	Wed May 16 12:13:25 2001
-+++ Makefile	Tue May 29 07:33:03 2001
-@@ -1,12 +1,14 @@
- WMBIFF_VERSION="0.3.0"
+--- Makefile.orig	Sun Jun 24 20:31:25 2001
++++ Makefile
+@@ -2,7 +2,9 @@
+ WMBIFF_VERSION="0.3.1"
  DESTDIR=
 -prefix=/usr/local
 +prefix=${PREFIX}
@@ -13,15 +13,18 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/05/29 05:45:40 tron Exp $
 +datadir=${prefix}/share/examples/wmbiff
 +
  CONF=/etc
+ 
+@@ -10,7 +12,7 @@
  LIBDIR = -L/usr/X11R6/lib
  LIBS   = -lXpm -lXext -lX11
 -CFLAGS = -O2 -Wall
-+CFLAGS += -Wall -I${PREFIX}/include -I${X11BASE}/include
  #CFLAGS = -g -Wall -pedantic 
- 
+-
++#CFLAGS += -Wall -I${PREFIX}/include -I${X11BASE}/include
++CFLAGS+= -I${X11BASE}/include
  EXTRAFLAGS = -DWMBIFF_VERSION='$(WMBIFF_VERSION)'
-@@ -21,12 +23,6 @@
- 	../wmgeneral/list.o \
+ #EXTRAFLAGS += -DDEBUG_POP3 -DDEBUG_IMAP4 -DDEBUG_LICQ \
+@@ -25,12 +27,6 @@
  	charutil.o
  
 -INSTALL = /usr/bin/install
@@ -31,19 +34,18 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/05/29 05:45:40 tron Exp $
 -
 -
  .c.o:
- 	gcc  $(CFLAGS) $(EXTRAFLAGS) -c $< -o $*.o
+-	$(CC) $(CFLAGS) $(EXTRAFLAGS) -c $< -o $*.o
++	${CC} ${CFLAGS} $(EXTRAFLAGS) -c $< -o $*.o
  
-@@ -36,7 +32,7 @@
- 	ln -s wmbiff-master-led.xpm wmbiff-master.xpm
+ all: wmbiff-master.xpm wmbiff
+@@ -40,5 +36,5 @@
  
  wmbiff:	$(OBJS)
--	gcc $(CFLAGS) $(EXTRAFLAGS) -o wmbiff -lX11 -lnsl $^ $(LIBDIR) $(LIBS)
-+	gcc $(CFLAGS) $(EXTRAFLAGS) -o wmbiff -lX11 $^ ${LDFLAGS} $(LIBDIR) $(LIBS)
+-	$(CC) $(CFLAGS) $(EXTRAFLAGS) -o wmbiff -lX11 -lnsl $^ $(LIBDIR) $(LIBS)
++	$(CC) ${CFLAGS} ${LDFLAGS} $(EXTRAFLAGS) -o wmbiff -lX11 $^ $(LIBDIR) $(LIBS)
  
  clean:
- 	for i in $(OBJS) ; do \
-@@ -45,12 +41,11 @@
- 	rm -f wmbiff *~ tags core wmbiff-master.xpm
+@@ -51,10 +47,9 @@
  
  install: wmbiff
 -	$(INSTALL_DIR) $(DESTDIR)$(bindir)
@@ -59,4 +61,3 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/05/29 05:45:40 tron Exp $
 +	${BSD_INSTALL_DATA} sample.wmbiffrc $(DESTDIR)$(datadir)/
  
  # CODING STYLE AND INDENTATION [2001-Mar-12]:
- #
diff --git a/mail/wmbiff/patches/patch-ab b/mail/wmbiff/patches/patch-ab
index fb8a67a15c3..57720638ac7 100644
--- a/mail/wmbiff/patches/patch-ab
+++ b/mail/wmbiff/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/05/29 05:45:40 tron Exp $
+$NetBSD: patch-ab,v 1.2 2001/07/04 19:04:16 magick Exp $
 
---- wmbiff.c.orig	Wed May 16 12:14:08 2001
-+++ wmbiff.c	Tue May 29 07:35:38 2001
-@@ -17,6 +17,10 @@
+--- wmbiff.c.orig	Sun Jun 24 20:31:25 2001
++++ wmbiff.c
+@@ -18,6 +18,10 @@
  #include <X11/Xlib.h>
  #include <X11/xpm.h>
  
@@ -13,14 +13,15 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/05/29 05:45:40 tron Exp $
  #include "../wmgeneral/wmgeneral.h"
  #include "../wmgeneral/misc.h"
  
-@@ -76,7 +80,11 @@
+@@ -77,7 +81,12 @@
  	if ((m = getenv("MAIL")) != NULL) {
  		strcpy(mbox[0].path, m);
  	} else if ((m = getenv("USER")) != NULL) {
 +#ifdef  _PATH_MAILDIR
-+		strcpy(mbox[0].path, _PATH_MAILDIR "/");
++                 strcpy(mbox[0].path, _PATH_MAILDIR "/");
 +#else
- 		strcpy(mbox[0].path, "/var/spool/mail/");
++
+ 		strcpy(mbox[0].path, "/var/mail/");
 +#endif
  		strcat(mbox[0].path, m);
  	}