7 files changed, 148 insertions, 191 deletions

diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 741ca0ef57e7..63b6a8ce0231 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -6,36 +6,34 @@
 #
 
 PORTNAME=	ntop
-PORTVERSION=	2.2
-PORTREVISION=	3
+PORTVERSION=	3.0.p2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/pre/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	clement@FreeBSD.org
 COMMENT=	Network monitoring tool with command line and web interfaces
 
-LIB_DEPENDS=	gd1.2:${PORTSDIR}/graphics/gd1 \
-		gdbm:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd \
+		gdbm.3:${PORTSDIR}/databases/gdbm \
+		png.5:${PORTSDIR}/graphics/png
 
 DBDIR?=		/var/db
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_OPENSSL=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-PLIST_SUB+=	DBDIR=${DBDIR}
-CONFIGURE_ENV=	LIBS="-lcrypto -L${LOCALBASE}/lib ${LDFLAGS}"
+PLIST_SUB+=	DBDIR=${DBDIR} \
+		SHLIB=${PORTVERSION:S/.p/pre/}
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=${DBDIR} \
 		--with-ossl-root=${OPENSSLBASE} \
 		--with-gdbm-root=${LOCALBASE} \
-		--with-gdchart-lib=${WRKSRC}/../gdchart0.94c \
-		--with-gdchart-include=${WRKSRC}/../gdchart0.94c \
 		--with-gd-root=${LOCALBASE} \
 		--with-libpng-root=${LOCALBASE} \
 		--with-zlib-root=/usr
@@ -45,19 +43,13 @@ MAN8=		ntop.8
 ##
 ## Available knobs:
 ##    WITH_LOCALE:        Enable locale (i18n) support.
-##    WITH_LSOF:          Add lsof as dependency.
-##    WITH_PCAP:          Enable libpcap support.
 ##    WITH_PCAP_PORT:     Use libpcap from ports.
-##    WITH_RRD:           Enable rrdtool support.
 ##    WITH_XMLDUMP:       Enable XML Dump support.
 ##
 ##    WITHOUT_TCPWRAPPER: Disable TCP wrapper support.
 ##
 OPTIONS=	LOCALE "Enable locale (i18n) support." Off \
-		LSOF "Add lsof as dependency." Off \
-		PCAP "Enable libpcap support." Off \
 		PCAP_PORT "Use libpcap from ports." Off \
-		RRD "Enablerrdtool support." Off \
 		XMLDUMP "Enable XML Dump support." Off \
 		TCPWRAPPER "Enable TCP wrapper support" On
 
@@ -67,27 +59,13 @@ OPTIONS=	LOCALE "Enable locale (i18n) support." Off \
 CONFIGURE_ARGS+=	--with-tcpwrap
 .endif
 
-.if defined(WITH_PCAP)
-.    if defined(WITH_PCAP_PORT)
+.if defined(WITH_PCAP_PORT)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libpcap.a:${PORTSDIR}/net/libpcap
 PCAP_ROOT=		${LOCALBASE}
-.    else
-PCAP_ROOT=		/usr
-.    endif
-CONFIGURE_ARGS+=	--with-pcap-root=${PCAP_ROOT}
-.endif
-
-.if defined(WITH_RRD)
-LIB_DEPENDS+=		rrd.0:${PORTSDIR}/net/rrdtool
-CONFIGURE_ARGS+=	--enable-rrd \
-			--with-rrd-root=${LOCALBASE}
 .else
-CONFIGURE_ARGS+=	--without-rrd-root
-.endif
-
-.if defined(WITH_LSOF)
-RUN_DEPENDS+=		lsof:${PORTSDIR}/sysutils/lsof
+PCAP_ROOT=		/usr
 .endif
+CONFIGURE_ARGS+=	--with-pcap-root=${PCAP_ROOT}
 
 .if defined(WITH_LOCALE)
 USE_GETTEXT=		yes
@@ -97,14 +75,10 @@ CONFIGURE_ARGS+=	--enable-i18n \
 
 .if defined(WITH_XMLDUMP)
 LIB_DEPENDS+=		gdome.8:${PORTSDIR}/textproc/gdome2
