Upgrade to 1.8.1.

Make myself maintainer of this port (agreed to by
Jonathan Hanna, the current maintainer of this port).

8 files changed, 48 insertions, 22 deletions

diff --git a/net-mgmt/argus/Makefile b/net-mgmt/argus/Makefile
index 65338df93ea2..31370adc070b 100644
--- a/net-mgmt/argus/Makefile
+++ b/net-mgmt/argus/Makefile
@@ -6,29 +6,27 @@
 #
 
 PORTNAME=	argus
-PORTVERSION=	1.7.b.1e
+PORTVERSION=	1.8.1
 CATEGORIES=	net security
-MASTER_SITES=	ftp://ftp.sei.cmu.edu/pub/argus/argus-1.7/
-DISTNAME=	argus-1.7.beta.1e
+MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/argus/current/
 
-MAINTAINER=	jhanna@home.com
+MAINTAINER=	se@freebsd.org
 
 .if !exists(/usr/include/tcpd.h)
 LIB_DEPENDS=	wrap.7:${PORTSDIR}/security/tcp_wrapper
 .endif
 
 GNU_CONFIGURE=	true
-CONFIGURE_ARGS=	--with-pcap=bpf
 
 MAN1=	connections.1 ra.1 rasort.1 services.1
 MAN5=	argus.5
 MAN8=	argus.8
 
 do-install:
-.for i in adjacency argus_bpf connections dnstats ra raservices rasort
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/argus_bpf ${PREFIX}/bin/argus
+.for i in fullra ra radjacency raconnections racount radnstats raservices rasort
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${PREFIX}/bin
 .endfor
-	${MV} ${PREFIX}/bin/argus_bpf ${PREFIX}/bin/argus
 .for i in connections.1 ra.1 rasort.1 services.1
 	${INSTALL_MAN} ${WRKSRC}/man/man1/$i ${PREFIX}/man/man1
 .endfor
@@ -38,6 +36,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/cons_out.h ${PREFIX}/include
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/argus
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/argus/README.argus
 .for i in CA-95.01 CA-95.01.scan.sh README configs dailyscan.sh policy.conf policy.test ra.conf services
 	${INSTALL_DATA} ${WRKSRC}/examples/$i ${PREFIX}/share/doc/argus
 .endfor
diff --git a/net-mgmt/argus/distinfo b/net-mgmt/argus/distinfo
index e7001591fb6a..e4ea11ebedc8 100644
--- a/net-mgmt/argus/distinfo
+++ b/net-mgmt/argus/distinfo
@@ -1 +1 @@
-MD5 (argus-1.7.beta.1e.tar.gz) = e39be3326791ded525cc33bb0314e95b
+MD5 (argus-1.8.1.tar.gz) = 863f865cbae42ae63b976c85b30fc288
diff --git a/net-mgmt/argus/files/patch-ae b/net-mgmt/argus/files/patch-ae
new file mode 100644
index 000000000000..7c271fc998ef
--- /dev/null
+++ b/net-mgmt/argus/files/patch-ae
@@ -0,0 +1,11 @@
+--- common/addrtoname.c.orig	Thu Apr 15 18:15:00 1999
++++ common/addrtoname.c	Tue Aug 15 18:11:25 2000
+@@ -59,7 +59,7 @@
+ static SIGRET nohostname(int);
+ #ifdef ETHER_SERVICE
+ struct ether_addr;
+-#ifndef linux
++#if !defined(linux) && !defined(__FreeBSD__)
+ extern int ether_ntohost(char *, struct ether_addr *);
+ #endif
+ #endif
diff --git a/net-mgmt/argus/pkg-plist b/net-mgmt/argus/pkg-plist
index 230751a94af1..3e7fd3a0f9cb 100644
--- a/net-mgmt/argus/pkg-plist
+++ b/net-mgmt/argus/pkg-plist
@@ -1,8 +1,10 @@
-bin/adjacency
 bin/argus
-bin/connections
-bin/dnstats
+bin/fullra
 bin/ra
+bin/raconnections
+bin/racount
+bin/radjacency
+bin/radnstats
 bin/raservices
 bin/rasort
 include/cons_def.h
@@ -10,6 +12,7 @@ include/cons_out.h
 share/doc/argus/CA-95.01
 share/doc/argus/CA-95.01.scan.sh
 share/doc/argus/README
