*/*: Refactor with IGNORE_WITH_MYSQL

- There are multiple ports which has MYSQL options and are non-DEFAULT. Most of the time committers actually forget to check with the OPTION enabled and in some cases they are BROKEN with newr versions of mysql. So test with different versions of mysql and mark IGNOPRE_WITH_MYSQL appropriately. Due to the EOL of 5.7 this has not been checked. - Unbreak sysutils/cfengine* with MySQL 8.0 and later - The primary purpose of running this check is having statistics of the MySQL usability over MariaDB to explore the future possibility of shifting to MariaDB as the default as major ports upstream have moved their codebase to support MariaDB over MySQL. - The following actions will also be taken after the sunset of MySQL 5.7 If a port is broken on all instances of MySQL/MariaDB: - If a port has the option of multiple DB backends and MySQL is the default then the DEFAULT will be changed to PGSQL/SQLITE before 2024Q1. And the OPTION will be removed before 2024Q2. If a MAINTAINER is aware about such cases and want to prefer PGSQL over SQLITE or vice versa please do so at your own accord. Otherwise PGSQL will be preferred over SQLITE. - If a port has the option of multiple DB backends and MySQL is not the default then the the OPTION will be removed before 2024Q1. Approved by: portmgr (blanket)
freebsd · Dec 29, 2023 · ee6c86a · ee6c86a
1 parent 3d426c9
commit ee6c86a
Show file tree

Hide file tree

Showing 34 changed files with 38 additions and 17 deletions.
diff --git a/biology/emboss/Makefile b/biology/emboss/Makefile
@@ -39,7 +39,7 @@ OPTIONS_DEFAULT=	X11
 
 DOCS_CONFIGURE_ON=	--with-docroot=${DOCSDIR}
 MYSQL_USES=	mysql
-MYSQL_VARS=	IGNORE_WITH_MYSQL=80
+MYSQL_VARS=	IGNORE_WITH_MYSQL="80 81"
 X11_USES=	motif xorg
 X11_USE=	XORG=x11
 X11_LIB_DEPENDS=	libgd.so:graphics/gd \

diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
@@ -59,6 +59,7 @@ MYSQL_USES=		mysql ssl
 MYSQL_PLIST_SUB=	MSM=''
 MYSQL_PLIST_SUB_OFF=	MSM='@comment '
 MYSQL_CONFIGURE_OFF=	--disable-mysql
+MYSQL_VARS=		IGNORE_WITH_MYSQL="80 81"
 PGSQL_USES=		pgsql
 PGSQL_PLIST_SUB=	PGM=''
 PGSQL_PLIST_SUB_OFF=	PGM='@comment '

diff --git a/databases/luadbi/Makefile b/databases/luadbi/Makefile
@@ -41,7 +41,7 @@ MYSQL_ALL_TARGET=	mysql
 MYSQL_PLIST_FILES=	%%LUA_MODLIBDIR%%/dbd/mysql.so
 MYSQL_MAKE_ENV+=	MYSQL_LDFLAGS="-L${LOCALBASE}/lib/mysql -lmysqlclient"
 MYSQL_MAKE_ENV+=	MYSQL_INC="-I${LOCALBASE}/include/mysql"
-MYSQL_VARS=	IGNORE_WITH_MYSQL=80
+MYSQL_VARS=	IGNORE_WITH_MYSQL="80 81"
 
 SQLITE3_USES=		localbase:ldflags sqlite:3
 SQLITE3_ALL_TARGET=	sqlite3

diff --git a/databases/mroonga/Makefile b/databases/mroonga/Makefile
@@ -14,7 +14,7 @@ BUILD_DEPENDS=	${NONEXISTENT}:${_MYSQL_SERVER}:configure
 LIB_DEPENDS=	libgroonga.so:textproc/groonga
 
 USES=		compiler:c11 libtool mysql pkgconfig shebangfix
-IGNORE_WITH_MYSQL=	105m 57w
+IGNORE_WITH_MYSQL=	105m 106m 1011m 57w 81
 
 SHEBANG_FILES=	data/rpm/post.sh data/rpm/preun.sh
 

diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
 		libzstd.so:archivers/zstd
 
 USES=		cmake:noninja compiler:c++17-lang cpe gmake mysql ssl
-IGNORE_WITH_MYSQL=	105m
+IGNORE_WITH_MYSQL=	105m 106m 1011m
 CPE_VENDOR=	oracle
 USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes

diff --git a/databases/mysql-udf/Makefile b/databases/mysql-udf/Makefile
@@ -14,7 +14,7 @@ DEPRECATED=	Upstream last update was in 2007
 EXPIRATION_DATE=	2023-12-31
 
 USES=		mysql
-IGNORE_WITH_MYSQL=	80
+IGNORE_WITH_MYSQL=	105m 106m 1011m 80 81
 
 CFLAGS+=	-fPIC
 

diff --git a/databases/mysqltcl/Makefile b/databases/mysqltcl/Makefile
@@ -8,7 +8,7 @@ COMMENT=	TCL module for accessing MySQL databases based on msqltcl
 WWW=		http://www.xdobry.de/mysqltcl/
 
 USES=		mysql tcl
-IGNORE_WITH_MYSQL=	80
+IGNORE_WITH_MYSQL=	80 81
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	lib/${PORTNAME}-${PORTVERSION}/libmysqltcl${PORTVERSION}.so \

diff --git a/databases/ocaml-mysql/Makefile b/databases/ocaml-mysql/Makefile
@@ -13,7 +13,7 @@ WWW=		http://ygrek.org.ua/p/ocaml-mysql/
 LICENSE=	LGPL21
 
 USES=		gmake mysql
-IGNORE_WITH_MYSQL=	80
+IGNORE_WITH_MYSQL=	80 81
 USE_OCAML=		yes
 USE_OCAML_FINDLIB=	yes
 USE_OCAML_CAMLP4=	yes

diff --git a/databases/qt6-base_sqldriver/Makefile b/databases/qt6-base_sqldriver/Makefile
@@ -30,4 +30,8 @@ sqlite_USES=		sqlite:3
 sqlite_CMAKE_ON=	QT_FEATURE_system_sqlite
 ${FLAVOR}_PLIST=	${.CURDIR}/pkg-plist.${FLAVOR}
 
+.if ${FLAVOR:U} == mysql
+IGNORE_WITH_MYSQL=	105m 106m 1011m
+.endif
+
 .include <bsd.port.mk>
diff --git a/databases/rubygem-mysql/Makefile b/databases/rubygem-mysql/Makefile
@@ -12,6 +12,6 @@ LICENSE=	GPLv2 RUBY
 LICENSE_COMB=	dual
 
 USES=		gem mysql
-IGNORE_WITH_MYSQL=	80
+IGNORE_WITH_MYSQL=	80 81
 
 .include <bsd.port.mk>
diff --git a/devel/gearmand/Makefile b/devel/gearmand/Makefile
@@ -55,6 +55,7 @@ MEMCACHED_CONFIGURE_ENABLE=	libmemcached
 MYSQL_USES=			mysql
 MYSQL_CONFIGURE_ON=	--with-mysql=yes
 MYSQL_CONFIGURE_OFF=	--with-mysql=no
+MYSQL_VARS=		IGNORE_WITH_MYSQL="80 81"
 PGSQL_USES=			pgsql
 PGSQL_CONFIGURE_ENABLE=	libpq
 SQLITE_USES=	sqlite

diff --git a/dns/opendnssec2/Makefile b/dns/opendnssec2/Makefile
@@ -49,6 +49,7 @@ SQLITE_DESC=	Use SQLite backend
 
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ON=	--with-enforcer-database=mysql
+MYSQL_VARS=	IGNORE_WITH_MYSQL="80 81"
 SOFTHSM_RUN_DEPENDS=	softhsm2>=2.5.0:security/softhsm2
 SOFTHSM_CONFIGURE_ON=	--with-pkcs11-softhsm=${LOCALBASE}/lib/softhsm/libsofthsm2.so
 SQLITE_BUILD_DEPENDS=	sqlite3>=3.3.9:databases/sqlite3

diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
@@ -198,6 +198,7 @@ MYSQL_CONFIGURE_ENABLE=		mysql-connector
 MYSQL_CONFIGURE_WITH=		system-mysql
 MYSQL_LIB_DEPENDS=		libmysqlcppconn.so:databases/mysql-connector-c++
 MYSQL_USES=			mysql
+MYSQL_VARS=		IGNORE_WITH_MYSQL="80 81"
 
 SDK_CONFIGURE_ENABLE=		odk
 SDK_DISTFILES=			unowinreg.dll:unoreg

diff --git a/finance/quickfix/Makefile b/finance/quickfix/Makefile
@@ -32,7 +32,7 @@ PGSQL_USES=	pgsql
 PGSQL_CONFIGURE_WITH=	postgresql
 MYSQL_USES=	mysql
 MYSQL_CONFIGURE_WITH=	mysql
-MYSQL_VARS=	IGNORE_WITH_MYSQL=80
+MYSQL_VARS=	IGNORE_WITH_MYSQL="80 81"
 PYTHON_USES=	python:3.8
 PYTHON_CONFIGURE_WITH=	python3
 RUBY_USES=	ruby

diff --git a/ftp/smbftpd/Makefile b/ftp/smbftpd/Makefile
@@ -21,6 +21,7 @@ USE_RC_SUBR=	${PORTNAME}
 
 MYSQL_USES=	mysql
 MYSQL_CONFIGURE_WITH=	mysql
+MYSQL_VARS=	IGNORE_WITH_MYSQL="105m 106m 1011m 80 81"
 PGSQL_USES=	pgsql
 PGSQL_CONFIGURE_WITH=	pgsql
 ICONV_USES=	iconv

diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
@@ -47,6 +47,7 @@ PERL_USES=		perl5
 
 MYSQL_CONFIGURE_ENABLE=	mysql
 MYSQL_USES=		mysql
+MYSQL_VARS=		IGNORE_WITH_MYSQL="80 81"
 
 PAM_CONFIGURE_WITH=	pam
 

diff --git a/games/ldmud/Makefile b/games/ldmud/Makefile
@@ -45,7 +45,7 @@ IPV6_CONFIGURE_ENABLE=	use-ipv6
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ENABLE=	use-mysql
 MYSQL_LDFLAGS=	-L${LOCALBASE}/lib/mysql
-MYSQL_VARS=		IGNORE_WITH_MYSQL=80
+MYSQL_VARS=		IGNORE_WITH_MYSQL="105m 106m 1011m 80 81"
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ENABLE=	use-pgsql
 SQLITE_USES=		sqlite

diff --git a/games/pvpgn/Makefile b/games/pvpgn/Makefile
@@ -44,6 +44,7 @@ D2_CONFIGURE_ENABLE=	d2cs d2dbs
 
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_WITH=	mysql
+MYSQL_VARS=		IGNORE_WITH_MYSQL="80 81"
 
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	pgsql

diff --git a/lang/urweb/Makefile b/lang/urweb/Makefile
@@ -37,6 +37,7 @@ ELISP_CONFIGURE_ON=		with_emacs=yes
 ELISP_CONFIGURE_OFF=		with_emacs=no
 MYSQL_USES=			mysql
 MYSQL_CONFIGURE_ENV_OFF=	MSHEADER="no"
+MYSQL_VARS=		IGNORE_WITH_MYSQL="105m 106m 1011m 80 81"
 PGSQL_USES=			pgsql
 PGSQL_CONFIGURE_ENV_OFF=	PGHEADER="no"
 PGSQL_VARS=			WANT_PGSQL=server

diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
@@ -271,6 +271,7 @@ CONFIGURE_ARGS+=	--with-mysql-includes=${LOCALBASE}/include/mysql \
 			--with-mysql-libraries=${LOCALBASE}/lib/mysql
 PLIST_SUB+=	MYSQL=""
 _DBDRV_COUNT:=	${_DBDRV_COUNT}o
+IGNORE_WITH_MYSQL=	105m 106m 1011m
 .	if ${PORT_OPTIONS:MMYSQL_COMPRESS}
 CONFIGURE_ARGS+=	--enable-client-compression
 .	endif

diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile
@@ -45,6 +45,7 @@ MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ON=	--enable-auth-mysql \
 			--with-mysql-lib-dir=${LOCALBASE}/lib/mysql \
 			--with-mysql-include-dir=${LOCALBASE}/include/mysql
+MYSQL_VARS=		IGNORE_WITH_MYSQL="80 81"
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ON=	--enable-auth-pgsql \
 			--with-pgsql-lib-dir=${LOCALBASE}/lib \

diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile
@@ -148,6 +148,7 @@ ROAMING_CONFIGURE_ON=		--enable-roaming-users \
 MYSQL_CONFIGURE_ON=		--enable-auth-module=mysql \
 				--enable-incdir=${LOCALBASE}/include/mysql \
 				--enable-libdir=${LOCALBASE}/lib/mysql
+MYSQL_VARS=		IGNORE_WITH_MYSQL="105m 106m 1011m 80 81"
 MYSQL_REPLICATION_CONFIGURE_ON=	--enable-mysql-replication
 MYSQL_LIMITS_CONFIGURE_ON=	--enable-mysql-limits
 

diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
@@ -75,6 +75,7 @@ SQLITE_LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
 
 MYSQL_USES=		mysql
 MYSQL_CONFIGURE_ENABLE=	mysql
+MYSQL_VARS=	IGNORE_WITH_MYSQL="81"
 
 BDB_USES=		bdb
 BDB_CONFIGURE_ENABLE=	db

diff --git a/net-mgmt/super_mediator/Makefile b/net-mgmt/super_mediator/Makefile
@@ -31,7 +31,7 @@ SPREAD_DESC=	Enable Spread libary as a pub/sub distribution capability
 MYSQL_LIB_DEPENDS=	libmysqlclient.so:${_MYSQL_CLIENT}
 MYSQL_USES=	mysql
 MYSQL_CONFIGURE_WITH=	mysql
-MYSQL_VARS=	IGNORE_WITH_MYSQL=80
+MYSQL_VARS=	IGNORE_WITH_MYSQL="80 81"
 SKIPSET_LIB_DEPENDS=	libsilk.so:security/silktools
 SKIPSET_CONFIGURE_WITH=	skipset
 SPREAD_LIB_DEPENDS=	libspread.so:net/spread4

diff --git a/net-p2p/xbt/Makefile b/net-p2p/xbt/Makefile
@@ -12,6 +12,7 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/asio.hpp:devel/boost-libs
 
 USES=		compiler:c++17-lang mysql pkgconfig
+IGNORE_WITH_MYSQL=	105m 106m 1011m
 USE_GITHUB=	yes
 GH_ACCOUNT=	OlafvdSpek
 GH_TAGNAME=	9c7dbc4

diff --git a/net/linknx/Makefile b/net/linknx/Makefile
@@ -48,6 +48,7 @@ LIBLUA_LDFLAGS=	-L${LUA_LIBDIR}
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}/bin/mysql_config
 MYSQL_CONFIGURE_OFF=	--without-mysql
 MYSQL_USES=	mysql
+MYSQL_VARS=		IGNORE_WITH_MYSQL="80 81"
 
 PORTDOCS=	*
 

diff --git a/security/barnyard2/Makefile b/security/barnyard2/Makefile
@@ -52,7 +52,9 @@ MYSQL_USES=		mysql
 MYSQL_CONFIGURE_WITH=	mysql
 MYSQL_CONFIGURE_ON=	--with-mysql-includes=${LOCALBASE}/include/mysql \
 			--with-mysql-libraries=${LOCALBASE}/lib/mysql
+MYSQL_VARS=		IGNORE_WITH_MYSQL="80 81"
 MYSQL_SSL_CONFIGURE_ENABLE=	mysql-ssl-support
+MYSQL_SSL_VARS=		IGNORE_WITH_MYSQL="80"
 ODBC_BROKEN=		fails to build with ODBC=on
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 ODBC_CONFIGURE_WITH=	odbc

diff --git a/sysutils/cfengine-devel/Makefile b/sysutils/cfengine-devel/Makefile
@@ -60,10 +60,10 @@ PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	postgresql=${LOCALBASE}
 
 MYSQL_USES=		mysql
-MYSQL_BROKEN=		configure: error: MySQL client library exports symbols (EVP_CIPHER_CTX_init) clashing with OpenSSL.
 MYSQL_CONFIGURE_WITH=	mysql=${LOCALBASE}
 MYSQL_LIB_DEPENDS=	libmysqlclient.so:${_MYSQL_CLIENT}
 MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
+MYSQL_VARS=		IGNORE_WITH_MYSQL="57"
 
 LIBVIRT_CONFIGURE_WITH=	libvirt=${LOCALBASE}
 LIBVIRT_LIB_DEPENDS+=	libvirt.so:devel/libvirt

diff --git a/sysutils/cfengine320/Makefile b/sysutils/cfengine320/Makefile
@@ -57,11 +57,11 @@ PGSQL_CONFIGURE_WITH=	--with-postgresql=${LOCALBASE}
 PGSQL_CONFIGURE_OFF=	--without-postgresql
 
 MYSQL_USES=		mysql
-MYSQL_BROKEN=		configure: error: MySQL client library exports symbols (EVP_CIPHER_CTX_init) clashing with OpenSSL.
 MYSQL_CONFIGURE_WITH=	--with-mysql=${LOCALBASE}
 MYSQL_CONFIGURE_OFF=	--without-mysql
 MYSQL_LIB_DEPENDS=	libmysqlclient.so:${_MYSQL_CLIENT}
 MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
+MYSQL_VARS=		IGNORE_WITH_MYSQL="57"
 
 LIBVIRT_CONFIGURE_WITH=	--with-libvirt=${LOCALBASE}
 LIBVIRT_LIB_DEPENDS+=	libvirt.so:devel/libvirt

diff --git a/sysutils/cfengine321/Makefile b/sysutils/cfengine321/Makefile
@@ -57,11 +57,11 @@ PGSQL_CONFIGURE_WITH=	--with-postgresql=${LOCALBASE}
 PGSQL_CONFIGURE_OFF=	--without-postgresql
 
 MYSQL_USES=		mysql
-MYSQL_BROKEN=		configure: error: MySQL client library exports symbols (EVP_CIPHER_CTX_init) clashing with OpenSSL.
 MYSQL_CONFIGURE_WITH=	--with-mysql=${LOCALBASE}
 MYSQL_CONFIGURE_OFF=	--without-mysql
 MYSQL_LIB_DEPENDS=	libmysqlclient.so:${_MYSQL_CLIENT}
 MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
+MYSQL_VARS=		IGNORE_WITH_MYSQL="57"
 
 LIBVIRT_CONFIGURE_WITH=	--with-libvirt=${LOCALBASE}
 LIBVIRT_LIB_DEPENDS+=	libvirt.so:devel/libvirt

diff --git a/sysutils/cfengine322/Makefile b/sysutils/cfengine322/Makefile
@@ -57,11 +57,11 @@ PGSQL_CONFIGURE_WITH=	--with-postgresql=${LOCALBASE}
 PGSQL_CONFIGURE_OFF=	--without-postgresql
 
 MYSQL_USES=		mysql
-MYSQL_BROKEN=		configure: error: MySQL client library exports symbols (EVP_CIPHER_CTX_init) clashing with OpenSSL.
 MYSQL_CONFIGURE_WITH=	--with-mysql=${LOCALBASE}
 MYSQL_CONFIGURE_OFF=	--without-mysql
 MYSQL_LIB_DEPENDS=	libmysqlclient.so:${_MYSQL_CLIENT}
 MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
+MYSQL_VARS=		IGNORE_WITH_MYSQL="57"
 
 LIBVIRT_CONFIGURE_WITH=	--with-libvirt=${LOCALBASE}
 LIBVIRT_LIB_DEPENDS+=	libvirt.so:devel/libvirt

diff --git a/sysutils/cfengine323/Makefile b/sysutils/cfengine323/Makefile
@@ -57,11 +57,11 @@ PGSQL_CONFIGURE_WITH=	--with-postgresql=${LOCALBASE}
 PGSQL_CONFIGURE_OFF=	--without-postgresql
 
 MYSQL_USES=		mysql
-MYSQL_BROKEN=		configure: error: MySQL client library exports symbols (EVP_CIPHER_CTX_init) clashing with OpenSSL.
 MYSQL_CONFIGURE_WITH=	--with-mysql=${LOCALBASE}
 MYSQL_CONFIGURE_OFF=	--without-mysql
 MYSQL_LIB_DEPENDS=	libmysqlclient.so:${_MYSQL_CLIENT}
 MYSQL_LDFLAGS=		-L${LOCALBASE}/lib/mysql
+MYSQL_VARS=		IGNORE_WITH_MYSQL="57"
 
 LIBVIRT_CONFIGURE_WITH=	--with-libvirt=${LOCALBASE}
 LIBVIRT_LIB_DEPENDS+=	libvirt.so:devel/libvirt

diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
@@ -42,6 +42,7 @@ BDB_CONFIGURE_WITH=	bdb
 MYSQL_LIB_DEPENDS=	libunwind.so:devel/libunwind
 MYSQL_USES=		mysql ssl
 MYSQL_CONFIGURE_WITH=	mysql
+MYSQL_VARS=	IGNORE_WITH_MYSQL="105m 106m 1011m"
 
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_WITH=	postgresql

diff --git a/www/kannel/Makefile b/www/kannel/Makefile
@@ -38,7 +38,7 @@ OPTIONS_DEFAULT=	SQLITE3
 
 MYSQL_USES=	mysql
 MYSQL_CONFIGURE_WITH=	mysql
-MYSQL_VARS=	IGNORE_WITH_MYSQL=80
+MYSQL_VARS=	IGNORE_WITH_MYSQL="80 81"
 PGSQL_USES=	pgsql
 PGSQL_CONFIGURE_WITH=	pgsql
 SQLITE3_USES=	sqlite:3