-CONFIGURE_ARGS+=	--enable-xmldump \
-			--with-xml2-lib=${LOCALBASE}/lib \
-			--with-xml2-include=${LOCALBASE}/include/libxml2/libxml \
-			--with-gdome-lib=${LOCALBASE}/lib \
-			--with-gdome-include=${LOCALBASE}/include/libgdome \
-			--with-glib-lib=${LOCALBASE}/lib \
-			--with-glib-include=${LOCALBASE}/include/glib12
-CONFIGURE_ENV+=		"CPPFLAGS=-I${LOCALBASE}/include/libxml2 "
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/libxml2 \
+			-I${LOCALBASE}/include/libxml2/libxml \
+			-I${LOCALBASE}/include/libgdome \
+			-I${LOCALBASE}/include/glib-2.0"
 .endif
 
 pre-everything:: show-options
@@ -112,24 +86,16 @@ pre-everything:: show-options
 show-options:
 	@${SED} -ne 's/^##//p' ${.CURDIR}/Makefile
 
-# This part is a little bit dirty, but configure script need gdchart linked against
-# libgd1.
-pre-configure:
-	@${CP} ${FILESDIR}/Makefile.gdchart ${WRKSRC}/../gdchart0.94c/Makefile
-	@(cd ${WRKSRC}/../gdchart0.94c ; ${SETENV} ${MAKE_ENV} ${MAKE})
+post-extract:
+	@${RM} ${WRKSRC}/configureextra/FREEBSD
 
 post-install:
 	@${MKDIR} ${DBDIR}/ntop
-	@${MKDIR} ${PREFIX}/etc/rc.d
-	@${SED} -e "s#%%PREFIX%%#${PREFIX}#g" \
-		-e "s#%%LOGDIR%%#${LOGDIR}#g" ${FILESDIR}/ntop.sh > \
+	@${CHOWN} -R nobody:nobody ${DBDIR}/ntop
+	@${RMDIR} ${PREFIX}/lib/plugins
+	@${SED} -e "s#%%PREFIX%%#${PREFIX}#g" ${FILESDIR}/ntop.sh > \
 		${WRKDIR}/ntop.sh
 	@${INSTALL_DATA} ${WRKDIR}/ntop.sh ${PREFIX}/etc/rc.d
-.if !defined(BATCH)
 	@${SED} "s,%%LOCALBASE%%,${LOCALBASE},g" < ${PKGMESSAGE}
-.endif
-
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
 
 .include <bsd.port.post.mk>
diff --git a/net/ntop/distinfo b/net/ntop/distinfo
index be491acd8837..dafd13bd2e6f 100644
--- a/net/ntop/distinfo
+++ b/net/ntop/distinfo
@@ -1,2 +1,2 @@
-MD5 (ntop-2.2.tgz) = 4586e4173fcab64d2394502603fc73aa
-SIZE (ntop-2.2.tgz) = 2551153
+MD5 (ntop-3.0pre2.tgz) = 2c5d815963afb1e32510818f96d20028
+SIZE (ntop-3.0pre2.tgz) = 3021398
diff --git a/net/ntop/files/Makefile.gdchart b/net/ntop/files/Makefile.gdchart
deleted file mode 100644
index 9ff45345fc70..000000000000
--- a/net/ntop/files/Makefile.gdchart
+++ /dev/null
@@ -1,36 +0,0 @@
-GDC_INCL = .
-GD_INCL  = $(LOCALBASE)/include/gd
-GD_LIB   = $(LOCALBASE)/lib
-
-AR=ar
-RANLIB = ranlib
-
-all: libgdchart.a
-
-# --- compile the lib ---
-price_conv.o: price_conv.c
-	$(CC) $(CFLAGS) -c price_conv.c
-
-gdc.o: gdc.c gdc.h
-	$(CC) -I$(GD_INCL) -I$(GDC_INCL) $(CFLAGS) -c gdc.c
-
-gdc_pie.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdcpie.h gdc_pie.c
-	$(CC) -I$(GD_INCL) -I$(GDC_INCL) $(CFLAGS) -c gdc_pie.c
-
-gdchart.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdchart.h gdchart.c
-	$(CC) -I$(GD_INCL) -I$(GDC_INCL) $(CFLAGS) -c gdchart.c
-
-libgdchart.a: gdc.o gdc_pie.o gdchart.o price_conv.o
-	$(AR) rc libgdchart.a gdc.o gdc_pie.o gdchart.o price_conv.o
-	@if [ -x $(RANLIB) ] ; then \
-	  $(RANLIB) libgdchart.a; \
-	fi;
-
-install:
-
-# --- clean ---
-clean:
-	rm -f *.o gdc_samp1 gdc_samp2 gdc_pie_samp libgdchart.a
-	cd $(GD_LIB) ; $(MAKE) -f Makefile clean
-
-distclean: clean
diff --git a/net/ntop/files/ntop.sh b/net/ntop/files/ntop.sh
index 920ba0eacf19..8ed84b440b14 100644
--- a/net/ntop/files/ntop.sh
+++ b/net/ntop/files/ntop.sh
@@ -15,20 +15,20 @@ userid='nobody'
 http_port='3000'
 
 # [IP:]port for serving HTTPS; set to '0' to disable
