From owner-svn-ports-all@freebsd.org Thu Oct 8 01:51:28 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 78CFC9D10B4; Thu, 8 Oct 2015 01:51:28 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 2AF411171; Thu, 8 Oct 2015 01:51:28 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t981pRvK049685; Thu, 8 Oct 2015 01:51:27 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t981pRsW049681; Thu, 8 Oct 2015 01:51:27 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510080151.t981pRsW049681@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 8 Oct 2015 01:51:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398791 - 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.20 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, 08 Oct 2015 01:51:28 -0000 Author: amdmi3 Date: Thu Oct 8 01:51:27 2015 New Revision: 398791 URL: https://svnweb.freebsd.org/changeset/ports/398791 Log: - Switch to options helpers - Fix build with PCAP_PORT by depending on specific .so version (otherwise dependency is satisfied with system libpcap.so, net/libpcap is not installed and the build fails) - Drop 8.x support Approved by: portmgr blanket Modified: head/net/ntop/Makefile Modified: head/net/ntop/Makefile ============================================================================== --- head/net/ntop/Makefile Thu Oct 8 01:09:38 2015 (r398790) +++ head/net/ntop/Makefile Thu Oct 8 01:51:27 2015 (r398791) @@ -50,44 +50,21 @@ XMLDUMP_DESC= Enable XML Dump support JUMBO_FRAMES_DESC= Jumbo Frames (experimental) MAKO_DESC= Install py-mako for Host Map, Region View -.include +PCAP_PORT_LIB_DEPENDS= libpcap.so.1:${PORTSDIR}/net/libpcap +PCAP_PORT_CONFIGURE_ON= --with-pcap-root=${LOCALBASE} +PCAP_PORT_CONFIGURE_OFF=--with-pcap-root=/usr -.if ${PORT_OPTIONS:MPCAP_PORT} -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+= libgdome.so:${PORTSDIR}/textproc/gdome2 -CPPFLAGS+= -I${LOCALBASE}/include/libxml2 \ +XMLDUMP_LIB_DEPENDS= libgdome.so:${PORTSDIR}/textproc/gdome2 +XMLDUMP_CPPFLAGS= -I${LOCALBASE}/include/libxml2 \ -I${LOCALBASE}/include/libxml2/libxml \ -I${LOCALBASE}/include/libgdome \ -I${LOCALBASE}/include/glib-2.0 -.endif -.if ${PORT_OPTIONS:MJUMBO_FRAMES} -CONFIGURE_ARGS+= --enable-jumbo-frames # should set your mtu to 9000 # see http://www.cyberciti.biz/faq/freebsd-jumbo-frames-networking-configration/ -.endif +JUMBO_FRAMES_CONFIGURE_ON= --enable-jumbo-frames -.if ${PORT_OPTIONS:MMAKO} -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mako>0:${PORTSDIR}/textproc/py-mako -.endif - -.include - -# Quick and dirty hackaround - older binutils barf when asked to strip -# an .a file, newer complain about missing sections and succeed. -# The real fix would be for ntop to not try stripping .a files, -# but upstream seems to have gone ahead with ntopng so this may not -# ever be fixed. -.if ${OSVERSION} < 900033 -USE_BINUTILS= yes -CONFIGURE_ARGS+= STRIP=${LOCALBASE}/bin/strip -.endif +MAKO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mako>0:${PORTSDIR}/textproc/py-mako pre-configure: @(cd ${WRKSRC} && ./autogen.sh --noconfig) @@ -98,4 +75,4 @@ pre-install: post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ntop/plugins/*.so -.include +.include