2 files changed, 58 insertions, 39 deletions

diff --git a/net-mgmt/argus3-clients/Makefile b/net-mgmt/argus3-clients/Makefile
index ca1e28f2a7cf..28066bae8ad2 100644
--- a/net-mgmt/argus3-clients/Makefile
+++ b/net-mgmt/argus3-clients/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	argus-clients
 PORTVERSION=	3.0.6.2
+PORTREVISION=	1
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	http://qosient.com/argus/src/ \
 		ftp://qosient.com/pub/argus/src/
@@ -14,87 +15,80 @@ LICENSE=	GPLv3
 
 CONFLICTS=	argus-clients-2* argus-clients-sasl-2*
 
-OPTIONS_DEFINE=	GEOIP MANPAGES MYSQL SASL
-OPTIONS_DEFAULT=MANPAGES MYSQL SASL
+OPTIONS_DEFINE=	GEOIP MYSQL SASL
+OPTIONS_DEFAULT=MYSQL SASL
 
 USES=		bison ncurses perl5
 USE_CSTD=	gnu89
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 GNU_CONFIGURE=	true
 
 .if ${PORT_OPTIONS:MSASL}
 PKGNAMESUFFIX+=	-sasl
-LIB_DEPENDS+=	sasl2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=	yes
 PLIST_SUB+=	MYSQL=""
-.if ${PORT_OPTIONS:MMANPAGES}
-MAN1+=		rasql.1 rasqlinsert.1 rasqltimeindex.1
-.endif
 .else
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MGEOIP}
-LIB_DEPENDS+=	GeoIP:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS+=	libGeoIP.so:${PORTSDIR}/net/GeoIP
 CONFIGURE_ARGS+=	--with-GeoIP=${LOCALBASE}
 .endif
 
-.if ${PORT_OPTIONS:MMANPAGES}
-MAN1+=	ra.1 rabins.1 racluster.1 raconvert.1 racount.1 radump.1 raevent.1 \
-	rafilteraddr.1 ragraph.1 ragrep.1 rahisto.1 ralabel.1 ranonymize.1 \
-	rapath.1 rapolicy.1 rasort.1 rasplit.1 rastream.1 rastrip.1
-MAN5=	racluster.5 radium.conf.5 ralabel.conf.5 ranonymize.5 rarc.5
-MAN8=	radium.8
-.endif
-
 do-install:
+.for i in radark ragraph rahosts raips raplot raports
+	@${REINPLACE_CMD} -e 's#/usr/bin/perl#${LOCALBASE}/bin/perl#' ${WRKSRC}/bin/$i
+.endfor
 .for i in ra rabins racluster raconvert racount radium radump raevent \
 	rafilteraddr ragrep rahisto ralabel ranonymize rapath rapolicy \
 	rarpwatch raservices rasort rasplit rastream rastrip \
 	ratemplate ratimerange ratop rauserdata
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${STAGEDIR}/${PREFIX}/bin/$i
 .endfor
-
 .for i in argusclientbug radark ragraph rahosts raips raplot raports
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/$i ${STAGEDIR}/${PREFIX}/bin/$i
 .endfor
-
 .if ${PORT_OPTIONS:MMYSQL}
 .for i in rasql rasqlinsert rasqltimeindex
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${STAGEDIR}/${PREFIX}/bin/$i
 .endfor
 .endif
 .for i in radark ragraph rahosts raports
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/$i ${STAGEDIR}/${PREFIX}/bin/$i
 .endfor
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/
+	${MKDIR} ${STAGEDIR}/${DOCSDIR}/
 .for i in AUTHORS CHANGES CREDITS ChangeLog INSTALL \
 	MANIFEST README VERSION
-	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}/${DOCSDIR}
 .endfor
-.endif
-.if ${PORT_OPTIONS:MMANPAGES}
-.for i in ${MAN1}
-	${INSTALL_DATA} ${WRKSRC}/man/man1/$i ${MANPREFIX}/man/man1
+.for i in ra.1 rabins.1 racluster.1 raconvert.1 racount.1 radump.1 raevent.1 \
+	rafilteraddr.1 ragraph.1 ragrep.1 rahisto.1 ralabel.1 ranonymize.1 \
+	rapath.1 rapolicy.1 rasort.1 rasplit.1 rastream.1 rastrip.1
+	${INSTALL_MAN} ${WRKSRC}/man/man1/$i ${STAGEDIR}/${PREFIX}/man/man1
 .endfor
