- Update to 5.0.1

5 files changed, 169 insertions, 126 deletions

diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 0b02ddc68c56..f290b0f4d034 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,17 +1,10 @@
-# New ports collection makefile for:   ntop
-# Date created:        10 August 1998
-# Whom:                Bill Fumerola <billf@chc-chimes.com>
-#
+# Created by: Bill Fumerola <billf@chc-chimes.com>
 # $FreeBSD$
-#
 
 PORTNAME=	ntop
-PORTVERSION=	4.1.0
-PORTREVISION=	5
+PORTVERSION=	5.0.1
 CATEGORIES=	net
-#MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Stable
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz
 
 MAINTAINER=	sylvio@FreeBSD.org
 COMMENT=	Network monitoring tool with command line and web interfaces
@@ -19,10 +12,11 @@ COMMENT=	Network monitoring tool with command line and web interfaces
 LIB_DEPENDS=	gdbm.4:${PORTSDIR}/databases/gdbm \
 		event-1.4:${PORTSDIR}/devel/libevent
 BUILD_DEPENDS=	rrdtool>=1.2:${PORTSDIR}/databases/rrdtool \
+		subversion>=1.7.0:${PORTSDIR}/devel/subversion \
 		dot:${PORTSDIR}/graphics/graphviz \
 		geoiplookup:${PORTSDIR}/net/GeoIP
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
-		 ${LOCALBASE}/lib/X11/fonts/URW/a010013l.afm:${PORTSDIR}/x11-fonts/urwfonts
+		${LOCALBASE}/lib/X11/fonts/URW/a010013l.afm:${PORTSDIR}/x11-fonts/urwfonts
 
 DBDIR?=		/var/db
 
@@ -39,37 +33,36 @@ PLIST_SUB=	DBDIR=${DBDIR} \
 CONFIGURE_ARGS=	--localstatedir=${DBDIR} \
 		--with-ossl-root=${OPENSSLBASE} \
 		--with-gdbm-root=${LOCALBASE} \
-		--with-zlib-root=/usr \
-		--disable-snmp
+		--with-zlib-root=/usr
 
 MAN8=		ntop.8
 
+CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 SUB_FILES=	pkg-deinstall
 SUB_LIST=	DBDIR=${DBDIR}
 USE_RC_SUBR=	ntop
 
-##
-## Available knobs:
-##    WITH_PCAP_PORT:     Use libpcap from ports.
-##    WITH_XMLDUMP:       Enable XML Dump support.
-##    WITH_MAKO:	 Enable Host Map, Region View (installs py-mako)
-##
-OPTIONS=	PCAP_PORT "Use libpcap from ports." Off \
-		XMLDUMP "Enable XML Dump support." Off \
-		JUMBO_FRAMES "Jumbo Frames. Experimental." Off \
-		MAKO "Install py-mako for Host Map, Region View " Off
+OPTIONS_DEFINE=	PCAP_PORT XMLDUMP JUMBO_FRAMES MAKO
+
+PCAP_PORT_DESC=		Use libpcap from ports
+XMLDUMP_DESC=		Enable XML Dump support
+JUMBO_FRAMES_DESC=	Jumbo Frames. Experimental.
+MAKO_DESC=		Install py-mako for Host Map, Region View
 
 .include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_PCAP_PORT)
+.if ${PORT_OPTIONS:MPCAP_PORT}
 LIB_DEPENDS+=		pcap.1:${PORTSDIR}/net/libpcap
 CONFIGURE_ARGS+=	--with-pcap-root=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--with-pcap-root=/usr
 .endif
 
-.if defined(WITH_XMLDUMP)
+.if ${PORT_OPTIONS:MXMLDUMP}
 LIB_DEPENDS+=		gdome.8:${PORTSDIR}/textproc/gdome2
 CPPFLAGS+=		-I${LOCALBASE}/include/libxml2 \
 			-I${LOCALBASE}/include/libxml2/libxml \
@@ -77,13 +70,13 @@ CPPFLAGS+=		-I${LOCALBASE}/include/libxml2 \
 			-I${LOCALBASE}/include/glib-2.0
 .endif
 
-.if defined(WITH_JUMBO_FRAMES)
+.if ${PORT_OPTIONS:MJUMBO_FRAMES}
 CONFIGURE_ARGS+=	--enable-jumbo-frames
 # should set your mtu to 9000
 # see http://www.cyberciti.biz/faq/freebsd-jumbo-frames-networking-configration/
 .endif
 
