Update to 2.02 and add a postfwd3 rc script

postfwd3 is still considered beta software

mail/postfwd/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.9 2019/02/08 13:15:13 sthen Exp $
+# $OpenBSD: Makefile,v 1.10 2019/05/15 06:44:23 giovanni Exp $
 
 COMMENT =	Postfix policy server
 
-DISTNAME =	postfwd-1.39
+DISTNAME =	postfwd-2.02
 WRKDIST =	${WRKDIR}/postfwd
 
 CATEGORIES =	mail
@@ -18,6 +18,7 @@ MASTER_SITES =	${HOMEPAGE}
 
 RUN_DEPENDS =	devel/p5-Net-Server \
 		devel/p5-IO-Multiplex \
+		net/p5-Net-CIDR-Lite \
 		net/p5-Net-DNS
 
 PKG_ARCH =	*
@@ -26,6 +27,7 @@ NO_TEST =	Yes
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/sbin/postfwd2 ${PREFIX}/sbin/postfwd2
+	${INSTALL_SCRIPT} ${WRKSRC}/sbin/postfwd3 ${PREFIX}/sbin/postfwd3
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/postfwd/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/postfwd/plugins/
 	${INSTALL_DATA} ${WRKSRC}/etc/postfwd.cf.sample ${PREFIX}/share/examples/postfwd/postfwd.cf.sample
@@ -34,9 +36,10 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/postfwd-client.pl ${PREFIX}/bin/postfwd-client.pl
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/rblcheck.pl ${PREFIX}/bin/rblcheck.pl
 	${INSTALL_SCRIPT} ${WRKSRC}/tools/hapolicy/hapolicy ${PREFIX}/sbin/hapolicy
-	${INSTALL_DATA} ${WRKSRC}/doc/postfwd2* ${PREFIX}/share/doc/postfwd/
+	${INSTALL_DATA} ${WRKSRC}/doc/postfwd3* ${PREFIX}/share/doc/postfwd/
 	${INSTALL_DATA} ${WRKSRC}/tools/hapolicy/hapolicy.* ${PREFIX}/share/doc/postfwd/
 	${INSTALL_DATA} ${WRKSRC}/tools/request.sample ${PREFIX}/share/doc/postfwd/request.sample
 	${INSTALL_MAN} ${WRKSRC}/man/man8/postfwd2.8 ${PREFIX}/man/man8/postfwd2.8
+	${INSTALL_MAN} ${WRKSRC}/man/man8/postfwd3.8 ${PREFIX}/man/man8/postfwd3.8
 
 .include <bsd.port.mk>

mail/postfwd/distinfo

@@ -1,2 +1,2 @@
-SHA256 (postfwd-1.39.tar.gz) = Vv0pJwHRlOC0CFdTnBi/Cu+pE+dpVzOOzeaR77aRuyU=
-SIZE (postfwd-1.39.tar.gz) = 408145
+SHA256 (postfwd-2.02.tar.gz) = pJE85X458QenBzJkbu8up0xymyRGLo3fxQh7AUyn9tw=
+SIZE (postfwd-2.02.tar.gz) = 265781

mail/postfwd/patches/patch-sbin_postfwd2

@@ -1,13 +0,0 @@
-$OpenBSD: patch-sbin_postfwd2,v 1.3 2019/02/08 13:15:13 sthen Exp $
-Index: sbin/postfwd2
---- sbin/postfwd2.orig
-+++ sbin/postfwd2
-@@ -63,7 +63,7 @@ our %postfwd_settings = (
- 		no_client_stdout => '1',
- 	},
- 	master => {
--		pid_file         => "/var/tmp/$NAME-master.pid",
-+		pid_file         => "/var/run/$NAME-master.pid",
- 		watchdog	 => 60,
- 		failures	 => 7,
- 		respawn		 => 4,

mail/postfwd/patches/patch-sbin_postfwd3

@@ -0,0 +1,14 @@
+$OpenBSD: patch-sbin_postfwd3,v 1.1 2019/05/15 06:44:23 giovanni Exp $
+
+Index: sbin/postfwd3
+--- sbin/postfwd3.orig
++++ sbin/postfwd3
+@@ -74,7 +74,7 @@ our %postfwd_settings = (
+ 		no_client_stdout => 1,
+ 	},
+ 	master => {
+-		pid_file         => "/var/tmp/$NAME-master.pid",
++		pid_file         => "/var/run/$NAME-master.pid",
+ 		watchdog	 => 60,
+ 		failures	 => 7,
+ 		respawn		 => 4,

mail/postfwd/pkg/PLIST

@@ -1,20 +1,21 @@
-@comment $OpenBSD: PLIST,v 1.4 2019/02/08 13:15:13 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.5 2019/05/15 06:44:23 giovanni Exp $
 @newgroup _postfwd:715
 @newuser _postfwd:715:715:daemon:Postfwd Daemon:/var/empty:/sbin/nologin
 @rcscript ${RCDIR}/postfwd2
+@rcscript ${RCDIR}/postfwd3
 bin/postfwd-client.pl
 bin/rblcheck.pl
 @man man/man8/postfwd2.8
+@man man/man8/postfwd3.8
 sbin/hapolicy
 sbin/postfwd2
+sbin/postfwd3
 share/doc/postfwd/
 share/doc/postfwd/hapolicy.html
 share/doc/postfwd/hapolicy.txt
-share/doc/postfwd/postfwd2-chroot.html
-share/doc/postfwd/postfwd2-chroot.txt
-share/doc/postfwd/postfwd2.CHANGELOG
-share/doc/postfwd/postfwd2.html
-share/doc/postfwd/postfwd2.txt
+share/doc/postfwd/postfwd3.CHANGELOG
+share/doc/postfwd/postfwd3.html
+share/doc/postfwd/postfwd3.txt
 share/doc/postfwd/request.sample
 share/examples/postfwd/
 @sample ${SYSCONFDIR}/postfix/

mail/postfwd/pkg/postfwd3.rc

@@ -0,0 +1,20 @@
+#!/bin/ksh
+#
+# $OpenBSD: postfwd3.rc,v 1.1 2019/05/15 06:44:23 giovanni Exp $
+
+daemon="${TRUEPREFIX}/sbin/postfwd3"
+daemon_flags="-u _postfwd -g _postfwd -f ${SYSCONFDIR}/postfix/postfwd3.cf"
+
+. /etc/rc.d/rc.subr
+
+pexp="perl: ${daemon}${daemon_flags:+ ${daemon_flags}}"
+
+rc_stop() {
+	${daemon} --stop
+}
+
+rc_reload() {
+	${daemon} --hup
+}
+
+rc_cmd $1