Page MenuHomeFreeBSD

D23261.id67069.diff
No OneTemporary

D23261.id67069.diff

Index: net-mgmt/pmacct/Makefile
===================================================================
--- net-mgmt/pmacct/Makefile
+++ net-mgmt/pmacct/Makefile
@@ -11,16 +11,14 @@
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=MMAP LAYER2 SHARED
AVRO_DESC= Enable avro support
GEOIP2_DESC= Enable GeoIPv2 (libmaxminddb) support
@@ -37,65 +35,48 @@
.include <bsd.port.options.mk>
+SQLDOC= "@comment "
+
.if ${PORT_OPTIONS:MMYSQL}
USES+= mysql
CONFIGURE_ARGS+=--enable-mysql
-PLIST_SUB+= WITH_MYSQL=""
-PLIST_SUB+= SQLDOC=""
+SQLDOC= ""
.else
CONFIGURE_ARGS+=--disable-mysql
-PLIST_SUB+= WITH_MYSQL="@comment "
-PLIST_SUB+= SQLDOC="@comment "
.endif
.if ${PORT_OPTIONS:MPGSQL}
USES+= pgsql
WANT_PGSQL= client
CONFIGURE_ARGS+=--enable-pgsql
-PLIST_SUB+= WITH_PGSQL=""
-PLIST_SUB+= SQLDOC=""
+SQLDOC= ""
.else
CONFIGURE_ARGS+=--disable-pgsql
-PLIST_SUB+= WITH_PGSQL="@comment "
-PLIST_SUB+= SQLDOC="@comment "
.endif
.if ${PORT_OPTIONS:MSQLITE3}
USES+= pkgconfig sqlite
CONFIGURE_ARGS+=--enable-sqlite3 \
--with-sqlite3-includes=${LOCALBASE}/include
-PLIST_SUB+= WITH_SQLITE3=""
-PLIST_SUB+= SQLDOC=""
+SQLDOC= ""
.else
CONFIGURE_ARGS+=--disable-sqlite3
-PLIST_SUB+= WITH_SQLITE3="@comment "
-PLIST_SUB+= SQLDOC="@comment "
.endif
+PLIST_SUB+= SQLDOC=${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
-
.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

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 1, 2:07 AM (5 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28246314
Default Alt Text
D23261.id67069.diff (2 KB)

Event Timeline