--envbJBWh7q8WU6mo
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Mon, Nov 21, 2005 at 07:08:16PM +0100, Matthias Andree wrote:
> bogofilter 1.0.0 is near, and 0.96.6 is our current stable release and
> the hopefully last release candidate.
> 
> It would be very nice if someone could look into updating the package to
> 0.96.6 so that it gets some testing and we can fix final remaining issues
> in the upstream.

Here's an update of mail/bogofilter to 0.96.6.  I'm not sure about the
removal of patch-ac though; bogofilter 0.96.6 has something similar but
not identical.  

	Geert

--envbJBWh7q8WU6mo
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="bogofilter.diff"

Index: Makefile
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/mail/bogofilter/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- Makefile	18 Jul 2005 00:07:21 -0000	1.29
+++ Makefile	21 Nov 2005 19:06:26 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.29 2005/07/18 00:07:21 seb Exp $
 
-DISTNAME=	bogofilter-0.92.8
-PKGREVISION=	3
+DISTNAME=	bogofilter-0.96.6
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bogofilter/}
 EXTRACT_SUFX=	.tar.bz2
Index: PLIST
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/mail/bogofilter/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- PLIST	9 Feb 2004 00:59:06 -0000	1.3
+++ PLIST	21 Nov 2005 19:06:26 -0000
@@ -1,9 +1,15 @@
 @comment $NetBSD: PLIST,v 1.3 2004/02/09 00:59:06 snj Exp $
+bin/bf_compact
+bin/bf_copy
+bin/bf_tar
 bin/bogofilter
 bin/bogolexer
 bin/bogotune
 bin/bogoupgrade
 bin/bogoutil
+man/man1/bf_compact.1
+man/man1/bf_copy.1
+man/man1/bf_tar.1
 man/man1/bogofilter.1
 man/man1/bogolexer.1
 man/man1/bogotune.1
Index: distinfo
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/mail/bogofilter/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo	24 Feb 2005 09:59:20 -0000	1.15
+++ distinfo	21 Nov 2005 19:06:26 -0000
@@ -1,8 +1,7 @@
 $NetBSD: distinfo,v 1.15 2005/02/24 09:59:20 agc Exp $
 
-SHA1 (bogofilter-0.92.8.tar.bz2) = ffaf181f71dfee7d4475d5c20fed4a8f50a3e7c4
-RMD160 (bogofilter-0.92.8.tar.bz2) = 72b3d7426fca787fcb774b8d6c540a4668796e35
-Size (bogofilter-0.92.8.tar.bz2) = 637420 bytes
-SHA1 (patch-aa) = 2ce311616845a75aa978f96f5792db65b66539d5
+SHA1 (bogofilter-0.96.6.tar.bz2) = ce6ea4e9b1dd1342aa102816356f0bd6bbdb536a
+RMD160 (bogofilter-0.96.6.tar.bz2) = 501fc9b4e65c23133dc517a8a3fb5f98669a87a9
+Size (bogofilter-0.96.6.tar.bz2) = 746286 bytes
+SHA1 (patch-aa) = 1609c132d8c35e04b82c45815461a1ca36223c16
 SHA1 (patch-ab) = f55a9956d82f56cef686a9125983ec5fd6942809
-SHA1 (patch-ac) = 9bfbb24fcf719f256512cd422973deaf5c52d2e6
Index: patches/patch-aa
===================================================================
RCS file: /pub/NetBSD-CVS/pkgsrc/mail/bogofilter/patches/patch-aa,v
retrieving revision 1.3
diff -u -r1.3 patch-aa
--- patches/patch-aa	26 Oct 2004 05:41:41 -0000	1.3
+++ patches/patch-aa	21 Nov 2005 19:06:26 -0000
@@ -1,24 +1,24 @@
 $NetBSD: patch-aa,v 1.3 2004/10/26 05:41:41 snj Exp $
 
---- Makefile.in.orig	2004-10-19 17:39:42.000000000 -0700
-+++ Makefile.in	2004-10-25 22:11:33.000000000 -0700
-@@ -204,6 +204,7 @@ SYSCONFDIR = @sysconfdir@
+--- Makefile.in.orig	2005-11-12 23:36:29.000000000 +0100
++++ Makefile.in
+@@ -258,6 +258,7 @@ SYSCONFDIR = @sysconfdir@
  
  # what to build
  sysconf_DATA = bogofilter.cf.example
 +egdir = $(prefix)/share/examples/bogofilter
  
  # what to distribute
- EXTRA_DIST = autogen.sh gsl config.rpath \
-@@ -254,14 +255,8 @@ bogofilter.spec: $(top_builddir)/config.
- 	cd $(top_builddir) && $(SHELL) ./config.status $@
+ EXTRA_DIST = autogen.sh gsl config.rpath bogofilter.cf.example \
+@@ -361,14 +362,8 @@ bogogrep.obj: contrib/bogogrep.c
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bogogrep.obj `if test -f 'contrib/bogogrep.c'; then $(CYGPATH_W) 'contrib/bogogrep.c'; else $(CYGPATH_W) '$(srcdir)/contrib/bogogrep.c'; fi`
  uninstall-info-am:
  install-sysconfDATA: $(sysconf_DATA)
 -	@$(NORMAL_INSTALL)
 -	test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
 -	@list='$(sysconf_DATA)'; for p in $$list; do \
 -	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+-	  f=$(am__strip_dir) \
 -	  echo " $(sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
 -	  $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
 -	done
Index: patches/patch-ac
===================================================================
RCS file: patches/patch-ac
diff -N patches/patch-ac
--- patches/patch-ac	17 Jan 2005 15:22:33 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/01/17 15:22:33 wiz Exp $
-
---- src/datastore_db.c.orig	2004-09-28 23:28:04.000000000 -0400
-+++ src/datastore_db.c
-@@ -237,7 +237,11 @@ static uint32_t get_psize(DB *dbp)
-     uint32_t ret, pagesize;
-     DB_BTREE_STAT *dbstat = NULL;
- 
-+#if (DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 3)
-+    ret = dbp->stat(dbp, NULL, &dbstat, DB_FAST_STAT);
-+#else
-     ret = dbp->stat(dbp, &dbstat, DB_FAST_STAT);
-+#endif
-     if (ret) {
- 	dbp->err (dbp, ret, "%s (db) DB->stat", progname);
- 	return 0xffffffff;

--envbJBWh7q8WU6mo--