6 files changed, 143 insertions, 51 deletions

diff --git a/net/argus/Makefile b/net/argus/Makefile
index 31370adc070b..1a071d55527e 100644
--- a/net/argus/Makefile
+++ b/net/argus/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	argus
-PORTVERSION=	1.8.1
+PORTVERSION=	2.0.0
 CATEGORIES=	net security
-MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/argus/current/
+MASTER_SITES=	http://qosient.com/argus/src/ \
+		ftp://qosient.com/pub/argus/src/
 
 MAINTAINER=	se@freebsd.org
 
@@ -17,28 +18,28 @@ LIB_DEPENDS=	wrap.7:${PORTSDIR}/security/tcp_wrapper
 .endif
 
 GNU_CONFIGURE=	true
+CONFIGURE_ARGS=	--exec-prefix=${PREFIX} #--without-flex --without-bison
 
-MAN1=	connections.1 ra.1 rasort.1 services.1
-MAN5=	argus.5
+MAN1=	ra.1 racount.1 ragator.1 ramon.1 rasort.1 raxml.1
+MAN5=	argus.5 argus.conf.5 rarc.5
 MAN8=	argus.8
 
-do-install:
-	${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
-.for i in connections.1 ra.1 rasort.1 services.1
-	${INSTALL_MAN} ${WRKSRC}/man/man1/$i ${PREFIX}/man/man1
-.endfor
-	${INSTALL_MAN} ${WRKSRC}/man/man5/argus.5 ${PREFIX}/man/man5/argus.5
-	${INSTALL_MAN} ${WRKSRC}/man/man8/argus.8 ${PREFIX}/man/man8/argus.8
+pre-install:
 	${INSTALL_DATA} ${WRKSRC}/include/cons_def.h ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/include/cons_out.h ${PREFIX}/include
+	${MKDIR} ${PREFIX}/share/examples/argus-2.0
+	${INSTALL_DATA} ${WRKSRC}/support/README ${PREFIX}/share/examples/argus-2.0
+.for i in Archive Config Deployment Startup System Xml
+	${MKDIR} ${PREFIX}/share/examples/argus-2.0/$i
+	${INSTALL_DATA} ${WRKSRC}/support/$i/* ${PREFIX}/share/examples/argus-2.0/$i
+.endfor
 .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
+	${MKDIR} ${PREFIX}/share/doc/argus-2.0/html/man
+.for i in README LICENSE COPYRIGHT doc/CHANGES doc/FAQ doc/HOW-TO
+	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/argus-2.0
+.endfor
+.for i in  doc/html/man/*.html
+	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/argus-2.0/html/man
 .endfor
 .endif
 
diff --git a/net/argus/distinfo b/net/argus/distinfo
index e4ea11ebedc8..66790230be2d 100644
--- a/net/argus/distinfo
+++ b/net/argus/distinfo
@@ -1 +1,2 @@
-MD5 (argus-1.8.1.tar.gz) = 863f865cbae42ae63b976c85b30fc288
+MD5 (argus-2.0.0.tar.gz) = 1a033f2be15aa919764bda2978a3cf84
+SIZE (argus-2.0.0.tar.gz) = 465960
diff --git a/net/argus/files/patch-aa b/net/argus/files/patch-aa
new file mode 100644
index 000000000000..4f216582735f
--- /dev/null
+++ b/net/argus/files/patch-aa
@@ -0,0 +1,54 @@
+--- Makefile.in.orig	Sun Apr  8 17:17:01 2001
++++ Makefile.in	Sun Apr  8 17:40:11 2001
+@@ -60,7 +60,7 @@
+ # Pathname of directory to install the man page
+ MANDEST = @mandir@
+ # Pathname of directory to install the docs
+-DOCDIR = /usr/share/doc/argus-2.0
++DOCDIR = ${prefix}/share/doc/argus-2.0
+ 
+ # VPATH
+ srcdir = @srcdir@
+@@ -127,15 +127,6 @@
+ 	[ -d $(DESTDIR)/argus/archive ] || \
+ 		(mkdir -p $(DESTDIR)/argus/archive; chmod 755 $(DESTDIR)/argus/archive)
+ 
+-	[ -d $(DOCDIR) ] || \
+-		(mkdir -p $(DOCDIR); chmod 755 $(DOCDIR))
+-
+-	[ -d $(DOCDIR)/html ] || \
+-		(mkdir -p $(DOCDIR)/html; chmod 755 $(DOCDIR)/html)
+-
+-	[ -d $(DOCDIR)/html/man ] || \
+-		(mkdir -p $(DOCDIR)/html/man; chmod 755 $(DOCDIR)/html/man)
+-
+ 	[ -d /var/log/argus ] || \
+ 		(mkdir -p /var/log/argus; chmod 755 /var/log/argus)
+ 
+@@ -148,17 +139,9 @@
+ 		fi; \
+ 	done
+ 
+-	$(INSTALL) -m 0644 $(srcdir)/doc/CHANGES $(DOCDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(DOCDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(DOCDIR)
+-	$(INSTALL) -m 0644 $(srcdir)/doc/html/man/*.html $(DOCDIR)/html/man
+-
+ 	$(INSTALL) -m 0644 $(srcdir)/README $(DESTDIR)/argus
+-	$(INSTALL) -m 0644 $(srcdir)/README $(DOCDIR)
+ 	$(INSTALL) -m 0644 $(srcdir)/LICENSE $(DESTDIR)/argus
+-	$(INSTALL) -m 0644 $(srcdir)/LICENSE $(DOCDIR)
+ 	$(INSTALL) -m 0644 $(srcdir)/COPYRIGHT $(DESTDIR)/argus
+-	$(INSTALL) -m 0644 $(srcdir)/COPYRIGHT $(DOCDIR)
+ 
+ 	$(INSTALL) -m 0755 $(srcdir)/bin/argusbug $(BINDIR)/argusbug
+ 	$(INSTALL) -m 0755 $(srcdir)/support/Archive/argusarchive $(BINDIR)/argusarchive
+@@ -176,6 +159,8 @@
+ 		$(MANDEST)/man1/racount.1
+ 	$(INSTALL) -m 0644 $(srcdir)/man/man1/ragator.1 \
+ 		$(MANDEST)/man1/ragator.1
++	$(INSTALL) -m 0644 $(srcdir)/man/man1/ramon.1 \
++		$(MANDEST)/man1/ramon.1
+ 	$(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 \
+ 		$(MANDEST)/man1/rasort.1
+ 	$(INSTALL) -m 0644 $(srcdir)/man/man1/raxml.1 \
diff --git a/net/argus/files/patch-ae b/net/argus/files/patch-ae
index 7c271fc998ef..e69de29bb2d1 100644
--- a/net/argus/files/patch-ae
+++ b/net/argus/files/patch-ae
@@ -1,11 +0,0 @@
---- 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-descr b/net/argus/pkg-descr
index 7705b077032a..a6dd9ea6cc42 100644
--- a/net/argus/pkg-descr
+++ b/net/argus/pkg-descr
@@ -1,10 +1,12 @@
-Argus is a generic IP network transaction auditing tool that has
-has been used by thousands of sites to perform a number of powerful
-network management tasks that are currently not possible using commercial
-network management tools.
+Argus is a generic IP network transaction auditing tool that has been used 
+by thousands of sites to perform a number of powerful network management 
+tasks that are currently not possible using commercial network management 
+tools.
 
 Argus runs as an application level daemon, promiscuously reading network
 datagrams from a specified interface, and generates network traffic audit
 records for the network activity that it encounters.  It is the way that
 Argus categorizes and reports on network activity that makes this tool
 unique and powerful.
+
+WWW: http://www.quosient.com/argus
diff --git a/net/argus/pkg-plist b/net/argus/pkg-plist
index 3e7fd3a0f9cb..d23818bb9593 100644
--- a/net/argus/pkg-plist
+++ b/net/argus/pkg-plist
@@ -1,22 +1,67 @@
-bin/argus
-bin/fullra
+argus/COPYRIGHT
+argus/LICENSE
+argus/README
+bin/argusarchive
+bin/argusbug
 bin/ra
-bin/raconnections
 bin/racount
-bin/radjacency
-bin/radnstats
-bin/raservices
+bin/ragator
+bin/ramon
+bin/rapath
 bin/rasort
+bin/raxml
 include/cons_def.h
 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
-share/doc/argus/policy.test
-share/doc/argus/ra.conf
-share/doc/argus/services
-@dirrm share/doc/argus
+lib/argus_common.a
+lib/argus_parse.a
+sbin/argus
+share/doc/argus-2.0/CHANGES
+share/doc/argus-2.0/COPYRIGHT
+share/doc/argus-2.0/FAQ
+share/doc/argus-2.0/HOW-TO
+share/doc/argus-2.0/LICENSE
+share/doc/argus-2.0/README
+share/doc/argus-2.0/html/man/argus.5.html
+share/doc/argus-2.0/html/man/argus.8.html
+share/doc/argus-2.0/html/man/argus.conf.5.html
+share/doc/argus-2.0/html/man/hosts_access.5.html
+share/doc/argus-2.0/html/man/hosts_options.5.html
+share/doc/argus-2.0/html/man/ra.1.html
+share/doc/argus-2.0/html/man/racount.1.html
+share/doc/argus-2.0/html/man/ragator.1.html
+share/doc/argus-2.0/html/man/ramon.1.html
+share/doc/argus-2.0/html/man/rarc.5.html
+share/doc/argus-2.0/html/man/rasort.1.html
+share/doc/argus-2.0/html/man/raxml.1.html
+share/doc/argus-2.0/html/man/tcpd.8.html
+share/doc/argus-2.0/html/man/tcpdump.1.html
+share/examples/argus-2.0/Archive/argusarchive
+share/examples/argus-2.0/Config/argus.conf
+share/examples/argus-2.0/Config/excel.rc
+share/examples/argus-2.0/Config/fmodel.conf
+share/examples/argus-2.0/Config/rarc
+share/examples/argus-2.0/Deployment/sample
+share/examples/argus-2.0/README
+share/examples/argus-2.0/Startup/README
+share/examples/argus-2.0/Startup/argus
+share/examples/argus-2.0/System/crontab
+share/examples/argus-2.0/System/magic
+share/examples/argus-2.0/Xml/ArgusRecord.biz
+share/examples/argus-2.0/Xml/ArgusRecord.dtd
+share/examples/argus-2.0/Xml/ArgusRecord.sox
+share/examples/argus-2.0/Xml/ArgusRecord.xdr
+share/examples/argus-2.0/Xml/ArgusRecord.xsd
+share/examples/argus-2.0/Xml/ArgusRecordSample.xml
+share/examples/argus-2.0/Xml/README
+@dirrm share/examples/argus-2.0/Xml
+@dirrm share/examples/argus-2.0/System
+@dirrm share/examples/argus-2.0/Startup
+@dirrm share/examples/argus-2.0/Deployment
+@dirrm share/examples/argus-2.0/Config
+@dirrm share/examples/argus-2.0/Archive
+@dirrm share/examples/argus-2.0
+@dirrm share/doc/argus-2.0/html/man
+@dirrm share/doc/argus-2.0/html
+@dirrm share/doc/argus-2.0
+@dirrm argus/archive
+@dirrm argus