Index: head/mail/postfix-postfwd/Makefile
===================================================================
--- head/mail/postfix-postfwd/Makefile	(revision 521226)
+++ head/mail/postfix-postfwd/Makefile	(revision 521227)
@@ -1,51 +1,49 @@
 # Created by: Sahil Tandon <sahil@tandon.net>
 # $FreeBSD$
 
 PORTNAME=	postfwd
-PORTVERSION=	1.35
-PORTREVISION=	1
+PORTVERSION=	2.02
+DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
-MASTER_SITES=	http://www.${PORTNAME}.org/old/
 PKGNAMEPREFIX=	postfix-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	andreas.jobs+freebsdbugs@ruhr-uni-bochum.de
 COMMENT=	Postfix firewall policy daemon
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
 RUN_DEPENDS=	p5-Net-DNS>=0:dns/p5-Net-DNS \
 		p5-Net-Server>=0:net/p5-Net-Server
 
+USES=		perl5 shebangfix
+
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 
 USE_RC_SUBR=	${PORTNAME}
-USES=		perl5 shebangfix
+USE_GITHUB=	yes
 SHEBANG_FILES=	sbin/* tools/*.pl tools/hapolicy/*
 USE_PERL5=	run
 NO_BUILD=	yes
 
-OPTIONS_DEFINE=	EXAMPLES DOCS POSTFWD2
-POSTFWD2_DESC=	Install postfwd v2 rather than v1
+PORTDOCS=	*
+PORTEXAMPLES=	*
 
+OPTIONS_DEFINE=	EXAMPLES DOCS
+
 do-install:
-	@${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}.cf.sample ${STAGEDIR}${ETCDIR}
-	@${INSTALL_MAN} ${WRKSRC}/man/man8/* ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}.cf.sample ${STAGEDIR}${ETCDIR}
+	${INSTALL_MAN} ${WRKSRC}/man/man8/* ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_SCRIPT} ${WRKSRC}/sbin/${PORTNAME}3 ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/tools/request.sample ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/plugins/postfwd.plugins.sample ${STAGEDIR}${EXAMPLESDIR}
-
-do-install-POSTFWD2-on:
-	@${INSTALL_SCRIPT} ${WRKSRC}/sbin/${PORTNAME}2 ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-
-do-install-POSTFWD2-off:
-	@${INSTALL_SCRIPT} ${WRKSRC}/sbin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
Index: head/mail/postfix-postfwd/distinfo
===================================================================
--- head/mail/postfix-postfwd/distinfo	(revision 521226)
+++ head/mail/postfix-postfwd/distinfo	(revision 521227)
@@ -1,2 +1,3 @@
-SHA256 (postfwd-1.35.tar.gz) = 42abf8fc1229e8a09fa0141b6e23e34c6e1b654a56f6e7556d04067eafc77c41
-SIZE (postfwd-1.35.tar.gz) = 354609
+TIMESTAMP = 1575902368
+SHA256 (postfwd-postfwd-v2.02_GH0.tar.gz) = 38d191b825192c7a884aef8f6a10ef5f93860df7428c9fab645eab81bdfcf6af
+SIZE (postfwd-postfwd-v2.02_GH0.tar.gz) = 266603
Index: head/mail/postfix-postfwd/pkg-plist
===================================================================
--- head/mail/postfix-postfwd/pkg-plist	(revision 521226)
+++ head/mail/postfix-postfwd/pkg-plist	(revision 521227)
@@ -1,21 +1,6 @@
 bin/postfwd
 etc/postfwd
 man/man8/postfwd.8.gz
+man/man8/postfwd1.8.gz
 man/man8/postfwd2.8.gz
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/arch.html
-%%PORTDOCS%%%%DOCSDIR%%/hapolicy.html
-%%PORTDOCS%%%%DOCSDIR%%/hapolicy.txt
-%%PORTDOCS%%%%DOCSDIR%%/postfwd-ARCH.png
-%%PORTDOCS%%%%DOCSDIR%%/postfwd.CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/postfwd.html
-%%PORTDOCS%%%%DOCSDIR%%/postfwd.txt
-%%PORTDOCS%%%%DOCSDIR%%/postfwd2-chroot.html
-%%PORTDOCS%%%%DOCSDIR%%/postfwd2-chroot.txt
-%%PORTDOCS%%%%DOCSDIR%%/postfwd2.CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/postfwd2.html
-%%PORTDOCS%%%%DOCSDIR%%/postfwd2.txt
-%%PORTDOCS%%%%DOCSDIR%%/quick.html
-%%PORTDOCS%%%%DOCSDIR%%/versions.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/postfwd.plugins.sample
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/request.sample
+man/man8/postfwd3.8.gz