- Update net-mgmt/argus3-clients to 3.0.2

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

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

11 files changed, 56 insertions, 48 deletions

diff --git a/net-mgmt/argus3-clients/Makefile b/net-mgmt/argus3-clients/Makefile
index ce518998c5b6..2c519ed3f1ac 100644
--- a/net-mgmt/argus3-clients/Makefile
+++ b/net-mgmt/argus3-clients/Makefile
@@ -6,54 +6,54 @@
 #
 
 PORTNAME=	argus-clients
-PORTVERSION=	3.0.0
+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=	Client programs for the argus IP network transaction auditing tool
 
-OPTIONS+=	SASL "SASL authentication support 1" on \
-		DEBUG "Enable debug" off
+CONFLICTS=	argus-clients-2* argus-clients-sasl-2*
 
-.include <bsd.port.pre.mk>
+OPTIONS+=	SASL "SASL authentication support" on \
+		MYSQL "MySQL database support" on
 
-.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
 
-MAN1=	ra.1 rabins.1 racluster.1 racount.1 ragraph.1 ragrep.1 rahisto.1 \
-	rasort.1 rasplit.1 rastrip.1
+.if defined(WITH_MYSQL)
+USE_MYSQL=	yes
+.endif
+
+MAN1=	ra.1 rabins.1 racluster.1 racount.1 ragraph.1 rahisto.1 \
+	ranonymize.1 rasort.1 rasplit.1 rastream.1 rastrip.1
 MAN5=	racluster.5 radium.conf.5 rarc.5
 MAN8=	radium.8
 
-pre-configure:
-.if defined(WITH_DEBUG)
-	${TOUCH} ${WRKSRC}/.debug
-.endif
+.include <bsd.port.pre.mk>
 
 do-install:
 .for i in ra rabins racluster racount radump rafilteraddr \
-		ragrep rahisto ralabel ranonymize rapath rapolicy \
-		rasort rasplit rastream rastrip ratemplate \
-		ratimerange ratop ratree
+		rahisto ralabel ranonymize rapath rapolicy \
+		raservices rasort rasplit rasql rasqlinsert rastream \
+		rastrip ratemplate ratimerange ratop ratree rauserdata
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i
 .endfor
-.for i in argusbug radark ragraph rahosts raports
+.for i in radark ragraph rahosts raports
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/$i ${PREFIX}/bin/$i
 .endfor
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}/
-.for i in README COPYING CREDITS doc/CHANGES doc/FAQ doc/HOW-TO
+.for i in README COPYING doc/CHANGES doc/FAQ doc/HOW-TO
 	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
 .endfor
 .endif
@@ -68,11 +68,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/man/man8/$i ${MANPREFIX}/man/man8
 .endfor
 .endif
-.for i in argus_client.a argus_common.a argus_parse.a
-	${INSTALL_DATA} ${WRKSRC}/lib/$i ${PREFIX}/lib/$i
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/include/cons_def.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/include/cons_out.h ${PREFIX}/include
 	${MKDIR} ${EXAMPLESDIR}
 .for i in Config Startup System
 	${MKDIR} ${EXAMPLESDIR}/$i
