7 files changed, 582 insertions, 158 deletions

diff --git a/net-mgmt/argus/Makefile b/net-mgmt/argus/Makefile
index 07fcf1452452..adba7210193a 100644
--- a/net-mgmt/argus/Makefile
+++ b/net-mgmt/argus/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	argus
-PORTVERSION=	2.0.5
-PORTREVISION=	1
+PORTVERSION=	2.0.6
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	http://qosient.com/argus/src/ \
 		ftp://qosient.com/pub/argus/src/
@@ -15,42 +14,38 @@ MASTER_SITES=	http://qosient.com/argus/src/ \
 MAINTAINER=	se@freebsd.org
 COMMENT=	A generic IP network transaction auditing tool
 
-.if !exists(/usr/include/tcpd.h)
-LIB_DEPENDS=	wrap.7:${PORTSDIR}/security/tcp_wrapper
-.endif
 .if defined(WITH_SASL)
-LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
+LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 .endif
+RUN_DEPENDS=	${LOCALBASE}/bin/ragrep:${PORTSDIR}/net-mgmt/argus-clients
 
 USE_BISON=	true
 GNU_CONFIGURE=	true
-CONFIGURE_ARGS=	--exec-prefix=${PREFIX} #--without-flex --without-bison
+CONFIGURE_ARGS=	--exec-prefix=${PREFIX}
 .if defined(WITH_SASL)
-CONFIGURE_ARGS+=	--with-sasl=${PREFIX}
-CFLAGS+=	-I${PREFIX}/include/sasl
+CONFIGURE_ARGS+= --with-sasl=${PREFIX}
 .endif
 
-MAN1=	ra.1 racount.1 ragator.1 ramon.1 rasort.1 raxml.1
-MAN5=	argus.5 argus.conf.5 rarc.5
-MAN8=	argus.8
+DOCSDIR?=       ${PREFIX}/share/doc/argus-2.0
+
+MAN5=		argus.5 argus.conf.5
+MAN8=		argus.8
 