-.if defined(WITH_MAKO)
+.if ${PORT_OPTIONS:MMAKO}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mako>0:${PORTSDIR}/textproc/py-mako
 .endif
 
diff --git a/net/ntop/distinfo b/net/ntop/distinfo
index bc5ef62e4f36..e1115236738f 100644
--- a/net/ntop/distinfo
+++ b/net/ntop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ntop-4.1.0.tar.gz) = c71e5563879ec1866296825e1705f30b5a67eb87c9abfbd7dc1c5baeed0384a4
-SIZE (ntop-4.1.0.tar.gz) = 39118983
+SHA256 (ntop-5.0.1.tar.gz) = 7e8e84cb14d2173beaca4d4cb991a14d84a4bef84ec37b2276bc363f45c52ef8
+SIZE (ntop-5.0.1.tar.gz) = 40133867
diff --git a/net/ntop/files/patch-Makefile.am b/net/ntop/files/patch-Makefile.am
index 4b924a1f2c40..552d2070ad05 100644
--- a/net/ntop/files/patch-Makefile.am
+++ b/net/ntop/files/patch-Makefile.am
@@ -1,5 +1,5 @@
---- Makefile.am.orig	2011-03-03 08:44:59.000000000 -0500
-+++ Makefile.am	2011-12-28 14:25:08.000000000 -0500
+--- Makefile.am.orig	2012-08-02 04:39:52.000000000 -0300
++++ Makefile.am	2013-01-08 10:43:54.000000000 -0200
 @@ -61,8 +61,6 @@
  
  ETTER_PASSIVE_FILE = etter.finger.os
@@ -9,11 +9,11 @@
  
  NTOPDATA = ntop-cert.pem \
             $(ETTER_PASSIVE) \
-@@ -303,15 +301,14 @@
+@@ -308,16 +306,13 @@
  	  echo "  WARNING: This install created a directory for the ntop"; \
  	  echo "           files and databases:"; \
  	  echo ""; \
--	  echo "             $(DESTDIR)/$(datadir)/ntop"; \
+-	  echo "             $(DESTDIR)$(datadir)/ntop"; \
 +	  echo "             $(CFG_DBFILE_DIR)"; \
  	  echo ""; \
  	  echo "           This directory MUST be owned by the user"; \
@@ -21,21 +21,21 @@
  	  echo ""; \
  	  echo "           The command you must issue is something like:"; \
  	  echo ""; \
--	  echo "           chown -R ntop.ntop $(DESTDIR)/$(datadir)/ntop"; \
--	  echo "     or    chown -R ntop:users $(DESTDIR)/$(datadir)/ntop"; \
-+	  echo "           chown -R nobody:nobody $(CFG_DBFILE_DIR)"; \
- 	  echo ""; \
+-	  echo "           chown -R ntop.ntop $(DESTDIR)$(datadir)/ntop"; \
+-	  echo "     or    chown -R ntop:users $(DESTDIR)$(datadir)/ntop"; \
+-	  echo ""; \
  	  echo "           man chown to check the syntax for YOUR system"; \
  	  echo ""; \