diff --git a/net-mgmt/argus3-clients/distinfo b/net-mgmt/argus3-clients/distinfo
index 8a7f60bbb5c9..181531af29b5 100644
--- a/net-mgmt/argus3-clients/distinfo
+++ b/net-mgmt/argus3-clients/distinfo
@@ -1,3 +1,3 @@
-MD5 (argus-clients-3.0.0.tar.gz) = 69220c898c0a3ad612292eaecdec70d2
-SHA256 (argus-clients-3.0.0.tar.gz) = f3b5b37c69b0eb7f3bf561a25709900e295ee15de69000d4c7d165684ebe783d
-SIZE (argus-clients-3.0.0.tar.gz) = 1421803
+MD5 (argus-clients-3.0.2.tar.gz) = 3d3e9f4ce0539f8320c38cd43fcecbc1
+SHA256 (argus-clients-3.0.2.tar.gz) = 68ffc169ff4d6e4c08c19522833c829b2e560ee61b779a7a4f166c1cf022a7c4
+SIZE (argus-clients-3.0.2.tar.gz) = 1802627
diff --git a/net-mgmt/argus3-clients/files/patch-clients::Makefile.in b/net-mgmt/argus3-clients/files/patch-clients_Makefile.in
index c22136b2c923..c22136b2c923 100644
--- a/net-mgmt/argus3-clients/files/patch-clients::Makefile.in
+++ b/net-mgmt/argus3-clients/files/patch-clients_Makefile.in
diff --git a/net-mgmt/argus3-clients/files/patch-common::Makefile.in b/net-mgmt/argus3-clients/files/patch-common_Makefile.in
index efb48995864d..efb48995864d 100644
--- a/net-mgmt/argus3-clients/files/patch-common::Makefile.in
+++ b/net-mgmt/argus3-clients/files/patch-common_Makefile.in
diff --git a/net-mgmt/argus3-clients/files/patch-common::argus_util.c b/net-mgmt/argus3-clients/files/patch-common_argus_util.c
index c9fe888242e7..c9fe888242e7 100644
--- a/net-mgmt/argus3-clients/files/patch-common::argus_util.c
+++ b/net-mgmt/argus3-clients/files/patch-common_argus_util.c
diff --git a/net-mgmt/argus3-clients/files/patch-radium::Makefile.in b/net-mgmt/argus3-clients/files/patch-radium_Makefile.in
index b4aff807f68e..b4aff807f68e 100644
--- a/net-mgmt/argus3-clients/files/patch-radium::Makefile.in
+++ b/net-mgmt/argus3-clients/files/patch-radium_Makefile.in
diff --git a/net-mgmt/argus3-clients/files/patch-radump_Makefile.in b/net-mgmt/argus3-clients/files/patch-radump_Makefile.in
new file mode 100644
index 000000000000..fe94348d5f75
--- /dev/null
+++ b/net-mgmt/argus3-clients/files/patch-radump_Makefile.in
@@ -0,0 +1,11 @@
+--- radump/Makefile.in.orig	2010-02-04 17:27:44.000000000 +0300
++++ radump/Makefile.in	2010-02-04 17:28:00.000000000 +0300
+@@ -50,7 +50,7 @@
+ 
+ CC = @CC@
+ CCOPT = @V_CCOPT@
+-INCLS = -I. -I../include -I../common @V_INCLS@
++INCLS = -I. -I../include -I../common @V_INCLS@ @SASLFLAGS@
+ DEFS = @DEFS@
+ COMPATLIB = @COMPATLIB@ @LIB_SASL@ @LIBS@ @V_THREADS@ @V_GEOIPDEP@
+ 
diff --git a/net-mgmt/argus3-clients/files/patch-ragrep::Makefile.in b/net-mgmt/argus3-clients/files/patch-ragrep::Makefile.in
deleted file mode 100644
index 506373f80e02..000000000000
--- a/net-mgmt/argus3-clients/files/patch-ragrep::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ragrep/Makefile.in~	2008-02-05 04:37:43.000000000 +0100
-+++ ragrep/Makefile.in	2008-02-07 11:32:41.614018339 +0100
-@@ -38,7 +38,7 @@
- 
- CC = @CC@
- CCOPT = @V_CCOPT@
--INCLS = -I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../common @V_INCLS@
-+INCLS = -I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../common @V_INCLS@ @SASLFLAGS@
- DEFS = @DEFS@
- COMPATLIB = @COMPATLIB@ @LIB_SASL@ @LIBS@ @V_THREADS@
- 
diff --git a/net-mgmt/argus3-clients/files/patch-ramysql_Makefile.in b/net-mgmt/argus3-clients/files/patch-ramysql_Makefile.in
new file mode 100644
index 000000000000..54063f569363
--- /dev/null
+++ b/net-mgmt/argus3-clients/files/patch-ramysql_Makefile.in
@@ -0,0 +1,11 @@
+--- ramysql/Makefile.in.orig	2010-02-04 17:34:38.000000000 +0300
++++ ramysql/Makefile.in	2010-02-04 17:34:50.000000000 +0300
+@@ -50,7 +50,7 @@
+ 
+ CC = @CC@
+ CCOPT = @V_CCOPT@
+-INCLS = @INCLS@ -I. -I../include -I../common @V_INCLS@ @MYSQL_INCLS@
++INCLS = @INCLS@ -I. -I../include -I../common @V_INCLS@ @MYSQL_INCLS@ @SASLFLAGS@
+ DEFS = @DEFS@
+ COMPATLIB = @COMPATLIB@ @LIB_SASL@ @LIBS@ @V_THREADS@ @V_GEOIPDEP@
+ 
diff --git a/net-mgmt/argus3-clients/files/patch-ratop::Makefile.in b/net-mgmt/argus3-clients/files/patch-ratop_Makefile.in
index 0b65b3223685..0b65b3223685 100644
--- a/net-mgmt/argus3-clients/files/patch-ratop::Makefile.in
+++ b/net-mgmt/argus3-clients/files/patch-ratop_Makefile.in
diff --git a/net-mgmt/argus3-clients/pkg-plist b/net-mgmt/argus3-clients/pkg-plist
index abe12f0ae77e..21e9873fc25c 100644
--- a/net-mgmt/argus3-clients/pkg-plist
+++ b/net-mgmt/argus3-clients/pkg-plist
@@ -1,4 +1,3 @@
-bin/argusbug
 bin/ra
 bin/rabins
 bin/racluster
