svn commit: r356609 - head/net/ntop

[Dmitry Marakasov]

Author: amdmi3
Date: Thu Jun  5 08:20:24 2014
New Revision: 356609
URL: http://svnweb.freebsd.org/changeset/ports/356609
QAT: https://qat.redports.org/buildarchive/r356609/

Log:
  - Stagify
  - Use new LIB_DEPENDS syntax
  - Fix plist (@exec order and don't remove /var/db)
  
  Approved by:	portmgr blanket

Modified:
  head/net/ntop/Makefile
  head/net/ntop/pkg-plist

Modified: head/net/ntop/Makefile
==============================================================================
--- head/net/ntop/Makefile	Thu Jun  5 08:07:21 2014	(r356608)
+++ head/net/ntop/Makefile	Thu Jun  5 08:20:24 2014	(r356609)
@@ -3,15 +3,15 @@
 
 PORTNAME=	ntop
 PORTVERSION=	5.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Stable
 
 MAINTAINER=	sylvio at FreeBSD.org
 COMMENT=	Network monitoring tool with command line and web interfaces
 
-LIB_DEPENDS=	gdbm.4:${PORTSDIR}/databases/gdbm \
-		event-1.4:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm \
+		libevent-1.4.so:${PORTSDIR}/devel/libevent
 BUILD_DEPENDS=	rrdtool>=1.2:${PORTSDIR}/databases/rrdtool \
 		subversion>=1.7.0:${PORTSDIR}/devel/subversion \
 		dot:${PORTSDIR}/graphics/graphviz \
@@ -35,8 +35,6 @@ CONFIGURE_ARGS=	--localstatedir=${DBDIR}
 		--with-gdbm-root=${LOCALBASE} \
 		--with-zlib-root=/usr
 
-MAN8=		ntop.8
-
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -52,19 +50,18 @@ XMLDUMP_DESC=		Enable XML Dump support
 JUMBO_FRAMES_DESC=	Jumbo Frames. Experimental.
 MAKO_DESC=		Install py-mako for Host Map, Region View
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPCAP_PORT}
-LIB_DEPENDS+=		pcap.1:${PORTSDIR}/net/libpcap
+LIB_DEPENDS+=		libpcap.so:${PORTSDIR}/net/libpcap
 CONFIGURE_ARGS+=	--with-pcap-root=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--with-pcap-root=/usr
 .endif
 
 .if ${PORT_OPTIONS:MXMLDUMP}
-LIB_DEPENDS+=		gdome.8:${PORTSDIR}/textproc/gdome2
+LIB_DEPENDS+=		libgdome.so:${PORTSDIR}/textproc/gdome2
 CPPFLAGS+=		-I${LOCALBASE}/include/libxml2 \
 			-I${LOCALBASE}/include/libxml2/libxml \
 			-I${LOCALBASE}/include/libgdome \
@@ -91,8 +88,4 @@ pre-configure:
 pre-install:
 	@cd ${WRKSRC} && ${GMAKE} dnetter
 
-post-install:
-	@${MKDIR} ${DBDIR}/ntop
-	@${CHOWN} -R nobody:nobody ${DBDIR}/ntop
-
 .include <bsd.port.post.mk>

Modified: head/net/ntop/pkg-plist
==============================================================================
--- head/net/ntop/pkg-plist	Thu Jun  5 08:07:21 2014	(r356608)
+++ head/net/ntop/pkg-plist	Thu Jun  5 08:20:24 2014	(r356609)
@@ -23,6 +23,7 @@ lib/libsflowPlugin.so
 lib/ntop/plugins/netflowPlugin.so
 lib/ntop/plugins/rrdPlugin.so
 lib/ntop/plugins/sflowPlugin.so
+man/man8/ntop.8.gz
 %%DATADIR%%/html/Google_Maps_Marker.png
 %%DATADIR%%/html/JSCookMenu.js
 %%DATADIR%%/html/Risk_high.gif
@@ -508,7 +509,6 @@ lib/ntop/plugins/sflowPlugin.so
 @dirrm %%DATADIR%%/html/img_inquisitor
 @dirrm %%DATADIR%%/html
 @dirrm %%DATADIR%%
- at exec chown -R nobody:nobody %%DBDIR%%/ntop
 @exec mkdir -p %%DBDIR%%/ntop
- at unexec rmdir %%DBDIR%% 2>/dev/null || true
+ at exec chown -R nobody:nobody %%DBDIR%%/ntop
 @unexec rmdir %%DBDIR%%/ntop 2>/dev/null || true