Update "wmbiff" package to version 0.4.13. This version fix numerous

bugs discovered this version 0.3.1 and adds many features like e.g.
IPv6 support.

5 files changed, 54 insertions, 101 deletions

diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index bd03a6cce8f..b5c745815f9 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -1,20 +1,25 @@
-# $NetBSD: Makefile,v 1.6 2002/10/21 12:35:54 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/01/31 12:57:07 tron Exp $
 
-DISTNAME=	wmbiff-0.3.1
-PKGREVISION=	1
+DISTNAME=	wmbiff-0.4.13
 CATEGORIES=	mail x11
 MASTER_SITES=	$(MASTER_SITE_SOURCEFORGE:=wmbiff/)
 
-MAINTAINER=	magick@zhadum.de
+MAINTAINER=	tron@zhadum.de
 HOMEPAGE=	http://sourceforge.net/projects/wmbiff/
 COMMENT=	xbuffy like "mail-checker" for WindowMaker
 
+GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
 USE_X11=	YES
 USE_GMAKE=	YES
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/wmbiff
+EX_DIR=		${PREFIX}/share/examples/wmbiff
 
+post-install:
+	${INSTALL_DATA_DIR} ${EX_DIR}
+	${INSTALL_DATA} ${WRKSRC}/wmbiff/sample.wmbiffrc ${EX_DIR}
+
+.include "../../devel/rx/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
 .include "../../wm/windowmaker/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/wmbiff/PLIST b/mail/wmbiff/PLIST
index 47ab6aeb90c..f36d06c5adf 100644
--- a/mail/wmbiff/PLIST
+++ b/mail/wmbiff/PLIST
@@ -1,6 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:01:42 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/31 12:57:07 tron Exp $
 bin/wmbiff
 man/man1/wmbiff.1
 man/man5/wmbiffrc.5
 share/examples/wmbiff/sample.wmbiffrc
+share/wmbiff/skins/wmbiff-master-contrast.xpm
+share/wmbiff/skins/wmbiff-master-led.xpm
 @dirrm share/examples/wmbiff
+@dirrm share/wmbiff/skins
+@dirrm share/wmbiff
diff --git a/mail/wmbiff/distinfo b/mail/wmbiff/distinfo
index 7e010d35214..da2303cfe83 100644
--- a/mail/wmbiff/distinfo
+++ b/mail/wmbiff/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2001/11/14 08:14:58 tron Exp $
+$NetBSD: distinfo,v 1.6 2003/01/31 12:57:07 tron Exp $
 
-SHA1 (wmbiff-0.3.1.tar.gz) = b2fd9ace17e4eed24004722c21b1f6bf3f5fc3e0
-Size (wmbiff-0.3.1.tar.gz) = 29165 bytes
-SHA1 (patch-aa) = d8970d6752651e13537e2e7af769e092e5706df3
-SHA1 (patch-ab) = 1c1cda1ec1e3727d2a1dd5ca58ceecededbe1eeb
+SHA1 (wmbiff-0.4.13.tar.gz) = 3e8efffb6a2d0456b88bc4f0f990ffaf41f8fa10
+Size (wmbiff-0.4.13.tar.gz) = 176897 bytes
+SHA1 (patch-aa) = 2007bd498ef54b6fc9779092bcf0771e41dec8e0
+SHA1 (patch-ab) = 297984c76e062f11ead42a2b834ab9dc81d2bdd5
diff --git a/mail/wmbiff/patches/patch-aa b/mail/wmbiff/patches/patch-aa
index 6ddb0913b2b..62632481a2e 100644
--- a/mail/wmbiff/patches/patch-aa
+++ b/mail/wmbiff/patches/patch-aa
@@ -1,71 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2001/11/14 08:14:59 tron Exp $
+$NetBSD: patch-aa,v 1.5 2003/01/31 12:57:08 tron Exp $
 
