- Update to 3.2

- Re-add version checking allow ntop developers to know how many FreeBSD
  people use it
- Drop maintainership

4 files changed, 8 insertions, 23 deletions

diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index 674f06168672..a4962552962a 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	ntop
-PORTVERSION=	3.1
-PORTREVISION=	1
+PORTVERSION=	3.2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.p/pre/}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	clement@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Network monitoring tool with command line and web interfaces
 
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd \
@@ -22,13 +21,12 @@ LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd \
 		png.5:${PORTSDIR}/graphics/png
 
 DBDIR?=		/var/db
-WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_OPENSSL=	yes
-USE_INC_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 PLIST_SUB+=	DBDIR=${DBDIR} \
 		SHLIB=${PORTVERSION:S/.p/pre/}
@@ -86,11 +84,6 @@ CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/libxml2 \
 			-I${LOCALBASE}/include/glib-2.0"
 .endif
 
-pre-everything:: show-options
-
-show-options:
-	@${SED} -ne 's/^##//p' ${.CURDIR}/Makefile
-
 post-extract:
 	@${RM} ${WRKSRC}/configureextra/FREEBSD
 
diff --git a/net/ntop/distinfo b/net/ntop/distinfo
index 661f9e965a78..e6c3af4a6f35 100644
--- a/net/ntop/distinfo
+++ b/net/ntop/distinfo
@@ -1,2 +1,2 @@
-MD5 (ntop-3.1.tgz) = 1c9b4097c2e464b84f2fe8f6626d2b06
-SIZE (ntop-3.1.tgz) = 3286596
+MD5 (ntop-3.2.tgz) = cd29a876b34a7dd76555e9acd8f160bb
+SIZE (ntop-3.2.tgz) = 3910593
diff --git a/net/ntop/files/ntop.sh b/net/ntop/files/ntop.sh
index 577d8a77f0f7..5e27b03dc87d 100644
--- a/net/ntop/files/ntop.sh
+++ b/net/ntop/files/ntop.sh
@@ -28,7 +28,7 @@ additional_args=''
 # End of user-configurable variables
 #----------------------------------------------------------------------
 
-args='-d -L --set-pcap-nonblocking --skip-version-check'
+args='-d -L --set-pcap-nonblocking'
 
 [ ! -z $interfaces ] && args="$args -i $interfaces"
 [ ! -z $http_port ] && args="$args -w $http_port"
diff --git a/net/ntop/pkg-plist b/net/ntop/pkg-plist
index 3b22c57cd874..e9a72340ef4a 100644
--- a/net/ntop/pkg-plist
+++ b/net/ntop/pkg-plist
@@ -58,19 +58,10 @@ lib/ntop/plugins/xmldumpPlugin.so
 %%DATADIR%%/html/spacer.gif
 %%DATADIR%%/html/theme.css
 %%DATADIR%%/html/statsicons/flags/local.gif
-%%DATADIR%%/html/About.html
-%%DATADIR%%/html/Admin.html
-%%DATADIR%%/html/All.html
-%%DATADIR%%/html/Copyright.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/SCSI.html
-%%DATADIR%%/html/Summary.html
 %%DATADIR%%/html/antenna.gif
 %%DATADIR%%/html/arrow_down.gif
 %%DATADIR%%/html/arrow_up.gif
@@ -113,7 +104,6 @@ lib/ntop/plugins/xmldumpPlugin.so
 %%DATADIR%%/html/help.html
 %%DATADIR%%/html/help.png
 %%DATADIR%%/html/hostSortNote.html
-%%DATADIR%%/html/index.html
 %%DATADIR%%/html/info.gif
 %%DATADIR%%/html/initiator.gif
 %%DATADIR%%/html/lock.png
@@ -126,6 +116,7 @@ lib/ntop/plugins/xmldumpPlugin.so
 %%DATADIR%%/html/minor.gif
 %%DATADIR%%/html/modifyUser.gif
 %%DATADIR%%/html/multihomed.gif
+%%DATADIR%%/html/multivlaned.gif
 %%DATADIR%%/html/nboxLogo.gif
 %%DATADIR%%/html/ntop.gif
 %%DATADIR%%/html/ntop.html
@@ -133,6 +124,7 @@ lib/ntop/plugins/xmldumpPlugin.so
 %%DATADIR%%/html/ntophelp.html
 %%DATADIR%%/html/p2p.gif
 %%DATADIR%%/html/pie-error.png
+%%DATADIR%%/html/phone.gif
 %%DATADIR%%/html/printer.gif
 %%DATADIR%%/html/privacyNotice.html
 %%DATADIR%%/html/question.gif