4 files changed, 33 insertions, 35 deletions

diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index d5a48bd54a92..eb01c00a2fa6 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ntop
-PORTVERSION=	3.3
-PORTREVISION=	4
+PORTVERSION=	3.3.8
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/net/ntop/distinfo b/net/ntop/distinfo
index b73a9dfdde71..d053109c60a3 100644
--- a/net/ntop/distinfo
+++ b/net/ntop/distinfo
@@ -1,3 +1,3 @@
-MD5 (ntop-3.3.tar.gz) = a0e52a85587c8a5519d822d04862dab4
-SHA256 (ntop-3.3.tar.gz) = e849dabe0ac1ff006e487aef7b78fe06864b8d74a7b789fe6c7b8e258b7f361c
-SIZE (ntop-3.3.tar.gz) = 3709605
+MD5 (ntop-3.3.8.tar.gz) = 19c6a582c285ffae18bf0c3b599d184e
+SHA256 (ntop-3.3.8.tar.gz) = 8e25f3c527493e1495030b1b8cfb09158c75829a740f55c6339674efcc504238
+SIZE (ntop-3.3.8.tar.gz) = 5626313
diff --git a/net/ntop/files/patch-libtool.m4.in b/net/ntop/files/patch-libtool.m4.in
deleted file mode 100644
index ec46c77430bc..000000000000
--- a/net/ntop/files/patch-libtool.m4.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libtool.m4.in.orig	Tue Jul 17 12:50:08 2007
-+++ ./libtool.m4.in	Tue Jul 17 12:50:13 2007
-@@ -1288,7 +1288,7 @@
-   ;;
- 
- freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
diff --git a/net/ntop/pkg-plist b/net/ntop/pkg-plist
index 09316b21122b..3fcb4e227d7b 100644
--- a/net/ntop/pkg-plist
+++ b/net/ntop/pkg-plist
@@ -7,35 +7,39 @@ etc/ntop/oui.txt.gz
 etc/ntop/p2c.opt.table.gz
 etc/ntop/specialMAC.txt.gz
 @dirrm etc/ntop
-lib/libicmpPlugin-%%PORTVERSION%%
-lib/libicmpPlugin
+lib/libcpacketPlugin-%%PORTVERSION%%.so
+lib/libcpacketPlugin.so
+lib/libcpacketPlugin.a
+lib/libicmpPlugin-%%PORTVERSION%%.so
+lib/libicmpPlugin.so
 lib/libicmpPlugin.a
-lib/liblastSeenPlugin-%%PORTVERSION%%
-lib/liblastSeenPlugin
+lib/liblastSeenPlugin-%%PORTVERSION%%.so
+lib/liblastSeenPlugin.so
 lib/liblastSeenPlugin.a
-lib/libnetflowPlugin-%%PORTVERSION%%
-lib/libnetflowPlugin
+lib/libnetflowPlugin-%%PORTVERSION%%.so
+lib/libnetflowPlugin.so
 lib/libnetflowPlugin.a
-lib/libntop-%%PORTVERSION%%
-lib/libntop
+lib/libntop-%%PORTVERSION%%.so
+lib/libntop.so
 lib/libntop.a
 lib/libntop.la
-lib/libntopreport-%%PORTVERSION%%
-lib/libntopreport
+lib/libntopreport-%%PORTVERSION%%.so
+lib/libntopreport.so
 lib/libntopreport.a
 lib/libntopreport.la
-lib/libpdaPlugin-%%PORTVERSION%%
-lib/libpdaPlugin
+lib/libpdaPlugin-%%PORTVERSION%%.so
+lib/libpdaPlugin.so
 lib/libpdaPlugin.a
-lib/libremotePlugin-%%PORTVERSION%%
-lib/libremotePlugin
+lib/libremotePlugin-%%PORTVERSION%%.so
+lib/libremotePlugin.so
 lib/libremotePlugin.a
-lib/librrdPlugin-%%PORTVERSION%%
-lib/librrdPlugin
+lib/librrdPlugin-%%PORTVERSION%%.so
+lib/librrdPlugin.so
 lib/librrdPlugin.a
-lib/libsflowPlugin-%%PORTVERSION%%
-lib/libsflowPlugin
+lib/libsflowPlugin-%%PORTVERSION%%.so
+lib/libsflowPlugin.so
 lib/libsflowPlugin.a
+lib/ntop/plugins/cpacketPlugin.so
 lib/ntop/plugins/icmpPlugin.so
 lib/ntop/plugins/lastSeenPlugin.so
 lib/ntop/plugins/netflowPlugin.so
@@ -45,6 +49,11 @@ lib/ntop/plugins/rrdPlugin.so
 lib/ntop/plugins/sflowPlugin.so
 @dirrm lib/ntop/plugins
 @dirrm lib/ntop
+%%DATADIR%%/perl/report/basic.xml
+%%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
@@ -63,7 +72,6 @@ lib/ntop/plugins/sflowPlugin.so
 %%DATADIR%%/html/theme.js
 %%DATADIR%%/html/arrow.gif
 %%DATADIR%%/html/blank.gif
-%%DATADIR%%/html/ntop_logo.gif
 %%DATADIR%%/html/spacer.gif
 %%DATADIR%%/html/theme.css
 %%DATADIR%%/html/statsicons/flags/local.gif
@@ -417,6 +425,8 @@ lib/ntop/plugins/sflowPlugin.so
 %%DATADIR%%/html/jscalendar/calendar-setup.js
 %%DATADIR%%/html/jscalendar/calendar.js
 %%DATADIR%%/html/jscalendar/lang/calendar-en.js
+@dirrm %%DATADIR%%/perl/report/
+@dirrm %%DATADIR%%/perl
 @dirrm %%DATADIR%%/html/jscalendar/lang
 @dirrm %%DATADIR%%/html/jscalendar
 @dirrm %%DATADIR%%/html/img_inquisitor