From ca3b258b0bac903caa534d5146da0ed150ff521a Mon Sep 17 00:00:00 2001
From: jakob <jakob@openbsd.org>
Date: Mon, 19 Nov 2007 09:18:18 +0000
Subject: [PATCH] update to v4; from okan

---
 mail/milter-greylist/Makefile                 | 18 ++++++++---
 mail/milter-greylist/distinfo                 | 10 +++----
 .../patches/patch-greylist_conf               | 30 ++++++++++++-------
 mail/milter-greylist/pkg/PLIST                |  9 ++++--
 4 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index 2160d376e7a..6c29c3fd137 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2007/09/16 00:17:05 merdely Exp $
+# $OpenBSD: Makefile,v 1.5 2007/11/19 09:18:18 jakob Exp $
 
 COMMENT=	greylist milter
 
-DISTNAME=	milter-greylist-3.0
+DISTNAME=	milter-greylist-4.0
 PKGNAME=	${DISTNAME}
 CATEGORIES=	mail
 HOMEPAGE=	http://hcpnet.free.fr/milter-greylist/
@@ -22,11 +22,21 @@ WANTLIB=	c pthread milter
 
 BUILD_DEPENDS=	::devel/bison
 
-USERNAME=	_milter-greylist
+USERNAME=	_milter-greylist:_milter-greylist
+GREYLISTDIR=	/var/db/milter-greylist
 EXAMPLESDIR=	share/examples/milter-greylist
 
+SUBST_VARS=	GREYLISTDIR
+
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	--with-user=${USERNAME}
+CONFIGURE_ARGS+=	--with-user=${USERNAME} \
+			--with-dumpfile=${GREYLISTDIR}/greylist.db
+
+pre-configure:
+	@perl -pi -e 's,!!USERNAME!!,${USERNAME},; \
+		s,!!GREYLISTDIR!!,${GREYLISTDIR},' ${WRKSRC}/greylist.conf
+	@perl -pi -e 's,!!GREYLISTDIR!!,${GREYLISTDIR},' \
+		${WRKSRC}/greylist.conf.5 ${WRKSRC}/milter-greylist.8
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/milter-greylist ${PREFIX}/libexec
diff --git a/mail/milter-greylist/distinfo b/mail/milter-greylist/distinfo
index c390816cc25..a0eec79cd6c 100644
--- a/mail/milter-greylist/distinfo
+++ b/mail/milter-greylist/distinfo
@@ -1,5 +1,5 @@
-MD5 (milter-greylist-3.0.tgz) = /91ViMeKQFwQfUyKQMfgGg==
-RMD160 (milter-greylist-3.0.tgz) = Y5GIO+kHax95CrWCBwsVK4DiBQw=
-SHA1 (milter-greylist-3.0.tgz) = OLM0MA/hFBqDKf4Zh1TmMoaYESk=
-SHA256 (milter-greylist-3.0.tgz) = iWLCm3MOsCToPRQvjC/zb/xBtl9hEcpnB3Uhc7JcjNA=
-SIZE (milter-greylist-3.0.tgz) = 141461
+MD5 (milter-greylist-4.0.tgz) = KDSTOycpjTBjDupiHL/c9Q==
+RMD160 (milter-greylist-4.0.tgz) = 6EMpSR6gYERUmq+/Zb+K30wBlWs=
+SHA1 (milter-greylist-4.0.tgz) = 6UyMin7VzydVDrafZgx9dcYPasE=
+SHA256 (milter-greylist-4.0.tgz) = izSAYq+PRoeaIaGQBw1yYWU2Nl9uHjGO/xjD/LAkyHU=
+SIZE (milter-greylist-4.0.tgz) = 185107
diff --git a/mail/milter-greylist/patches/patch-greylist_conf b/mail/milter-greylist/patches/patch-greylist_conf
index f20de39e16d..fc4deae82ef 100644
--- a/mail/milter-greylist/patches/patch-greylist_conf
+++ b/mail/milter-greylist/patches/patch-greylist_conf
@@ -1,12 +1,20 @@
-$OpenBSD: patch-greylist_conf,v 1.2 2006/11/22 22:26:31 jakob Exp $
---- greylist.conf.orig	Wed Sep 27 22:03:49 2006
-+++ greylist.conf	Wed Nov 22 15:54:29 2006
-@@ -8,7 +8,7 @@
- pidfile "/var/run/milter-greylist.pid"
- socket "/var/milter-greylist/milter-greylist.sock"
- dumpfile "/var/milter-greylist/greylist.db"
--user "smmsp"
-+user "_milter-greylist"
+$OpenBSD: patch-greylist_conf,v 1.3 2007/11/19 09:18:18 jakob Exp $
+--- greylist.conf.orig	Wed Oct 24 23:20:11 2007
++++ greylist.conf	Wed Nov  7 11:35:35 2007
+@@ -6,12 +6,12 @@
+ #
  
- # Be verbose (or use -v flag)
- #verbose
+ pidfile "/var/run/milter-greylist.pid"
+-socket "/var/milter-greylist/milter-greylist.sock"
+-dumpfile "/var/milter-greylist/greylist.db"
+-user "smmsp"
++socket "!!GREYLISTDIR!!/milter-greylist.sock"
++dumpfile "!!GREYLISTDIR!!/greylist.db"
++user "!!USERNAME!!"
+ 
+ # Log milter-greylist activity to a file
+-#stat "/var/milter-greylist/greylist.log" \
++#stat "!!GREYLISTDIR!!/greylist.log" \
+ #      "%T{%Y/%m/%d %T} %d [%i] %r -> %f %S (ACL %A) %Xc %Xe %Xm %Xh"
+ # Same, sent to syslog
+ #stat "|logger -p local7.info" \
diff --git a/mail/milter-greylist/pkg/PLIST b/mail/milter-greylist/pkg/PLIST
index dac4f83729b..32103d95bdb 100644
--- a/mail/milter-greylist/pkg/PLIST
+++ b/mail/milter-greylist/pkg/PLIST
@@ -1,11 +1,14 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2006/07/31 12:36:43 jakob Exp $
-@newuser _milter-greylist:568::daemon:milter-greylist Account:/nonexistent:/sbin/nologin
+@comment $OpenBSD: PLIST,v 1.2 2007/11/19 09:18:18 jakob Exp $
+@newgroup _milter-greylist:568
+@newuser _milter-greylist:568:_milter-greylist:daemon:milter-greylist Account:/nonexistent:/sbin/nologin
 libexec/milter-greylist
 @man man/man5/greylist.conf.5
 @man man/man8/milter-greylist.8
 share/examples/milter-greylist/
+@sample ${SYSCONFDIR}/mail/
 share/examples/milter-greylist/greylist.conf
 @sample ${SYSCONFDIR}/mail/greylist.conf
 @mode 0755
+@group _milter-greylist
 @owner _milter-greylist
-@sample /var/db/milter-greylist/
+@sample ${GREYLISTDIR}/