- Update to 4.0.1

Submitted by:	Jean-Baptiste Berlioz <tobe@gnagnaki.net> (via E-mail)

7 files changed, 169 insertions, 332 deletions

diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 4d5acee980e7..6d68eff864e2 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -6,18 +6,10 @@
 #
 
 PORTNAME=	ntop
-PORTVERSION=	3.3.10
-PORTREVISION=	7
+PORTVERSION=	4.0.1
 CATEGORIES=	net
-MASTER_SITES=	http://www.ntop.org/trac/export/4103/trunk/ntop/3rd_party/ \
-		SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-DISTFILES=	etter.finger.os.gz \
-		GeoIPASNum.dat.gz \
-		GeoLiteCity.dat.gz \
-		oui.txt.gz \
-		specialMAC.txt.gz \
-		${PORTNAME}-${PORTVERSION}.tar.gz
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tar.gz
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	Network monitoring tool with command line and web interfaces
@@ -34,7 +26,7 @@ DBDIR?=		/var/db
 MAKE_JOBS_SAFE=	yes
 USE_AUTOTOOLS=	libtool automake autoconf
 USE_GNOME=	libxml2
-USE_LUA=	5.1
+USE_PYTHON=	2.6+
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
@@ -61,19 +53,13 @@ USE_RC_SUBR=	ntop.sh
 ##    WITH_LOCALE:        Enable locale (i18n) support.
 ##    WITH_PCAP_PORT:     Use libpcap from ports.
 ##    WITH_XMLDUMP:       Enable XML Dump support.
-##    WITHOUT_TCPWRAPPER: Disable TCP wrapper support.
 ##
 OPTIONS=	LOCALE "Enable locale (i18n) support." Off \
 		PCAP_PORT "Use libpcap from ports." Off \
-		XMLDUMP "Enable XML Dump support." Off \
-		TCPWRAPPER "Enable TCP wrapper support" On
+		XMLDUMP "Enable XML Dump support." Off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_TCPWRAPPER)
-CONFIGURE_ARGS+=	--with-tcpwrap
-.endif
-
 .if defined(WITH_PCAP_PORT)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
 CONFIGURE_ARGS+=	--with-pcap-root=${LOCALBASE}
@@ -99,14 +85,6 @@ CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/libxml2 \
 BROKEN=		does not configure on 6.X
 .endif
 
-post-extract:
-	@${RM} ${WRKSRC}/configureextra/FREEBSD
-	@${CP} ${_DISTDIR}/etter.finger.os.gz ${WRKSRC}
-	@${CP} ${_DISTDIR}/GeoIPASNum.dat.gz ${WRKSRC}
-	@${CP} ${_DISTDIR}/GeoLiteCity.dat.gz ${WRKSRC}
-	@${CP} ${_DISTDIR}/oui.txt.gz ${WRKSRC}
-	@${CP} ${_DISTDIR}/specialMAC.txt.gz ${WRKSRC}
-
 pre-configure:
 	@cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} ${SH} autogen.sh --noconfig
 
@@ -116,7 +94,5 @@ pre-install:
 post-install:
 	@${MKDIR} ${DBDIR}/ntop
 	@${CHOWN} -R nobody:nobody ${DBDIR}/ntop
-	@${INSTALL} -d ${ETCDIR}/l7-patterns
-	@cd ${WRKSRC}/l7-patterns/&&${COPYTREE_SHARE} . ${ETCDIR}/l7-patterns
 
 .include <bsd.port.post.mk>
