Index: net-mgmt/pmacct/Makefile =================================================================== --- net-mgmt/pmacct/Makefile +++ net-mgmt/pmacct/Makefile @@ -11,146 +11,65 @@ LICENSE= GPLv2 -USES= libtool +USES= libtool pkgconfig localbase USE_RC_SUBR= pmacctd nfacctd sfacctd SUB_FILES= pkg-message GNU_CONFIGURE= yes -CPPFLAGS+= "-I${LOCALBASE}/include" -LDFLAGS+= "-L${LOCALBASE}/lib" WRKSRC= ${WRKDIR}/pmacct-1.7.4 -OPTIONS_DEFINE= MYSQL PGSQL SQLITE3 THREADS LAYER2 IPV6 DEBUG GEOIP2 \ - DOCS PLABEL RABBITMQ KAFKA JANSSON AVRO EXAMPLES -OPTIONS_DEFAULT=MMAP LAYER2 THREADS SHARED +OPTIONS_DEFINE= MYSQL PGSQL SQLITE3 LAYER2 DEBUG GEOIP2 \ + DOCS PLABEL RABBITMQ KAFKA AVRO EXAMPLES +OPTIONS_DEFAULT=LAYER2 +OPTIONS_SUB= 1 AVRO_DESC= Enable avro support GEOIP2_DESC= Enable GeoIPv2 (libmaxminddb) support -JANSSON_DESC= Enable Jansson support KAFKA_DESC= Enable Kafka support LAYER2_DESC= Enable Layer-2 support: MAC addresses and VLANs -# Requires libnetfilter_log port/package -# NFLOG_DESC= Enable NFLOG support -# Requires legacy mongo-c-driver version 0.8 which is not available -# MONGO_DESC= Enable MongoDB support PLABEL_DESC= Enable IP prefix labels RABBITMQ_DESC= Enable RabbitMQ/AMQP support SQLITE3_DESC= Enable SQLite3 support -.include +SQLDOC= "@comment " -.if ${PORT_OPTIONS:MMYSQL} -USES+= mysql -CONFIGURE_ARGS+=--enable-mysql -PLIST_SUB+= WITH_MYSQL="" -PLIST_SUB+= SQLDOC="" -.else -CONFIGURE_ARGS+=--disable-mysql -PLIST_SUB+= WITH_MYSQL="@comment " -PLIST_SUB+= SQLDOC="@comment " -.endif +MYSQL_USES= mysql +MYSQL_CONFIGURE_ENABLE= mysql +MYSQL_VARS+= SQLDOC="" -.if ${PORT_OPTIONS:MPGSQL} -USES+= pgsql -WANT_PGSQL= client -CONFIGURE_ARGS+=--enable-pgsql -PLIST_SUB+= WITH_PGSQL="" -PLIST_SUB+= SQLDOC="" -.else -CONFIGURE_ARGS+=--disable-pgsql -PLIST_SUB+= WITH_PGSQL="@comment " -PLIST_SUB+= SQLDOC="@comment " -.endif +PGSQL_USES= pgsql +PGSQL_CONFIGURE_ENABLE= pgsql +PGSQL_VARS+= WANT_PGSQL=client +PGSQL_VARS+= SQLDOC="" -.if ${PORT_OPTIONS:MSQLITE3} -USES+= pkgconfig sqlite -CONFIGURE_ARGS+=--enable-sqlite3 \ - --with-sqlite3-includes=${LOCALBASE}/include -PLIST_SUB+= WITH_SQLITE3="" -PLIST_SUB+= SQLDOC="" -.else -CONFIGURE_ARGS+=--disable-sqlite3 -PLIST_SUB+= WITH_SQLITE3="@comment " -PLIST_SUB+= SQLDOC="@comment " -.endif +SQLITE3_USES= sqlite +SQLITE3_CONFIGURE_ENABLE= sqlite3 +SQLITE3_VARS= SQLDOC="" -.if ${PORT_OPTIONS:MLAYER2} -CONFIGURE_ARGS+=--enable-l2 -.else -CONFIGURE_ARGS+=--disable-l2 -.endif +LAYER2_CONFIGURE_ENABLE= l2 +PLABEL_CONFIGURE_ENABLE= plabel +DEBUG_CONFIGURE_ENABLE= debug -.if ${PORT_OPTIONS:MIPV6} -CONFIGURE_ARGS+=--enable-ipv6 -.else -CONFIGURE_ARGS+=--disable-ipv6 -.endif +RABBITMQ_VARS= LIB_DEPENDS+=librabbitmq.so:net/rabbitmq-c-devel +RABBITMQ_CONFIGURE_ENABLE= rabbitmq -.if ${PORT_OPTIONS:MPLABEL} -CONFIGURE_ARGS+=--enable-plabel -.else -CONFIGURE_ARGS+=--disable-plabel -.endif +KAFKA_VARS= LIB_DEPENDS+=librdkafka.so:net/librdkafka +KAFKA_CONFIGURE_ENABLE== kafka -.if ${PORT_OPTIONS:MTHREADS} -CONFIGURE_ARGS+=--enable-threads -.else -CONFIGURE_ARGS+=--disable-threads -.endif +AVRO_VARS= LIB_DEPENDS+=libavro.so:devel/avro-c +AVRO_CONFIGURE_ENABLE= avro -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+=--enable-debug -.endif +GEOIP2_VARS= LIB_DEPENDS+=libmaxminddb.so:net/libmaxminddb +GEOIP2_CONFIGURE_ENABLE= geoipv2 -.if ${PORT_OPTIONS:MMONGO} -#CONFIGURE_ARGS+=--enable-mongodb -.else -CONFIGURE_ARGS+=--disable-mongodb -.endif +.include -.if ${PORT_OPTIONS:MRABBITMQ} -.if ${PORT_OPTIONS:MJANSSON} -USES+= pkgconfig -LIB_DEPENDS+= libjansson.so:devel/jansson -CONFIGURE_ARGS+=--enable-jansson -.else -IGNORE= RabbitMQ support requires enabled Jansson support -.endif -LIB_DEPENDS+= librabbitmq.so:net/rabbitmq-c-devel -CONFIGURE_ARGS+=--enable-rabbitmq -.endif +PLIST_SUB+= SQLDOC=${SQLDOC} +PLIST_SUB+= WITH_KAFKA=${KAFKA} -.if ${PORT_OPTIONS:MKAFKA} -.if ${PORT_OPTIONS:MJANSSON} -USES+= pkgconfig +.if ${PORT_OPTIONS:MRABBITMQ} || ${PORT_OPTIONS:MKAFKA} LIB_DEPENDS+= libjansson.so:devel/jansson CONFIGURE_ARGS+=--enable-jansson -.else -IGNORE= Kafaka support requires enabled Jansson support -.endif -LIB_DEPENDS+= librdkafka.so:net/librdkafka -CONFIGURE_ARGS+=--enable-kafka -PLIST_SUB+=WITH_KAFKA="" -.else -PLIST_SUB+=WITH_KAFKA="@comment " -.endif - -.if ${PORT_OPTIONS:MAVRO} -LIB_DEPENDS+= libavro.so:devel/avro-c -CONFIGURE_ARGS+=--enable-avro -.endif - -.if ${PORT_OPTIONS:MNFLOG} -#CONFIGURE_ARGS+=--enable-nflog -#PLIST_SUB+=WITH_NFLOG="" -.else -CONFIGURE_ARGS+=--disable-nflog -PLIST_SUB+=WITH_NFLOG="@comment " -.endif - -.if ${PORT_OPTIONS:MGEOIP2} -LIB_DEPENDS+= libmaxminddb.so:net/libmaxminddb -CONFIGURE_ARGS+=--enable-geoipv2 .endif .include Index: net-mgmt/pmacct/distinfo =================================================================== --- net-mgmt/pmacct/distinfo +++ net-mgmt/pmacct/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582385432 +TIMESTAMP = 1582402028 SHA256 (pmacct-1.7.4p1.tar.gz) = 8a35fdde01a2e34faf7c0d68cb3010bca56667638a6227b02384d015ee9c1335 SIZE (pmacct-1.7.4p1.tar.gz) = 1581347 Index: net-mgmt/pmacct/files/patch-Makefile.am =================================================================== --- net-mgmt/pmacct/files/patch-Makefile.am +++ net-mgmt/pmacct/files/patch-Makefile.am @@ -1,7 +1,7 @@ ---- Makefile.am.orig 2019-04-19 04:06:27.000000000 +0200 -+++ Makefile.am 2019-06-16 19:58:43.298406000 +0200 -@@ -17,7 +17,7 @@ - pmacct_examples_lg_arch_dir = $(pmacct_examples_arch_dir)/lg +--- Makefile.am.orig 2019-12-07 17:48:46 UTC ++++ Makefile.am +@@ -22,7 +22,7 @@ pmacct_examples_lg_arch_dir = $(pmacct_examples_arch_d + endif pmacct_examples_custom_dir = $(pmacct_examples_arch_dir)/custom if USING_SQL -pmacct_sql_dir = $(pmacct_data_dir)/sql Index: net-mgmt/pmacct/files/patch-Makefile.in =================================================================== --- net-mgmt/pmacct/files/patch-Makefile.in +++ net-mgmt/pmacct/files/patch-Makefile.in @@ -1,8 +1,8 @@ ---- Makefile.in.orig 2019-06-16 20:01:08.854403000 +0200 -+++ Makefile.in 2019-06-16 20:01:32.038160000 +0200 -@@ -346,7 +346,7 @@ - pmacct_examples_lg_dir = $(pmacct_examples_dir)/lg - pmacct_examples_lg_arch_dir = $(pmacct_examples_arch_dir)/lg +--- Makefile.in.orig 2019-12-14 15:24:32 UTC ++++ Makefile.in +@@ -404,7 +404,7 @@ pmacct_examples_avro_dir = $(pmacct_examples_dir)/avro + @USING_BGP_BINS_TRUE@pmacct_examples_lg_dir = $(pmacct_examples_dir)/lg + @USING_BGP_BINS_TRUE@pmacct_examples_lg_arch_dir = $(pmacct_examples_arch_dir)/lg pmacct_examples_custom_dir = $(pmacct_examples_arch_dir)/custom -@USING_SQL_TRUE@pmacct_sql_dir = $(pmacct_data_dir)/sql +@USING_SQL_TRUE@pmacct_sql_dir = $(pmacct_data_dir) Index: net-mgmt/pmacct/files/patch-src_mysql__plugin.h =================================================================== --- /dev/null +++ net-mgmt/pmacct/files/patch-src_mysql__plugin.h @@ -0,0 +1,13 @@ +--- src/mysql_plugin.h.orig 2020-02-23 10:26:58 UTC ++++ src/mysql_plugin.h +@@ -22,10 +22,8 @@ + /* includes */ + #if defined HAVE_MYSQL_H + #include +-#include + #else + #include +-#include + #endif + + #include "sql_common.h" Index: net-mgmt/pmacct/files/patch-src_sql__common.h =================================================================== --- /dev/null +++ net-mgmt/pmacct/files/patch-src_sql__common.h @@ -0,0 +1,11 @@ +--- src/sql_common.h.orig 2020-02-22 20:28:47 UTC ++++ src/sql_common.h +@@ -64,7 +64,7 @@ + #define SQL_TABLE_VERSION_BGP 1000 + + /* macros */ +-#define SPACELEFT(x) (sizeof(x)-strlen(x)) ++#define SPACELEFT(x) (sizeof(x)-strlen(x)-1) + #define SPACELEFT_LEN(x,y) (sizeof(x)-y) + #define SPACELEFT_PTR(x,y) (y-strlen(x)) +