net-mgmt/argus3: support stage and remove option

PR:		191018 (based on)
Submitted by:	maintainer

2 files changed, 35 insertions, 48 deletions

diff --git a/net-mgmt/argus3/Makefile b/net-mgmt/argus3/Makefile
index bb277e1a67d..b41b6f92690 100644
--- a/net-mgmt/argus3/Makefile
+++ b/net-mgmt/argus3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	argus
 PORTVERSION=	3.0.6.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	http://qosient.com/argus/src/ \
 		ftp://qosient.com/pub/argus/src/
@@ -14,60 +15,46 @@ LICENSE=	GPLv3
 
 CONFLICTS=	argus-2* argus-sasl-2* argus-clients-2*
 
-OPTIONS_DEFINE=	SASL MANPAGES
-OPTIONS_DEFAULT=SASL MANPAGES
+OPTIONS_DEFINE=	SASL
+OPTIONS_DEFAULT=SASL
 
 USE_RC_SUBR=	argus
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 USES=		bison perl5
-GNU_CONFIGURE=	true
+GNU_CONFIGURE=	yes
 
 .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:MMANPAGES}
-MAN5=		argus.conf.5
-MAN8=		argus.8
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's#/usr/lib/sasl2#${LOCALBASE}/lib/sasl2#' ${WRKSRC}/argus/ArgusOutput.c
 
+pre-install:
+	@${REINPLACE_CMD} -e 's#/usr/bin/perl#${LOCALBASE}/bin/perl#' ${WRKSRC}/bin/argus-lsof
+	@${REINPLACE_CMD} -e 's#/bin/bash#${LOCALBASE}/bin/bash#' ${WRKSRC}/bin/argus-vmstat
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/argus ${PREFIX}/sbin/argus
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/argus ${STAGEDIR}${PREFIX}/sbin/argus
 .for i in argus-lsof argus-snmp	argus-vmstat argusbug
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/$i ${STAGEDIR}${PREFIX}/bin/$i
 .endfor
-	${MKDIR} ${EXAMPLESDIR}/Archive ${EXAMPLESDIR}/Config \
-		 ${EXAMPLESDIR}/Deployment ${EXAMPLESDIR}/Startup \
-		 ${EXAMPLESDIR}/System
-.for i in README \
-	Archive/argusarchive \
+	${INSTALL_MAN} ${WRKSRC}/man/man5/argus.conf.5 ${STAGEDIR}${PREFIX}/man/man5/
+	${INSTALL_MAN} ${WRKSRC}/man/man8/argus.8 ${STAGEDIR}${PREFIX}/man/man8/
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/Archive ${STAGEDIR}${EXAMPLESDIR}/Config \
+		 ${STAGEDIR}${EXAMPLESDIR}/Deployment ${STAGEDIR}${EXAMPLESDIR}/Startup \
+		 ${STAGEDIR}${EXAMPLESDIR}/System
+.for i in Archive/argusarchive \
 	Config/argus.conf \
 	Deployment/sample \
 	Startup/argus Startup/README \
 	System/crontab System/magic
-	${INSTALL_DATA} ${WRKSRC}/support/$i ${EXAMPLESDIR}/$i
-.endfor
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/
-.for i in README
-	${INSTALL_DATA} ${WRKSRC}/doc/$i ${DOCSDIR}/
+	${INSTALL_DATA} ${WRKSRC}/support/$i ${STAGEDIR}${EXAMPLESDIR}/$i
 .endfor
-.endif
-.if ${PORT_OPTIONS:MMANPAGES}
-.for i in ${MAN5}
-	${INSTALL_DATA} ${WRKSRC}/man/man5/$i ${MANPREFIX}/man/man5
-.endfor
-.for i in ${MAN8}
-	${INSTALL_DATA} ${WRKSRC}/man/man8/$i ${MANPREFIX}/man/man8
-.endfor
-.endif
+	${CP} ${WRKSRC}/support/Config/argus.conf ${STAGEDIR}${PREFIX}/etc/argus.conf.sample
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/argus3/pkg-plist b/net-mgmt/argus3/pkg-plist
index d5d9fede060..0b5edf963de 100644
--- a/net-mgmt/argus3/pkg-plist
+++ b/net-mgmt/argus3/pkg-plist
@@ -1,21 +1,21 @@
+@sample etc/argus.conf.sample
 bin/argus-lsof
 bin/argus-snmp
 bin/argus-vmstat
 bin/argusbug
 sbin/argus
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%EXAMPLESDIR%%/Archive/argusarchive
-%%EXAMPLESDIR%%/Config/argus.conf
-%%EXAMPLESDIR%%/Deployment/sample
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/Startup/README
-%%EXAMPLESDIR%%/Startup/argus
-%%EXAMPLESDIR%%/System/crontab
-%%EXAMPLESDIR%%/System/magic
-@dirrm %%EXAMPLESDIR%%/System
-@dirrm %%EXAMPLESDIR%%/Startup
-@dirrm %%EXAMPLESDIR%%/Deployment
-@dirrm %%EXAMPLESDIR%%/Config
-@dirrm %%EXAMPLESDIR%%/Archive
-@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+man/man5/argus.conf.5.gz
+man/man8/argus.8.gz
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Archive/argusarchive
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Config/argus.conf
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Deployment/sample
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Startup/argus
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Startup/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/System/crontab
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/System/magic
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/Archive
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/Config
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/Deployment
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/Startup
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%/System
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%