diff --git a/net/ntop/distinfo b/net/ntop/distinfo
index e2fbdce90272..ff3675c1527d 100644
--- a/net/ntop/distinfo
+++ b/net/ntop/distinfo
@@ -1,18 +1,2 @@
-MD5 (etter.finger.os.gz) = cc7bf111369e4111089b86ad75953c79
-SHA256 (etter.finger.os.gz) = f4ef41faad479f47080696032a90b695807ce9a28dbb0d2a215f54c870fa9471
-SIZE (etter.finger.os.gz) = 18394
-MD5 (GeoIPASNum.dat.gz) = b34900f4783e2efddacbf8bf260c1dad
-SHA256 (GeoIPASNum.dat.gz) = c39a86798e64c6773da17a7e6afcea8da98292a4ee2b755369bb046a14aac38b
-SIZE (GeoIPASNum.dat.gz) = 1203026
-MD5 (GeoLiteCity.dat.gz) = 94d0975210023c802ccb1f6ec0727b19
-SHA256 (GeoLiteCity.dat.gz) = b92dad48943b388e73e542b5f895850d4de4d78d8f3ecaaa85214bd46ded6930
-SIZE (GeoLiteCity.dat.gz) = 26285561
-MD5 (oui.txt.gz) = f1309510af2e852ee1fa8ed1909c0fa1
-SHA256 (oui.txt.gz) = 5534fe672f920f8b05bb044b1c36e60f154bb58415d147b2e52276eb167f74eb
-SIZE (oui.txt.gz) = 598418
-MD5 (specialMAC.txt.gz) = 4a52a90c7db969712eaac5b048d3f3b1
-SHA256 (specialMAC.txt.gz) = 8ac344327ffca8617e0c9b25b646f0da1adf9c5a0a0f3e6ad5e8335666627d07
-SIZE (specialMAC.txt.gz) = 749
-MD5 (ntop-3.3.10.tar.gz) = 6e2ffa90d5f935c8f03d88a5dd19a866
-SHA256 (ntop-3.3.10.tar.gz) = aa18ba3acb564d707521deaa2655f61f5b617d98d4fb5a014553f3fa123f123a
-SIZE (ntop-3.3.10.tar.gz) = 3235500
+SHA256 (ntop-4.0.1.tar.gz) = 5b8d393246e423e434532a4de79fe4f08191b98c451d76a4ede251302fd4f56d
+SIZE (ntop-4.0.1.tar.gz) = 39184538
diff --git a/net/ntop/files/patch-Makefile.am b/net/ntop/files/patch-Makefile.am
index 1ac086c0e581..1377c36d96a8 100644
--- a/net/ntop/files/patch-Makefile.am
+++ b/net/ntop/files/patch-Makefile.am
@@ -1,6 +1,6 @@
---- Makefile.am.orig	2009-04-17 17:27:57.000000000 -0300
-+++ Makefile.am	2010-01-22 21:18:51.000000000 -0200
-@@ -70,15 +70,13 @@
+--- ./Makefile.am.orig	2011-02-02 10:24:56.000000000 +0100
++++ ./Makefile.am	2011-02-02 10:50:06.000000000 +0100
+@@ -68,8 +68,6 @@
  
  ETTER_PASSIVE_FILE = etter.finger.os
  ETTER_PASSIVE = $(ETTER_PASSIVE_FILE).gz
@@ -9,33 +9,15 @@
  
  NTOPDATA = ntop-cert.pem \
             $(ETTER_PASSIVE) \
