8 files changed, 128 insertions, 98 deletions

diff --git a/net-mgmt/argus/Makefile b/net-mgmt/argus/Makefile
index c5aaeea56928..2391f4cd0952 100644
--- a/net-mgmt/argus/Makefile
+++ b/net-mgmt/argus/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	argus
-PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTVERSION=	2.0.4
 CATEGORIES=	net security
 MASTER_SITES=	http://qosient.com/argus/src/ \
 		ftp://qosient.com/pub/argus/src/
@@ -21,11 +20,12 @@ LIB_DEPENDS=	wrap.7:${PORTSDIR}/security/tcp_wrapper
 GNU_CONFIGURE=	true
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX} #--without-flex --without-bison
 
-MAN1=	ra.1 racount.1 ragator.1 rasort.1 raxml.1
+MAN1=	ra.1 racount.1 ragator.1 ramon.1 rasort.1 raxml.1
 MAN5=	argus.5 argus.conf.5 rarc.5
 MAN8=	argus.8
 
 pre-install:
+	${MKDIR} ${PREFIX}/argus/archive
 	${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
@@ -36,7 +36,7 @@ pre-install:
 .endfor
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/argus-2.0/html/man
-.for i in README COPYING COPYRIGHT doc/CHANGES doc/FAQ doc/HOW-TO
+.for i in README COPYING CREDITS 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
diff --git a/net-mgmt/argus/distinfo b/net-mgmt/argus/distinfo
index eef1c895c198..7f43c157a658 100644
--- a/net-mgmt/argus/distinfo
+++ b/net-mgmt/argus/distinfo
@@ -1,2 +1,2 @@
-MD5 (argus-2.0.3.tar.gz) = 0ec94c35d5642fc391af3a2511eb076a
-SIZE (argus-2.0.3.tar.gz) = 420058
+MD5 (argus-2.0.4.tar.gz) = f90a02109c2c12b235d8c0525a3cdd1a
+SIZE (argus-2.0.4.tar.gz) = 444863
diff --git a/net-mgmt/argus/files/patch-aa b/net-mgmt/argus/files/patch-aa
index b943e4f5bb47..c3066865d7ac 100644
--- a/net-mgmt/argus/files/patch-aa
+++ b/net-mgmt/argus/files/patch-aa
@@ -1,46 +1,64 @@
---- Makefile.in.orig	Thu Oct 11 21:49:45 2001
-+++ Makefile.in	Sat Nov 24 13:45:09 2001
-@@ -57,7 +57,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
+--- Makefile.in.orig	Mon Nov 26 21:42:32 2001
++++ Makefile.in	Thu Jan 17 23:18:54 2002
+@@ -32,7 +32,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
  srcdir = @srcdir@
-@@ -124,15 +124,6 @@
- 	[ -d $(DESTDIR)/argus/archive ] || \
- 		(mkdir -p $(DESTDIR)/argus/archive; chmod 755 $(DESTDIR)/argus/archive)
+-docdir = /usr/share/doc/argus-2.0
++docdir = @prefix@/share/doc/argus-2.0
+ 
+ 
+ #### End of system configuration section. ####
+@@ -63,28 +63,6 @@
+ .PHONY: all
  
--	[ -d $(DOCDIR) ] || \
--		(mkdir -p $(DOCDIR); chmod 755 $(DOCDIR))
+ install:  force
+-	make installdirs
+-	[ -d @prefix@ ] || \
+-		(mkdir -p @prefix@; chmod 755 @prefix@)
 -
--	[ -d $(DOCDIR)/html ] || \
--		(mkdir -p $(DOCDIR)/html; chmod 755 $(DOCDIR)/html)
+-	[ -d @sbindir@ ] || \
+-		(mkdir -p @sbindir@; chmod 755 @sbindir@)
 -
--	[ -d $(DOCDIR)/html/man ] || \
--		(mkdir -p $(DOCDIR)/html/man; chmod 755 $(DOCDIR)/html/man)
+-	[ -d $(exec_prefix)/argus ] || \
+-		(mkdir -p $(exec_prefix)/argus; chmod 755 $(exec_prefix)/argus)
 -
- 	[ -d /var/log/argus ] || \
- 		(mkdir -p /var/log/argus; chmod 755 /var/log/argus)
- 
-@@ -145,17 +136,9 @@
+-	[ -d $(exec_prefix)/argus/archive ] || \
+-		(mkdir -p $(exec_prefix)/argus/archive; chmod 755 $(exec_prefix)/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)
+-
+ 	@for i in  $(DIRS) ; do \
+ 		if [ -d $$i ] ; then \
+ 		echo "making in $$i"; \
+@@ -94,23 +72,10 @@
  		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)/COPYING $(DESTDIR)/argus
