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

On Wed, Oct 24, 2007 at 12:56:34PM +0200, Hubert Feyrer wrote:
> I can't do any testing beyond installing right now. Please test the patch
> below, and let me know if the resulting package works for you, within the
> next few days. I can commit it then, as soon as I get your OK.


I'd also add options for the new PNG and JPEG scanning support (see attach).
I'll run with the new version for a few days before committing this.


> >(Also, did it have to be re-named/versioned to 1.4.2 in pkgsrc?  Does
> >pkgsrc versioning for the source product not support "1.4b" type
> >versioning?)
> 
> Apparently it does:
> 
> 	yui% pkg_admin pmatch 'foo>1.4' 'foo-1.5' ; echo $?
> 	0
> 	yui% pkg_admin pmatch 'foo>1.4' 'foo-1.3' ; echo $?
> 	1
> 
> ... works as expected, and...
> 
> 	yui% pkg_admin pmatch 'foo>1.4b' 'foo-1.4c' ; echo $?
> 	0
> 	yui% pkg_admin pmatch 'foo>1.4b' 'foo-1.4a' ; echo $?
> 	1
> 
> ... works as well. I have NFI why the scheme was chosen. :(
> Geert?


Because it's a much more common scheme?


Regarding patch-aa: apparantly it was added to fix building with gcc4.  As I'm
running NetBSD 4.x (with gcc3),  can anyone else verify whether it builds with
gcc4 without patch-aa?  


	Geert



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

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/spamprobe/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile	4 Aug 2006 20:12:31 -0000	1.17
+++ Makefile	25 Oct 2007 09:05:52 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.17 2006/08/04 20:12:31 ghen Exp $
 
-DISTNAME=	spamprobe-1.4b
-PKGNAME=	spamprobe-1.4.2
+DISTNAME=	spamprobe-1.4d
+PKGNAME=	spamprobe-1.4.4
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=spamprobe/}
 
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/spamprobe/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo	13 Aug 2006 10:13:42 -0000	1.11
+++ distinfo	25 Oct 2007 09:05:52 -0000
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.11 2006/08/13 10:13:42 wiz Exp $
 
-SHA1 (spamprobe-1.4b.tar.gz) = a20a6c4a3ab831dd39b392c755170140d91cc372
-RMD160 (spamprobe-1.4b.tar.gz) = e3d08b6ea4eb603f4341b9c683a2092db3ba3aa5
-Size (spamprobe-1.4b.tar.gz) = 255023 bytes
+SHA1 (spamprobe-1.4d.tar.gz) = fbcd65eb21097cd860d5e5ee2c4c2524c717a237
+RMD160 (spamprobe-1.4d.tar.gz) = 4a9e098b92e6900d8b03d7ed5e8d052f2b2e8c56
+Size (spamprobe-1.4d.tar.gz) = 262761 bytes
 SHA1 (patch-aa) = d3367dbd5cb309c6629d174574daf9e2899ce62a
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mail/spamprobe/options.mk,v
retrieving revision 1.4
diff -u -r1.4 options.mk
--- options.mk	22 Feb 2007 19:26:44 -0000	1.4
+++ options.mk	25 Oct 2007 09:05:52 -0000
@@ -1,8 +1,8 @@
 # $NetBSD: options.mk,v 1.4 2007/02/22 19:26:44 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.spamprobe
-PKG_SUPPORTED_OPTIONS=		bdb gif
-PKG_SUGGESTED_OPTIONS=		gif
+PKG_SUPPORTED_OPTIONS=		bdb gif png jpeg
+PKG_SUGGESTED_OPTIONS=		gif png jpeg
 
 .include "../../mk/bsd.options.mk"
 
@@ -15,3 +15,11 @@
 .if !empty(PKG_OPTIONS:Mgif)
 .include "../../graphics/libungif/buildlink3.mk"
 .endif
+
+.if !empty(PKG_OPTIONS:Mpng)
+.include "../../graphics/png/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mjpg)
+.include "../../graphics/jpeg/buildlink3.mk"
+.endif

--Kj7319i9nmIyA2yE--