ntop is a network traffic probe that shows the network usage, similar to what

the popular top Unix command does. ntop is based on libpcap and it has been
written in a portable way in order to virtually run on every Unix platform and
on Win32 as well.

ntop users can use a web browser (e.g. netscape) to navigate through ntop (that
acts as a web server) traffic information and get a dump of the network status.
In the latter case, ntop can be seen as a simple RMON-like agent with an
embedded web interface.

The use of:
- a web interface
- limited configuration and administration via the web interface
- reduced CPU and memory usage (they vary according to network size and traffic)
make ntop easy to use and suitable for monitoring various kind of networks.

8 files changed, 434 insertions, 268 deletions

diff --git a/net/ntop/DESCR b/net/ntop/DESCR
index 0cf209b3d48..795945b59b2 100644
--- a/net/ntop/DESCR
+++ b/net/ntop/DESCR
@@ -1,10 +1,15 @@
-ntop is a tool that shows the network usage, similar to what the
-popular top Unix command does. ntop has been written in a portable
-way in order to virtually run on every Unix platform.
+ntop is a network traffic probe that shows the network usage, similar to what
+the popular top Unix command does. ntop is based on libpcap and it has been
+written in a portable way in order to virtually run on every Unix platform and
+on Win32 as well. 
 
-ntop can be used in both interactive or web mode. In the first case,
-ntop displays the network status on the user's terminal whereas in
-web mode a web browser (e.g. netscape) can attach to ntop (that acts
-as a web server) and get a dump of the network status. In the latter
-case, ntop can be seen as a simple RMON-like agent with an embedded
-web interface.
+ntop users can use a web browser (e.g. netscape) to navigate through ntop (that
+acts as a web server) traffic information and get a dump of the network status.
+In the latter case, ntop can be seen as a simple RMON-like agent with an
+embedded web interface.
+
+The use of: 
+- a web interface 
+- limited configuration and administration via the web interface 
+- reduced CPU and memory usage (they vary according to network size and traffic)
+make ntop easy to use and suitable for monitoring various kind of networks.
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index eee5b60fb18..1358d45ce57 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,22 +1,41 @@
-# $NetBSD: Makefile,v 1.30 2004/10/03 20:51:23 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2005/01/06 11:52:35 adam Exp $
 
-DISTNAME=		ntop-1.1
-PKGREVISION=		4
-CATEGORIES=		net
-MASTER_SITES=		ftp://ftp.unipi.it/pub/local/ntop/source/
-EXTRACT_SUFX=		-src.tar.gz
+DISTNAME=	ntop-3.1
+CATEGORIES=	net
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ntop/}
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=		kim@tac.nyc.ny.us
-HOMEPAGE=		http://www.ntop.org/
-COMMENT=		Shows network usage (similar to "top" for processes)
+MAINTAINER=	adam@NetBSD.org
+HOMEPAGE=	http://www.ntop.org/
+COMMENT=	Shows network usage (similar to "top" for processes)
+
+CONFLICTS=	ntop-[0-9]*
+
+WRKSRC=		${WRKDIR}/ntop
 
 USE_BUILDLINK3=		yes
+USE_GNU_TOOLS+=		make
+USE_LIBTOOL=		yes
+USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-threads=no
+CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/share/ntop
+CONFIGURE_ARGS+=	--with-gd-root=${BUILDLINK_PREFIX.gd}
+CONFIGURE_ARGS+=	--with-gdbm-root=${BUILDLINK_PREFIX.gdbm}
+CONFIGURE_ARGS+=	--with-gdchart-root=${BUILDLINK_PREFIX.gdchart}
+CONFIGURE_ARGS+=	--with-localedir=${LOCALBASE}/${PKGLOCALEDIR}
+CONFIGURE_ARGS+=	--with-libpng-root=${BUILDLINK_PREFIX.png}
+CONFIGURE_ARGS+=	--with-ossl-root=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+=	--with-pcap-root=${BUILDLINK_PREFIX.libpcap}
+CONFIGURE_ARGS+=	--with-zlib-root=${BUILDLINK_PREFIX.zlib}
+# ntop-3.x crashes with IPv6
+CONFIGURE_ARGS+=	--disable-ipv6
 
-INSTALL_TARGET=		install install-man
+PTHREAD_OPTS+=		require
 