- 	$(INSTALL) -m 0644 $(srcdir)/COPYRIGHT $(DESTDIR)/argus
--	$(INSTALL) -m 0644 $(srcdir)/COPYRIGHT $(DOCDIR)
- 
- 	$(INSTALL) -m 0755 $(srcdir)/bin/argusbug $(BINDIR)/argusbug
- 
+-	$(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 $(prefix)/argus
+-	$(INSTALL) -m 0644 $(srcdir)/README $(docdir)
+ 	$(INSTALL) -m 0644 $(srcdir)/COPYING $(prefix)/argus
+-	$(INSTALL) -m 0644 $(srcdir)/COPYING $(docdir)
+-
+	$(INSTALL) -m 0755 $(srcdir)/bin/argusbug @bindir@/argusbug
+
+-	[ -d @mandir@ ] || \
+-		(mkdir -p @mandir@; chmod 755 @mandir@)
+-	[ -d @mandir@/man5 ] || \
+-		(mkdir -p @mandir@/man5; chmod 755 @mandir@/man5)
+-	[ -d @mandir@/man8 ] || \
+-		(mkdir -p @mandir@/man8; chmod 755 @mandir@/man8)
+ 	$(INSTALL) -m 0644 $(srcdir)/man/man5/argus.5 @mandir@/man5/argus.5
+ 	$(INSTALL) -m 0644 $(srcdir)/man/man5/argus.conf.5 @mandir@/man5/argus.conf.5
+ 	$(INSTALL) -m 0644 $(srcdir)/man/man5/rarc.5 @mandir@/man5/rarc.5
diff --git a/net-mgmt/argus/pkg-plist b/net-mgmt/argus/pkg-plist
index 595f98e3d749..4300dcd5f87c 100644
--- a/net-mgmt/argus/pkg-plist
+++ b/net-mgmt/argus/pkg-plist
@@ -1,5 +1,4 @@
 argus/COPYING
-argus/COPYRIGHT
 argus/README
 bin/argusbug
 bin/ra
@@ -16,7 +15,7 @@ lib/argus_parse.a
 sbin/argus
 %%PORTDOCS%%share/doc/argus-2.0/CHANGES
 %%PORTDOCS%%share/doc/argus-2.0/COPYING
-%%PORTDOCS%%share/doc/argus-2.0/COPYRIGHT
+%%PORTDOCS%%share/doc/argus-2.0/CREDITS
 %%PORTDOCS%%share/doc/argus-2.0/FAQ
 %%PORTDOCS%%share/doc/argus-2.0/HOW-TO
 %%PORTDOCS%%share/doc/argus-2.0/README
@@ -44,7 +43,6 @@ 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
@@ -59,5 +57,4 @@ share/examples/argus-2.0/Xml/README
 %%PORTDOCS%%@dirrm share/doc/argus-2.0/html/man
 %%PORTDOCS%%@dirrm share/doc/argus-2.0/html
 %%PORTDOCS%%@dirrm share/doc/argus-2.0
-@dirrm argus/archive
-@dirrm argus
+@exec rmdir @D/argus/archive @D/argus >/dev/null 2>&1
diff --git a/net/argus/Makefile b/net/argus/Makefile
index c5aaeea56928..2391f4cd0952 100644
--- a/net/argus/Makefile
+++ b/net/argus/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	argus
-PORTVERSION=	2.0.3
-PORTREVISION=	1
+PORTVERSION=	2.0.4
 CATEGORIES=	net security
 MASTER_SITES=	http://qosient.com/argus/src/ \
 		ftp://qosient.com/pub/argus/src/
@@ -21,11 +20,12 @@ LIB_DEPENDS=	wrap.7:${PORTSDIR}/security/tcp_wrapper
 GNU_CONFIGURE=	true
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX} #--without-flex --without-bison
 
