Changes 3.2:

* VoIP support
* NetFlow v9/IPFIX enhancements
* performance boost
* more statistics and stability

4 files changed, 32 insertions, 21 deletions

diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index a30a423f470..1b64a0b71bf 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2005/10/12 21:22:08 reed Exp $
+# $NetBSD: Makefile,v 1.41 2005/10/26 15:43:08 adam Exp $
 
-DISTNAME=	ntop-3.1
-PKGREVISION=	4
+DISTNAME=	ntop-3.2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ntop/}
 EXTRACT_SUFX=	.tgz
@@ -12,11 +11,9 @@ COMMENT=	Shows network usage (similar to "top" for processes)
 
 CONFLICTS=	ntop-[0-9]*
 
-WRKSRC=		${WRKDIR}/ntop
-
-USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		gawk gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/share/ntop
diff --git a/net/ntop/PLIST b/net/ntop/PLIST
index 5c48b3a8202..00cdb0f33eb 100644
--- a/net/ntop/PLIST
+++ b/net/ntop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/01/06 11:52:35 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/10/26 15:43:08 adam Exp $
 bin/ntop
 lib/libicmpPlugin-${PKGVERSION}.so
 lib/libicmpPlugin.a
@@ -36,20 +36,11 @@ lib/ntop/plugins/sflowPlugin.so
 lib/ntop/plugins/snmpPlugin.so
 lib/ntop/plugins/xmldumpPlugin.so
 man/man8/ntop.8
-share/ntop/html/About.html
-share/ntop/html/Admin.html
-share/ntop/html/All.html
-share/ntop/html/Copyright.html
-share/ntop/html/FibreChannel.html
-share/ntop/html/IP.html
 share/ntop/html/JSCookMenu.js
-share/ntop/html/Local.html
 share/ntop/html/Risk_high.gif
 share/ntop/html/Risk_low.gif
 share/ntop/html/Risk_medium.gif
 share/ntop/html/Risk_unknown.gif
-share/ntop/html/SCSI.html
-share/ntop/html/Summary.html
 share/ntop/html/antenna.gif
 share/ntop/html/arrow.gif
 share/ntop/html/arrow_down.gif
@@ -94,7 +85,6 @@ share/ntop/html/gray_bg.gif
 share/ntop/html/help.html
 share/ntop/html/help.png
 share/ntop/html/hostSortNote.html
-share/ntop/html/index.html
 share/ntop/html/info.gif
 share/ntop/html/initiator.gif
 share/ntop/html/lock.png
@@ -107,6 +97,7 @@ share/ntop/html/menuline.png
 share/ntop/html/minor.gif
 share/ntop/html/modifyUser.gif
 share/ntop/html/multihomed.gif
+share/ntop/html/multivlaned.gif
 share/ntop/html/nboxLogo.gif
 share/ntop/html/ntop.gif
 share/ntop/html/ntop.html
@@ -114,6 +105,7 @@ share/ntop/html/ntop_logo.gif
 share/ntop/html/ntopdump.dtd
 share/ntop/html/ntophelp.html
 share/ntop/html/p2p.gif
+share/ntop/html/phone.gif
 share/ntop/html/pie-error.png
 share/ntop/html/printer.gif
 share/ntop/html/privacyNotice.html
@@ -385,3 +377,4 @@ share/ntop/ntop/specialMAC.txt.gz
 @dirrm lib/plugins
 @dirrm lib/ntop/plugins
 @dirrm lib/ntop
+@exec ${MKDIR} %D/lib/plugins
diff --git a/net/ntop/distinfo b/net/ntop/distinfo
index a7cb23ca125..28f4d0ad8b5 100644
--- a/net/ntop/distinfo
+++ b/net/ntop/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 12:13:57 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/10/26 15:43:08 adam Exp $
 
-SHA1 (ntop-3.1.tgz) = 2aaae2f6f5a343d480eed7284db187b53f598b31
-RMD160 (ntop-3.1.tgz) = 636bf513ec956362f505a005ab757bc5c0e63eac
-Size (ntop-3.1.tgz) = 3286596 bytes
+SHA1 (ntop-3.2.tgz) = ab17e871890bc490746fe03f171523073b54e1e8
+RMD160 (ntop-3.2.tgz) = 18ea4b535826e6d7bdf56c071c271869653cba8d
+Size (ntop-3.2.tgz) = 3910593 bytes
+SHA1 (patch-aa) = 07f8619e951f9237f5e1211ac085bea2aad2d1a8
diff --git a/net/ntop/patches/patch-aa b/net/ntop/patches/patch-aa
new file mode 100644
index 00000000000..19c915413e8
--- /dev/null
+++ b/net/ntop/patches/patch-aa
@@ -0,0 +1,20 @@
+$NetBSD: patch-aa,v 1.8 2005/10/26 15:43:08 adam Exp $
+
+--- configure.orig	2005-10-26 16:57:21.000000000 +0200
++++ configure
+@@ -22985,6 +22985,15 @@ case "${target}:${CC}" in
+         echo "* This appears to be ${DEFINEOS} (release not checked)"
+       ;;
+ 
++    *-*-netbsd*:* )
++	DEFINEOS="NETBSD"
++        echo "* This appears to be ${DEFINEOS}"
++      ;;
++    *-*-openbsd*:* )
++	DEFINEOS="OPENBSD"
++        echo "* This appears to be ${DEFINEOS}"
++      ;;
++
+     * )
+         echo "* ${target} is an unknown/unsupported OS"
+         echo "*"