+.include "../../databases/gdbm/buildlink3.mk"
+.include "../../graphics/gdchart/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ntop/PLIST b/net/ntop/PLIST
index b46aa6fabfd..5c48b3a8202 100644
--- a/net/ntop/PLIST
+++ b/net/ntop/PLIST
@@ -1,3 +1,387 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:57:08 zuntum Exp $
-sbin/ntop
+@comment $NetBSD: PLIST,v 1.2 2005/01/06 11:52:35 adam Exp $
+bin/ntop
+lib/libicmpPlugin-${PKGVERSION}.so
+lib/libicmpPlugin.a
+lib/libicmpPlugin.so
+lib/liblastSeenPlugin-${PKGVERSION}.so
+lib/liblastSeenPlugin.a
+lib/liblastSeenPlugin.so
+lib/libmyrrd.la
+lib/libnetflowPlugin-${PKGVERSION}.so
+lib/libnetflowPlugin.a
+lib/libnetflowPlugin.so
+lib/libntop.la
+lib/libntopreport.la
+lib/libpdaPlugin-${PKGVERSION}.so
+lib/libpdaPlugin.a
+lib/libpdaPlugin.so
+lib/librrdPlugin-${PKGVERSION}.so
+lib/librrdPlugin.a
+lib/librrdPlugin.so
+lib/libsflowPlugin-${PKGVERSION}.so
+lib/libsflowPlugin.a
+lib/libsflowPlugin.so
+lib/libsnmpPlugin-${PKGVERSION}.so
+lib/libsnmpPlugin.a
+lib/libsnmpPlugin.so
+lib/libxmldumpPlugin-${PKGVERSION}.so
+lib/libxmldumpPlugin.a
+lib/libxmldumpPlugin.so
+lib/ntop/plugins/icmpPlugin.so
+lib/ntop/plugins/lastSeenPlugin.so
+lib/ntop/plugins/netflowPlugin.so
+lib/ntop/plugins/pdaPlugin.so
+lib/ntop/plugins/rrdPlugin.so
+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
+share/ntop/html/arrow_up.gif
+share/ntop/html/back.gif
+share/ntop/html/bar.gif
+share/ntop/html/bg_line.gif
+share/ntop/html/black.gif
+share/ntop/html/blank.gif
+share/ntop/html/bottom_corner.gif
+share/ntop/html/bridge.gif
+share/ntop/html/brocade.gif
+share/ntop/html/bug.png
+share/ntop/html/bulb.gif
+share/ntop/html/card.gif
+share/ntop/html/child.gif
+share/ntop/html/clear.gif
+share/ntop/html/clock.gif
+share/ntop/html/collapsed.gif
+share/ntop/html/copyright.png
+share/ntop/html/corner.gif
+share/ntop/html/deleteURL.gif
+share/ntop/html/deleteUser.gif
+share/ntop/html/disk.gif
+share/ntop/html/dns.gif
+share/ntop/html/download.gif
+share/ntop/html/dump.html
+share/ntop/html/emulex.gif
+share/ntop/html/error.gif
+share/ntop/html/expanded.gif
+share/ntop/html/faq.html
+share/ntop/html/favicon.ico
+share/ntop/html/fback.gif
+share/ntop/html/fforward.gif
+share/ntop/html/forward.gif
+share/ntop/html/functions.js
+share/ntop/html/gauge.jpg
+share/ntop/html/gaugeR.jpg
+share/ntop/html/gaugeS.jpg
+share/ntop/html/graph.gif
+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
+share/ntop/html/mail.gif
+share/ntop/html/major.gif
+share/ntop/html/marchio_unipi_pant541_144.gif
+share/ntop/html/menubar.png
+share/ntop/html/menubar_j.png
+share/ntop/html/menuline.png
+share/ntop/html/minor.gif
+share/ntop/html/modifyUser.gif
+share/ntop/html/multihomed.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/ntopdump.dtd
+share/ntop/html/ntophelp.html
+share/ntop/html/p2p.gif
+share/ntop/html/pie-error.png
+share/ntop/html/printer.gif
+share/ntop/html/privacyNotice.html
+share/ntop/html/question.gif
+share/ntop/html/router.gif
+share/ntop/html/seagate.gif
+share/ntop/html/spacer.gif
+share/ntop/html/statsicons/flags/ad.gif
+share/ntop/html/statsicons/flags/ae.gif
+share/ntop/html/statsicons/flags/af.gif
+share/ntop/html/statsicons/flags/ag.gif
+share/ntop/html/statsicons/flags/ai.gif
+share/ntop/html/statsicons/flags/al.gif
+share/ntop/html/statsicons/flags/am.gif
+share/ntop/html/statsicons/flags/an.gif
+share/ntop/html/statsicons/flags/ao.gif
+share/ntop/html/statsicons/flags/aq.gif
+share/ntop/html/statsicons/flags/ar.gif
+share/ntop/html/statsicons/flags/as.gif
+share/ntop/html/statsicons/flags/at.gif
+share/ntop/html/statsicons/flags/au.gif
+share/ntop/html/statsicons/flags/aw.gif
+share/ntop/html/statsicons/flags/az.gif
+share/ntop/html/statsicons/flags/ba.gif
+share/ntop/html/statsicons/flags/bb.gif
+share/ntop/html/statsicons/flags/bd.gif
+share/ntop/html/statsicons/flags/be.gif
+share/ntop/html/statsicons/flags/bf.gif
+share/ntop/html/statsicons/flags/bg.gif
+share/ntop/html/statsicons/flags/bh.gif
+share/ntop/html/statsicons/flags/bi.gif
+share/ntop/html/statsicons/flags/bj.gif
+share/ntop/html/statsicons/flags/bm.gif
+share/ntop/html/statsicons/flags/bn.gif
+share/ntop/html/statsicons/flags/bo.gif
+share/ntop/html/statsicons/flags/br.gif
+share/ntop/html/statsicons/flags/bs.gif
+share/ntop/html/statsicons/flags/bt.gif
+share/ntop/html/statsicons/flags/bv.gif
+share/ntop/html/statsicons/flags/bw.gif
+share/ntop/html/statsicons/flags/by.gif
+share/ntop/html/statsicons/flags/bz.gif
+share/ntop/html/statsicons/flags/ca.gif
+share/ntop/html/statsicons/flags/cc.gif
+share/ntop/html/statsicons/flags/cd.gif
+share/ntop/html/statsicons/flags/cf.gif
+share/ntop/html/statsicons/flags/cg.gif
+share/ntop/html/statsicons/flags/ch.gif
+share/ntop/html/statsicons/flags/ci.gif
+share/ntop/html/statsicons/flags/ck.gif
+share/ntop/html/statsicons/flags/cl.gif
+share/ntop/html/statsicons/flags/cm.gif
+share/ntop/html/statsicons/flags/cn.gif
+share/ntop/html/statsicons/flags/co.gif
+share/ntop/html/statsicons/flags/com.gif
+share/ntop/html/statsicons/flags/cr.gif
+share/ntop/html/statsicons/flags/cu.gif
+share/ntop/html/statsicons/flags/cv.gif
+share/ntop/html/statsicons/flags/cx.gif
+share/ntop/html/statsicons/flags/cy.gif
+share/ntop/html/statsicons/flags/cz.gif
+share/ntop/html/statsicons/flags/de.gif
+share/ntop/html/statsicons/flags/dj.gif
+share/ntop/html/statsicons/flags/dk.gif
+share/ntop/html/statsicons/flags/dm.gif
+share/ntop/html/statsicons/flags/do.gif
+share/ntop/html/statsicons/flags/dz.gif
+share/ntop/html/statsicons/flags/ec.gif
+share/ntop/html/statsicons/flags/edu.gif
+share/ntop/html/statsicons/flags/ee.gif
+share/ntop/html/statsicons/flags/eg.gif
+share/ntop/html/statsicons/flags/eh.gif
+share/ntop/html/statsicons/flags/es.gif
+share/ntop/html/statsicons/flags/et.gif
+share/ntop/html/statsicons/flags/eu.gif
+share/ntop/html/statsicons/flags/fi.gif
+share/ntop/html/statsicons/flags/fj.gif
+share/ntop/html/statsicons/flags/fk.gif
+share/ntop/html/statsicons/flags/fm.gif
+share/ntop/html/statsicons/flags/fo.gif
+share/ntop/html/statsicons/flags/fr.gif
+share/ntop/html/statsicons/flags/fx.gif
+share/ntop/html/statsicons/flags/ga.gif
+share/ntop/html/statsicons/flags/gb.gif
+share/ntop/html/statsicons/flags/gd.gif
+share/ntop/html/statsicons/flags/ge.gif
+share/ntop/html/statsicons/flags/gf.gif
+share/ntop/html/statsicons/flags/gh.gif
+share/ntop/html/statsicons/flags/gi.gif
+share/ntop/html/statsicons/flags/gl.gif
+share/ntop/html/statsicons/flags/gm.gif
+share/ntop/html/statsicons/flags/gn.gif
+share/ntop/html/statsicons/flags/gov.gif
+share/ntop/html/statsicons/flags/gp.gif
+share/ntop/html/statsicons/flags/gq.gif
+share/ntop/html/statsicons/flags/gr.gif
+share/ntop/html/statsicons/flags/gt.gif
+share/ntop/html/statsicons/flags/gu.gif
+share/ntop/html/statsicons/flags/gw.gif
+share/ntop/html/statsicons/flags/gy.gif
+share/ntop/html/statsicons/flags/hk.gif
+share/ntop/html/statsicons/flags/hm.gif
+share/ntop/html/statsicons/flags/hn.gif
+share/ntop/html/statsicons/flags/hr.gif
+share/ntop/html/statsicons/flags/ht.gif
+share/ntop/html/statsicons/flags/hu.gif
+share/ntop/html/statsicons/flags/id.gif
+share/ntop/html/statsicons/flags/ie.gif
+share/ntop/html/statsicons/flags/il.gif
+share/ntop/html/statsicons/flags/in.gif
+share/ntop/html/statsicons/flags/int.gif
+share/ntop/html/statsicons/flags/io.gif
+share/ntop/html/statsicons/flags/iq.gif
+share/ntop/html/statsicons/flags/ir.gif
+share/ntop/html/statsicons/flags/is.gif
+share/ntop/html/statsicons/flags/it.gif
+share/ntop/html/statsicons/flags/jm.gif
+share/ntop/html/statsicons/flags/jo.gif
+share/ntop/html/statsicons/flags/jp.gif
+share/ntop/html/statsicons/flags/ke.gif
+share/ntop/html/statsicons/flags/kg.gif
+share/ntop/html/statsicons/flags/kh.gif
+share/ntop/html/statsicons/flags/ki.gif
+share/ntop/html/statsicons/flags/km.gif
+share/ntop/html/statsicons/flags/kn.gif
+share/ntop/html/statsicons/flags/kp.gif
+share/ntop/html/statsicons/flags/kr.gif
+share/ntop/html/statsicons/flags/kw.gif
+share/ntop/html/statsicons/flags/ky.gif
+share/ntop/html/statsicons/flags/kz.gif
+share/ntop/html/statsicons/flags/la.gif
+share/ntop/html/statsicons/flags/lb.gif
+share/ntop/html/statsicons/flags/lc.gif
+share/ntop/html/statsicons/flags/li.gif
+share/ntop/html/statsicons/flags/lk.gif
+share/ntop/html/statsicons/flags/local.gif
+share/ntop/html/statsicons/flags/localhost.gif
+share/ntop/html/statsicons/flags/lr.gif
+share/ntop/html/statsicons/flags/ls.gif
+share/ntop/html/statsicons/flags/lt.gif
+share/ntop/html/statsicons/flags/lu.gif
+share/ntop/html/statsicons/flags/lv.gif
+share/ntop/html/statsicons/flags/ly.gif
+share/ntop/html/statsicons/flags/ma.gif
+share/ntop/html/statsicons/flags/mc.gif
+share/ntop/html/statsicons/flags/md.gif
+share/ntop/html/statsicons/flags/mil.gif
+share/ntop/html/statsicons/flags/mk.gif
+share/ntop/html/statsicons/flags/ml.gif
+share/ntop/html/statsicons/flags/mn.gif
+share/ntop/html/statsicons/flags/mo.gif
+share/ntop/html/statsicons/flags/mq.gif
+share/ntop/html/statsicons/flags/mr.gif
+share/ntop/html/statsicons/flags/mt.gif
+share/ntop/html/statsicons/flags/mu.gif
+share/ntop/html/statsicons/flags/mx.gif
+share/ntop/html/statsicons/flags/my.gif
+share/ntop/html/statsicons/flags/mz.gif
+share/ntop/html/statsicons/flags/na.gif
+share/ntop/html/statsicons/flags/ne.gif
+share/ntop/html/statsicons/flags/net.gif
+share/ntop/html/statsicons/flags/ng.gif
+share/ntop/html/statsicons/flags/ni.gif
+share/ntop/html/statsicons/flags/nl.gif
+share/ntop/html/statsicons/flags/no.gif
+share/ntop/html/statsicons/flags/np.gif
+share/ntop/html/statsicons/flags/nu.gif
+share/ntop/html/statsicons/flags/nz.gif
+share/ntop/html/statsicons/flags/om.gif
+share/ntop/html/statsicons/flags/org.gif
+share/ntop/html/statsicons/flags/pa.gif
+share/ntop/html/statsicons/flags/pe.gif
+share/ntop/html/statsicons/flags/pf.gif
+share/ntop/html/statsicons/flags/pg.gif
+share/ntop/html/statsicons/flags/ph.gif
+share/ntop/html/statsicons/flags/pk.gif
+share/ntop/html/statsicons/flags/pl.gif
+share/ntop/html/statsicons/flags/pr.gif
+share/ntop/html/statsicons/flags/ps.gif
+share/ntop/html/statsicons/flags/pt.gif
+share/ntop/html/statsicons/flags/py.gif
+share/ntop/html/statsicons/flags/qa.gif
+share/ntop/html/statsicons/flags/ro.gif
+share/ntop/html/statsicons/flags/ru.gif
+share/ntop/html/statsicons/flags/rw.gif
+share/ntop/html/statsicons/flags/sa.gif
+share/ntop/html/statsicons/flags/sb.gif
+share/ntop/html/statsicons/flags/sd.gif
+share/ntop/html/statsicons/flags/se.gif
+share/ntop/html/statsicons/flags/sg.gif
+share/ntop/html/statsicons/flags/si.gif
+share/ntop/html/statsicons/flags/sk.gif
+share/ntop/html/statsicons/flags/sm.gif
+share/ntop/html/statsicons/flags/sn.gif
+share/ntop/html/statsicons/flags/su.gif
+share/ntop/html/statsicons/flags/sv.gif
+share/ntop/html/statsicons/flags/sy.gif
+share/ntop/html/statsicons/flags/sz.gif
+share/ntop/html/statsicons/flags/tc.gif
+share/ntop/html/statsicons/flags/td.gif
+share/ntop/html/statsicons/flags/tf.gif
+share/ntop/html/statsicons/flags/tg.gif
+share/ntop/html/statsicons/flags/th.gif
+share/ntop/html/statsicons/flags/tj.gif
+share/ntop/html/statsicons/flags/tk.gif
+share/ntop/html/statsicons/flags/tm.gif
+share/ntop/html/statsicons/flags/tn.gif
+share/ntop/html/statsicons/flags/to.gif
+share/ntop/html/statsicons/flags/tr.gif
+share/ntop/html/statsicons/flags/tt.gif
+share/ntop/html/statsicons/flags/tw.gif
+share/ntop/html/statsicons/flags/tz.gif
+share/ntop/html/statsicons/flags/ua.gif
+share/ntop/html/statsicons/flags/uk.gif
+share/ntop/html/statsicons/flags/us.gif
+share/ntop/html/statsicons/flags/uy.gif
+share/ntop/html/statsicons/flags/uz.gif
+share/ntop/html/statsicons/flags/va.gif
+share/ntop/html/statsicons/flags/vc.gif
+share/ntop/html/statsicons/flags/ve.gif
+share/ntop/html/statsicons/flags/vg.gif
+share/ntop/html/statsicons/flags/vi.gif
+share/ntop/html/statsicons/flags/vn.gif
+share/ntop/html/statsicons/flags/wf.gif
+share/ntop/html/statsicons/flags/ws.gif
+share/ntop/html/statsicons/flags/ye.gif
+share/ntop/html/statsicons/flags/yu.gif
+share/ntop/html/statsicons/flags/za.gif
+share/ntop/html/statsicons/flags/ze.gif
+share/ntop/html/statsicons/flags/zm.gif
+share/ntop/html/statsicons/flags/zw.gif
+share/ntop/html/statsicons/os/aix.gif
+share/ntop/html/statsicons/os/amiga.gif
+share/ntop/html/statsicons/os/be.gif
+share/ntop/html/statsicons/os/bsd.gif
+share/ntop/html/statsicons/os/cisco.gif
+share/ntop/html/statsicons/os/hp.gif
+share/ntop/html/statsicons/os/irix.gif
+share/ntop/html/statsicons/os/linux.gif
+share/ntop/html/statsicons/os/mac.gif
+share/ntop/html/statsicons/os/novell.gif
+share/ntop/html/statsicons/os/os2.gif
+share/ntop/html/statsicons/os/sun.gif
+share/ntop/html/statsicons/os/windows.gif
+share/ntop/html/style.css
+share/ntop/html/switch.gif
+share/ntop/html/theme.css
+share/ntop/html/theme.js
+share/ntop/html/upload.gif
+share/ntop/html/url.gif
+share/ntop/html/user.gif
+share/ntop/html/users.gif
+share/ntop/html/vgauge.jpg
+share/ntop/html/warning.gif
+share/ntop/html/web.gif
+share/ntop/html/wheel.gif
+share/ntop/html/white_bg.gif
+share/ntop/ntop/etter.finger.os.gz
+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
+@dirrm share/ntop/ntop
+@dirrm share/ntop/html/statsicons/os
+@dirrm share/ntop/html/statsicons/flags
+@dirrm share/ntop/html/statsicons
+@dirrm share/ntop/html
+@dirrm share/ntop
+@dirrm lib/plugins
+@dirrm lib/ntop/plugins
+@dirrm lib/ntop
diff --git a/net/ntop/distinfo b/net/ntop/distinfo
index f92bf3fb6ab..a1e083a82a6 100644
--- a/net/ntop/distinfo
+++ b/net/ntop/distinfo
@@ -1,8 +1,4 @@
-$NetBSD: distinfo,v 1.3 2004/10/03 20:51:23 wiz Exp $
+$NetBSD: distinfo,v 1.4 2005/01/06 11:52:35 adam Exp $
 