-MAN1=	ra.1 racount.1 ragator.1 rasort.1 raxml.1
+MAN1=	ra.1 racount.1 ragator.1 ramon.1 rasort.1 raxml.1
 MAN5=	argus.5 argus.conf.5 rarc.5
 MAN8=	argus.8
 
 pre-install:
+	${MKDIR} ${PREFIX}/argus/archive
 	${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
@@ -36,7 +36,7 @@ pre-install:
 .endfor
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/argus-2.0/html/man
-.for i in README COPYING COPYRIGHT doc/CHANGES doc/FAQ doc/HOW-TO
+.for i in README COPYING CREDITS 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
diff --git a/net/argus/distinfo b/net/argus/distinfo
index eef1c895c198..7f43c157a658 100644
--- a/net/argus/distinfo
+++ b/net/argus/distinfo
@@ -1,2 +1,2 @@
-MD5 (argus-2.0.3.tar.gz) = 0ec94c35d5642fc391af3a2511eb076a
-SIZE (argus-2.0.3.tar.gz) = 420058
+MD5 (argus-2.0.4.tar.gz) = f90a02109c2c12b235d8c0525a3cdd1a
+SIZE (argus-2.0.4.tar.gz) = 444863
diff --git a/net/argus/files/patch-aa b/net/argus/files/patch-aa
index b943e4f5bb47..c3066865d7ac 100644
--- a/net/argus/files/patch-aa
+++ b/net/argus/files/patch-aa
@@ -1,46 +1,64 @@
---- Makefile.in.orig	Thu Oct 11 21:49:45 2001
-+++ Makefile.in	Sat Nov 24 13:45:09 2001
-@@ -57,7 +57,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
+--- Makefile.in.orig	Mon Nov 26 21:42:32 2001
++++ Makefile.in	Thu Jan 17 23:18:54 2002
+@@ -32,7 +32,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
  srcdir = @srcdir@
-@@ -124,15 +124,6 @@
- 	[ -d $(DESTDIR)/argus/archive ] || \
- 		(mkdir -p $(DESTDIR)/argus/archive; chmod 755 $(DESTDIR)/argus/archive)
+-docdir = /usr/share/doc/argus-2.0
++docdir = @prefix@/share/doc/argus-2.0
+ 
+ 
+ #### End of system configuration section. ####
+@@ -63,28 +63,6 @@
+ .PHONY: all
  
--	[ -d $(DOCDIR) ] || \
--		(mkdir -p $(DOCDIR); chmod 755 $(DOCDIR))
+ install:  force
+-	make installdirs
+-	[ -d @prefix@ ] || \
+-		(mkdir -p @prefix@; chmod 755 @prefix@)
 -
--	[ -d $(DOCDIR)/html ] || \
--		(mkdir -p $(DOCDIR)/html; chmod 755 $(DOCDIR)/html)
+-	[ -d @sbindir@ ] || \
+-		(mkdir -p @sbindir@; chmod 755 @sbindir@)
 -
--	[ -d $(DOCDIR)/html/man ] || \
--		(mkdir -p $(DOCDIR)/html/man; chmod 755 $(DOCDIR)/html/man)
+-	[ -d $(exec_prefix)/argus ] || \
+-		(mkdir -p $(exec_prefix)/argus; chmod 755 $(exec_prefix)/argus)
 -
- 	[ -d /var/log/argus ] || \
- 		(mkdir -p /var/log/argus; chmod 755 /var/log/argus)
- 
-@@ -145,17 +136,9 @@
+-	[ -d $(exec_prefix)/argus/archive ] || \
+-		(mkdir -p $(exec_prefix)/argus/archive; chmod 755 $(exec_prefix)/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)
+-
+ 	@for i in  $(DIRS) ; do \
+ 		if [ -d $$i ] ; then \
+ 		echo "making in $$i"; \
+@@ -94,23 +72,10 @@
  		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)/COPYING $(DESTDIR)/argus
