- update postgrey to 1.34

- add an rc script (reload works).

ok jakob@

mail/postgrey/Makefile

@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.15 2010/11/19 07:23:09 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2011/05/06 08:40:06 sthen Exp $
 
 COMMENT=	postfix greylist daemon
 
-DISTNAME=	postgrey-1.32
-REVISION =	0
+DISTNAME=	postgrey-1.34
 CATEGORIES=	mail
 
 HOMEPAGE=	http://postgrey.schweikert.ch/
@@ -13,13 +12,12 @@ MASTER_SITES=	${HOMEPAGE}/pub/ \
 
 MAINTAINER=     Jakob Schlyter <jakob@openbsd.org>
 
-# GPL
+# GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-USE_GROFF =		Yes
 NO_BUILD=		Yes
 NO_REGRESS=		Yes
 
@@ -30,6 +28,7 @@ RUN_DEPENDS=		devel/p5-Net-Server \
 			net/p5-Net-DNS
 
 do-install:
+	perl -pi -e 's,/etc/postfix,${SYSCONFDIR}/postfix,g' ${WRKSRC}/postgrey
 	${INSTALL_SCRIPT} ${WRKSRC}/postgrey ${PREFIX}/libexec
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/postgreyreport ${PREFIX}/sbin
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/postgrey/

mail/postgrey/distinfo

@@ -1,5 +1,5 @@
-MD5 (postgrey-1.32.tar.gz) = UkpOFlv5l5lvO8yt45RxLw==
-RMD160 (postgrey-1.32.tar.gz) = hiVTmRZaGR6KSUCNANHCNKsMmr0=
-SHA1 (postgrey-1.32.tar.gz) = e33xiWd/wW51lvxXIx7WXb3eZBQ=
-SHA256 (postgrey-1.32.tar.gz) = tGCTkBi5h2PHT00ychBK24XzIbz9nIZtr/c+TgYf6yQ=
-SIZE (postgrey-1.32.tar.gz) = 35486
+MD5 (postgrey-1.34.tar.gz) = 9zanvhCUWT8aZs0T8ys57w==
+RMD160 (postgrey-1.34.tar.gz) = fEDWgAnlfVZRfw2WLb08opiZMeo=
+SHA1 (postgrey-1.34.tar.gz) = YlKc1iMtxoxyRUi0dric2oY7deo=
+SHA256 (postgrey-1.34.tar.gz) = mp7i9OPLvxVkLkeAJAfIEKxcVPCtFXLr7D8PZF6zVwc=
+SIZE (postgrey-1.34.tar.gz) = 36399

mail/postgrey/patches/patch-postgrey

@@ -1,15 +1,12 @@
---- postgrey.orig	Thu Jul 31 12:51:39 2008
-+++ postgrey	Thu Jul 31 12:54:15 2008
-@@ -23,7 +23,7 @@
- @ISA = qw(Net::Server::Multiplex);
- 
- my $VERSION = '1.32';
+--- postgrey.orig	Wed May  4 21:54:15 2011
++++ postgrey	Thu May  5 16:44:16 2011
+@@ -26,4 +26,4 @@ use vars qw(@ISA);
 -my $DEFAULT_DBDIR = '/var/spool/postfix/postgrey';
 +my $DEFAULT_DBDIR = '/var/db/postgrey';
  my $CONFIG_DIR = '/etc/postfix';
  
  sub cidr_parse($)
-@@ -574,8 +574,8 @@
+@@ -585,8 +585,8 @@ sub main()
              commandline      => [ $0, @ARGV_saved ],
              port             => [ $opt{inet} ? $opt{inet} : $opt{unix}."|unix" ],
              proto            => $opt{inet} ? 'tcp' : 'unix',
@@ -20,7 +17,7 @@
              dbdir            => $opt{dbdir} || $DEFAULT_DBDIR,
              setsid           => $opt{daemonize} ? 1 : undef,
              pid_file         => $opt{daemonize} ? $opt{pidfile} : undef,
-@@ -782,9 +782,9 @@
+@@ -794,9 +794,9 @@ B<postgrey> [I<options>...]
   -i, --inet=[HOST:]PORT  listen on PORT, localhost if HOST is not specified
   -d, --daemonize         run in the background
       --pidfile=PATH      put daemon pid into this file

mail/postgrey/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2008/11/06 14:50:54 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.5 2011/05/06 08:40:06 sthen Exp $
 @newgroup _postgrey:563
 @newuser _postgrey:563:563:daemon:Postgrey Daemon:/var/empty:/sbin/nologin
 libexec/postgrey
@@ -17,3 +17,4 @@ share/examples/postgrey/postgrey_whitelist_clients
 @sample ${SYSCONFDIR}/postfix/postgrey_whitelist_clients
 share/examples/postgrey/postgrey_whitelist_recipients
 @sample ${SYSCONFDIR}/postfix/postgrey_whitelist_recipients
+@rcscript ${RCDIR}/postgrey

mail/postgrey/pkg/postgrey.rc

@@ -0,0 +1,12 @@
+#!/bin/sh
+#
+# $OpenBSD: postgrey.rc,v 1.1 2011/05/06 08:40:06 sthen Exp $
+
+daemon="${TRUEPREFIX}/libexec/postgrey"
+daemon_flags="--inet=10023 -d"
+
+. /etc/rc.d/rc.subr
+
+pexp="perl: ${daemon} ${daemon_flags}"
+
+rc_cmd $1