diff options
| author | nia <nia@pkgsrc.org> | 2021-05-14 12:57:27 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2021-05-14 12:57:27 +0000 |
| commit | 33014f899af69b9ca9aef1ec506cccef5ab36893 (patch) | |
| tree | 18a893a348cfcc617979bb0450cf1213c7f2741b /net/ntopng | |
| parent | 187857751508507596853794039d91ee395d5a8b (diff) | |
| download | pkgsrc-33014f899af69b9ca9aef1ec506cccef5ab36893.tar.gz | |
ntopng: Don't use bundled copy of Lua
Diffstat (limited to 'net/ntopng')
| -rw-r--r-- | net/ntopng/Makefile | 8 | ||||
| -rw-r--r-- | net/ntopng/distinfo | 3 | ||||
| -rw-r--r-- | net/ntopng/patches/patch-Makefile.in | 45 |
3 files changed, 52 insertions, 4 deletions
diff --git a/net/ntopng/Makefile b/net/ntopng/Makefile index 07d73954692..ad1a1bbdcd1 100644 --- a/net/ntopng/Makefile +++ b/net/ntopng/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.50 2021/05/14 12:29:44 nia Exp $ +# $NetBSD: Makefile,v 1.51 2021/05/14 12:57:27 nia Exp $ DISTNAME= ntopng-4.0 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=ntop/} @@ -22,6 +22,8 @@ RCD_SCRIPTS+= ntopng CXXFLAGS+= -std=c++11 # va_copy() +MAKE_FLAGS+= LUA_LIB=-llua5.3 + # Portable types CFLAGS.SunOS+= -Du_int8_t=uint8_t CFLAGS.SunOS+= -Du_int16_t=uint16_t @@ -51,7 +53,7 @@ post-build: .include "../../databases/rrdtool/buildlink3.mk" .include "../../databases/sqlite3/buildlink3.mk" .include "../../geography/libmaxminddb/buildlink3.mk" -.include "../../lang/lua/buildlink3.mk" +.include "../../lang/lua53/buildlink3.mk" .include "../../net/GeoIP/buildlink3.mk" .include "../../net/libpcap/buildlink3.mk" .include "../../net/ndpi/buildlink3.mk" diff --git a/net/ntopng/distinfo b/net/ntopng/distinfo index 6ee15d47aba..fbcbd506d5d 100644 --- a/net/ntopng/distinfo +++ b/net/ntopng/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.7 2020/05/25 20:26:51 adam Exp $ +$NetBSD: distinfo,v 1.8 2021/05/14 12:57:27 nia Exp $ SHA1 (ntopng-4.0.tar.gz) = cf5f61e01370bcf99a93d54c4c0caa22cc5acad0 RMD160 (ntopng-4.0.tar.gz) = 9549cc625a8f51e2ad503b5c81297ae304271112 SHA512 (ntopng-4.0.tar.gz) = a278cc5f304e3040b31c691286650a54d61b5587033724c4513dd7372168477d5b0b471a1d2a5c5682034464b022b88e971567a38d836216431ea77bf1ed90c9 Size (ntopng-4.0.tar.gz) = 43239175 bytes +SHA1 (patch-Makefile.in) = 39bd64f682f85451cd3f4945c8218af596f591f9 SHA1 (patch-configure.seed) = d7c4d13245a511d811dbc672595584b25b18f426 SHA1 (patch-include_Redis.h) = ad7b03b9ebfb8b9786cca3f8c49ea24dc559ba12 SHA1 (patch-include_ntop__includes.h) = 2bf588dba941f25b71381c7848b237d964d77f31 diff --git a/net/ntopng/patches/patch-Makefile.in b/net/ntopng/patches/patch-Makefile.in new file mode 100644 index 00000000000..4e22758c9dd --- /dev/null +++ b/net/ntopng/patches/patch-Makefile.in @@ -0,0 +1,45 @@ +$NetBSD: patch-Makefile.in,v 1.6 2021/05/14 12:57:27 nia Exp $ + +Don't build an internal copy of Lua... + +--- Makefile.in.orig 2020-03-27 16:51:24.000000000 +0000 ++++ Makefile.in +@@ -29,19 +29,6 @@ MONGOOSE_HOME=${PWD}/third-party/mongoos + MONGOOSE_INC=-I$(MONGOOSE_HOME) + ###### + +-LUA_PLATFORM=generic +- +-ifeq ($(OS),Linux) +- LUA_PLATFORM=linux +-else ifeq ($(OS),Darwin) +- LUA_PLATFORM=macosx +-else ifeq ($(OS), $(filter $(OS), FreeBSD)) +- LUA_PLATFORM=freebsd +-endif +- +-LUA_HOME=${PWD}/third-party/lua-5.3.5 +-LUA_INC=-I$(LUA_HOME)/src +-LUA_LIB=$(LUA_HOME)/src/liblua.a + + ###### + LIBRRDTOOL_HOME=${PWD}/third-party/rrdtool-1.4.8 +@@ -121,8 +108,6 @@ RPM_PKG = $(TARGET)-$(NTOPNG_VERSION)-@R + RPM_DATA_PKG = $(TARGET)-data-$(NTOPNG_VERSION)-@REVISION@.noarch.rpm + ###### + +-LIB_TARGETS = $(LUA_LIB) +- + ifneq ($(HAS_ZEROMQ), 0) + LIB_TARGETS += $(ZEROMQ_LIB) + endif +@@ -162,9 +147,6 @@ test_alert_engine: $(OBJECTS_NO_MAIN) $( + $(MAKE) CPPFLAGS="${CPPFLAGS} -DTEST_CHECK_ENGINE" src/AlertCheckLuaEngine.o + $(GPP) $(OBJECTS_NO_MAIN) -Wall $(NLIBS) -o $@ + +-$(LUA_LIB): +- cd $(LUA_HOME); @GMAKE@ $(LUA_PLATFORM) +- + $(ZEROMQ_LIB): + cd $(ZEROMQ_HOME); ./configure --without-documentation --without-libsodium; @GMAKE@ + |