- 	$(INSTALL) -m 0644 $(srcdir)/COPYRIGHT $(DESTDIR)/argus
--	$(INSTALL) -m 0644 $(srcdir)/COPYRIGHT $(DOCDIR)
- 
- 	$(INSTALL) -m 0755 $(srcdir)/bin/argusbug $(BINDIR)/argusbug
- 
+-	$(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 $(prefix)/argus
+-	$(INSTALL) -m 0644 $(srcdir)/README $(docdir)
+ 	$(INSTALL) -m 0644 $(srcdir)/COPYING $(prefix)/argus
+-	$(INSTALL) -m 0644 $(srcdir)/COPYING $(docdir)
+-
+	$(INSTALL) -m 0755 $(srcdir)/bin/argusbug @bindir@/argusbug
+
+-	[ -d @mandir@ ] || \
+-		(mkdir -p @mandir@; chmod 755 @mandir@)
+-	[ -d @mandir@/man5 ] || \
+-		(mkdir -p @mandir@/man5; chmod 755 @mandir@/man5)
+-	[ -d @mandir@/man8 ] || \
+-		(mkdir -p @mandir@/man8; chmod 755 @mandir@/man8)
+ 	$(INSTALL) -m 0644 $(srcdir)/man/man5/argus.5 @mandir@/man5/argus.5
+ 	$(INSTALL) -m 0644 $(srcdir)/man/man5/argus.conf.5 @mandir@/man5/argus.conf.5
+ 	$(INSTALL) -m 0644 $(srcdir)/man/man5/rarc.5 @mandir@/man5/rarc.5
diff --git a/net/argus/pkg-plist b/net/argus/pkg-plist
index 595f98e3d749..4300dcd5f87c 100644
--- a/net/argus/pkg-plist
+++ b/net/argus/pkg-plist
@@ -1,5 +1,4 @@
 argus/COPYING
-argus/COPYRIGHT
 argus/README
 bin/argusbug
 bin/ra
@@ -16,7 +15,7 @@ lib/argus_parse.a
 sbin/argus
 %%PORTDOCS%%share/doc/argus-2.0/CHANGES
 %%PORTDOCS%%share/doc/argus-2.0/COPYING
-%%PORTDOCS%%share/doc/argus-2.0/COPYRIGHT
+%%PORTDOCS%%share/doc/argus-2.0/CREDITS
 %%PORTDOCS%%share/doc/argus-2.0/FAQ
 %%PORTDOCS%%share/doc/argus-2.0/HOW-TO
 %%PORTDOCS%%share/doc/argus-2.0/README
@@ -44,7 +43,6 @@ 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
@@ -59,5 +57,4 @@ share/examples/argus-2.0/Xml/README
 %%PORTDOCS%%@dirrm share/doc/argus-2.0/html/man
 %%PORTDOCS%%@dirrm share/doc/argus-2.0/html
 %%PORTDOCS%%@dirrm share/doc/argus-2.0
-@dirrm argus/archive
-@dirrm argus
+@exec rmdir @D/argus/archive @D/argus >/dev/null 2>&1