-SHA1 (ntop-1.1-src.tar.gz) = b244f025709cfcdae14d59e78778e2daf2e7bc55
-Size (ntop-1.1-src.tar.gz) = 220950 bytes
-SHA1 (patch-aa) = 1d9002e962061ddc174cb0f904f868ca91070465
-SHA1 (patch-ab) = f0d6be0bde866803f25da5ace473e244514e3d14
-SHA1 (patch-ac) = 1f32b536470e77bf6e029d0933bb375c1b08aee0
-SHA1 (patch-ad) = b2ef6583696880a55888a549ad5d4a7d3c8d49c0
+SHA1 (ntop-3.1.tgz) = 2aaae2f6f5a343d480eed7284db187b53f598b31
+Size (ntop-3.1.tgz) = 3286596 bytes
diff --git a/net/ntop/patches/patch-aa b/net/ntop/patches/patch-aa
deleted file mode 100644
index 7a4e4c5d877..00000000000
--- a/net/ntop/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2001/03/10 18:00:51 wiz Exp $
-
---- Makefile.in.orig	Mon May  3 09:03:10 1999
-+++ Makefile.in
-@@ -54,7 +54,7 @@
- DEFS = @DEFS@
- 
- # Standard CFLAGS
--CFLAGS = $(CCOPT) $(DEFS) @G_THREAD_CFLAGS@ @LSOF_DEFS@ @OS_DEFS@ $(INCLS) 
-+CFLAGS = $(CCOPT) $(DEFS) @G_THREAD_CFLAGS@ @LSOF_DEFS@ @OS_DEFS@ $(INCLS) $(CPPFLAGS)
- 
- # Standard LDFLAGS
- LDFLAGS = @LDFLAGS@
-@@ -105,7 +105,7 @@
- report.c: ntop.h
- 
- install:
--	$(INSTALL) -m 6550 $(PROG) $(DESTDIR)$(BINDEST)/$(PROG)
-+	$(INSTALL) -m 555 $(PROG) $(DESTDIR)$(BINDEST)/$(PROG)
- 
- install-man:
- 	$(INSTALL) -m 444 $(PROG).8 $(DESTDIR)$(MANDEST)/man8/$(PROG).8
diff --git a/net/ntop/patches/patch-ab b/net/ntop/patches/patch-ab
deleted file mode 100644
index a9c6302487d..00000000000
--- a/net/ntop/patches/patch-ab
+++ /dev/null
@@ -1,108 +0,0 @@
-$NetBSD: patch-ab,v 1.9 2001/03/10 18:00:51 wiz Exp $
-
---- ntop.c.orig	Wed Apr 28 19:49:00 1999
-+++ ntop.c
-@@ -254,7 +254,7 @@
-   initIPServices();
- 
- #ifndef WIN32
--  while ((op = getopt(argc, argv, "df:F:hr:i:p:l:nw:m:")) != EOF)
-+  while ((op = getopt(argc, argv, "df:F:hr:i:p:l:nm:")) != EOF)
-     switch (op) {
- 
- #ifndef WIN32
-@@ -324,6 +324,7 @@
-       numericFlag++;
-       break;
- 
-+#if 0
-     case 'w':
-       if(!isdigit(optarg[0])) {
- 	printf("FATAL ERROR: flag -w expects a numeric argument.\n");
-@@ -332,6 +333,7 @@
-       webMode++;
-       webPort = atoi(optarg);
-       break;
-+#endif
- 
-     default:
-       usage(0);
-@@ -348,11 +350,6 @@
- #endif
- 
- #ifndef WIN32
--  if((rFileName == NULL) && (getuid () && geteuid ()) || setuid (0)) {
--    printf("Sorry, you must be superuser in order to run ntop.\n");
--    return(-1);
--  }
--  
-   if(daemonMode && (!webMode)) {
-     printf("WARNING: -d is incompatible with interactive mode.\n");
-   } else if(daemonMode)
-@@ -392,13 +389,30 @@
- #ifndef WIN32
-   /* Determine the device name if not specified */
-   if (device == NULL && (device = pcap_lookupdev(ebuf)) == NULL) {
--    printf(ebuf);
-+    printf("%s\n", ebuf);
-     return(-1);
-   }
- 
-   getLocalHostAddress(&localHostAddress, device);
- 
-   if(rFileName == NULL) {
-+    /* Fire up libpcap */
-+    pcapPtr = pcap_open_live(device, DEFAULT_SNAPLEN, !pflag, 1000, ebuf);
-+  } else {
-+    pcapPtr = pcap_open_offline(rFileName, ebuf);
-+  }
-+
-+  if (pcapPtr == NULL) {
-+    printf("%s\n", ebuf);
-+    return(-1);
-+  }
-+
-+  if (pcap_lookupnet(device, &localnet, &netmask, ebuf) < 0) {
-+    printf("%s\n", ebuf);
-+    return(-1);
-+  }
-+
-+  if(rFileName == NULL) {
-     if(webMode) {
-       (void)fprintf(stderr, "ntop v.%s %s [%s]"
- #ifndef WIN32
-@@ -418,21 +432,6 @@
-       init_curses();
-     }
- #endif
--
--    /* Fire up libpcap */
--    pcapPtr = pcap_open_live(device, DEFAULT_SNAPLEN, !pflag, 1000, ebuf);
--  } else {
--    pcapPtr = pcap_open_offline(rFileName, ebuf);
--  }
--
--  if (pcapPtr == NULL) {
--    printf(ebuf);
--    return(-1);
--  }
--
--  if (pcap_lookupnet(device, &localnet, &netmask, ebuf) < 0) {
--    printf(ebuf);
--    return(-1);
-   }
- #else /* WIN32 */
-   printf("ntop v.%s %s [%s]"
-@@ -458,12 +457,6 @@
-     free(localAddresses);
-     localAddresses = NULL;
-   }
--
--#ifndef WIN32
--  /* Now that the socket is open, throw away potential setuid/setgid */
--  (void)setgid(getgid());
--  (void)setuid(getuid());
--#endif
- 
- #ifndef WIN32
-   /* get datalink type */
diff --git a/net/ntop/patches/patch-ac b/net/ntop/patches/patch-ac
deleted file mode 100644
index fcc1d2b5d83..00000000000
--- a/net/ntop/patches/patch-ac
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2001/01/07 02:25:35 wiz Exp $
-
---- pbuf.c.orig	Mon May  3 17:43:09 1999
-+++ pbuf.c
-@@ -843,20 +843,18 @@
- 
- int checkKeyPressed() {
-   int theChar = getch();
--  unsigned char in_char;
-   int rc = 1, numScreens; 
- 
--  if((theChar != EOF) 
--     && ((in_char = (unsigned char)theChar)) != 255) {
-+  if((theChar != EOF) && (theChar != ERR)) {
-   
-     /*
-       char buf[32];
- 
--      sprintf(buf, ">%c-%d<", in_char, in_char);
-+      sprintf(buf, ">%c-%d<", theChar, theChar);
-       mvprintw(0, 40, buf); refresh();
-       sleep(2);
-     */
--    switch(in_char) {
-+    switch(theChar) {
-     case 'q':
-     case 'Q':
-       cleanup(-1);
diff --git a/net/ntop/patches/patch-ad b/net/ntop/patches/patch-ad
deleted file mode 100644
index 9a713b56a69..00000000000
--- a/net/ntop/patches/patch-ad
+++ /dev/null
@@ -1,80 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2004/10/03 20:51:23 wiz Exp $
-
---- ntop.8.orig	1999-04-13 10:20:11.000000000 +0200
-+++ ntop.8
-@@ -19,8 +19,6 @@ ntop \- display top network users
- .IR "IP protocols to monitor" ]
- .RB [ -i 
- .IR interface ]
--.RB [ -w 
--.IR port ]
- .RB [ -d ]
- .RB [ -m 
- .IR "local subnet" ]
-@@ -34,12 +32,7 @@ ntop \- display top network users
- shows the current network usage. It displays a list of hosts that are
- currently using the network and reports information concerning the (IP and non-IP) 
- traffic generated by each host. 
--.B ntop
--can be started either in a terminal window (interactive mode) or in
--web mode. In the latter case, a web browser is needed to use the
--program. The traffic is sorted according to the host and the protocol. Whenever
--.B ntop
--is started in web mode (-w flag), multiple remote users can access the traffic information. See below for more information.
-+The traffic is sorted according to the host and the protocol.
- .PP
- .SH "COMMAND\-LINE OPTIONS"
- .It -r
-@@ -77,28 +70,10 @@ Specifies the network interface used by
- .
- 
- .It -w 
--Starts
--.B ntop
--in web mode. Users can attach their web browsers to the specified port and browse 
--traffic information remotely. Supposing to start
--.B ntop
--at the port 3000 (ntop -w 3000), the URL to access is
--http://hostname:3000/. The file ~/.ntop specifies the HTTP
--user/password of those people who are allowed to access ntop. If the
--~/.ntop file is missing no security will be used hence everyone can
--access traffic information. A simple .ntop file is the following:
--.
--#
--# .ntop File format
--#
--# user<tab>/<space>pw
--#
--#
--luca		linux
--.
--Please note that an HTTP server is NOT
--needed in order to use the program in interactive mode.
--.
-+Is disabled in this version of ntop for security reasons.
-+See
-+.B http://www.securityfocus.com/advisories/2520
-+for details.
- 
- .It -d
- This flag (it has to be used with -w) causes ntop to become a daemon, i.e. it is started in background and detached from the terminal.
-@@ -185,12 +160,6 @@ three 
- columns are toggled. Please note that these columns represent either
- the traffic sent or received, according to the the way the list is sorted (see previous
- command).
--
--.SH "WEB VIEWS (Web mode)"
--While
--.B ntop
--is running in web mode (-w flag), multiple users can access the traffic information using conventional web browsers. The main HTML page, is divided is two frames. The left frame allows users to select the traffic view that will be displayed in the right frame. Available sections are: sort traffic by data sent, sort traffic by data received, traffic statistics, active hosts list, remote to local (i.e. inside the subnet defined for the network board from which the program is currently sniffing) IP traffic, local to remote IP traffic, local to local IP traffic, list of active TCP sessions, IP protocol distribution statistics, IP protocol usage, IP traffic matrix.
--
- .
- .SH "FIELD DESCRIPTIONS (Interactive mode)"
- .B ntop
-@@ -247,4 +216,4 @@ at ftp://ftp.ee.lbl.gov/libpcap.tar.Z.
- .
- .
- .SH AUTHOR
--Please send bug reports to the ntop mailing list <ntop@unipi.it>. ntop's author is Luca Deri <deri@unipi.it>.
-\ No newline at end of file
-+Please send bug reports to the ntop mailing list <ntop@unipi.it>. ntop's author is Luca Deri <deri@unipi.it>.