-pre-install:
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/argus_bpf ${PREFIX}/sbin/argus
 	${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
-	${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-2.0/html/man
-.for i in README COPYING CREDITS doc/CHANGES doc/FAQ doc/HOW-TO
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/argus-2.0
-.endfor
+	${MKDIR} ${DOCSDIR}/html/man
 .for i in  doc/html/man/*.html
-	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/share/doc/argus-2.0/html/man
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}/html/man
+.endfor
+.endif
+.if !defined(NOMAN)
+.for i in ${MAN5}
+	${INSTALL_DATA} ${WRKSRC}/man/man5/$i ${PREFIX}/man/man5
+.endfor
+.for i in ${MAN8}
+	${INSTALL_DATA} ${WRKSRC}/man/man8/$i ${PREFIX}/man/man8
 .endfor
 .endif
 
diff --git a/net-mgmt/argus/distinfo b/net-mgmt/argus/distinfo
index baea3d01c8d5..8e1d21978256 100644
--- a/net-mgmt/argus/distinfo
+++ b/net-mgmt/argus/distinfo
@@ -1,2 +1,2 @@
-MD5 (argus-2.0.5.tar.gz) = 76ae6e86a59af2e7f61e746ad2df3e54
-SIZE (argus-2.0.5.tar.gz) = 495234
+MD5 (argus-2.0.6.tar.gz) = ecc1b6880f32fab5adc93fce5186dc8e
+SIZE (argus-2.0.6.tar.gz) = 349299
diff --git a/net-mgmt/argus/files/patch-2.0.6-fix-2004-05-10 b/net-mgmt/argus/files/patch-2.0.6-fix-2004-05-10
new file mode 100644
index 000000000000..257892befd03
--- /dev/null
+++ b/net-mgmt/argus/files/patch-2.0.6-fix-2004-05-10
@@ -0,0 +1,520 @@
+diff -u3 -r ./ChangeLog /tmp/1/argus-2.0.6.fixes.1/ChangeLog
+--- ./ChangeLog	Wed May  5 15:15:44 2004
++++ /tmp/1/argus-2.0.6.fixes.1/ChangeLog	Mon May 10 19:09:58 2004
+@@ -1,3 +1,6 @@
++Mon May 10 13:02:46 EDT 2004
++	* bug in -F processing fixed.
++
+ Wed May  5 09:15:34 EDT 2004
+ 	* argus-2.0.6 released.
+ 
+diff -u3 -r ./VERSION /tmp/1/argus-2.0.6.fixes.1/VERSION
+--- ./VERSION	Wed May  5 15:54:22 2004
++++ /tmp/1/argus-2.0.6.fixes.1/VERSION	Mon May 10 19:10:12 2004
+@@ -1 +1 @@
+-2.0.6
++2.0.6.fixes.1
+diff -u3 -r ./aclocal.m4 /tmp/1/argus-2.0.6.fixes.1/aclocal.m4
+--- ./aclocal.m4	Mon Feb 23 16:00:29 2004
++++ /tmp/1/argus-2.0.6.fixes.1/aclocal.m4	Mon May 10 14:53:01 2004
+@@ -322,7 +322,7 @@
+ 
+ dnl
+ dnl If the file .debug exists:
+-dnl   Add NTAM_DEBUG to the condefs.h file.
++dnl   Add ARGUS_DEBUG to the condefs.h file.
+ dnl
+ dnl usage:
+ dnl
+@@ -338,13 +338,13 @@
+     [
+     if test -f .debug ; then
+         cat >> confdefs.h <<\EOF
+-#define NTAMDEBUG 1
++#define ARGUSDEBUG 1
+ EOF
+     fi])
+ 
+ dnl 
+ dnl If the file .threads exists:
+-dnl   Add NTAM_THREADS to the condefs.h file.
++dnl   Add ARGUS_THREADS to the condefs.h file.
+ dnl
+ dnl usage:
+ dnl
+@@ -360,7 +360,7 @@
+     [
+     if test -f .threads ; then
+         cat >> confdefs.h <<\EOF
+-#define NTAM_THREADS 1
++#define ARGUS_THREADS 1
+ EOF
+        if test "$GCC" = yes ; then
+            LIBS="$LIBS -pthread"
+@@ -451,7 +451,7 @@
+          LIB_SASL="$LIB_SASL -lsasl"
+ 
+          if test "$with_sasl" != no; then
+-            AC_DEFINE(NTAM_SASL, 1)
++            AC_DEFINE(ARGUS_SASL, 1)
+             AC_SUBST(LIB_SASL)
+             AC_SUBST(SASLFLAGS)
+          fi
+diff -u3 -r ./common/argus_filter.c /tmp/1/argus-2.0.6.fixes.1/common/argus_filter.c
+--- ./common/argus_filter.c	Mon Feb 23 16:00:36 2004
++++ /tmp/1/argus-2.0.6.fixes.1/common/argus_filter.c	Mon May 10 15:29:10 2004
+@@ -4765,11 +4765,13 @@
+ void
+ ArgusDebug (int d, char *fmt, ...)
+ {
+-   va_list ap;
+    char buf[1024], *ptr;
++   struct timeval now;
++   va_list ap;
+ 
+    if (d <= Argusdflag) {
+-      (void) sprintf (buf, "%s[%d]: %s ", ArgusProgramName, (int)getpid(), print_time(&ArgusGlobalTime));
++      gettimeofday(&now, 0L);
++      (void) sprintf (buf, "%s[%d]: %s ", ArgusProgramName, (int)getpid(), print_time(&now));
+       ptr = &buf[strlen(buf)];
+ 
+       va_start (ap, fmt);
+@@ -5480,9 +5482,8 @@
+    ptr = &buf[strlen(buf)];
+    va_end (ap);
+ 
+-   if (*fmt) {
+-      fmt += (int) strlen (fmt);
+-      if (fmt[-1] != '\n')
++   if (*ptr) {
++      if (ptr[-1] != '\n')
+          sprintf (ptr, "\n");
+    }
+ 
+diff -u3 -r ./configure /tmp/1/argus-2.0.6.fixes.1/configure
+--- ./configure	Wed May  5 16:27:45 2004
++++ /tmp/1/argus-2.0.6.fixes.1/configure	Mon May 10 14:53:56 2004
+@@ -3901,7 +3901,7 @@
+ 
+     if test -f .debug ; then
+         cat >> confdefs.h <<\EOF
+-#define NTAMDEBUG 1
++#define ARGUSDEBUG 1
+ EOF
+     fi
+ 
+@@ -4376,7 +4376,7 @@
+ 
+          if test "$with_sasl" != no; then
+             cat >>confdefs.h <<\_ACEOF
+-#define NTAM_SASL 1
++#define ARGUS_SASL 1
+ _ACEOF
+ 
+ 
+diff -u3 -r ./server/ArgusSource.c /tmp/1/argus-2.0.6.fixes.1/server/ArgusSource.c
+--- ./server/ArgusSource.c	Fri Apr 30 20:11:35 2004
++++ /tmp/1/argus-2.0.6.fixes.1/server/ArgusSource.c	Mon May 10 15:23:22 2004
+@@ -67,7 +67,7 @@
+       ArgusSnapLen = getArgusSnapLen();
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (1, "ArgusNewSource() returning 0x%x\n", retn);
++   ArgusDebug (1, "ArgusNewSource() returning 0x%x", retn);
+ #endif
+ 
+    return (retn);
+@@ -99,7 +99,7 @@
+       setuid(getuid());
+ 
+       if ((ArgusPd[0] = ArgusOpenInputPacketFile(errbuf)) == NULL)
+-         ArgusLog (LOG_ERR, "ArgusInitSource: %s\n", errbuf);
++         ArgusLog (LOG_ERR, "ArgusInitSource: %s", errbuf);
+ 
+    } else {
+       if (ArgusDeviceList == NULL) {
+@@ -127,7 +127,7 @@
+                   ArgusInterface[i].ArgusNetMask  = ntohl(ArgusInterface[i].ArgusNetMask);
+                }
+             } else
+-               ArgusLog (LOG_ERR, "ArgusInitSource: pcap_open_live %s\n", errbuf);
++               ArgusLog (LOG_ERR, "ArgusInitSource: pcap_open_live %s", errbuf);
+ 
+             ArgusPushBackList(ArgusDeviceList, ArgusDevice);
+          }
+@@ -154,7 +154,7 @@
+    bzero ((char *) &ArgusFilters[0], sizeof (struct bpf_program));
+ 
+    if (pcap_compile (ArgusPd[0], &ArgusFilters[0], ArgusInputFilter, getArgusOflag(), ArgusNetMask) < 0)
+-      ArgusLog (LOG_ERR, "ArgusInputFilter \"%s\" %s\n", ArgusInputFilter, pcap_geterr (ArgusPd[0]));
++      ArgusLog (LOG_ERR, "ArgusInputFilter \"%s\" %s", ArgusInputFilter, pcap_geterr (ArgusPd[0]));
+ 
+    if (Argusbpflag) {
+       Argusbpf_dump (&ArgusFilters[0], Argusbpflag);
+@@ -165,18 +165,18 @@
+       if (ArgusPd[i] != NULL) {
+          if (ArgusInputPacketFileType == ARGUSLIBPPKTFILE) {
+             if (pcap_setfilter (ArgusPd[i], &ArgusFilters[0]) < 0)
+-               ArgusLog (LOG_ERR, "%s\n", pcap_geterr (ArgusPd[i]));
++               ArgusLog (LOG_ERR, "%s", pcap_geterr (ArgusPd[i]));
+          }
+       }
+    }
+ 
+    if (ArgusWriteOutPacketFile) {
+       if ((ArgusPcapOutFile = pcap_dump_open(ArgusPd[0], ArgusWriteOutPacketFile)) == NULL)
+-         ArgusLog (LOG_ERR, "%s\n", pcap_geterr (ArgusPd[0]));
++         ArgusLog (LOG_ERR, "%s", pcap_geterr (ArgusPd[0]));
+    }
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (1, "ArgusInitSource() returning\n");
++   ArgusDebug (1, "ArgusInitSource() returning");
+ #endif
+ }
+ 
+@@ -197,7 +197,7 @@
+       pcap_dump_close(ArgusPcapOutFile);
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (1, "ArgusDeleteSource() deleting ArgusSourceTask 0x%x\n", ArgusSourceTask);
++   ArgusDebug (1, "ArgusDeleteSource() deleting ArgusSourceTask 0x%x", ArgusSourceTask);
+ #endif
+    return (0);
+ }
+@@ -260,7 +260,7 @@
+       retn = (char *) ArgusFrontList(ArgusDeviceList);
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (3, "getArgusDevice() returning %s\n", retn);
++   ArgusDebug (3, "getArgusDevice() returning %s", retn);
+ #endif
+    return (retn);
+ }
+@@ -276,7 +276,7 @@
+       ArgusPushFrontList(ArgusDeviceList, strdup(value));
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (3, "setArgusDevice(%s) returning\n", value);
++   ArgusDebug (3, "setArgusDevice(%s) returning", value);
+ #endif
+ }
+ 
+@@ -289,7 +289,7 @@
+    }
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (3, "clearArgusDevice(%s) returning\n");
++   ArgusDebug (3, "clearArgusDevice(%s) returning");
+ #endif
+ }
+ 
+@@ -381,7 +381,7 @@
+       close(pcap_fileno(ArgusPd[0]));
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (5, "ArgusMoatTshRead() returning %d\n", retn);
++   ArgusDebug (5, "ArgusMoatTshRead() returning %d", retn);
+ #endif
+ 
+    return (retn);
+@@ -424,7 +424,7 @@
+    }
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (5, "ArgusSnoopRead() returning %d\n", retn);
++   ArgusDebug (5, "ArgusSnoopRead() returning %d", retn);
+ #endif
+ 
+    return (retn);
+@@ -449,7 +449,7 @@
+       }
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (3, "Arguslookup_pcap_callback(%d) returning %s: 0x%x\n", type, name, retn);
++   ArgusDebug (3, "Arguslookup_pcap_callback(%d) returning %s: 0x%x", type, name, retn);
+ #endif
+ 
+    return (retn);
+@@ -489,7 +489,7 @@
+                }
+       
+                if ((ArgusPcapOutFile = pcap_dump_open(ArgusPd[0], ArgusWriteOutPacketFile)) == NULL)
+-                  ArgusLog (LOG_ERR, "%s\n", pcap_geterr (ArgusPd[0]));
++                  ArgusLog (LOG_ERR, "%s", pcap_geterr (ArgusPd[0]));
+             }
+          }
+       }
+@@ -499,7 +499,7 @@
+       pcap_dump((u_char *)ArgusPcapOutFile, h, p);
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (6, "ArgusEtherPacket (0x%x, 0x%x, 0x%x) returning\n", user, h, p);
++   ArgusDebug (6, "ArgusEtherPacket (0x%x, 0x%x, 0x%x) returning", user, h, p);
+ #endif
+ }
+ 
+@@ -604,7 +604,7 @@
+ 
+    ArgusGlobalTime  = *tvp;
+    if (ArgusGlobalTime.tv_sec < 0) {
+-      ArgusLog (LOG_ERR, "ArgusFddiPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d\n",
++      ArgusLog (LOG_ERR, "ArgusFddiPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d",
+               user, h, p, ArgusGlobalTime.tv_sec, ArgusGlobalTime.tv_usec);
+    }
+    ArgusThisLength  = length;
+@@ -617,7 +617,7 @@
+    }
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (6, "ArgusFddiPacket (0x%x, 0x%x, 0x%x) returning\n", user, h, p);
++   ArgusDebug (6, "ArgusFddiPacket (0x%x, 0x%x, 0x%x) returning", user, h, p);
+ #endif
+ }
+ 
+@@ -636,7 +636,7 @@
+ 
+    ArgusGlobalTime  = *tvp;
+    if (ArgusGlobalTime.tv_sec < 0) {
+-      ArgusLog (LOG_ERR, "ArgusATMPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d\n",
++      ArgusLog (LOG_ERR, "ArgusATMPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d",
+               user, h, p, ArgusGlobalTime.tv_sec, ArgusGlobalTime.tv_usec);
+    }
+ 
+@@ -669,7 +669,7 @@
+    ArgusProcessPacket (ep, length, tvp);
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (6, "ArgusATMPacket (0x%x, 0x%x, 0x%x) returning\n", user, h, p);
++   ArgusDebug (6, "ArgusATMPacket (0x%x, 0x%x, 0x%x) returning", user, h, p);
+ #endif
+ }
+ 
+@@ -688,7 +688,7 @@
+ 
+    ArgusGlobalTime  = *tvp;
+    if (ArgusGlobalTime.tv_sec < 0) {
+-      ArgusLog (LOG_ERR, "ArgusPppPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d\n",
++      ArgusLog (LOG_ERR, "ArgusPppPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d",
+               user, h, p, ArgusGlobalTime.tv_sec, ArgusGlobalTime.tv_usec);
+    }
+    ArgusSnapLength  = caplen;
+@@ -703,7 +703,7 @@
+    }
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (6, "ArgusPppPacket (0x%x, 0x%x, 0x%x) returning\n", user, h, p);
++   ArgusDebug (6, "ArgusPppPacket (0x%x, 0x%x, 0x%x) returning", user, h, p);
+ #endif
+ }
+ 
+@@ -723,7 +723,7 @@
+ 
+    ArgusGlobalTime  = *tvp;
+    if (ArgusGlobalTime.tv_sec < 0) {
+-      ArgusLog (LOG_ERR, "ArgusPppBsdosPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d\n",
++      ArgusLog (LOG_ERR, "ArgusPppBsdosPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d",
+               user, h, p, ArgusGlobalTime.tv_sec, ArgusGlobalTime.tv_usec);
+    }
+    ArgusSnapLength  = caplen;
+@@ -754,7 +754,7 @@
+    }
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (6, "ArgusPppPacket (0x%x, 0x%x, 0x%x) returning\n", user, h, p);
++   ArgusDebug (6, "ArgusPppPacket (0x%x, 0x%x, 0x%x) returning", user, h, p);
+ #endif
+ }
+ 
+@@ -789,7 +789,7 @@
+ 
+    ArgusGlobalTime  = *tvp;
+    if (ArgusGlobalTime.tv_sec < 0) {
+-      ArgusLog (LOG_ERR, "ArgusSlipPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d\n",
++      ArgusLog (LOG_ERR, "ArgusSlipPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d",
+               user, h, p, ArgusGlobalTime.tv_sec, ArgusGlobalTime.tv_usec);
+    }
+    ArgusSnapLength  = caplen;
+@@ -805,7 +805,7 @@
+ 
+  
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (6, "ArgusSlipPacket (0x%x, 0x%x, 0x%x) returning\n", user, h, p);
++   ArgusDebug (6, "ArgusSlipPacket (0x%x, 0x%x, 0x%x) returning", user, h, p);
+ #endif
+ }
+ 
+@@ -821,7 +821,7 @@
+ 
+    ArgusGlobalTime  = *tvp;
+    if (ArgusGlobalTime.tv_sec < 0) {
+-      ArgusLog (LOG_ERR, "ArgusIpPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d\n",
++      ArgusLog (LOG_ERR, "ArgusIpPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d",
+               user, h, p, ArgusGlobalTime.tv_sec, ArgusGlobalTime.tv_usec);
+    }
+    ArgusSnapLength  = caplen;
+@@ -835,7 +835,7 @@
+ 
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (6, "ArgusIpPacket (0x%x, 0x%x, 0x%x) returning\n", user, h, p);
++   ArgusDebug (6, "ArgusIpPacket (0x%x, 0x%x, 0x%x) returning", user, h, p);
+ #endif
+ }
+ 
+@@ -860,7 +860,7 @@
+ 
+    ArgusGlobalTime  = *tvp;
+    if (ArgusGlobalTime.tv_sec < 0) {
+-      ArgusLog (LOG_ERR, "ArgusSllPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d\n",
++      ArgusLog (LOG_ERR, "ArgusSllPacket (0x%x, 0x%x, 0x%x) libpcap timestamp out of range %d.%d",
+               user, h, p, ArgusGlobalTime.tv_sec, ArgusGlobalTime.tv_usec);
+    }
+ 
+@@ -911,7 +911,7 @@
+    ArgusProcessPacket (ep, length, tvp);
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (6, "ArgusSllPacket (0x%x, 0x%x, 0x%x) returning\n", user, h, p);
++   ArgusDebug (6, "ArgusSllPacket (0x%x, 0x%x, 0x%x) returning", user, h, p);
+ #endif
+ }
+ 
+@@ -958,7 +958,7 @@
+                               case ARGUSLIBPPKTFILE:
+                                  if ((pcap_read (ArgusPd[i], -1, ArgusCallBack, (u_char *) NULL)) < 0) {
+ #ifdef ARGUSDEBUG
+-                                    ArgusDebug (4, "ArgusGetPackets: pcap_read() returned %s\n", pcap_geterr(ArgusPd[i]));
++                                    ArgusDebug (4, "ArgusGetPackets: pcap_read() returned %s", pcap_geterr(ArgusPd[i]));
+ #endif
+                                     noerror = 0;
+                                  }
+@@ -986,7 +986,7 @@
+                   gettimeofday (tvp, NULL);
+                   ArgusGlobalTime = *tvp;
+                   if (ArgusGlobalTime.tv_sec < 0) {
+-                     ArgusLog (LOG_ERR, "ArgusGetPackets () gettimeofday() timestamp out of range %d.%d\n",
++                     ArgusLog (LOG_ERR, "ArgusGetPackets () gettimeofday() timestamp out of range %d.%d",
+                              ArgusGlobalTime.tv_sec, ArgusGlobalTime.tv_usec);
+                   }
+    
+@@ -997,7 +997,7 @@
+                FD_ZERO(&ArgusReadMask);
+    
+ #ifdef ARGUSDEBUG
+-               ArgusDebug (4, "ArgusGetPackets: select() returned %s\n", strerror(errno));
++               ArgusDebug (4, "ArgusGetPackets: select() returned %s", strerror(errno));
+ #endif
+                if (errno == EINTR)
+                   break;
+@@ -1029,7 +1029,7 @@
+    gettimeofday (&ArgusEndTime, 0L);
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (4, "ArgusGetPackets () returning\n");
++   ArgusDebug (4, "ArgusGetPackets () returning");
+ #endif
+ }
+ 
+@@ -1066,7 +1066,7 @@
+    }
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (3, "Argusbpf_dump (0x%x, %d) returning\n", p, option);
++   ArgusDebug (3, "Argusbpf_dump (0x%x, %d) returning", p, option);
+ #endif
+ }
+ 
+@@ -1124,7 +1124,7 @@
+                ArgusReadingOffLine++;
+ 
+             } else
+-               ArgusLog(LOG_ERR, "ArgusOpenInputPacketFile(%s) error. %s\n", Argusrfile, strerror(errno));
++               ArgusLog(LOG_ERR, "ArgusOpenInputPacketFile(%s) error. %s", Argusrfile, strerror(errno));
+          } else
+          if ((ch = fgetc(ArgusPacketInput)) != EOF) {
+             ungetc(ch, ArgusPacketInput);
+@@ -1144,19 +1144,19 @@
+                   }
+    
+                } else {
+-                  snprintf (errbuf, PCAP_ERRBUF_SIZE - 1, "Unknown packet file format\n");
++                  snprintf (errbuf, PCAP_ERRBUF_SIZE - 1, "Unknown packet file format");
+                }
+             } else {
+-               snprintf (errbuf, PCAP_ERRBUF_SIZE - 1, "Error reading %s. Read %d bytes\n", Argusrfile, rlen);
++               snprintf (errbuf, PCAP_ERRBUF_SIZE - 1, "Error reading %s. Read %d bytes", Argusrfile, rlen);
+             }
+          } else {
+-            snprintf (errbuf, PCAP_ERRBUF_SIZE - 1, "Error reading %s. Stream Empty\n", Argusrfile);
++            snprintf (errbuf, PCAP_ERRBUF_SIZE - 1, "Error reading %s. Stream Empty", Argusrfile);
+          }
+       }
+    }
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (3, "ArgusOpenInputPacketFile(0x%x) returning 0x%x\n", errbuf, retn);
++   ArgusDebug (3, "ArgusOpenInputPacketFile(0x%x) returning 0x%x", errbuf, retn);
+ #endif
+  
+    return (retn);
+@@ -1189,7 +1189,7 @@
+    }
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (6, "ArgusCopyArgv(0x%x) returning 0x%x\n", argv, buf);
++   ArgusDebug (6, "ArgusCopyArgv(0x%x) returning 0x%x", argv, buf);
+ #endif
+  
+    return buf;
+@@ -1210,7 +1210,7 @@
+  
+    if ((fd = open(fname, O_RDONLY)) >= 0) {
+       if (fstat(fd, &buf) < 0) {
+-         snprintf (outbuf, 255, "%s: fstat('%s') failed.\n", ArgusProgramName, fname);
++         snprintf (outbuf, 255, "%s: fstat('%s') failed.", ArgusProgramName, fname);
+          perror (outbuf);
+          close(fd);
+       }
+@@ -1233,7 +1233,7 @@
+  
+ 
+ #ifdef ARGUSDEBUG
+-   ArgusDebug (3, "ArgusReadInfile(%s) returning 0x%x\n", fname, p);
++   ArgusDebug (3, "ArgusReadInfile(%s) returning 0x%x", fname, p);
+ #endif
+ 
+    return (p);
+diff -u3 -r ./server/argus.c /tmp/1/argus-2.0.6.fixes.1/server/argus.c
+--- ./server/argus.c	Mon Feb 23 16:00:36 2004
++++ /tmp/1/argus-2.0.6.fixes.1/server/argus.c	Mon May 10 14:51:57 2004
+@@ -236,8 +236,16 @@
+          if (*ptr == '-') {
+             do {
+                switch (*++ptr) {
++                  case 'D':
++                     if (*++ptr == '\0')
++                        ptr = argv[++i];
++                     setArgusdflag (atoi (ptr));
++                     break;
++
+                   case 'F':
+-                     ArgusParseResourceFile (argv[i++]);
++                     if (*++ptr == '\0')
++                        ptr = argv[++i];
++                     ArgusParseResourceFile (ptr);
+                      doconf++;
+                      break;
+ 
+diff -u3 -r ./server/argus.h /tmp/1/argus-2.0.6.fixes.1/server/argus.h
+--- ./server/argus.h	Mon Feb 23 16:00:36 2004
++++ /tmp/1/argus-2.0.6.fixes.1/server/argus.h	Mon May 10 15:00:13 2004
+@@ -57,7 +57,7 @@
+ 
+ char *RaTimeFormat = "%d %b %y %T";
+ char RaFieldDelimiter = '.';
+-int nflag = 1, Nflag = -1, uflag = 1, gflag = 0;
++int nflag = 1, Nflag = -1, uflag = 0, gflag = 0;
+ int Uflag = 6, XMLflag = 0, pflag = 0, pidflag = 0;
+ int Dflag = 0, daemonflag = 0;
+ 
diff --git a/net-mgmt/argus/files/patch-aa b/net-mgmt/argus/files/patch-aa
index e73cf4818cee..1ce088eace9c 100644
--- a/net-mgmt/argus/files/patch-aa
+++ b/net-mgmt/argus/files/patch-aa
@@ -1,57 +1,38 @@
---- Makefile.in.orig	Mon Nov 26 21:42:32 2001
-+++ Makefile.in	Thu Jan 17 23:18:54 2002
-@@ -63,28 +63,6 @@
- .PHONY: all
+--- Makefile.in~	Tue Apr 13 07:08:28 2004
++++ Makefile.in	Mon Apr 26 15:14:27 2004
+@@ -105,25 +105,25 @@
  
- install:  force
--	make installdirs
--	[ -d @prefix@ ] || \
--		(mkdir -p @prefix@; chmod 755 @prefix@)
--
--	[ -d @sbindir@ ] || \
--		(mkdir -p @sbindir@; chmod 755 @sbindir@)
--
--	[ -d $(exec_prefix)/argus ] || \
--		(mkdir -p $(exec_prefix)/argus; chmod 755 $(exec_prefix)/argus)
--
--	[ -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,25 +72,10 @@
- 		fi; \
- 	done
- 
--	$(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@ ] || \
+ 		(mkdir -p @mandir@; chmod 755 @mandir@)
 -	[ -d @mandir@/man1 ] || \
 -		(mkdir -p @mandir@/man1; chmod 755 @mandir@/man1)
--	[ -d @mandir@/man5 ] || \
--		(mkdir -p @mandir@/man5; chmod 755 @mandir@/man5)
--	[ -d @mandir@/man8 ] || \
--		(mkdir -p @mandir@/man8; chmod 755 @mandir@/man8)
++#	[ -d @mandir@/man1 ] || \
++#		(mkdir -p @mandir@/man1; chmod 755 @mandir@/man1)
+ 	[ -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
+-	$(INSTALL) -m 0644 $(srcdir)/man/man5/rarc.5 @mandir@/man5/rarc.5
++#	$(INSTALL) -m 0644 $(srcdir)/man/man5/rarc.5 @mandir@/man5/rarc.5
+ 
+ 	$(INSTALL) -m 0644 $(srcdir)/man/man8/argus.8 @mandir@/man8/argus.8
+ 
+-	$(INSTALL) -m 0644 $(srcdir)/man/man1/ra.1 @mandir@/man1/ra.1
+-	$(INSTALL) -m 0644 $(srcdir)/man/man1/racount.1 @mandir@/man1/racount.1
+-	$(INSTALL) -m 0644 $(srcdir)/man/man1/ragator.1 @mandir@/man1/ragator.1
+-	$(INSTALL) -m 0644 $(srcdir)/man/man1/ramon.1 @mandir@/man1/ramon.1
+-	$(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 @mandir@/man1/rapolicy.1
+-	$(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 @mandir@/man1/rasort.1
+-	$(INSTALL) -m 0644 $(srcdir)/man/man1/raxml.1 @mandir@/man1/raxml.1
++#	$(INSTALL) -m 0644 $(srcdir)/man/man1/ra.1 @mandir@/man1/ra.1
++#	$(INSTALL) -m 0644 $(srcdir)/man/man1/racount.1 @mandir@/man1/racount.1
++#	$(INSTALL) -m 0644 $(srcdir)/man/man1/ragator.1 @mandir@/man1/ragator.1
++#	$(INSTALL) -m 0644 $(srcdir)/man/man1/ramon.1 @mandir@/man1/ramon.1
++#	$(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 @mandir@/man1/rapolicy.1
++#	$(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 @mandir@/man1/rasort.1
++#	$(INSTALL) -m 0644 $(srcdir)/man/man1/raxml.1 @mandir@/man1/raxml.1
+ 
+ uninstall:
+ 	rm -f @mandir@/man5/argus.5
diff --git a/net-mgmt/argus/files/patch-ab b/net-mgmt/argus/files/patch-ab
deleted file mode 100644
index 3c8be2610584..000000000000
--- a/net-mgmt/argus/files/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
---- include/argus_filter.h~	Fri May 31 14:11:34 2002
-+++ include/argus_filter.h	Wed Dec 25 22:13:46 2002
-@@ -216,7 +216,13 @@
- extern void *ArgusCalloc (int, int);
- extern void ArgusFree (void *);
- 
--extern void error(va_list);
-+/*extern void error(va_list);*/
-+#if defined(__STDC__)
-+void error(const char *fmt, ...);
-+#else
-+void error(const char *fmt, va_dcl);
-+#endif
-+
- extern void warning(va_list);
- 
- extern char *savestr(const char *);
diff --git a/net-mgmt/argus/files/patch-configure b/net-mgmt/argus/files/patch-configure
index 2176dbc37cdc..ffb2901b7f98 100644
--- a/net-mgmt/argus/files/patch-configure
+++ b/net-mgmt/argus/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Thu May 30 21:30:19 2002
-+++ configure	Tue Jul  9 10:50:46 2002
-@@ -1644,7 +1644,7 @@
-    
+--- configure.orig	Mon Apr 26 14:39:58 2004
++++ configure	Mon Apr 26 14:40:16 2004
+@@ -4163,7 +4163,7 @@
+ 
        if test -d ${with_sasl}; then
            ac_cv_sasl_where_lib=${with_sasl}/lib
 -          ac_cv_sasl_where_inc=${with_sasl}/include
 +          ac_cv_sasl_where_inc=${with_sasl}/include/sasl
-    
+ 
            SASLFLAGS="-I$ac_cv_sasl_where_inc"
            LIB_SASL="-L$ac_cv_sasl_where_lib"
diff --git a/net-mgmt/argus/pkg-plist b/net-mgmt/argus/pkg-plist
index 2805056538de..fd82fb59035e 100644
--- a/net-mgmt/argus/pkg-plist
+++ b/net-mgmt/argus/pkg-plist
@@ -1,61 +1,6 @@
-argus/COPYING
-argus/README
-bin/argusbug
-bin/ra
-bin/racount
-bin/ragator
-bin/ramon
-bin/rapath
-bin/rasort
-bin/raxml
-include/cons_def.h
-include/cons_out.h
-lib/argus_common.a
-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/CREDITS
-%%PORTDOCS%%share/doc/argus-2.0/FAQ
-%%PORTDOCS%%share/doc/argus-2.0/HOW-TO
-%%PORTDOCS%%share/doc/argus-2.0/README
+@exec mkdir -p %D/argus/archive
 %%PORTDOCS%%share/doc/argus-2.0/html/man/argus.5.html
 %%PORTDOCS%%share/doc/argus-2.0/html/man/argus.8.html
 %%PORTDOCS%%share/doc/argus-2.0/html/man/argus.conf.5.html
-%%PORTDOCS%%share/doc/argus-2.0/html/man/ra.1.html
-%%PORTDOCS%%share/doc/argus-2.0/html/man/racount.1.html
-%%PORTDOCS%%share/doc/argus-2.0/html/man/ragator.1.html
-%%PORTDOCS%%share/doc/argus-2.0/html/man/ramon.1.html
-%%PORTDOCS%%share/doc/argus-2.0/html/man/rarc.5.html
-%%PORTDOCS%%share/doc/argus-2.0/html/man/rasort.1.html
-%%PORTDOCS%%share/doc/argus-2.0/html/man/raxml.1.html
-%%PORTDOCS%%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
-%%PORTDOCS%%@dirrm share/doc/argus-2.0/html/man
-%%PORTDOCS%%@dirrm share/doc/argus-2.0/html
-%%PORTDOCS%%@dirrm share/doc/argus-2.0
 @unexec rmdir %D/argus/archive %D/argus >/dev/null 2>&1 || true