Index: head/net/ntopng/Makefile =================================================================== --- head/net/ntopng/Makefile (revision 448517) +++ head/net/ntopng/Makefile (revision 448518) @@ -1,61 +1,61 @@ # Created by: Muhammad Moinur Rahman <5u623l20@gmail.com> # $FreeBSD$ PORTNAME= ntopng -PORTVERSION= 3.0.2017.06.05 +PORTVERSION= 3.0.2017.08.12 CATEGORIES= net MAINTAINER= madpilot@FreeBSD.org COMMENT= Network monitoring tool with command line and web interfaces LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= librrd.so:databases/rrdtool \ libluajit-5.1.so:lang/luajit \ libzmq.so:net/libzmq4 \ libcurl.so:ftp/curl \ libndpi.so:net/ndpi \ libjson-c.so:devel/json-c \ libsodium.so:security/libsodium BUILD_DEPENDS= bash:shells/bash -GNU_CONFIGURE= yes -USE_LDCONFIG= yes USES= autoreconf cpe gmake libtool localbase mysql pathfix pkgconfig \ shebangfix sqlite ssl SUB_FILES= ntopng-geoipupdate.sh pkg-deinstall SHEBANG_FILES= httpdocs/misc/ntopng-add-user.sh +GNU_CONFIGURE= yes +USE_LDCONFIG= yes USERS= ntopng GROUPS= ntopng USE_GITHUB= yes GH_ACCOUNT= ntop -GH_TAGNAME= 3de9516 +GH_TAGNAME= 8e2a743 CPE_VENDOR= ntop OPTIONS_DEFINE= GEOIP NLS OPTIONS_DEFAULT= GEOIP OPTIONS_SUB= yes GEOIP_LIB_DEPENDS= libGeoIP.so:net/GeoIP NLS_USES= gettext USE_RC_SUBR= ntopng post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${WRKSRC}/configure.seed cd ${WRKSRC} && ${SH} autogen.sh post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ntopng post-install-GEOIP-on: ${INSTALL_SCRIPT} ${WRKDIR}/ntopng-geoipupdate.sh ${STAGEDIR}${PREFIX}/bin .include Index: head/net/ntopng/distinfo =================================================================== --- head/net/ntopng/distinfo (revision 448517) +++ head/net/ntopng/distinfo (revision 448518) @@ -1,3 +1,3 @@ -TIMESTAMP = 1496678053 -SHA256 (ntop-ntopng-3.0.2017.06.05-3de9516_GH0.tar.gz) = 48f5bb14f1d82c5dc8a220e7e4d7e2f5fec2accf6fd8efa65af98654072c016f -SIZE (ntop-ntopng-3.0.2017.06.05-3de9516_GH0.tar.gz) = 23019840 +TIMESTAMP = 1503329023 +SHA256 (ntop-ntopng-3.0.2017.08.12-8e2a743_GH0.tar.gz) = 3adf3f00eb94da7981831d03ee9ba554caf6315e5cbd9bbb25cff590db2dac17 +SIZE (ntop-ntopng-3.0.2017.08.12-8e2a743_GH0.tar.gz) = 23022290 Index: head/net/ntopng/files/patch-Makefile.in =================================================================== --- head/net/ntopng/files/patch-Makefile.in (revision 448517) +++ head/net/ntopng/files/patch-Makefile.in (revision 448518) @@ -1,39 +1,11 @@ ---- Makefile.in.orig 2017-06-01 07:18:57 UTC +--- Makefile.in.orig 2017-08-12 15:15:33 UTC +++ Makefile.in -@@ -51,8 +51,10 @@ else - endif - ###### - ifeq ($(OS), $(filter $(OS), FreeBSD)) -- LIBNBPF_HOME=${PWD}/../PF_RING/userland/nbpf -- LIBNBPF_LIB=$(LIBNBPF_HOME)/libnbpf.a -+ ifneq (, $(wildcard "${PWD}/../PF_RING/userland/nbpf/libnbpf.a")) -+ LIBNBPF_HOME=${PWD}/../PF_RING/userland/nbpf -+ LIBNBPF_LIB=$(LIBNBPF_HOME)/libnbpf.a -+ endif - endif - ###### - HTTPCLIENT_INC=${PWD}/third-party/http-client-c/src/ -@@ -79,7 +81,7 @@ endif +@@ -89,7 +89,7 @@ endif HAS_ZEROMQ=$(shell pkg-config --exists libzmq; echo $$?) ifeq ($(HAS_ZEROMQ), 0) ZEROMQ_INC = $(shell pkg-config --cflags libzmq) - ZMQ_STATIC=/usr/local/lib/libzmq.a + ZMQ_STATIC=/nonexistent ifeq ($(wildcard $(ZMQ_STATIC)),) ZEROMQ_LIB = $(shell pkg-config --libs libzmq) else -@@ -178,10 +180,10 @@ geoip: - cp ~/dat_files/* httpdocs/geoip; gunzip -f httpdocs/geoip/*.dat.gz ; \ - else \ - cd httpdocs/geoip; \ -- wget -nc http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz; \ -- wget -nc http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz; \ -- wget -nc http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz; \ -- wget -nc http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz; \ -+ fetch http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz; \ -+ fetch http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz; \ -+ fetch http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz; \ -+ fetch http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz; \ - gunzip -f *.dat.gz ; \ - fi -