-# The certificate is %%PREFIX%%/share/ntop/ntop-cert.pem
+# The certificate is %%PREFIX%%/etc/ntop/ntop-cert.pem
 https_port='3001'
 
 # Directory for ntop.access.log
-logdir='%%LOGDIR%%'
+logdir='/var/log'
 
 # Specify any additional arguments here - see ntop(8)
-additional_args='-E'
+additional_args=''
 
 #
 # End of user-configurable variables
 #----------------------------------------------------------------------
 
-args='-d -L'
+args='-d -L -4 --set-pcap-nonblocking'
 
 [ ! -z $interfaces ] && args="$args -i $interfaces"
 [ ! -z $http_port ] && args="$args -w $http_port"
@@ -39,14 +39,17 @@ args='-d -L'
 
 case "$1" in
 start)
-  [ -d $logdir ] && touch ${logdir}/ntop.access.log \
-    && chown $userid ${logdir}/ntop.access.log
-  [ -d %%PREFIX%%/share/ntop ] && cd %%PREFIX%%/share/ntop
-  [ -x %%PREFIX%%/bin/ntop ] && %%PREFIX%%/bin/ntop $args >/dev/null 2>&1 \
-    && echo -n ' ntop'
+  if [ -d $logdir ]; then
+    touch ${logdir}/ntop.access.log
+    chown $userid ${logdir}/ntop.access.log
+  fi
+  if [ -x %%PREFIX%%/bin/ntop ]; then
+    %%PREFIX%%/bin/ntop $args > /dev/null 2>&1 &
+    echo -n ' ntop'
+  fi
   ;;
 stop)
-  killall ntop >/dev/null 2>&1 && echo -n ' ntop'
+  killall ntop > /dev/null 2>&1 && echo -n ' ntop'
   ;;
 *)
   echo "Usage: `basename $0` {start|stop}" >&2
diff --git a/net/ntop/files/patch-configure b/net/ntop/files/patch-configure
index 359b44038f03..a5dc3e7f7eb4 100644
--- a/net/ntop/files/patch-configure
+++ b/net/ntop/files/patch-configure
@@ -1,79 +1,94 @@
---- configure.orig	Mon Apr 14 18:41:50 2003
-+++ configure	Fri Dec 12 19:11:08 2003
-@@ -8251,9 +8251,9 @@
-             esac
-         fi
-         if test ".gd" != "."; then
--            rc=`(echo $LIBS | grep '\-lgd ' > /dev/null 2> /dev/null; echo $?)`
-+            rc=`(echo $LIBS | grep '\-lgd1 ' > /dev/null 2> /dev/null; echo $?)`
-             if [ $rc -eq 1 ]; then
--                LIBS="$LIBS -lgd"
-+                LIBS="$LIBS -lgd1"
-             fi
-         fi
-     fi
-@@ -8512,9 +8512,9 @@
-             esac
-         fi
-         if test ".glib" != "."; then
--            rc=`(echo $LIBS | grep '\-lglib ' > /dev/null 2> /dev/null; echo $?)`
-+            rc=`(echo $LIBS | grep '\-lglib12 ' > /dev/null 2> /dev/null; echo $?)`
-             if [ $rc -eq 1 ]; then
--                LIBS="$LIBS -lglib"
-+                LIBS="$LIBS -lglib12"
-             fi
-         fi
-     fi
-@@ -14711,7 +14711,7 @@
- 
- 
- 
--for ac_header in sched.h sys/sched.h
-+for ac_header in sched.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -17879,7 +17879,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgd  $LIBS"
-+LIBS="-lgd1  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h.  */
-@@ -17932,7 +17932,7 @@
- #define HAVE_LIBGD 1
- _ACEOF
- 
--  LIBS="-lgd $LIBS"
-+  LIBS="-lgd1 $LIBS"
- 
- fi
- 
-@@ -18648,13 +18648,13 @@
+--- configure.orig	Thu Mar  4 02:47:53 2004
++++ configure	Tue Mar  9 18:33:21 2004
+@@ -4897,8 +4897,8 @@
+         echo "*******************************************************************"
+         exit 1
+         ;;
+-    *1\.3\.4\-freebsd\-ports*)
+-        echo "* FreeBSD ports 1.3.4 seems to work, so we will let it slide..."
++    *1\.3\.5\-freebsd\-ports*)
++        echo "* FreeBSD ports 1.3.5 seems to work, so we will let it slide..."
+         echo "*"
+         echo "* Fasten your seat belt and good luck!  If you are injured, the"
+         echo "* development team will disavow any knowledge of your intentions."
+@@ -20276,13 +20276,13 @@
  
  
  
 -echo "$as_me:$LINENO: checking for g_date_julian in -lglib" >&5
 -echo $ECHO_N "checking for g_date_julian in -lglib... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for g_date_julian in -lglib12" >&5
