- add stage support

- add pkg-plist
- fix LICENSE
- use shebangfix

3 files changed, 40 insertions, 25 deletions

diff --git a/mail/postfix-postfwd/Makefile b/mail/postfix-postfwd/Makefile
index 4dc1baec82b8..62e777045343 100644
--- a/mail/postfix-postfwd/Makefile
+++ b/mail/postfix-postfwd/Makefile
@@ -3,58 +3,49 @@
 
 PORTNAME=	postfwd
 PORTVERSION=	1.35
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.${PORTNAME}.org/old/
 PKGNAMEPREFIX=	postfix-
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Postfix firewall policy daemon
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
 		p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
 		p5-Storable>=0:${PORTSDIR}/devel/p5-Storable \
 		p5-Time-HiRes>=0:${PORTSDIR}/devel/p5-Time-HiRes
 
-PORTDOCS=	*
-PORTEXAMPLES=	request.sample postfwd.plugins.sample
-
-PLIST_FILES=	bin/${PORTNAME} etc/${PORTNAME}.conf.sample
 SUB_FILES=	pkg-message
 
 USE_RC_SUBR=	${PORTNAME}
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_LANG=	perl
+SHEBANG_FILES=	sbin/* tools/*.pl tools/hapolicy/*
 USE_PERL5=	run
 NO_BUILD=	yes
 
-MAN8=		${PORTNAME}.8 ${PORTNAME}2.8
-
 OPTIONS_DEFINE=	EXAMPLES DOCS POSTFWD2
 POSTFWD2_DESC=	Install postfwd v2 rather than v1
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 do-install:
 .if ${PORT_OPTIONS:MPOSTFWD2}
-	@${INSTALL_SCRIPT} ${WRKSRC}/sbin/${PORTNAME}2 ${PREFIX}/bin/${PORTNAME}
+	@${INSTALL_SCRIPT} ${WRKSRC}/sbin/${PORTNAME}2 ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 .else
-	@${INSTALL_SCRIPT} ${WRKSRC}/sbin/${PORTNAME} ${PREFIX}/bin/
+	@${INSTALL_SCRIPT} ${WRKSRC}/sbin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 .endif
-	@${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}.cf.sample ${PREFIX}/etc/${PORTNAME}.conf.sample
-	@${INSTALL_MAN} ${WRKSRC}/man/man8/* ${MANPREFIX}/man/man8/
+	@${INSTALL_DATA} ${WRKSRC}/etc/${PORTNAME}.cf.sample ${STAGEDIR}${ETCDIR}
+	@${INSTALL_MAN} ${WRKSRC}/man/man8/* ${STAGEDIR}${MANPREFIX}/man/man8
 
 post-install:
-.if !empty(PORT_OPTIONS:MDOCS)
-	@${INSTALL} -o ${DOCOWN} -g ${DOCGRP} -m 555 -d ${DOCSDIR}
-	@cd ${WRKSRC}/doc/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
-.if !empty(PORT_OPTIONS:MEXAMPLES)
-	@${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m 555 -d ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/tools/request.sample ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/plugins/postfwd.plugins.sample ${EXAMPLESDIR}
-.endif
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/tools/request.sample ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/plugins/postfwd.plugins.sample ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/postfix-postfwd/pkg-descr b/mail/postfix-postfwd/pkg-descr
index 102e38ecd39d..0367bca0eb6e 100644
--- a/mail/postfix-postfwd/pkg-descr
+++ b/mail/postfix-postfwd/pkg-descr
@@ -5,4 +5,4 @@ allows you to choose an action (e.g. reject, dunno) for a combination of
 several smtp parameters (like sender and recipient address, size or the 
 client's TLS fingerprint).
 
-WWW:	http://www.postfwd.org/
+WWW: http://www.postfwd.org/
diff --git a/mail/postfix-postfwd/pkg-plist b/mail/postfix-postfwd/pkg-plist
new file mode 100644
index 000000000000..0034b46d586f
--- /dev/null
+++ b/mail/postfix-postfwd/pkg-plist
@@ -0,0 +1,24 @@
+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
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
+