---- Makefile.orig	Sun Jun 24 20:31:25 2001
-+++ Makefile	Thu Nov  1 12:35:28 2001
-@@ -2,16 +2,18 @@
- WMBIFF_VERSION="0.3.1"
- DESTDIR=
--prefix=/usr/local
-+prefix=${PREFIX}
- bindir=${prefix}/bin
--mandir=${prefix}/share/man
-+mandir=${prefix}/man
-+datadir=${prefix}/share/examples/wmbiff
-+
- CONF=/etc
- 
- CC     = gcc
--LIBDIR = -L/usr/X11R6/lib
-+LIBDIR = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
- LIBS   = -lXpm -lXext -lX11
--CFLAGS = -O2 -Wall
- #CFLAGS = -g -Wall -pedantic 
--
-+#CFLAGS += -Wall -I${PREFIX}/include -I${X11BASE}/include
-+CFLAGS+= -I${X11BASE}/include -I${LOCALBASE}/include
- EXTRAFLAGS = -DWMBIFF_VERSION='$(WMBIFF_VERSION)'
- #EXTRAFLAGS += -DDEBUG_POP3 -DDEBUG_IMAP4 -DDEBUG_LICQ \
- #	-DDEBUG_MBOX -DDEBUG_MAILDIR -DDEBUG -DDEBUG_MAIL_COUNT
-@@ -24,14 +26,8 @@
- 	../wmgeneral/list.o \
- 	charutil.o
- 
--INSTALL = /usr/bin/install
--INSTALL_DIR	= $(INSTALL) -p -d -o root -g root -m 755
--INSTALL_PROGRAM	= $(INSTALL) -p -o root -g root -m 755
--INSTALL_FILE 	= $(INSTALL) -p -o root -g root -m 644
--
--
- .c.o:
--	$(CC) $(CFLAGS) $(EXTRAFLAGS) -c $< -o $*.o
-+	${CC} ${CFLAGS} $(EXTRAFLAGS) -c $< -o $*.o
- 
- all: wmbiff-master.xpm wmbiff
- 
-@@ -39,7 +35,7 @@
- 	ln -s wmbiff-master-led.xpm wmbiff-master.xpm
- 
- wmbiff:	$(OBJS)
--	$(CC) $(CFLAGS) $(EXTRAFLAGS) -o wmbiff -lX11 -lnsl $^ $(LIBDIR) $(LIBS)
-+	$(CC) ${CFLAGS} ${LDFLAGS} $(EXTRAFLAGS) -o wmbiff -lX11 $^ $(LIBDIR) $(LIBS)
- 
- clean:
- 	for i in $(OBJS) ; do \
-@@ -50,12 +46,11 @@
- distclean: clean
- 
- install: wmbiff
--	$(INSTALL_DIR) $(DESTDIR)$(bindir)
--	$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
--	$(INSTALL_DIR) $(DESTDIR)$(mandir)/man5
--	$(INSTALL_PROGRAM) wmbiff $(DESTDIR)$(bindir)
--	$(INSTALL_FILE) wmbiff.1 $(DESTDIR)$(mandir)/man1
--	$(INSTALL_FILE) wmbiffrc.5 $(DESTDIR)$(mandir)/man5
-+	${BSD_INSTALL_PROGRAM} wmbiff $(DESTDIR)$(bindir)
-+	${BSD_INSTALL_MAN} wmbiff.1 $(DESTDIR)$(mandir)/man1
-+	${BSD_INSTALL_MAN} wmbiffrc.5 $(DESTDIR)$(mandir)/man5
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)/$(datadir)
-+	${BSD_INSTALL_DATA} sample.wmbiffrc $(DESTDIR)$(datadir)/
- 
- # CODING STYLE AND INDENTATION [2001-Mar-12]:
- #
+--- Makefile.in.orig	Sat Jan 25 05:31:04 2003
++++ Makefile.in	Thu Jan 30 13:39:32 2003
+@@ -120,7 +120,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = wmgeneral wmbiff autoconf scripts
++SUBDIRS = wmgeneral wmbiff autoconf
+ EXTRA_DIST = ChangeLog FAQ README.licq TODO
+ 
+ ACLOCAL_FLAGS = -I autoconf
diff --git a/mail/wmbiff/patches/patch-ab b/mail/wmbiff/patches/patch-ab
index 57720638ac7..069f25fc3a4 100644
--- a/mail/wmbiff/patches/patch-ab
+++ b/mail/wmbiff/patches/patch-ab
@@ -1,28 +1,30 @@
-$NetBSD: patch-ab,v 1.2 2001/07/04 19:04:16 magick Exp $
+$NetBSD: patch-ab,v 1.3 2003/01/31 12:57:08 tron Exp $
 
---- wmbiff.c.orig	Sun Jun 24 20:31:25 2001
-+++ wmbiff.c
-@@ -18,6 +18,10 @@
- #include <X11/Xlib.h>
- #include <X11/xpm.h>
+--- wmbiff/wmbiff.c.orig	Sat Jan 25 07:02:17 2003
++++ wmbiff/wmbiff.c	Thu Jan 30 13:30:38 2003
+@@ -24,6 +24,14 @@
+ #include <errno.h>
+ #include <string.h>
  
-+#ifdef __NetBSD__
++#if defined(FreeBSD) || defined(__NetBSD__) || defined(__OpenBSD__)
 +#include <paths.h>
 +#endif
 +
++#ifndef _PATH_MAILDIR
++#define _PATH_MAILDIR "/var/mail"
++#endif
++
  #include "../wmgeneral/wmgeneral.h"
  #include "../wmgeneral/misc.h"
  
-@@ -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 "/");
-+#else
-+
- 		strcpy(mbox[0].path, "/var/mail/");
-+#endif
- 		strcat(mbox[0].path, m);
- 	}
- 
+@@ -363,8 +371,8 @@
+ 			strcpy(mbox[0].path, m);
+ 		} else if ((m = getenv("USER")) != NULL) {
+ 			/* we are using MAIL environment var. type mbox */
+-			DMA(DEBUG_INFO, "Using /var/mail/%s.\n", m);
+-			strcpy(mbox[0].path, "/var/mail/");
++			DMA(DEBUG_INFO, "Using " _PATH_MAILDIR "/%s.\n", m);
++			strcpy(mbox[0].path, _PATH_MAILDIR);
+ 			strcat(mbox[0].path, m);
+ 		} else {
+ 			DMA(DEBUG_ERROR, "Cannot open config file '%s' nor use the "