-@@ -329,7 +326,6 @@
+ 	  echo "************************************************************"; \
+@@ -334,7 +329,6 @@
  	chcon -t textrel_shlib_t $(DESTDIR)$(libdir)/*ntop*.so
  
- install-data-local: ntop.txt ntop.html faq.html dnetter
+ install-data-local: ntop.txt ntop.html faq.html
 -	@$(top_srcdir)/mkinstalldirs $(DESTDIR)/$(libdir)/plugins;
- 	@if ! test -d $(DESTDIR)/$(datadir)/ntop; then \
- 	  $(top_srcdir)/mkinstalldirs $(DESTDIR)/$(datadir)/ntop; \
- 	  touch $(DESTDIR)/$(datadir)/ntop/warnuser; \
-@@ -365,21 +361,6 @@
+ 	@if ! test -d $(DESTDIR)$(datadir)/ntop; then \
+ 	  $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir)/ntop; \
+ 	  touch $(DESTDIR)$(datadir)/ntop/warnuser; \
+@@ -370,21 +364,6 @@
  	@echo ""
  	@echo ""
  	@echo -n "Preparing "
@@ -57,10 +57,11 @@
  	@echo -n "New file lines are:  "
  	@gunzip -c oui.txt.gz | wc -l
  	@echo ""
-@@ -398,34 +379,6 @@
+@@ -402,35 +381,6 @@
+ 	@echo ""
  	@echo "Preparing "
  	@echo ""
- 
+-
 -	@if test -f $(ETTER_PASSIVE).old; then \
 -	  echo "...Deleting prior file, $(ETTER_PASSIVE).old..."; \
 -	  rm -rf $(ETTER_PASSIVE).old; \
diff --git a/net/ntop/files/patch-configure.in b/net/ntop/files/patch-configure.in
index 1d5a208e42bc..35aff5563304 100644
--- a/net/ntop/files/patch-configure.in
+++ b/net/ntop/files/patch-configure.in
@@ -1,26 +1,42 @@
---- ./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 &&
--     test -r $PCAP_ROOT/libpcap.a &&
--     test -r $PCAP_ROOT/pcap.h; then
-+     test -r $PCAP_ROOT/lib/libpcap.a &&
-+     test -r $PCAP_ROOT/include/pcap.h; then
-        PCAP_ROOT=`cd ${PCAP_ROOT} && pwd`
-        CORELIBS="${CORELIBS} -L$PCAP_ROOT -lpcap"
-        INCS="${INCS} -I$PCAP_ROOT"
-@@ -1480,7 +1480,7 @@
+--- configure.in.orig	2012-08-13 04:35:26.000000000 -0300
++++ configure.in	2013-01-09 13:11:12.000000000 -0200
+@@ -472,7 +472,7 @@
+ dnl> Add /usr/local/ /opt/local
+ CFLAGS="${CFLAGS} -I/usr/local/include -I/opt/local/include"
+ CPPFLAGS="${CPPFLAGS} -I/usr/local/include -I/opt/local/include"
+-LDFLAGS="${LDFLAGS} -L/usr/local/lib -L/opt/local/lib"
++LDFLAGS="${LDFLAGS}-L/usr/local/lib -L/opt/local/lib"
  
-     dnl remove unecessary path
-     dnl line below workaround for OSX 10.6 (Snow Leopard)/10.7 (Lion)
--    PYTHON_INCS=`$PYTHON_CONFIG --cflags | sed -e "s/-arch i386// | sed -e "s/-arch ppc// | sed -e "s/-arch x86_64//"`
-+    PYTHON_INCS=`$PYTHON_CONFIG --cflags | sed -e "s/-arch i386//" | sed -e "s/-arch ppc//" | sed -e "s/-arch x86_64//"`
-     INCS="${INCS} ${PYTHON_INCS}"
+ PWD=`pwd`
  
- OLD_CFLAGS=$CFLAGS
-@@ -1815,8 +1815,6 @@
+@@ -560,7 +560,7 @@
+    test -d ${TMP_ROOT} &&
+    test -r ${TMP_ROOT}/libpcap.a; then
+        PCAP_ROOT=${TMP_ROOT}
+-       CORELIBS="${CORELIBS} -L${TMP_ROOT} -L${HOME}/PF_RING/userland/lib -lpfring -lpcap "
++       CORELIBS="${CORELIBS}-L${TMP_ROOT}-L${HOME}/PF_RING/userland/lib -lpfring -lpcap "
+        INCS="${INCS} -I ${PCAP_ROOT}"
+        AC_MSG_RESULT([found in $PCAP_ROOT])
+ elif test ".${PCAP_ROOT}" != .; then
+@@ -568,7 +568,7 @@
+      test -r $PCAP_ROOT/lib/libpcap.a &&
+      test -r $PCAP_ROOT/include/pcap.h; then
+        PCAP_ROOT=`cd ${PCAP_ROOT} && pwd`
+-       CORELIBS="${CORELIBS} -L ${PCAP_ROOT}/lib -lpcap"
++       CORELIBS="${CORELIBS}-L${PCAP_ROOT}/lib -lpcap"
+        INCS="${INCS} -I ${PCAP_ROOT}/include"
+        AC_MSG_RESULT([found in $PCAP_ROOT])
+   else
+@@ -584,7 +584,7 @@
+      test -r /usr/local/lib/libpcap.a &&
+      test -r /usr/local/include/pcap.h; then
+        PCAP_ROOT="/usr/local"
+-       CORELIBS="${CORELIBS} -L$PCAP_ROOT/lib -lpcap"
++       CORELIBS="${CORELIBS}-L$PCAP_ROOT/lib -lpcap"
+        INCS="${INCS} -I$PCAP_ROOT/include"
+        AC_MSG_RESULT([found in $PCAP_ROOT])
+ dnl>
+@@ -1744,8 +1744,6 @@
  else
     if test -f "3rd_party/GeoLiteCity.dat.gz"; then
       cp 3rd_party/GeoLiteCity.dat.gz .
@@ -29,7 +45,7 @@
     fi
  
     gunzip GeoLiteCity.dat.gz
-@@ -1829,8 +1827,6 @@
+@@ -1758,8 +1756,6 @@
  else
     if test -f "3rd_party/GeoIPASNum.dat.gz"; then
       cp 3rd_party/GeoIPASNum.dat.gz .
diff --git a/net/ntop/pkg-plist b/net/ntop/pkg-plist
index 13b2534e9ab2..892fc6d93f69 100644
--- a/net/ntop/pkg-plist
+++ b/net/ntop/pkg-plist
@@ -6,10 +6,6 @@ etc/ntop/etter.finger.os.gz
 etc/ntop/ntop-cert.pem
 etc/ntop/oui.txt.gz
 etc/ntop/specialMAC.txt.gz
-lib/libcpacketPlugin-%%PORTVERSION%%.so
-lib/libcpacketPlugin.so
-lib/libicmpPlugin-%%PORTVERSION%%.so
-lib/libicmpPlugin.so
 lib/libnetflowPlugin-%%PORTVERSION%%.so
 lib/libnetflowPlugin.so
 lib/libntop-%%PORTVERSION%%.so
@@ -24,42 +20,11 @@ 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/netflowPlugin.so
 lib/ntop/plugins/rrdPlugin.so
 lib/ntop/plugins/sflowPlugin.so
+%%DATADIR%%/html/Google_Maps_Marker.png
 %%DATADIR%%/html/JSCookMenu.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/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
@@ -90,6 +55,7 @@ lib/ntop/plugins/sflowPlugin.so
 %%DATADIR%%/html/clock.gif
 %%DATADIR%%/html/collapsed.gif
 %%DATADIR%%/html/corner.gif
+%%DATADIR%%/html/d3.js
 %%DATADIR%%/html/deleteURL.gif
 %%DATADIR%%/html/deleteUser.gif
 %%DATADIR%%/html/disk.gif
@@ -133,13 +99,79 @@ lib/ntop/plugins/sflowPlugin.so
 %%DATADIR%%/html/img_inquisitor/ul_corner_tr.gif
 %%DATADIR%%/html/info.gif
 %%DATADIR%%/html/initiator.gif
+%%DATADIR%%/html/jqplot/excanvas.js
+%%DATADIR%%/html/jqplot/excanvas.min.js
+%%DATADIR%%/html/jqplot/jquery.jqplot.css
+%%DATADIR%%/html/jqplot/jquery.jqplot.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.BezierCurveRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.BezierCurveRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.barRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.barRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.blockRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.blockRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.bubbleRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.bubbleRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.canvasAxisLabelRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.canvasAxisLabelRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.canvasAxisTickRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.canvasAxisTickRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.canvasOverlay.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.canvasOverlay.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.canvasTextRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.canvasTextRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.categoryAxisRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.categoryAxisRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.ciParser.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.ciParser.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.cursor.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.cursor.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.dateAxisRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.dateAxisRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.donutRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.donutRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.dragable.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.dragable.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.enhancedLegendRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.enhancedLegendRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.funnelRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.funnelRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.highlighter.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.highlighter.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.json2.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.json2.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.logAxisRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.logAxisRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.mekkoAxisRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.mekkoAxisRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.mekkoRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.mekkoRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.meterGaugeRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.meterGaugeRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.ohlcRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.ohlcRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.pieRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.pieRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.pointLabels.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.pointLabels.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.pyramidAxisRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.pyramidAxisRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.pyramidGridRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.pyramidGridRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.pyramidRenderer.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.pyramidRenderer.min.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.trendline.js
+%%DATADIR%%/html/jqplot/plugins/jqplot.trendline.min.js
+%%DATADIR%%/html/jquery-1.7.2.min.js
+%%DATADIR%%/html/jquery-ui-1.8.16.custom.css
+%%DATADIR%%/html/jquery-ui-1.8.16.custom.min.js
 %%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/linkedin.gif
 %%DATADIR%%/html/line-bottom.png
+%%DATADIR%%/html/linkedin.gif
+%%DATADIR%%/html/loading.gif
 %%DATADIR%%/html/lock.png
 %%DATADIR%%/html/mail.gif
 %%DATADIR%%/html/major.gif
@@ -163,8 +195,12 @@ lib/ntop/plugins/sflowPlugin.so
 %%DATADIR%%/html/reflection.js
 %%DATADIR%%/html/router.gif
 %%DATADIR%%/html/rrdAlarmConfig.js
+%%DATADIR%%/html/sankey.css
+%%DATADIR%%/html/sankey.js
+%%DATADIR%%/html/sankey.min.html
 %%DATADIR%%/html/seagate.gif
 %%DATADIR%%/html/skype.gif
+%%DATADIR%%/html/skype.png
 %%DATADIR%%/html/sorterScript.js
 %%DATADIR%%/html/sorterStyle.css
 %%DATADIR%%/html/spacer.gif
@@ -400,12 +436,10 @@ lib/ntop/plugins/sflowPlugin.so
 %%DATADIR%%/html/statsicons/os/hp.gif
 %%DATADIR%%/html/statsicons/os/irix.gif
 %%DATADIR%%/html/statsicons/os/linux.gif
-%%DATADIR%%/html/statsicons/os/mac.gif
 %%DATADIR%%/html/statsicons/os/novell.gif
 %%DATADIR%%/html/statsicons/os/os2.gif
 %%DATADIR%%/html/statsicons/os/sun.gif
 %%DATADIR%%/html/statsicons/os/windows.gif
-%%DATADIR%%/html/skype.png
 %%DATADIR%%/html/style.css
 %%DATADIR%%/html/switch.gif
 %%DATADIR%%/html/theme.css
@@ -429,9 +463,7 @@ lib/ntop/plugins/sflowPlugin.so
 %%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
@@ -447,6 +479,7 @@ lib/ntop/plugins/sflowPlugin.so
 %%DATADIR%%/python/rrdalarm/scripts/savelog.py
 %%DATADIR%%/python/rrdalarm/scripts/sendmail.py
 %%DATADIR%%/python/rrdalarm/start.py
+%%DATADIR%%/python/sankey.py
 %%DATADIR%%/python/templates/GeoPacketVisualizer.tmpl
 %%DATADIR%%/python/templates/fastbit.tmpl
 %%DATADIR%%/python/templates/ipPortQuery.tmpl
@@ -454,28 +487,28 @@ lib/ntop/plugins/sflowPlugin.so
 %%DATADIR%%/python/templates/rrdAlarmConfigurator.tmpl
 %%DATADIR%%/python/templates/rrdAlarmConfiguratorHelp.tmpl
 %%DATADIR%%/python/templates/rrdAlarmStart.tmpl
-@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 lib/ntop/plugins
+@dirrm lib/ntop
+@dirrm etc/ntop
+@dirrm %%DATADIR%%/python/templates
 @dirrm %%DATADIR%%/python/rrdalarm/scripts
 @dirrm %%DATADIR%%/python/rrdalarm
-@dirrm %%DATADIR%%/python/templates
+@dirrm %%DATADIR%%/python/json/iphone
+@dirrm %%DATADIR%%/python/json
+@dirrm %%DATADIR%%/python/docs/src
+@dirrm %%DATADIR%%/python/docs
 @dirrm %%DATADIR%%/python
+@dirrm %%DATADIR%%/html/statsicons/os
+@dirrm %%DATADIR%%/html/statsicons/flags
+@dirrm %%DATADIR%%/html/statsicons
+@dirrm %%DATADIR%%/html/jscalendar/lang
+@dirrm %%DATADIR%%/html/jscalendar
+@dirrm %%DATADIR%%/html/jqplot/plugins
+@dirrm %%DATADIR%%/html/jqplot
+@dirrm %%DATADIR%%/html/img_inquisitor
+@dirrm %%DATADIR%%/html
 @dirrm %%DATADIR%%
-@dirrm etc/ntop
-@dirrm lib/ntop/plugins
-@dirrm lib/ntop
-@exec mkdir -p %%DBDIR%%/ntop
 @exec chown -R nobody:nobody %%DBDIR%%/ntop
-@unexec rmdir %%DBDIR%%/ntop 2>/dev/null || true
+@exec mkdir -p %%DBDIR%%/ntop
 @unexec rmdir %%DBDIR%% 2>/dev/null || true
+@unexec rmdir %%DBDIR%%/ntop 2>/dev/null || true