From owner-svn-ports-all@FreeBSD.ORG Thu Jun 5 08:20:25 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B7D5FF29; Thu, 5 Jun 2014 08:20:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 991F22D41; Thu, 5 Jun 2014 08:20:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s558KPvm024537; Thu, 5 Jun 2014 08:20:25 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s558KPiu024535; Thu, 5 Jun 2014 08:20:25 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201406050820.s558KPiu024535@svn.freebsd.org> From: Dmitry Marakasov Date: Thu, 5 Jun 2014 08:20:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356609 - head/net/ntop X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jun 2014 08:20:25 -0000 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@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 .include .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 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%% -@exec chown -R nobody:nobody %%DBDIR%%/ntop @exec mkdir -p %%DBDIR%%/ntop -@unexec rmdir %%DBDIR%% 2>/dev/null || true +@exec chown -R nobody:nobody %%DBDIR%%/ntop @unexec rmdir %%DBDIR%%/ntop 2>/dev/null || true