- Fix perl dependency.

- Clean up complicated target definitions.

1 files changed, 8 insertions, 18 deletions

diff --git a/net/pbnc/Makefile b/net/pbnc/Makefile
index 6db78f2b98ec..fc6a4c7ad92d 100644
--- a/net/pbnc/Makefile
+++ b/net/pbnc/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	pbnc
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://duncanthrax.net/pbnc/
 DISTNAME=	pbnc
@@ -16,30 +17,19 @@ COMMENT=	Simple userspace TCP port bouncer
 RUN_DEPENDS=	${SITE_PERL}/Net/Netmask.pm:${PORTSDIR}/net-mgmt/p5-Net-Netmask
 
 NO_BUILD=	yes
-PLIST=		${WRKSRC}/pkg-plist
-
-CONFIGDIR=	etc
-CONFIG_FILES=	pbnc.cfg
-SCRIPTDIR=	bin
-SCRIPT_FILES=	pbnc.pl
-DOC_FILES=	pbnc.readme
+USE_PERL5_RUN=	yes
+PLIST_FILES=	etc/pbnc.cfg bin/pbnc.pl
+PORTDOCS= 	pbnc.readme
 
 pre-install:
-	(${ECHO_CMD} "${CONFIGDIR}/${CONFIG_FILES}"; \
-	${ECHO_CMD} "${SCRIPTDIR}/${SCRIPT_FILES}"; ) > ${PLIST}
-.if !defined(NOPORTDOCS)
-	(for F in ${DOC_FILES}; do \
-			${ECHO_CMD} "${DOCSDIR:S,^${PREFIX}/,,}/$${F}"; \
-		done;\
-	${ECHO_CMD} "@dirrm ${DOCSDIR:S,^${PREFIX}/,,}" ) >> ${PLIST}
-.endif
+	${REINPLACE_CMD} 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/pbnc.pl
 
 do-install:
-	${INSTALL_SCRIPT} ${SCRIPT_FILES:S,^,${WRKSRC}/,} ${PREFIX}/${SCRIPTDIR}
-	${INSTALL_DATA} ${CONFIG_FILES:S,^,${WRKSRC}/,} ${PREFIX}/${CONFIGDIR}
+	${INSTALL_DATA} ${WRKSRC}/pbnc.cfg ${PREFIX}/etc/pbnc.cfg
+	${INSTALL_SCRIPT} ${WRKSRC}/pbnc.pl ${PREFIX}/bin/pbnc.pl
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${DOC_FILES:S,^,${WRKSRC}/,} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>