@@ -7,7 +6,6 @@ bin/radark
 bin/radump
 bin/rafilteraddr
 bin/ragraph
-bin/ragrep
 bin/rahisto
 bin/rahosts
 bin/ralabel
@@ -15,34 +13,38 @@ bin/ranonymize
 bin/rapath
 bin/rapolicy
 bin/raports
+bin/raservices
 bin/rasort
 bin/rasplit
+bin/rasql
+bin/rasqlinsert
 bin/rastream
 bin/rastrip
 bin/ratemplate
 bin/ratimerange
 bin/ratop
 bin/ratree
-include/cons_def.h
-include/cons_out.h
-lib/argus_client.a
-lib/argus_common.a
-lib/argus_parse.a
+bin/rauserdata
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/HOW-TO
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%EXAMPLESDIR%%/Config/delegated-ipv4-latest
 %%EXAMPLESDIR%%/Config/excel.rc
+%%EXAMPLESDIR%%/Config/iana-address-file
+%%EXAMPLESDIR%%/Config/iana-ipv4-address
+%%EXAMPLESDIR%%/Config/iana-multicast-address
+%%EXAMPLESDIR%%/Config/iana-port-numbers
 %%EXAMPLESDIR%%/Config/ra.print.all.conf
 %%EXAMPLESDIR%%/Config/racluster.conf
 %%EXAMPLESDIR%%/Config/radium.conf
 %%EXAMPLESDIR%%/Config/ragetcountrycodes.sh
+%%EXAMPLESDIR%%/Config/ralabel.conf
 %%EXAMPLESDIR%%/Config/ranonymize.conf
 %%EXAMPLESDIR%%/Config/rarc
 %%EXAMPLESDIR%%/Config/rastream.sh
+%%EXAMPLESDIR%%/Config/std.sig
 %%EXAMPLESDIR%%/Startup/radium
 %%EXAMPLESDIR%%/System/magic
 %%EXAMPLESDIR%%/System/protocols
@@ -50,4 +52,4 @@ lib/argus_parse.a
 @dirrm %%EXAMPLESDIR%%/Startup
 @dirrm %%EXAMPLESDIR%%/Config
 @dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%