-.for i in ${MAN5}
-	${INSTALL_DATA} ${WRKSRC}/man/man5/$i ${MANPREFIX}/man/man5
+.for i in racluster.5 radium.conf.5 ralabel.conf.5 ranonymize.5 rarc.5
+	${INSTALL_MAN} ${WRKSRC}/man/man5/$i ${STAGEDIR}/${PREFIX}/man/man5
 .endfor
-.for i in ${MAN8}
-	${INSTALL_DATA} ${WRKSRC}/man/man8/$i ${MANPREFIX}/man/man8
+.for i in radium.8
+	${INSTALL_MAN} ${WRKSRC}/man/man8/$i ${STAGEDIR}/${PREFIX}/man/man8
+.endfor
+.if ${PORT_OPTIONS:MMYSQL}
+.for i in rasql.1 rasqlinsert.1 rasqltimeindex.1
+	${INSTALL_MAN} ${WRKSRC}/man/man1/$i ${STAGEDIR}/${PREFIX}/man/man1
 .endfor
 .endif
-	${MKDIR} ${EXAMPLESDIR}
+
+	${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
 .for i in Config Database Startup System
-	${MKDIR} ${EXAMPLESDIR}/$i
+	${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}/$i
 .endfor
 
 .for i in delegated-ipv4-latest excel.rc iana-address-file \
@@ -102,16 +96,16 @@ do-install:
 	racluster.conf radium.conf ragetcountrycodes.sh ralabel.conf \
 	ranonymize.conf rarc rarc.print.all.conf rastream.sh std.sig \
 	wireshark.manuf.txt
-	${INSTALL_DATA} ${WRKSRC}/support/Config/$i ${EXAMPLESDIR}/Config/$i
+	${INSTALL_DATA} ${WRKSRC}/support/Config/$i ${STAGEDIR}/${EXAMPLESDIR}/Config/$i
 .endfor
 .for i in MySQL.Archive.sh README
-	${INSTALL_DATA} ${WRKSRC}/support/Database/$i ${EXAMPLESDIR}/Database/$i
+	${INSTALL_DATA} ${WRKSRC}/support/Database/$i ${STAGEDIR}/${EXAMPLESDIR}/Database/$i
 .endfor
 .for i in README com.qosient.radium.plist com.qosient.rasplit.plist \
 	radium radium.service rasplit
-	${INSTALL_DATA} ${WRKSRC}/support/Startup/$i ${EXAMPLESDIR}/Startup/$i
+	${INSTALL_DATA} ${WRKSRC}/support/Startup/$i ${STAGEDIR}/${EXAMPLESDIR}/Startup/$i
 .endfor
 .for i in magic
-	${INSTALL_DATA} ${WRKSRC}/support/System/$i ${EXAMPLESDIR}/System/$i
+	${INSTALL_DATA} ${WRKSRC}/support/System/$i ${STAGEDIR}/${EXAMPLESDIR}/System/$i
 .endfor
 .include <bsd.port.mk>
diff --git a/net-mgmt/argus3-clients/pkg-plist b/net-mgmt/argus3-clients/pkg-plist
index c42b408613cd..e689b4f78c24 100644
--- a/net-mgmt/argus3-clients/pkg-plist
+++ b/net-mgmt/argus3-clients/pkg-plist
@@ -33,6 +33,31 @@ bin/ratemplate
 bin/ratimerange
 bin/ratop
 bin/rauserdata
+man/man1/ra.1.gz
+man/man1/rabins.1.gz
+man/man1/racluster.1.gz
+man/man1/raconvert.1.gz
+man/man1/racount.1.gz
+man/man1/radump.1.gz
+man/man1/raevent.1.gz
+man/man1/rafilteraddr.1.gz
+man/man1/ragraph.1.gz
+man/man1/ragrep.1.gz
+man/man1/rahisto.1.gz
+man/man1/ralabel.1.gz
+man/man1/ranonymize.1.gz
+man/man1/rapath.1.gz
+man/man1/rapolicy.1.gz
+man/man1/rasort.1.gz
+man/man1/rasplit.1.gz
+man/man1/rastream.1.gz
+man/man1/rastrip.1.gz
+man/man5/racluster.5.gz
+man/man5/radium.conf.5.gz
+man/man5/ralabel.conf.5.gz
+man/man5/ranonymize.5.gz
+man/man5/rarc.5.gz
+man/man8/radium.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS