git: 53512da87bad - 2024Q4 - irc/anope: Fix MySQL database support with MariaDB

From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Thu, 17 Oct 2024 03:04:54 UTC
The branch 2024Q4 has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=53512da87badf30dcd7de0f324a6b0147f76b2ed

commit 53512da87badf30dcd7de0f324a6b0147f76b2ed
Author:     Rafael Grether <devnull@apt322.org>
AuthorDate: 2024-10-17 02:55:33 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2024-10-17 03:04:47 +0000

    irc/anope: Fix MySQL database support with MariaDB
    
    PR:     273370
    MFH:    2024Q4
    (cherry picked from commit cc7b3f0d0ba13ff5308cf513edde09f8b22b549f)
---
 irc/anope/Makefile                               |  2 ++
 irc/anope/files/patch-modules_extra_m__mysql.cpp | 10 ----------
 irc/anope/pkg-descr                              | 20 +++++++-------------
 3 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/irc/anope/Makefile b/irc/anope/Makefile
index 23e17bb08300..0e96f36eb73c 100644
--- a/irc/anope/Makefile
+++ b/irc/anope/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	anope
 DISTVERSION=	2.0.16
+PORTREVISION=	1
 CATEGORIES=	irc
 
 MAINTAINER=	devnull@apt322.org
@@ -31,6 +32,7 @@ GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 LDAP_USES=	ldap
 
 MYSQL_USES=	mysql
+MYSQL_CMAKE_ON=	-DEXTRA_LIBS:STRING="${LOCALBASE}/lib/mysql/"
 
 NLS_USES=	gettext
 
diff --git a/irc/anope/files/patch-modules_extra_m__mysql.cpp b/irc/anope/files/patch-modules_extra_m__mysql.cpp
deleted file mode 100644
index 0b44204ae072..000000000000
--- a/irc/anope/files/patch-modules_extra_m__mysql.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-Detection of "libmysqlclient" library is broken, so remove this check
---- modules/extra/m_mysql.cpp.orig	2015-04-23 14:25:58 UTC
-+++ modules/extra/m_mysql.cpp
-@@ -1,6 +1,3 @@
--/* RequiredLibraries: mysqlclient */
--/* RequiredWindowsLibraries: libmysql */
--
- #include "module.h"
- #include "modules/sql.h"
- #define NO_CLIENT_LONG_LONG
diff --git a/irc/anope/pkg-descr b/irc/anope/pkg-descr
index 0d937e200782..4198327d4db1 100644
--- a/irc/anope/pkg-descr
+++ b/irc/anope/pkg-descr
@@ -4,19 +4,13 @@ administrators to manage their network with powerful tools.
 
 Anope currently works with:
   - Bahamut 1.4.27 or later (including 1.8)
-  - Charybdis 1.0 or later
-  - DreamForge 4.6.7
-  - Hybrid 7 or later
-  - InspIRCd 1.0 or later (including 3.x)
-  - Plexus 2.0 or later (including 3.0)
-  - PTlink 6.15 or later
-  - RageIRCd 2.0 beta-6 or later
-  - Ratbox 2.0.6 or later
-  - ShadowIRCd 4.0 beta 7 or later
-  - Solid IRCd 3.4.6 or later
-  - UltimateIRCd 2.8.2 or later (including 3.0)
-  - UnrealIRCd 3.1.1 or later (including 6.x)
-  - ViagraIRCd 1.3 or later
+  - Charybdis 3.4 or later
+  - ircd-hybrid 8.2.23 or later
+  - InspIRCd 1.2 or later
+  - ngIRCd 19.2 or later
+  - Plexus 3 or later
+  - Ratbox 3 or later
+  - UnrealIRCd 3.2 or later
 
 Anope could also work with some of the daemons derived by the ones listed
 above, but there's no support for them if they work or don't work.