Index: head/mail/postfix-postfwd/Makefile
===================================================================
--- head/mail/postfix-postfwd/Makefile	(revision 444341)
+++ head/mail/postfix-postfwd/Makefile	(revision 444342)
@@ -1,51 +1,51 @@
 # Created by: Sahil Tandon <sahil@tandon.net>
 # $FreeBSD$
 
 PORTNAME=	postfwd
 PORTVERSION=	1.35
 PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.${PORTNAME}.org/old/
 PKGNAMEPREFIX=	postfix-
 
 MAINTAINER=	ports@FreeBSD.org
 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 \
-		p5-Storable>=0:devel/p5-Storable \
-		p5-Time-HiRes>=0:devel/p5-Time-HiRes
+		p5-Net-Server>=0:net/p5-Net-Server
 
+NO_ARCH=	yes
 SUB_FILES=	pkg-message
 
 USE_RC_SUBR=	${PORTNAME}
 USES=		perl5 shebangfix
 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
 
-.include <bsd.port.options.mk>
-
 do-install:
-.if ${PORT_OPTIONS:MPOSTFWD2}
-	@${INSTALL_SCRIPT} ${WRKSRC}/sbin/${PORTNAME}2 ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-.else
-	@${INSTALL_SCRIPT} ${WRKSRC}/sbin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
-.endif
 	@${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}.cf.sample ${STAGEDIR}${ETCDIR}
 	@${INSTALL_MAN} ${WRKSRC}/man/man8/* ${STAGEDIR}${MANPREFIX}/man/man8
 
 post-install-DOCS-on:
 	@${MKDIR} ${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/pkg-plist
===================================================================
--- head/mail/postfix-postfwd/pkg-plist	(revision 444341)
+++ head/mail/postfix-postfwd/pkg-plist	(revision 444342)
@@ -1,22 +1,21 @@
 bin/postfwd
 etc/postfwd
 man/man8/postfwd.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
-