Here is a diff to clean up mysqlclient_r in
- net/freeradius
- net/rtg
- sysutils/bacula
- sysutils/collectd
Because I was there, I cleaned all the other WANTLIB issues.
OK?
Index: net/freeradius/Makefile
===================================================================
RCS file: /cvs/ports/net/freeradius/Makefile,v
retrieving revision 1.78
diff -u -p -r1.78 Makefile
--- net/freeradius/Makefile 12 Jul 2019 20:48:26 -0000 1.78
+++ net/freeradius/Makefile 15 Nov 2019 14:16:56 -0000
@@ -21,7 +21,8 @@ PKGNAME-iodbc= freeradius-iodbc-$V
PKGNAME-mysql= freeradius-mysql-$V
PKGNAME-pgsql= freeradius-pgsql-$V
PKGNAME-ldap= freeradius-ldap-$V
-REVISION-main= 1
+REVISION-main= 2
+REVISION-mysql= 0
CATEGORIES= net security
@@ -69,7 +70,7 @@ BUILD_DEPENDS= net/net-snmp
LIB_DEPENDS-main= databases/gdbm \
devel/libtool,-ltdl
WANTLIB-main= c iconv intl pcap pthread readline \
- curses gdbm>=3 ltdl>=4 crypto ssl
+ gdbm>=3 ltdl>=4 crypto ssl
PSEUDO_FLAVORS= no_ldap no_mysql no_pgsql no_iodbc
FLAVOR?=
@@ -101,7 +102,7 @@ CONFIGURE_ARGS+= --without-rlm_sql_mysql
.endif
LIB_DEPENDS-mysql= databases/mariadb
-WANTLIB-mysql= crypto ssl m pthread z mysqlclient_r
+WANTLIB-mysql= mariadb
RUN_DEPENDS-mysql= #empty
.if ${BUILD_PACKAGES:M-pgsql}
Index: net/rtg/Makefile
===================================================================
RCS file: /cvs/ports/net/rtg/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- net/rtg/Makefile 3 Jun 2019 16:06:55 -0000 1.18
+++ net/rtg/Makefile 15 Nov 2019 14:16:58 -0000
@@ -3,7 +3,7 @@
COMMENT = SNMP statistics monitoring system
DISTNAME = rtg-0.7.4
-REVISION = 13
+REVISION = 14
CATEGORIES = net
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=rtg/}
@@ -14,7 +14,7 @@ MAINTAINER = Stuart Henderson <sthen@op
# GPLv2+
PERMIT_PACKAGE = Yes
-WANTLIB += c crypto fontconfig freetype gd iconv jpeg m mysqlclient_r
+WANTLIB += c crypto fontconfig freetype gd iconv jpeg m mariadb
WANTLIB += netsnmp png pthread tiff webp z
LIB_DEPENDS = converters/libiconv \
Index: sysutils/bacula/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/bacula/Makefile,v
retrieving revision 1.142
diff -u -p -r1.142 Makefile
--- sysutils/bacula/Makefile 9 Sep 2019 11:10:10 -0000 1.142
+++ sysutils/bacula/Makefile 15 Nov 2019 14:17:02 -0000
@@ -20,6 +20,7 @@ PKGNAME-pgsql= bacula-pgsql-$V
PKGNAME-sqlite3= bacula-sqlite3-$V
REVISION-server= 1
+REVISION-mysql= 0
CATEGORIES= sysutils
@@ -121,7 +122,7 @@ WANTLIB-pgsql += pq crypto m ssl ${COMPI
LIB_DEPENDS-pgsql += ${MODGCC4_CPPLIBDEP} \
databases/postgresql
-WANTLIB-mysql += mysqlclient_r crypto m pthread ssl ${COMPILER_LIBCXX}
+WANTLIB-mysql += ${COMPILER_LIBCXX} crypto iconv m mariadb ssl z
LIB_DEPENDS-mysql += ${MODGCC4_CPPLIBDEP} \
databases/mariadb
Index: sysutils/collectd/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/collectd/Makefile,v
retrieving revision 1.61
diff -u -p -r1.61 Makefile
--- sysutils/collectd/Makefile 12 Jul 2019 20:49:40 -0000 1.61
+++ sysutils/collectd/Makefile 15 Nov 2019 14:17:02 -0000
@@ -35,17 +35,17 @@ CATEGORIES = sysutils
REVISION-main = 0
REVISION-memcachec = 0
REVISION-mqtt = 0
-REVISION-mysql = 0
+REVISION-mysql = 1
REVISION-nut = 0
REVISION-pgsql = 0
REVISION-ping = 0
-REVISION-prometheus = 0
-REVISION-python = 0
+REVISION-prometheus = 1
+REVISION-python = 1
REVISION-redis = 0
-REVISION-riemann = 0
-REVISION-rrdtool = 0
+REVISION-riemann = 1
+REVISION-rrdtool = 1
REVISION-snmp = 0
-REVISION-virt = 0
+REVISION-virt = 1
HOMEPAGE = http://www.collectd.org/
SHARED_LIBS += collectdclient 1.0
@@ -61,7 +61,7 @@ MODPY_RUNDEP = No
MULTI_PACKAGES = -main -mysql -pgsql -rrdtool -snmp -virt -python
-memcachec -mqtt -nut -riemann -redis -prometheus -ping
-WANTLIB-mysql = crypto m ssl mysqlclient_r pthread
+WANTLIB-mysql = mariadb pthread
LIB_DEPENDS-mysql = databases/mariadb
RUN_DEPENDS-mysql = collectd-$V:${BASE_PKGPATH},-main
@@ -69,10 +69,10 @@ WANTLIB-pgsql = pq pthread
LIB_DEPENDS-pgsql = databases/postgresql
RUN_DEPENDS-pgsql = collectd-$V:${BASE_PKGPATH},-main
-WANTLIB-rrdtool = X11 Xext Xrender c cairo expat ffi fontconfig \
+WANTLIB-rrdtool = X11 Xext Xrender cairo expat fontconfig \
freetype fribidi glib-2.0 gobject-2.0 \
graphite2 gthread-2.0 harfbuzz iconv intl lzma m \
- pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre \
+ pango-1.0 pangocairo-1.0 pangoft2-1.0 \
pixman-1 png pthread rrd xcb \
xcb-render xcb-shm xml2 z
LIB_DEPENDS-rrdtool = net/rrdtool
@@ -83,13 +83,13 @@ WANTLIB-snmp = crypto netsnmp pthread c
RUN_DEPENDS-snmp = collectd-$V:${BASE_PKGPATH},-main
LIB_DEPENDS-virt = sysutils/libvirt
-WANTLIB-virt = avahi-client avahi-common c dbus-1 ffi gmp gnutls
hogweed \
+WANTLIB-virt = avahi-client avahi-common dbus-1 ffi gmp gnutls hogweed
\
nettle p11-kit ssh2 tasn1 util virt crypto curl iconv \
idn2 intl lzma m nghttp2 pthread ssl unistring xml2 z
RUN_DEPENDS-virt = collectd-$V:${BASE_PKGPATH},-main
LIB_DEPENDS-python = ${MODPY_LIB_DEPENDS}
-WANTLIB-python = ${MODPY_WANTLIB} pthread m util
+WANTLIB-python = ${MODPY_WANTLIB} pthread m util iconv intl
RUN_DEPENDS-python = collectd-$V:${BASE_PKGPATH},-main \
${MODPY_RUN_DEPENDS}
@@ -102,9 +102,9 @@ RUN_DEPENDS-nut = collectd-$V:${BASE_PKG
WANTLIB-nut = crypto pthread ssl upsclient
LIB_DEPENDS-riemann = sysutils/riemann-c-client
-WANTLIB-riemann = c gmp gnutls ffi hogweed intl iconv idn2 nettle \
+WANTLIB-riemann = gmp gnutls ffi hogweed intl iconv idn2 nettle \
protobuf-c p11-kit pthread riemann-client tasn1 \
- unistring z
+ unistring
RUN_DEPENDS-riemann = collectd-$V:${BASE_PKGPATH},-main
LIB_DEPENDS-mqtt = net/mosquitto
@@ -114,8 +114,8 @@ WANTLIB-mqtt = mosquitto pthread
LIB_DEPENDS-prometheus = www/libmicrohttpd \
devel/protobuf-c
RUN_DEPENDS-prometheus = collectd-$V:${BASE_PKGPATH},-main
-WANTLIB-prometheus = c ffi gmp gnutls hogweed iconv idn2 intl microhttpd \
- nettle p11-kit protobuf-c pthread tasn1 unistring z
+WANTLIB-prometheus = ffi gmp gnutls hogweed iconv idn2 intl microhttpd \
+ nettle p11-kit protobuf-c pthread tasn1 unistring
LIB_DEPENDS-redis = databases/libhiredis
RUN_DEPENDS-redis = collectd-$V:${BASE_PKGPATH},-main
