Page MenuHomeFreeBSD
Files F163222433

D23261.id67096.diff
No OneTemporary
Actions

D23261.id67096.diff
View Options

Index: net-mgmt/pmacct/Makefile
===================================================================
--- net-mgmt/pmacct/Makefile
+++ net-mgmt/pmacct/Makefile
@@ -11,100 +11,46 @@
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"
-OPTIONS_DEFINE= MYSQL PGSQL SQLITE3 THREADS LAYER2 IPV6 DEBUG GEOIP2 \
+OPTIONS_DEFINE= MYSQL PGSQL SQLITE3 LAYER2 DEBUG GEOIP2 \
DOCS PLABEL RABBITMQ KAFKA JANSSON AVRO EXAMPLES
-OPTIONS_DEFAULT=MMAP LAYER2 THREADS SHARED
+OPTIONS_DEFAULT=LAYER2
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 <bsd.port.options.mk>
+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
-
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=--enable-ipv6
-.else
-CONFIGURE_ARGS+=--disable-ipv6
-.endif
+LAYER2_CONFIGURE_ENABLE= l2
+PLABEL_CONFIGURE_ENABLE= plabel
+DEBUG_CONFIGURE_ENABLE= debug
-.if ${PORT_OPTIONS:MPLABEL}
-CONFIGURE_ARGS+=--enable-plabel
-.else
-CONFIGURE_ARGS+=--disable-plabel
-.endif
-
-.if ${PORT_OPTIONS:MTHREADS}
-CONFIGURE_ARGS+=--enable-threads
-.else
-CONFIGURE_ARGS+=--disable-threads
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=--enable-debug
-.endif
+.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MMONGO}
-#CONFIGURE_ARGS+=--enable-mongodb
-.else
-CONFIGURE_ARGS+=--disable-mongodb
-.endif
+PLIST_SUB+= SQLDOC=${SQLDOC}
.if ${PORT_OPTIONS:MRABBITMQ}
.if ${PORT_OPTIONS:MJANSSON}
@@ -112,7 +58,7 @@
LIB_DEPENDS+= libjansson.so:devel/jansson
CONFIGURE_ARGS+=--enable-jansson
.else
-IGNORE= RabbitMQ support requires enabled Jansson support
+IGNORE= support for RabbitMQ requires enabled Jansson support.
.endif
LIB_DEPENDS+= librabbitmq.so:net/rabbitmq-c-devel
CONFIGURE_ARGS+=--enable-rabbitmq
@@ -124,7 +70,7 @@
LIB_DEPENDS+= libjansson.so:devel/jansson
CONFIGURE_ARGS+=--enable-jansson
.else
-IGNORE= Kafaka support requires enabled Jansson support
+IGNORE= support for Kafka requires enabled Jansson support.
.endif
LIB_DEPENDS+= librdkafka.so:net/librdkafka
CONFIGURE_ARGS+=--enable-kafka
@@ -138,14 +84,6 @@
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

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 22, 5:00 AM (2 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35348151
Default Alt Text
D23261.id67096.diff (4 KB)

Event Timeline