Date: Thu, 8 Oct 2015 01:51:27 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398791 - head/net/ntop Message-ID: <201510080151.t981pRsW049681@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk> +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 <bsd.port.pre.mk> - -# 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 <bsd.port.post.mk> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510080151.t981pRsW049681>