+share/doc/argus/README.argus
 share/doc/argus/configs
 share/doc/argus/dailyscan.sh
 share/doc/argus/policy.conf
diff --git a/net/argus/Makefile b/net/argus/Makefile
index 65338df93ea2..31370adc070b 100644
--- a/net/argus/Makefile
+++ b/net/argus/Makefile
@@ -6,29 +6,27 @@
 #
 
 PORTNAME=	argus
-PORTVERSION=	1.7.b.1e
+PORTVERSION=	1.8.1
 CATEGORIES=	net security
-MASTER_SITES=	ftp://ftp.sei.cmu.edu/pub/argus/argus-1.7/
-DISTNAME=	argus-1.7.beta.1e
+MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/argus/current/
 
-MAINTAINER=	jhanna@home.com
+MAINTAINER=	se@freebsd.org
 
 .if !exists(/usr/include/tcpd.h)
 LIB_DEPENDS=	wrap.7:${PORTSDIR}/security/tcp_wrapper
 .endif
 
 GNU_CONFIGURE=	true
-CONFIGURE_ARGS=	--with-pcap=bpf
 
 MAN1=	connections.1 ra.1 rasort.1 services.1
 MAN5=	argus.5
 MAN8=	argus.8
 
 do-install:
-.for i in adjacency argus_bpf connections dnstats ra raservices rasort
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/argus_bpf ${PREFIX}/bin/argus
+.for i in fullra ra radjacency raconnections racount radnstats raservices rasort
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/$i ${PREFIX}/bin
 .endfor
-	${MV} ${PREFIX}/bin/argus_bpf ${PREFIX}/bin/argus
 .for i in connections.1 ra.1 rasort.1 services.1
 	${INSTALL_MAN} ${WRKSRC}/man/man1/$i ${PREFIX}/man/man1
 .endfor
@@ -38,6 +36,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/cons_out.h ${PREFIX}/include
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/argus
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/argus/README.argus
 .for i in CA-95.01 CA-95.01.scan.sh README configs dailyscan.sh policy.conf policy.test ra.conf services
 	${INSTALL_DATA} ${WRKSRC}/examples/$i ${PREFIX}/share/doc/argus
 .endfor
diff --git a/net/argus/distinfo b/net/argus/distinfo
index e7001591fb6a..e4ea11ebedc8 100644
--- a/net/argus/distinfo
+++ b/net/argus/distinfo
@@ -1 +1 @@
-MD5 (argus-1.7.beta.1e.tar.gz) = e39be3326791ded525cc33bb0314e95b
+MD5 (argus-1.8.1.tar.gz) = 863f865cbae42ae63b976c85b30fc288
diff --git a/net/argus/files/patch-ae b/net/argus/files/patch-ae
new file mode 100644
index 000000000000..7c271fc998ef
--- /dev/null
+++ b/net/argus/files/patch-ae
@@ -0,0 +1,11 @@
+--- common/addrtoname.c.orig	Thu Apr 15 18:15:00 1999
++++ common/addrtoname.c	Tue Aug 15 18:11:25 2000
+@@ -59,7 +59,7 @@
+ static SIGRET nohostname(int);
+ #ifdef ETHER_SERVICE
+ struct ether_addr;
+-#ifndef linux
++#if !defined(linux) && !defined(__FreeBSD__)
+ extern int ether_ntohost(char *, struct ether_addr *);
+ #endif
+ #endif
diff --git a/net/argus/pkg-plist b/net/argus/pkg-plist
index 230751a94af1..3e7fd3a0f9cb 100644
--- a/net/argus/pkg-plist
+++ b/net/argus/pkg-plist
@@ -1,8 +1,10 @@
-bin/adjacency
 bin/argus
-bin/connections
-bin/dnstats
+bin/fullra
 bin/ra
+bin/raconnections
+bin/racount
+bin/radjacency
+bin/radnstats
 bin/raservices
 bin/rasort
 include/cons_def.h
@@ -10,6 +12,7 @@ include/cons_out.h
 share/doc/argus/CA-95.01
 share/doc/argus/CA-95.01.scan.sh
 share/doc/argus/README
+share/doc/argus/README.argus
 share/doc/argus/configs
 share/doc/argus/dailyscan.sh
 share/doc/argus/policy.conf