-+echo $ECHO_N "checking for g_date_julian in -lglib12... $ECHO_C" >&6
- if test "${ac_cv_lib_glib_g_date_julian+set}" = set; then
+-if test "${ac_cv_lib_glib_g_date_julian+set}" = set; then
++echo "$as_me:$LINENO: checking for g_date_new_julian in -lglib-2.0" >&5
++echo $ECHO_N "checking for g_date_new_julian in -lglib-2.0... $ECHO_C" >&6
++if test "${ac_cv_lib_glib_g_date_new_julian+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lglib  $LIBS"
-+LIBS="-lglib12  $LIBS"
++LIBS="-lglib-2.0  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  /* confdefs.h.  */
-@@ -18707,7 +18707,7 @@
+@@ -20297,11 +20297,11 @@
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char g_date_julian ();
++char g_date_new_julian ();
+ int
+ main ()
+ {
+-g_date_julian ();
++g_date_new_julian ();
+   ;
+   return 0;
+ }
+@@ -20318,24 +20318,24 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_lib_glib_g_date_julian=yes
++  ac_cv_lib_glib_g_date_new_julian=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_glib_g_date_julian=no
++ac_cv_lib_glib_g_date_new_julian=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_glib_g_date_julian" >&5
+-echo "${ECHO_T}$ac_cv_lib_glib_g_date_julian" >&6
+-if test $ac_cv_lib_glib_g_date_julian = yes; then
++echo "$as_me:$LINENO: result: $ac_cv_lib_glib_g_date_new_julian" >&5
++echo "${ECHO_T}$ac_cv_lib_glib_g_date_new_julian" >&6
++if test $ac_cv_lib_glib_g_date_new_julian = yes; then
+   cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBGLIB 1
  _ACEOF
  
 -  LIBS="-lglib $LIBS"
-+  LIBS="-lglib12 $LIBS"
++  LIBS="-lglib-2.0 $LIBS"
  
  fi
  
