Update "milter-greylist" package to version 4.2rc1.

Changes since version 4.0.1:
- SpamAssassassin support
- Native LDAP support via OpenLDAP (off by default in pkgsrc)
- DKIM support (not supported in pkgsrc)
- P0f support
- A lot of bug fixes

pkgsrc related changes:
- Optional "curl" support for external URL checking

5 files changed, 61 insertions, 17 deletions

diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index 2f2a84ba25c..44005d27513 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2009/03/08 15:54:26 tron Exp $
+# $NetBSD: Makefile,v 1.41 2009/03/16 10:15:23 tron Exp $
 
-DISTNAME=	milter-greylist-4.0.1
-PKGREVISION=	2
+DISTNAME=	milter-greylist-4.2rc1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.espci.fr/pub/milter-greylist/
 EXTRACT_SUFX=	.tgz
diff --git a/mail/milter-greylist/distinfo b/mail/milter-greylist/distinfo
index 41512d6ab9a..300a8429faf 100644
--- a/mail/milter-greylist/distinfo
+++ b/mail/milter-greylist/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.21 2008/09/08 10:07:19 tron Exp $
+$NetBSD: distinfo,v 1.22 2009/03/16 10:15:23 tron Exp $
 
-SHA1 (milter-greylist-4.0.1.tgz) = d9303df869dc54ee35df9803f330aef748b74ecc
-RMD160 (milter-greylist-4.0.1.tgz) = 81369e05891b16886b0f531e66519760922debb5
-Size (milter-greylist-4.0.1.tgz) = 185978 bytes
-SHA1 (patch-aa) = 2e31f7db50a8aac45e21e4ae4642d0c6631e8c78
+SHA1 (milter-greylist-4.2rc1.tgz) = 039d8b63051d886725e79e4903cdfd022b5b96a9
+RMD160 (milter-greylist-4.2rc1.tgz) = c24f2c98e0ed3f4b2058d92c70bd23ea0f23b2cd
+Size (milter-greylist-4.2rc1.tgz) = 205151 bytes
+SHA1 (patch-aa) = b90849d16aa541ee70df67bb25dd53ce3df63e70
+SHA1 (patch-ab) = 3e4e3ea42977b7a8dfc983bd1359c7bc6ad8ca92
diff --git a/mail/milter-greylist/options.mk b/mail/milter-greylist/options.mk
index be1935d15dd..46e210dbafc 100644
--- a/mail/milter-greylist/options.mk
+++ b/mail/milter-greylist/options.mk
@@ -1,14 +1,23 @@
-# $NetBSD: options.mk,v 1.6 2009/03/08 15:54:26 tron Exp $
+# $NetBSD: options.mk,v 1.7 2009/03/16 10:15:23 tron Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.milter-greylist
 PKG_OPTIONS_REQUIRED_GROUPS=	mta
 PKG_OPTIONS_GROUP.mta=		postfix-milter sendmail-milter
-PKG_SUPPORTED_OPTIONS=		dnsrbl drac spf
-PKG_SUGGESTED_OPTIONS=		dnsrbl sendmail-milter spf
+PKG_SUPPORTED_OPTIONS=		curl dnsrbl drac ldap p0f spamassassin spf
+PKG_SUGGESTED_OPTIONS=		dnsrbl p0f sendmail-milter spamassassin spf
 
 .include "../../mk/bsd.options.mk"
 
 ###
+### URL checking
+###
+.if !empty(PKG_OPTIONS:Mcurl)
+.include "../../www/curl/buildlink3.mk"
+
+CONFIGURE_ARGS+=	--with-libcurl=${BUILDLINK_PREFIX.curl}
+.endif
+
+###
 ### DNS Realtime Black List
 ###
 .if !empty(PKG_OPTIONS:Mdnsrbl)
@@ -27,6 +36,22 @@ CONFIGURE_ARGS+=	--enable-drac --with-drac-db=${DRACD_DB}
 .endif
 
 ###
+### LDAP support
+###
+.if !empty(PKG_OPTIONS:Mldap)
+.include "../../databases/openldap-client/buildlink3.mk"
+
+CONFIGURE_ARGS+=	--with-openldap=${BUILDLINK_PREFIX.openldap-client}
+.endif
+
+###
+### P0f support
+###
+.if !empty(PKG_OPTIONS:Mp0f)
+CONFIGURE_ARGS+=	--enable-p0f
+.endif
+
+###
 ### Postfix support
 ###
 .if !empty(PKG_OPTIONS:Mpostfix-milter)
@@ -55,6 +80,13 @@ MILTER_USER=		smmsp
 .endif
 
 ###
+### SpamAssassin support
+###
+.if !empty(PKG_OPTIONS:Mspamassassin)
+CONFIGURE_ARGS+=	--enable-spamassassin
+.endif
+
+###
 ### Sender Policy Framework
 ###
 .if empty(PKG_OPTIONS:Mspf)
@@ -62,5 +94,5 @@ CONFIGURE_ARGS+=	--disable-libspf2
 .else
 .include "../../mail/libspf2/buildlink3.mk"
 
-CONFIGURE_ARGS+=	--with-libspf2=${PREFIX:Q}
+CONFIGURE_ARGS+=	--with-libspf2=${BUILDLINK_PREFIX.libspf2}
 .endif
diff --git a/mail/milter-greylist/patches/patch-aa b/mail/milter-greylist/patches/patch-aa
index fbc153065bd..b276018154a 100644
--- a/mail/milter-greylist/patches/patch-aa
+++ b/mail/milter-greylist/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2006/10/15 12:11:51 tron Exp $
+$NetBSD: patch-aa,v 1.2 2009/03/16 10:15:23 tron Exp $
 
---- Makefile.in.orig	2006-10-06 10:14:39.000000000 +0100
-+++ Makefile.in	2006-10-15 13:06:07.000000000 +0100
-@@ -121,7 +121,7 @@
+--- Makefile.in.orig	2008-09-27 00:35:44.000000000 +0100
++++ Makefile.in	2009-03-15 20:41:49.000000000 +0000
+@@ -126,7 +126,7 @@
  		echo "	================================================"; \
  	) || ${TRUE}
  
@@ -10,4 +10,4 @@ $NetBSD: patch-aa,v 1.1 2006/10/15 12:11:51 tron Exp $
 +install: install-daemon-to-bin install-man install-db
  
  depend:
- 	${MKDEP} ${CFLAGS} ${SRC}
+ 	${MKDEP} ${CPPFLAGS} ${CFLAGS} ${SRC}
diff --git a/mail/milter-greylist/patches/patch-ab b/mail/milter-greylist/patches/patch-ab
new file mode 100644
index 00000000000..da0739a4ba0
--- /dev/null
+++ b/mail/milter-greylist/patches/patch-ab
@@ -0,0 +1,12 @@
+$NetBSD: patch-ab,v 1.3 2009/03/16 10:15:23 tron Exp $
+
+--- prop.c.orig	2008-08-03 10:48:44.000000000 +0100
++++ prop.c	2009-03-16 09:08:52.000000000 +0000
+@@ -62,7 +62,6 @@
+ #include "spf.h"
+ #include "acl.h"
+ #include "conf.h"
+-#include "urlcheck.h"
+ #include "sync.h"
+ #include "prop.h"
+