Changes 3.3.8:

* Bug fixes and improvements.

5 files changed, 39 insertions, 16 deletions

diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 6239c17fc2f..0c2e6fca318 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.48 2008/01/18 05:08:46 tnn Exp $
+# $NetBSD: Makefile,v 1.49 2008/10/16 12:24:09 adam Exp $
 
-DISTNAME=	ntop-3.3
-PKGREVISION=	2
+DISTNAME=	ntop-3.3.8
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ntop/}
 
@@ -15,7 +14,7 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		aclocal autoconf autoheader automake gawk gmake
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/share/ntop
 CONFIGURE_ARGS+=	--with-gd-root=${BUILDLINK_PREFIX.gd}
 CONFIGURE_ARGS+=	--with-gdbm-root=${BUILDLINK_PREFIX.gdbm}
@@ -36,8 +35,10 @@ BUILDLINK_API_DEPENDS.libpcap+=	libpcap>=0.8.3
 CONFIGURE_ARGS+=	--disable-mt
 .endif
 
+
 pre-configure:
 	set -e; cd ${WRKSRC}; \
+	cp ${PREFIX}/share/libtool/ltmain.sh .; \
 	aclocal; autoheader; automake -a --foreign -i; autoconf
 
 .include "../../databases/gdbm/buildlink3.mk"
diff --git a/net/ntop/PLIST b/net/ntop/PLIST
index dd00788f043..dd1f2bf56db 100644
--- a/net/ntop/PLIST
+++ b/net/ntop/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2007/09/15 07:35:38 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/10/16 12:24:09 adam Exp $
 bin/ntop
+lib/libcpacketPlugin-${PKGVERSION}.so
 lib/libicmpPlugin-${PKGVERSION}.so
 lib/libicmpPlugin.a
 lib/libicmpPlugin.so
@@ -14,7 +15,7 @@ lib/libntopreport.la
 lib/libpdaPlugin-${PKGVERSION}.so
 lib/libpdaPlugin.a
 lib/libpdaPlugin.so
-lib/libremotePlugin-3.3.so
+lib/libremotePlugin-${PKGVERSION}.so
 lib/libremotePlugin.a
 lib/libremotePlugin.so
 lib/librrdPlugin-${PKGVERSION}.so
@@ -23,6 +24,7 @@ lib/librrdPlugin.so
 lib/libsflowPlugin-${PKGVERSION}.so
 lib/libsflowPlugin.a
 lib/libsflowPlugin.so
+lib/ntop/plugins/cpacketPlugin.so
 lib/ntop/plugins/icmpPlugin.so
 lib/ntop/plugins/lastSeenPlugin.so
 lib/ntop/plugins/netflowPlugin.so
@@ -128,6 +130,7 @@ share/ntop/html/jscalendar/calendar-load.js
 share/ntop/html/jscalendar/calendar-setup.js
 share/ntop/html/jscalendar/calendar.js
 share/ntop/html/jscalendar/lang/calendar-en.js
+share/ntop/html/line-bottom.png
 share/ntop/html/lock.png
 share/ntop/html/mail.gif
 share/ntop/html/major.gif
@@ -140,7 +143,7 @@ share/ntop/html/multivlaned.gif
 share/ntop/html/nboxLogo.gif
 share/ntop/html/ntop.gif
 share/ntop/html/ntop.html
-share/ntop/html/ntop_logo.gif
+share/ntop/html/ntop_logo.png
 share/ntop/html/ntopdump.dtd
 share/ntop/html/ntophelp.html
 share/ntop/html/p2p.gif
@@ -408,6 +411,11 @@ share/ntop/ntop/ntop-cert.pem
 share/ntop/ntop/oui.txt.gz
 share/ntop/ntop/p2c.opt.table.gz
 share/ntop/ntop/specialMAC.txt.gz
+share/ntop/perl/report.pl
+share/ntop/perl/report/basic.xml
+share/ntop/perl/test.pl
+@dirrm share/ntop/perl/report
+@dirrm share/ntop/perl
 @dirrm share/ntop/ntop
 @dirrm share/ntop/html/statsicons/os
 @dirrm share/ntop/html/statsicons/flags
diff --git a/net/ntop/distinfo b/net/ntop/distinfo
index b3fe0f7a83d..41372c8d86d 100644
--- a/net/ntop/distinfo
+++ b/net/ntop/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2007/09/15 07:35:38 adam Exp $
+$NetBSD: distinfo,v 1.9 2008/10/16 12:24:09 adam Exp $
 
-SHA1 (ntop-3.3.tar.gz) = 4b56f15eb502ea853308433589820161ce82c8d8
-RMD160 (ntop-3.3.tar.gz) = 453842866189e7e8f63c68e70ea57800e41684b9
-Size (ntop-3.3.tar.gz) = 3709605 bytes
-SHA1 (patch-ab) = fe3b5c04a64698e35ff0b6d8f29208ec6f16bec1
+SHA1 (ntop-3.3.8.tar.gz) = 6ef20a1c43ce560b81e6439dc7ad0f7b29edc2c0
+RMD160 (ntop-3.3.8.tar.gz) = cd1b3e08f74d9231d56fc8b619ce5e85d3fabbd0
+Size (ntop-3.3.8.tar.gz) = 5626313 bytes
+SHA1 (patch-aa) = 3a3c9ce9bad98d6b73c487ca31ff67720e1ea96c
+SHA1 (patch-ab) = 55b23a8445a3364bd9e1dac6d1baa39a884bb471
diff --git a/net/ntop/patches/patch-aa b/net/ntop/patches/patch-aa
new file mode 100644
index 00000000000..373a5688f51
--- /dev/null
+++ b/net/ntop/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.11 2008/10/16 12:24:09 adam Exp $
+
+--- Makefile.am.orig	2008-10-16 08:40:25.000000000 +0200
++++ Makefile.am
+@@ -160,8 +160,6 @@ man_MANS = ntop.8
+ .PHONY: snapshot
+ 
+ 
+-acinclude.m4: acinclude.m4.ntop libtool.m4.in
+-	@cat acinclude.m4.ntop libtool.m4.in >acinclude.m4
+ 
+ CLEANLIST = `ls -l $(DESTDIR)$(libdir)/*ntop*.so $(DESTDIR)$(libdir)/*Plugin*.so | \
+           grep -v $(VERSION) | \
diff --git a/net/ntop/patches/patch-ab b/net/ntop/patches/patch-ab
index 698be703969..3cc783d7810 100644
--- a/net/ntop/patches/patch-ab
+++ b/net/ntop/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.12 2007/09/15 07:35:38 adam Exp $
+$NetBSD: patch-ab,v 1.13 2008/10/16 12:24:09 adam Exp $
 
---- configure.in.orig	2007-06-09 23:30:00.000000000 +0200
+--- configure.in.orig	2008-10-02 12:54:15.000000000 +0200
 +++ configure.in
-@@ -432,6 +432,15 @@ case "${target}:${CC}" in
+@@ -428,6 +428,15 @@ case "${target}:${CC}" in
          echo "* This appears to be ${DEFINEOS} (release not checked)"
        ;;
  
@@ -18,7 +18,7 @@ $NetBSD: patch-ab,v 1.12 2007/09/15 07:35:38 adam Exp $
      * )
          echo "* ${target} is an unknown/unsupported OS"
          echo "*"
-@@ -577,8 +586,8 @@ dnl> user defined directory passed as op
+@@ -573,8 +582,8 @@ dnl> user defined directory passed as op
  dnl>
  if test ".${PCAP_ROOT}" != .; then
    if test -d $PCAP_ROOT &&