- Update net-mgmt/argus3 to 3.0.2

- Register CONFLICTS with net-mgmt/argus
- Pass maintainership to submitter

PR:		142969
Submitted by:	Alexander Demin <support@spectrum.ru>

4 files changed, 39 insertions, 19 deletions

diff --git a/net-mgmt/argus3/Makefile b/net-mgmt/argus3/Makefile
index af8b44e7e993..c73d5b9b576f 100644
--- a/net-mgmt/argus3/Makefile
+++ b/net-mgmt/argus3/Makefile
@@ -6,41 +6,42 @@
 #
 
 PORTNAME=	argus
-PORTVERSION=	3.0.0
-PORTREVISION=	1
+PORTVERSION=	3.0.2
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	http://qosient.com/argus/src/ \
 		ftp://qosient.com/pub/argus/src/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	support@spectrum.ru
 COMMENT=	A generic IP network transaction auditing tool
 
-#RUN_DEPENDS=	${LOCALBASE}/bin/ragrep:${PORTSDIR}/net-mgmt/argus3-clients
+CONFLICTS=	argus-2* argus-sasl-2*
 
 OPTIONS+=	SASL "SASL authentication support" on
 
-.include <bsd.port.pre.mk>
+USE_RC_SUBR=	argus
 
-.if defined(WITH_SASL)
-PKGNAMESUFFIX=	-sasl
-LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
-.endif
+.include <bsd.port.options.mk>
 
 USE_BISON=	build
 GNU_CONFIGURE=	true
+
 .if defined(WITH_SASL)
+PKGNAMESUFFIX=	-sasl
+LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
 .endif
 
 MAN5=		argus.conf.5
 MAN8=		argus.8
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#/usr/lib/sasl2#${LOCALBASE}/lib/sasl2#' ${WRKSRC}/argus/ArgusOutput.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/argus ${PREFIX}/sbin/argus
-#	${INSTALL_SCRIPT} ${WRKSRC}/bin/argusbug ${PREFIX}/bin/argusbug
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/argusbug ${PREFIX}/bin/argusbug
 	${MKDIR} ${EXAMPLESDIR}/Archive ${EXAMPLESDIR}/Config \
 		 ${EXAMPLESDIR}/Deployment ${EXAMPLESDIR}/Startup \
 		 ${EXAMPLESDIR}/System
@@ -54,14 +55,11 @@ do-install:
 .endfor
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}/
-.for i in FAQ HOW-TO
+.for i in README
 	${INSTALL_DATA} ${WRKSRC}/doc/$i ${DOCSDIR}/
 .endfor
 .endif
 .if !defined(NOMAN)
-#.for i in ${MAN1}
-#	${INSTALL_DATA} ${WRKSRC}/man/man1/$i ${MANPREFIX}/man/man1
-#.endfor
 .for i in ${MAN5}
 	${INSTALL_DATA} ${WRKSRC}/man/man5/$i ${MANPREFIX}/man/man5
 .endfor
diff --git a/net-mgmt/argus3/distinfo b/net-mgmt/argus3/distinfo
index c2ee550b0415..3b5977312e6a 100644
--- a/net-mgmt/argus3/distinfo
+++ b/net-mgmt/argus3/distinfo
@@ -1,3 +1,3 @@
-MD5 (argus-3.0.0.tar.gz) = 532dd9d86dacc2b497e24776c2c7eb96
-SHA256 (argus-3.0.0.tar.gz) = c2c40903ed592f045b73ee94e84431e4dcbb5ef9d07c6d967daf16068ed282cf
-SIZE (argus-3.0.0.tar.gz) = 400426
+MD5 (argus-3.0.2.tar.gz) = 7dc6ebe03bc840a777dd93447d269a31
+SHA256 (argus-3.0.2.tar.gz) = b9745373945ae4d4229738259805877f09b531feea62963727612656995e1d50
+SIZE (argus-3.0.2.tar.gz) = 392854
diff --git a/net-mgmt/argus3/files/argus.in b/net-mgmt/argus3/files/argus.in
new file mode 100644
index 000000000000..0f22c6531ec9
--- /dev/null
+++ b/net-mgmt/argus3/files/argus.in
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# PROVIDE: argus
+# REQUIRE: NETWORKING
+
+. /etc/rc.subr
+
+name="argus"
+rcvar=`set_rcvar`
+
+load_rc_config $name
+
+# Set defaults
+: ${argus_enable="NO"}
+: ${argus_procname="%%PREFIX%%/sbin/argus"}
+: ${argus_flags="-F %%PREFIX%%/etc/argus.conf"}
+
+required_files="${argus_config}"
+command=$argus_procname
+command_args="${argus_flags}"
+
+run_rc_command "$1"
diff --git a/net-mgmt/argus3/pkg-plist b/net-mgmt/argus3/pkg-plist
index c1a8ac8818f7..964ed7bfa54e 100644
--- a/net-mgmt/argus3/pkg-plist
+++ b/net-mgmt/argus3/pkg-plist
@@ -1,6 +1,6 @@
+bin/argusbug
 sbin/argus
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/HOW-TO
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%EXAMPLESDIR%%/Archive/argusarchive
 %%EXAMPLESDIR%%/Config/argus.conf
 %%EXAMPLESDIR%%/Deployment/sample