-            oui.txt.gz \
-            specialMAC.txt.gz \
--	   GeoIPASNum.dat \
--	   GeoLiteCity.dat
-+	   GeoIPASNum.dat.gz \
-+	   GeoLiteCity.dat.gz
- 
- NTOPHTML = html html/*.js html/*.html  html/*.gif html/*.jpg html/*.ico html/*.png \
-            html/*.css html/*.dtd \
-@@ -270,8 +268,6 @@
- 
- install: install-recursive
- 
--	cd @GEO_DIR@; make install
--
- 	@mkdir -p $(DESTDIR)/$(CFG_DBFILE_DIR)
- 
- 	@echo ""
-@@ -341,7 +337,6 @@
+@@ -337,7 +335,6 @@
  	chcon -t textrel_shlib_t $(DESTDIR)$(libdir)/*ntop*.so
  
- install-data-local: ntop.txt ntop.html faq.html
+ install-data-local: ntop.txt ntop.html faq.html dnetter
 -	@$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)/plugins;
  	@if ! test -d $(DESTDIR)/$(datadir)/ntop; then \
  	  $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/ntop; \
  	  touch $(DESTDIR)/$(datadir)/ntop/warnuser; \
-@@ -376,21 +371,6 @@
+@@ -373,21 +370,6 @@
  	@echo ""
  	@echo ""
  	@echo -n "Preparing "
@@ -57,16 +39,7 @@
  	@echo -n "New file lines are:  "
  	@gunzip -c oui.txt.gz | wc -l
  	@echo ""
-@@ -400,7 +380,7 @@
- 
- # download the Novell SAP Protocol information table
- dnsapt:
--	@(cd Internet; wget -c http://www.iana.org/assignments/novell-sap-numbers)
-+	@(cd Internet; fetch http://www.iana.org/assignments/novell-sap-numbers)
- 
- # download the passive ethernet fingerprint database
- dnetter:
-@@ -409,34 +389,6 @@
+@@ -406,34 +388,6 @@
  	@echo "Preparing "
  	@echo ""
  
diff --git a/net/ntop/files/patch-autogen.sh b/net/ntop/files/patch-autogen.sh
index 5fd3a5c43e81..8430443e9293 100644
--- a/net/ntop/files/patch-autogen.sh
+++ b/net/ntop/files/patch-autogen.sh
@@ -1,6 +1,6 @@
---- autogen.sh.orig	2009-09-15 11:33:11.000000000 -0300
-+++ autogen.sh	2009-09-15 11:34:06.000000000 -0300
-@@ -244,16 +244,6 @@
+--- ./autogen.sh.orig	2011-02-02 10:40:23.000000000 +0100
++++ ./autogen.sh	2011-02-02 10:40:40.000000000 +0100
+@@ -202,16 +202,6 @@
    GNU_OR_DIE=0
  }
  
diff --git a/net/ntop/files/patch-configure.in b/net/ntop/files/patch-configure.in
index 32b7fd41b6d2..46c9d46d8559 100644
--- a/net/ntop/files/patch-configure.in
+++ b/net/ntop/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	2009-09-15 11:37:06.000000000 -0300
-+++ configure.in	2009-09-15 11:45:13.000000000 -0300
-@@ -621,8 +621,8 @@
+--- ./configure.in.orig	2011-02-02 10:41:10.000000000 +0100
++++ ./configure.in	2011-02-02 10:49:06.000000000 +0100
+@@ -582,8 +582,8 @@
  else
  if test ".${PCAP_ROOT}" != .; then
    if test -d $PCAP_ROOT &&
@@ -11,73 +11,21 @@
         PCAP_ROOT=`cd ${PCAP_ROOT} && pwd`
         CORELIBS="${CORELIBS} -L$PCAP_ROOT -lpcap"
         INCS="${INCS} -I$PCAP_ROOT"
-@@ -1650,27 +1650,6 @@
- fi
- 
- dnl>
--dnl> Lua - http://www.lua.org
--dnl>
--LUA_VERSION=lua-5.1.4
--if test -f "$LUA_VERSION.tar.gz"; then
--   echo "Lua already present on this machine"
--else
--   wget http://www.lua.org/ftp/$LUA_VERSION.tar.gz
--fi
--
--tar xvfz $LUA_VERSION.tar.gz
--cat $LUA_VERSION/src/Makefile | sed -e s,'MYCFLAGS=-DLUA_USE_POSIX',' MYCFLAGS="-fPIC -DLUA_USE_POSIX"',g > /tmp/lua.temp
--cat /tmp/lua.temp >  $LUA_VERSION/src/Makefile
--#rm -f /tmp/lua.temp
--cd $LUA_VERSION; make posix; cd ..
--
--LUA_LIB_DIR=$PWD/$LUA_VERSION"/src"
--LIBS="-L${LUA_LIB_DIR} -llua ${LIBS} "
--INCS="${INCS} -I${LUA_LIB_DIR}"
--AC_DEFINE_UNQUOTED(HAVE_LUA, 1, [LUA is supported])
--
--dnl>
- dnl> SCTP - RFC 3286
- dnl>
- AC_MSG_CHECKING([sctp])
-@@ -1962,40 +1941,7 @@
-     }'`
- fi
- 
--dnl> GeoIP (http://www.maxmind.com/)
--if test -f "GeoIP.tar.gz"; then
--   echo "GeoIP already present on this machine"
--else
--   wget http://www.maxmind.com/download/geoip/api/c/GeoIP.tar.gz
--fi
--tar xvfz GeoIP.tar.gz
--GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
--cd $GEO_DIR; ./configure --prefix=${prefix}; make; cd ..
--# OSX Fix
--GEO_DYLIB="$GEO_DIR/libGeoIP/.libs/libGeoIP.dylib"
--if test -f $GEO_DYLIB; then
--   ln -s $GEO_DYLIB .
--fi
--
--if test -f "GeoLiteCity.dat"; then
--   echo "GeoLiteCity.dat already present"
--else
--   wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
--   gunzip GeoLiteCity.dat.gz
--fi
--
--if test -f "GeoIPASNum.dat"; then
--   echo "GeoIPASNum.dat already present"
--else
--   wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
--   gunzip GeoIPASNum.dat.gz
--fi
--
--
--GEO_DIR=`find $PWD -type d -name "GeoIP-*"`
--GEO_IP="$GEO_DIR/libGeoIP/"
--CFLAGS="$CFLAGS -I$GEO_IP"
--LDFLAGS="-L$GEO_IP.libs/ -lGeoIP $LDFLAGS"
-+LDFLAGS="$LDFLAGS -lGeoIP"
+@@ -1815,8 +1815,6 @@
+ else
+    if test -f "3rd_party/GeoLiteCity.dat.gz"; then
+      cp 3rd_party/GeoLiteCity.dat.gz .
+-   else
+-     wget http://www.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz
+    fi
  
- dnl> NTOPCONFIGDEBUG_SETTINGS([precet])
+    gunzip GeoLiteCity.dat.gz
+@@ -1829,8 +1827,6 @@
+ else
+    if test -f "3rd_party/GeoIPASNum.dat.gz"; then
+      cp 3rd_party/GeoIPASNum.dat.gz .
+-   else
+-     wget http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
+    fi
  
+    gunzip GeoIPASNum.dat.gz
diff --git a/net/ntop/files/patch-ntop.c b/net/ntop/files/patch-ntop.c
index 6d3992f21bea..06e42f37b34b 100644
--- a/net/ntop/files/patch-ntop.c
+++ b/net/ntop/files/patch-ntop.c
@@ -1,6 +1,6 @@
---- ntop.c.orig	2010-01-15 20:54:06.000000000 -0200
-+++ ntop.c	2010-01-15 20:55:37.000000000 -0200
-@@ -183,7 +183,7 @@
+--- ./ntop.c.orig	2011-02-02 10:23:03.000000000 +0100
++++ ./ntop.c	2011-02-02 10:24:12.000000000 +0100
+@@ -187,7 +187,7 @@
  #endif
    signal(SIGQUIT, SIG_IGN);
  
diff --git a/net/ntop/pkg-plist b/net/ntop/pkg-plist
index 908b967b4fae..eced7c40fd3a 100644
--- a/net/ntop/pkg-plist
+++ b/net/ntop/pkg-plist
@@ -1,163 +1,88 @@
 bin/ntop
-etc/ntop/GeoIPASNum.dat.gz
-etc/ntop/GeoLiteCity.dat.gz
-etc/ntop/ntop-cert.pem
+etc/ntop/GeoIPASNum.dat
+etc/ntop/GeoLiteCity.dat
 etc/ntop/etter.finger.os.gz
+etc/ntop/ntop-cert.pem
 etc/ntop/oui.txt.gz
 etc/ntop/specialMAC.txt.gz
-etc/ntop/l7-patterns/100bao.pat
-etc/ntop/l7-patterns/aim.pat
-etc/ntop/l7-patterns/aimwebcontent.pat
-etc/ntop/l7-patterns/applejuice.pat
-etc/ntop/l7-patterns/ares.pat
-etc/ntop/l7-patterns/battlefield1942.pat
-etc/ntop/l7-patterns/battlefield2.pat
-etc/ntop/l7-patterns/bgp.pat
-etc/ntop/l7-patterns/biff.pat
-etc/ntop/l7-patterns/bittorrent.pat
-etc/ntop/l7-patterns/ciscovpn.pat
-etc/ntop/l7-patterns/citrix.pat
-etc/ntop/l7-patterns/counterstrike-source.pat
-etc/ntop/l7-patterns/cvs.pat
-etc/ntop/l7-patterns/dayofdefeat-source.pat
-etc/ntop/l7-patterns/dhcp.pat
-etc/ntop/l7-patterns/directconnect.pat
-etc/ntop/l7-patterns/dns.pat
-etc/ntop/l7-patterns/doom3.pat
-etc/ntop/l7-patterns/edonkey.pat
-etc/ntop/l7-patterns/fasttrack.pat
-etc/ntop/l7-patterns/finger.pat
-etc/ntop/l7-patterns/freenet.pat
-etc/ntop/l7-patterns/ftp.pat
-etc/ntop/l7-patterns/gkrellm.pat
-etc/ntop/l7-patterns/gnucleuslan.pat
-etc/ntop/l7-patterns/gnutella.pat
-etc/ntop/l7-patterns/goboogy.pat
-etc/ntop/l7-patterns/gopher.pat
-etc/ntop/l7-patterns/h323.pat
-etc/ntop/l7-patterns/halflife2-deathmatch.pat
-etc/ntop/l7-patterns/hddtemp.pat
-etc/ntop/l7-patterns/hotline.pat
-etc/ntop/l7-patterns/http.pat
-etc/ntop/l7-patterns/ident.pat
-etc/ntop/l7-patterns/imap.pat
-etc/ntop/l7-patterns/ipp.pat
-etc/ntop/l7-patterns/irc.pat
-etc/ntop/l7-patterns/jabber.pat
-etc/ntop/l7-patterns/kugoo.pat
-etc/ntop/l7-patterns/live365.pat
-etc/ntop/l7-patterns/lpd.pat
-etc/ntop/l7-patterns/msn-filetransfer.pat
-etc/ntop/l7-patterns/msnmessenger.pat
-etc/ntop/l7-patterns/mute.pat
-etc/ntop/l7-patterns/napster.pat
-etc/ntop/l7-patterns/nbns.pat
-etc/ntop/l7-patterns/ncp.pat
-etc/ntop/l7-patterns/netbios.pat
-etc/ntop/l7-patterns/nntp.pat
-etc/ntop/l7-patterns/ntp.pat
-etc/ntop/l7-patterns/openft.pat
-etc/ntop/l7-patterns/poco.pat
-etc/ntop/l7-patterns/pop3.pat
-etc/ntop/l7-patterns/pressplay.pat
-etc/ntop/l7-patterns/qq.pat
-etc/ntop/l7-patterns/quake-halflife.pat
-etc/ntop/l7-patterns/quake1.pat
-etc/ntop/l7-patterns/rdp.pat
-etc/ntop/l7-patterns/rlogin.pat
-etc/ntop/l7-patterns/rtsp.pat
-etc/ntop/l7-patterns/shoutcast.pat
-etc/ntop/l7-patterns/sip.pat
-etc/ntop/l7-patterns/skypeout.pat
-etc/ntop/l7-patterns/skypetoskype.pat
-etc/ntop/l7-patterns/smb.pat
-etc/ntop/l7-patterns/smtp.pat
-etc/ntop/l7-patterns/snmp.pat
-etc/ntop/l7-patterns/socks.pat
-etc/ntop/l7-patterns/soribada.pat
-etc/ntop/l7-patterns/soulseek.pat
-etc/ntop/l7-patterns/ssdp.pat
-etc/ntop/l7-patterns/ssh.pat
-etc/ntop/l7-patterns/ssl.pat
-etc/ntop/l7-patterns/subspace.pat
-etc/ntop/l7-patterns/telnet.pat
-etc/ntop/l7-patterns/tesla.pat
-etc/ntop/l7-patterns/tftp.pat
-etc/ntop/l7-patterns/tls.pat
-etc/ntop/l7-patterns/tsp.pat
-etc/ntop/l7-patterns/validcertssl.pat
-etc/ntop/l7-patterns/vnc.pat
-etc/ntop/l7-patterns/whois.pat
-etc/ntop/l7-patterns/x11.pat
-etc/ntop/l7-patterns/xboxlive.pat
-etc/ntop/l7-patterns/xunlei.pat
-etc/ntop/l7-patterns/yahoo.pat
-etc/ntop/l7-patterns/zmaap.pat
 lib/libcpacketPlugin-%%PORTVERSION%%.so
 lib/libcpacketPlugin.so
 lib/libicmpPlugin-%%PORTVERSION%%.so
 lib/libicmpPlugin.so
-lib/liblastSeenPlugin-%%PORTVERSION%%.so
-lib/liblastSeenPlugin.so
 lib/libnetflowPlugin-%%PORTVERSION%%.so
 lib/libnetflowPlugin.so
 lib/libntop-%%PORTVERSION%%.so
-lib/libntop.so
 lib/libntop.a
 lib/libntop.la
+lib/libntop.so
 lib/libntopreport-%%PORTVERSION%%.so
-lib/libntopreport.so
 lib/libntopreport.a
 lib/libntopreport.la
+lib/libntopreport.so
 lib/librrdPlugin-%%PORTVERSION%%.so
 lib/librrdPlugin.so
 lib/libsflowPlugin-%%PORTVERSION%%.so
 lib/libsflowPlugin.so
 lib/ntop/plugins/cpacketPlugin.so
 lib/ntop/plugins/icmpPlugin.so
-lib/ntop/plugins/lastSeenPlugin.so
 lib/ntop/plugins/netflowPlugin.so
 lib/ntop/plugins/rrdPlugin.so
 lib/ntop/plugins/sflowPlugin.so
-%%DATADIR%%/perl/report/basic.xml
-%%DATADIR%%/html/multihomed.png
-%%DATADIR%%/perl/report.pl
-%%DATADIR%%/perl/test.pl
-%%DATADIR%%/html/ntop_logo.png
-%%DATADIR%%/html/line-bottom.png
-%%DATADIR%%/html/autosuggest.js
-%%DATADIR%%/html/calendar-setup.js
-%%DATADIR%%/html/calendar.js
-%%DATADIR%%/html/domLib.js
-%%DATADIR%%/html/domTT.js
-%%DATADIR%%/html/zoom.js
-%%DATADIR%%/html/calendar.gif
-%%DATADIR%%/html/edit.gif
-%%DATADIR%%/html/graph_zoom.gif
-%%DATADIR%%/html/marker.gif
-%%DATADIR%%/html/skype.gif
-%%DATADIR%%/html/external.png
-%%DATADIR%%/html/marker.png
-%%DATADIR%%/html/autosuggest.css
 %%DATADIR%%/html/JSCookMenu.js
-%%DATADIR%%/html/theme.js
-%%DATADIR%%/html/arrow.gif
-%%DATADIR%%/html/blank.gif
-%%DATADIR%%/html/spacer.gif
-%%DATADIR%%/html/theme.css
-%%DATADIR%%/html/statsicons/flags/local.gif
+%%DATADIR%%/html/MochiKit/Async.js
+%%DATADIR%%/html/MochiKit/Base.js
+%%DATADIR%%/html/MochiKit/Color.js
+%%DATADIR%%/html/MochiKit/DOM.js
+%%DATADIR%%/html/MochiKit/DateTime.js
+%%DATADIR%%/html/MochiKit/DragAndDrop.js
+%%DATADIR%%/html/MochiKit/Format.js
+%%DATADIR%%/html/MochiKit/Iter.js
+%%DATADIR%%/html/MochiKit/Logging.js
+%%DATADIR%%/html/MochiKit/LoggingPane.js
+%%DATADIR%%/html/MochiKit/MochiKit.js
+%%DATADIR%%/html/MochiKit/MockDOM.js
+%%DATADIR%%/html/MochiKit/Position.js
+%%DATADIR%%/html/MochiKit/Selector.js
+%%DATADIR%%/html/MochiKit/Signal.js
+%%DATADIR%%/html/MochiKit/Sortable.js
+%%DATADIR%%/html/MochiKit/Style.js
+%%DATADIR%%/html/MochiKit/Test.js
+%%DATADIR%%/html/MochiKit/Visual.js
+%%DATADIR%%/html/MochiKit/__package__.js
+%%DATADIR%%/html/PlotKit/Base.js
+%%DATADIR%%/html/PlotKit/Canvas.js
+%%DATADIR%%/html/PlotKit/EasyPlot.js
+%%DATADIR%%/html/PlotKit/Layout.js
+%%DATADIR%%/html/PlotKit/PlotKit.js
+%%DATADIR%%/html/PlotKit/PlotKit_Packed.js
+%%DATADIR%%/html/PlotKit/SVG.js
+%%DATADIR%%/html/PlotKit/SweetCanvas.js
+%%DATADIR%%/html/PlotKit/SweetSVG.js
+%%DATADIR%%/html/PlotKit/excanvas.js
 %%DATADIR%%/html/Risk_high.gif
 %%DATADIR%%/html/Risk_low.gif
 %%DATADIR%%/html/Risk_medium.gif
 %%DATADIR%%/html/Risk_unknown.gif
 %%DATADIR%%/html/antenna.gif
+%%DATADIR%%/html/arrow.gif
+%%DATADIR%%/html/arrow_down.png
+%%DATADIR%%/html/arrow_up.png
+%%DATADIR%%/html/autosuggest.css
+%%DATADIR%%/html/autosuggest.js
+%%DATADIR%%/html/back.png
 %%DATADIR%%/html/bg_line.gif
+%%DATADIR%%/html/bit_off.png
+%%DATADIR%%/html/bit_on.png
 %%DATADIR%%/html/black.gif
+%%DATADIR%%/html/blank.gif
 %%DATADIR%%/html/bottom_corner.gif
 %%DATADIR%%/html/bridge.gif
 %%DATADIR%%/html/brocade.gif
 %%DATADIR%%/html/bug.png
 %%DATADIR%%/html/bulb.gif
+%%DATADIR%%/html/calendar-setup.js
+%%DATADIR%%/html/calendar.gif
+%%DATADIR%%/html/calendar.js
 %%DATADIR%%/html/card.gif
 %%DATADIR%%/html/child.gif
 %%DATADIR%%/html/clear.gif
@@ -168,33 +93,63 @@ lib/ntop/plugins/sflowPlugin.so
 %%DATADIR%%/html/deleteUser.gif
 %%DATADIR%%/html/disk.gif
 %%DATADIR%%/html/dns.gif
+%%DATADIR%%/html/domLib.js
+%%DATADIR%%/html/domTT.js
 %%DATADIR%%/html/download.gif
 %%DATADIR%%/html/dump.html
+%%DATADIR%%/html/edit.gif
 %%DATADIR%%/html/emulex.gif
 %%DATADIR%%/html/error.gif
 %%DATADIR%%/html/expanded.gif
+%%DATADIR%%/html/external.png
 %%DATADIR%%/html/faq.html
 %%DATADIR%%/html/favicon.ico
+%%DATADIR%%/html/fback.png
+%%DATADIR%%/html/fforward.png
+%%DATADIR%%/html/forward.png
 %%DATADIR%%/html/functions.js
 %%DATADIR%%/html/gauge.jpg
 %%DATADIR%%/html/gaugeR.jpg
 %%DATADIR%%/html/gaugeS.jpg
 %%DATADIR%%/html/graph.gif
+%%DATADIR%%/html/graph_zoom.gif
+%%DATADIR%%/html/graph_zoomDOWN.gif
+%%DATADIR%%/html/graph_zoomUP.gif
 %%DATADIR%%/html/gray_bg.gif
 %%DATADIR%%/html/help.html
 %%DATADIR%%/html/help.png
 %%DATADIR%%/html/hostSortNote.html
+%%DATADIR%%/html/icon_python.png
+%%DATADIR%%/html/img_inquisitor/as_pointer.gif
+%%DATADIR%%/html/img_inquisitor/hl_corner_bl.gif
+%%DATADIR%%/html/img_inquisitor/hl_corner_br.gif
+%%DATADIR%%/html/img_inquisitor/hl_corner_tl.gif
+%%DATADIR%%/html/img_inquisitor/hl_corner_tr.gif
+%%DATADIR%%/html/img_inquisitor/ul_corner_bl.gif
+%%DATADIR%%/html/img_inquisitor/ul_corner_br.gif
+%%DATADIR%%/html/img_inquisitor/ul_corner_tl.gif
+%%DATADIR%%/html/img_inquisitor/ul_corner_tr.gif
 %%DATADIR%%/html/info.gif
 %%DATADIR%%/html/initiator.gif
+%%DATADIR%%/html/jscalendar/calendar-load.js
+%%DATADIR%%/html/jscalendar/calendar-setup.js
+%%DATADIR%%/html/jscalendar/calendar.js
+%%DATADIR%%/html/jscalendar/lang/calendar-en.js
+%%DATADIR%%/html/json2.js
+%%DATADIR%%/html/line-bottom.png
 %%DATADIR%%/html/lock.png
 %%DATADIR%%/html/mail.gif
 %%DATADIR%%/html/major.gif
 %%DATADIR%%/html/marchio_unipi_pant541_144.gif
+%%DATADIR%%/html/marker.gif
+%%DATADIR%%/html/marker.png
 %%DATADIR%%/html/minor.gif
+%%DATADIR%%/html/multihomed.png
 %%DATADIR%%/html/multivlaned.gif
 %%DATADIR%%/html/nboxLogo.gif
 %%DATADIR%%/html/ntop.gif
 %%DATADIR%%/html/ntop.html
+%%DATADIR%%/html/ntop_logo.png
 %%DATADIR%%/html/ntopdump.dtd
 %%DATADIR%%/html/ntophelp.html
 %%DATADIR%%/html/p2p.gif
@@ -202,8 +157,14 @@ lib/ntop/plugins/sflowPlugin.so
 %%DATADIR%%/html/printer.gif
 %%DATADIR%%/html/privacyNotice.html
 %%DATADIR%%/html/question.gif
+%%DATADIR%%/html/reflection.js
 %%DATADIR%%/html/router.gif
+%%DATADIR%%/html/rrdAlarmConfig.js
 %%DATADIR%%/html/seagate.gif
+%%DATADIR%%/html/skype.gif
+%%DATADIR%%/html/sorterScript.js
+%%DATADIR%%/html/sorterStyle.css
+%%DATADIR%%/html/spacer.gif
 %%DATADIR%%/html/statsicons/flags/ad.gif
 %%DATADIR%%/html/statsicons/flags/ae.gif
 %%DATADIR%%/html/statsicons/flags/af.gif
@@ -332,6 +293,7 @@ lib/ntop/plugins/sflowPlugin.so
 %%DATADIR%%/html/statsicons/flags/lc.gif
 %%DATADIR%%/html/statsicons/flags/li.gif
 %%DATADIR%%/html/statsicons/flags/lk.gif
+%%DATADIR%%/html/statsicons/flags/local.gif
 %%DATADIR%%/html/statsicons/flags/localhost.gif
 %%DATADIR%%/html/statsicons/flags/lr.gif
 %%DATADIR%%/html/statsicons/flags/ls.gif
@@ -440,16 +402,10 @@ lib/ntop/plugins/sflowPlugin.so
 %%DATADIR%%/html/statsicons/os/os2.gif
 %%DATADIR%%/html/statsicons/os/sun.gif
 %%DATADIR%%/html/statsicons/os/windows.gif
-%%DATADIR%%/html/arrow_down.png
-%%DATADIR%%/html/arrow_up.png
-%%DATADIR%%/html/back.png
-%%DATADIR%%/html/bit_off.png
-%%DATADIR%%/html/bit_on.png
-%%DATADIR%%/html/fback.png
-%%DATADIR%%/html/fforward.png
-%%DATADIR%%/html/forward.png
 %%DATADIR%%/html/style.css
 %%DATADIR%%/html/switch.gif
+%%DATADIR%%/html/theme.css
+%%DATADIR%%/html/theme.js
 %%DATADIR%%/html/upload.gif
 %%DATADIR%%/html/url.gif
 %%DATADIR%%/html/user.gif
@@ -459,58 +415,58 @@ lib/ntop/plugins/sflowPlugin.so
 %%DATADIR%%/html/web.gif
 %%DATADIR%%/html/wheel.gif
 %%DATADIR%%/html/white_bg.gif
-%%DATADIR%%/html/PlotKit/Base.js
-%%DATADIR%%/html/PlotKit/Canvas.js
-%%DATADIR%%/html/PlotKit/EasyPlot.js
-%%DATADIR%%/html/PlotKit/Layout.js
-%%DATADIR%%/html/PlotKit/PlotKit.js
-%%DATADIR%%/html/PlotKit/PlotKit_Packed.js
-%%DATADIR%%/html/PlotKit/SVG.js
-%%DATADIR%%/html/PlotKit/SweetCanvas.js
-%%DATADIR%%/html/PlotKit/SweetSVG.js
-%%DATADIR%%/html/PlotKit/excanvas.js
-%%DATADIR%%/html/MochiKit/Async.js
-%%DATADIR%%/html/MochiKit/Base.js
-%%DATADIR%%/html/MochiKit/Color.js
-%%DATADIR%%/html/MochiKit/DOM.js
-%%DATADIR%%/html/MochiKit/DateTime.js
-%%DATADIR%%/html/MochiKit/Format.js
-%%DATADIR%%/html/MochiKit/Iter.js
-%%DATADIR%%/html/MochiKit/Logging.js
-%%DATADIR%%/html/MochiKit/LoggingPane.js
-%%DATADIR%%/html/MochiKit/MochiKit.js
-%%DATADIR%%/html/MochiKit/MockDOM.js
-%%DATADIR%%/html/MochiKit/Signal.js
-%%DATADIR%%/html/MochiKit/Test.js
-%%DATADIR%%/html/MochiKit/Visual.js
-%%DATADIR%%/html/MochiKit/__package__.js
-%%DATADIR%%/html/img_inquisitor/as_pointer.gif
-%%DATADIR%%/html/img_inquisitor/hl_corner_bl.gif
-%%DATADIR%%/html/img_inquisitor/hl_corner_br.gif
-%%DATADIR%%/html/img_inquisitor/hl_corner_tl.gif
-%%DATADIR%%/html/img_inquisitor/hl_corner_tr.gif
-%%DATADIR%%/html/img_inquisitor/ul_corner_bl.gif
-%%DATADIR%%/html/img_inquisitor/ul_corner_br.gif
-%%DATADIR%%/html/img_inquisitor/ul_corner_tl.gif
-%%DATADIR%%/html/img_inquisitor/ul_corner_tr.gif
-%%DATADIR%%/html/jscalendar/calendar-load.js
-%%DATADIR%%/html/jscalendar/calendar-setup.js
-%%DATADIR%%/html/jscalendar/calendar.js
-%%DATADIR%%/html/jscalendar/lang/calendar-en.js
+%%DATADIR%%/html/zoom.js
+%%DATADIR%%/python/GeoPacketVisualizer.py
+%%DATADIR%%/python/docs/Makefile
+%%DATADIR%%/python/docs/epydoc.conf
+%%DATADIR%%/python/docs/src/fastbit.py
+%%DATADIR%%/python/docs/src/host.py
+%%DATADIR%%/python/docs/src/interface.py
+%%DATADIR%%/python/docs/src/ntop.py
+%%DATADIR%%/python/fastbit.py
+%%DATADIR%%/python/hello_world.py
+%%DATADIR%%/python/ipPortQuery.py
+%%DATADIR%%/python/json/info.py
+%%DATADIR%%/python/json/interfaces.py
+%%DATADIR%%/python/json/iphone/clientcheck.py
+%%DATADIR%%/python/json/iphone/hostinfo.py
+%%DATADIR%%/python/json/iphone/ifdata.py
+%%DATADIR%%/python/json/iphone/iflist.py
+%%DATADIR%%/python/json/iphone/iftophosts.py
+%%DATADIR%%/python/json/iphone/instance.py
+%%DATADIR%%/python/json/iphone/interfaces.py
+%%DATADIR%%/python/rrdalarm/config.py
+%%DATADIR%%/python/rrdalarm/crontab.rrdalarm
+%%DATADIR%%/python/rrdalarm/save.py
+%%DATADIR%%/python/rrdalarm/scripts/savelog.py
+%%DATADIR%%/python/rrdalarm/scripts/sendmail.py
+%%DATADIR%%/python/rrdalarm/start.py
+%%DATADIR%%/python/templates/GeoPacketVisualizer.tmpl
+%%DATADIR%%/python/templates/fastbit.tmpl
+%%DATADIR%%/python/templates/ipPortQuery.tmpl
+%%DATADIR%%/python/templates/queryResults.tmpl
+%%DATADIR%%/python/templates/rrdAlarmConfigurator.tmpl
+%%DATADIR%%/python/templates/rrdAlarmConfiguratorHelp.tmpl
+%%DATADIR%%/python/templates/rrdAlarmStart.tmpl
 @exec mkdir -p %%DBDIR%%/ntop
-@dirrm %%DATADIR%%/perl/report
-@dirrm %%DATADIR%%/perl
-@dirrm %%DATADIR%%/html/jscalendar/lang
-@dirrm %%DATADIR%%/html/jscalendar
-@dirrm %%DATADIR%%/html/img_inquisitor
 @dirrm %%DATADIR%%/html/MochiKit
 @dirrm %%DATADIR%%/html/PlotKit
+@dirrm %%DATADIR%%/html/img_inquisitor
+@dirrm %%DATADIR%%/html/jscalendar/lang
+@dirrm %%DATADIR%%/html/jscalendar
 @dirrm %%DATADIR%%/html/statsicons/flags
 @dirrm %%DATADIR%%/html/statsicons/os
 @dirrm %%DATADIR%%/html/statsicons
 @dirrm %%DATADIR%%/html
+@dirrm %%DATADIR%%/python/docs/src
+@dirrm %%DATADIR%%/python/docs
+@dirrm %%DATADIR%%/python/json/iphone
+@dirrm %%DATADIR%%/python/json
+@dirrm %%DATADIR%%/python/rrdalarm/scripts
+@dirrm %%DATADIR%%/python/rrdalarm
+@dirrm %%DATADIR%%/python/templates
+@dirrm %%DATADIR%%/python
 @dirrm %%DATADIR%%
-@dirrm etc/ntop/l7-patterns
 @dirrm etc/ntop
 @dirrm lib/ntop/plugins
 @dirrm lib/ntop