+@@ -24985,7 +24985,7 @@
+    test ".${ac_cv_header_glibconfig_h}" = ".yes"      &&
+    test ".${ac_cv_header_xmlversion_h}" = ".yes"      &&
+    test ".${ac_cv_header_gdome_h}" = ".yes"           &&
+-   test ".${ac_cv_lib_glib_g_date_julian}" = ".yes"   &&
++   test ".${ac_cv_lib_glib_g_date_new_julian}" = ".yes"   &&
+    test ".${ac_cv_lib_xml2_xmlCheckVersion}" = ".yes" &&
+    test ".${ac_cv_lib_gdome_gdome_di_saveDocToFile}" = ".yes"; then
+     echo "$as_me:$LINENO: result: ok" >&5
+@@ -25004,7 +25004,7 @@
+     echo "*                  gdome.h...${ac_cv_header_gdome_h}"
+     echo "*                  libgdome.so or libgdome.a...${ac_cv_lib_gdome_gdome_di_saveDocToFile}"
+     echo "*                  glib.h...${ac_cv_header_glib_h}"
+-    echo "*                  libglib.so or libglib.a...${ac_cv_lib_glib_g_date_julian}"
++    echo "*                  libglib.so or libglib.a...${ac_cv_lib_glib_g_date_new_julian}"
+     echo "*                  glibconfig.h...${ac_cv_header_glibconfig_h}"
+     echo "*"
+     echo "*           (yes means it was found, no means it was not found)"
diff --git a/net/ntop/files/patch-main.c b/net/ntop/files/patch-main.c
deleted file mode 100644
index 295297ec8d5e..000000000000
--- a/net/ntop/files/patch-main.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- main.c.orig	Mon Jul 14 19:34:51 2003
-+++ main.c	Mon Jul 14 19:43:31 2003
-@@ -757,7 +757,7 @@
-   
-   if((argc == 2) && (argv[1][0] != '-')) {
-     /* Options specified on a configuration file */
--    FILE *fd = fopen(argv[optind], "r");
-+    FILE *fd = fopen(argv[optind] + 1, "r");
- 
-     if(fd != NULL) {
- 
-
-
diff --git a/net/ntop/pkg-plist b/net/ntop/pkg-plist
index bad58ba2af42..24d25499ea4c 100644
--- a/net/ntop/pkg-plist
+++ b/net/ntop/pkg-plist
@@ -1,33 +1,42 @@
 @exec mkdir -p %%DBDIR%%/ntop
 bin/ntop
+etc/ntop/etter.passive.os.fp.gz
+etc/ntop/ntop-cert.pem
+etc/ntop/oui.txt.gz
+etc/ntop/p2c.opt.table.gz
+etc/ntop/specialMAC.txt.gz
+@dirrm etc/ntop
 etc/rc.d/ntop.sh
-lib/libicmpPlugin-2.2.so
+lib/libicmpPlugin-%%SHLIB%%.so
 lib/libicmpPlugin.a
 lib/libicmpPlugin.so
-lib/liblastSeenPlugin-2.2.so
+lib/liblastSeenPlugin-%%SHLIB%%.so
 lib/liblastSeenPlugin.a
 lib/liblastSeenPlugin.so
-lib/libnetflowPlugin-2.2.so
+lib/libnetflowPlugin-%%SHLIB%%.so
 lib/libnetflowPlugin.a
 lib/libnetflowPlugin.so
-lib/libnfsPlugin-2.2.so
+lib/libnfsPlugin-%%SHLIB%%.so
 lib/libnfsPlugin.a
 lib/libnfsPlugin.so
-lib/libntop-2.2.so
+lib/libntop-%%SHLIB%%.so
 lib/libntop.a
 lib/libntop.so
-lib/libntopreport-2.2.so
+lib/libntopreport-%%SHLIB%%.so
 lib/libntopreport.a
 lib/libntopreport.so
-lib/libpdaPlugin-2.2.so
+lib/libpdaPlugin-%%SHLIB%%.so
 lib/libpdaPlugin.a
 lib/libpdaPlugin.so
-lib/librrdPlugin-2.2.so
+lib/librrdPlugin-%%SHLIB%%.so
 lib/librrdPlugin.a
 lib/librrdPlugin.so
-lib/libsflowPlugin-2.2.so
+lib/libsflowPlugin-%%SHLIB%%.so
 lib/libsflowPlugin.a
 lib/libsflowPlugin.so
+lib/libxmldumpPlugin-%%SHLIB%%.so
+lib/libxmldumpPlugin.a
+lib/libxmldumpPlugin.so
 lib/ntop/plugins/icmpPlugin.so
 lib/ntop/plugins/lastSeenPlugin.so
 lib/ntop/plugins/netflowPlugin.so
@@ -35,21 +44,22 @@ lib/ntop/plugins/nfsPlugin.so
 lib/ntop/plugins/pdaPlugin.so
 lib/ntop/plugins/rrdPlugin.so
 lib/ntop/plugins/sflowPlugin.so
+lib/ntop/plugins/xmldumpPlugin.so
 @dirrm lib/ntop/plugins
 @dirrm lib/ntop
 %%DATADIR%%/html/About.html
 %%DATADIR%%/html/Admin.html
+%%DATADIR%%/html/All.html
 %%DATADIR%%/html/Copyright.html
-%%DATADIR%%/html/DataRcvd.html
-%%DATADIR%%/html/DataSent.html
-%%DATADIR%%/html/IPProtocols.html
-%%DATADIR%%/html/IPTraffic.html
+%%DATADIR%%/html/FibreChannel.html
+%%DATADIR%%/html/IP.html
+%%DATADIR%%/html/Local.html
 %%DATADIR%%/html/Risk_high.gif
 %%DATADIR%%/html/Risk_low.gif
 %%DATADIR%%/html/Risk_medium.gif
 %%DATADIR%%/html/Risk_unknown.gif
-%%DATADIR%%/html/Stats.html
-%%DATADIR%%/html/TotalData.html
+%%DATADIR%%/html/SCSI.html
+%%DATADIR%%/html/Summary.html
 %%DATADIR%%/html/antenna.gif
 %%DATADIR%%/html/arrow_down.gif
 %%DATADIR%%/html/arrow_up.gif
@@ -58,32 +68,40 @@ lib/ntop/plugins/sflowPlugin.so
 %%DATADIR%%/html/bg_line.gif
 %%DATADIR%%/html/black.gif
 %%DATADIR%%/html/bottom_corner.gif
+%%DATADIR%%/html/bridge.gif
+%%DATADIR%%/html/brocade.gif
 %%DATADIR%%/html/bug.png
 %%DATADIR%%/html/bulb.gif
 %%DATADIR%%/html/card.gif
 %%DATADIR%%/html/child.gif
 %%DATADIR%%/html/clear.gif
+%%DATADIR%%/html/clock.gif
 %%DATADIR%%/html/collapsed.gif
 %%DATADIR%%/html/copyright.png
 %%DATADIR%%/html/corner.gif
 %%DATADIR%%/html/deleteURL.gif
 %%DATADIR%%/html/deleteUser.gif
+%%DATADIR%%/html/disk.gif
 %%DATADIR%%/html/dns.gif
 %%DATADIR%%/html/download.gif
 %%DATADIR%%/html/dump.html
-%%DATADIR%%/html/dumpxml.html
+%%DATADIR%%/html/emulex.gif
 %%DATADIR%%/html/error.gif
 %%DATADIR%%/html/expanded.gif
+%%DATADIR%%/html/faq.html
 %%DATADIR%%/html/favicon.ico
 %%DATADIR%%/html/fback.gif
 %%DATADIR%%/html/fforward.gif
 %%DATADIR%%/html/forward.gif
 %%DATADIR%%/html/functions.js
 %%DATADIR%%/html/gauge.jpg
+%%DATADIR%%/html/gaugeR.jpg
+%%DATADIR%%/html/gaugeS.jpg
 %%DATADIR%%/html/graph.gif
 %%DATADIR%%/html/gray_bg.gif
 %%DATADIR%%/html/help.html
 %%DATADIR%%/html/help.png
+%%DATADIR%%/html/hostSortNote.html
 %%DATADIR%%/html/index.html
 %%DATADIR%%/html/index_inner.html
 %%DATADIR%%/html/index_inner_w3c.html
@@ -93,6 +111,7 @@ lib/ntop/plugins/sflowPlugin.so
 %%DATADIR%%/html/index_top_w3c.html
 %%DATADIR%%/html/index_w3c.html
 %%DATADIR%%/html/info.gif
+%%DATADIR%%/html/initiator.gif
 %%DATADIR%%/html/lock.png
 %%DATADIR%%/html/mail.gif
 %%DATADIR%%/html/major.gif
@@ -111,8 +130,10 @@ lib/ntop/plugins/sflowPlugin.so
 %%DATADIR%%/html/p2p.gif
 %%DATADIR%%/html/pie-error.png
 %%DATADIR%%/html/printer.gif
+%%DATADIR%%/html/privacyNotice.html
 %%DATADIR%%/html/question.gif
 %%DATADIR%%/html/router.gif
+%%DATADIR%%/html/seagate.gif
 %%DATADIR%%/html/statsicons/flags/ad.gif
 %%DATADIR%%/html/statsicons/flags/ae.gif
 %%DATADIR%%/html/statsicons/flags/af.gif
@@ -340,6 +361,7 @@ lib/ntop/plugins/sflowPlugin.so
 %%DATADIR%%/html/statsicons/os/amiga.gif
 %%DATADIR%%/html/statsicons/os/be.gif
 %%DATADIR%%/html/statsicons/os/bsd.gif
+%%DATADIR%%/html/statsicons/os/cisco.gif
 %%DATADIR%%/html/statsicons/os/hp.gif
 %%DATADIR%%/html/statsicons/os/irix.gif
 %%DATADIR%%/html/statsicons/os/linux.gif
@@ -349,7 +371,7 @@ lib/ntop/plugins/sflowPlugin.so
 %%DATADIR%%/html/statsicons/os/sun.gif
 %%DATADIR%%/html/statsicons/os/windows.gif
 %%DATADIR%%/html/style.css
-%%DATADIR%%/html/top.html
+%%DATADIR%%/html/switch.gif
 %%DATADIR%%/html/upload.gif
 %%DATADIR%%/html/url.gif
 %%DATADIR%%/html/user.gif