From nobody Thu Oct 17 02:58:14 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XTXZt4jX1z5ZNBS; Thu, 17 Oct 2024 02:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XTXZt49Q0z4jFs; Thu, 17 Oct 2024 02:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729133894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MhHUYSzpsqKbRea9tqt1Gmqx+rIEr4TKyPAlhGvi6ys=; b=ZPU9XkSgu1JnXHDqMuNG0HZhfQmKT5zWys3KitkBiL+B+Tt4xBBBQwc1Q7b2InPbnu/5iE oRkVaqlD1J6pYrRQQhKKyG9BEfJXD5RKQgfK2STf25qoiARDd1zafZe1CuQnczcYVZm1zw IdAVyEQXHSOAADfU0NDqqkLJKOrSneLhb7ByMogX//cEUNLZIBOeolh8xrx6NMykTspxKz +U+5l02PeTvQwJdpdHNzO/Dr+99Z2gne7eT7cmnJdTWF+rgHEY5+uM7oNxMpNMWDtr0ua/ Pan38/tHOLkuC/DLSAkcMsCy5g5uo8bqE8hCJqxioRyRSrYlHobtJBB79UmrtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729133894; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MhHUYSzpsqKbRea9tqt1Gmqx+rIEr4TKyPAlhGvi6ys=; b=ad/zFNJ6RmYHO3isYJCBDdBh3n0terKujE6FsLK2jjCEE6rrAxCetMU6QYnrWy61bsNU9+ KzYcbG6NK4p+2fc6/SLF7A0GEbSOv/ucFuOg+DoF0QWxbdJd9VcbMiZX7IeTfpatQK77Fo ZJbG388sv4iig7p0vAyl2qFl0g1EHzVf4qdnsivQnL3urUquoLkQQXuUOhc1cvdT0P587U RTU+8Fr3jhAe7TVhEEScTZooSIuz9Vcgi7r7EI+tQLv2QcZrfheDHjNz6ZOrrM6ewz8vuD EiK0KbD0Uemmvlf4Mk4GHmmyX3O4lgaaC1C6ZtRDMELQuVPqEDRllHggHtJfsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729133894; a=rsa-sha256; cv=none; b=PlaEhr04ukvNZgByJMakzId6Ennslbq2LZkGPF68OrViWXk7xf8LB8tsUT5O5/bIZM57yS H84lYv3j0mhvM0kpSl1BOYTrksBRcbBQpHKI2ChRjCIfy7T2kUhd+vX9Ew+vjRFX5x052K usUfkEVgqoM3v7dJIG0nZP0yHNr3Y/yxBF4Dx0KwngrlStKPjm7N/f8W3e4vFl0+5irloK AsOvJz+0/Lyy0f7fwN1GLYKSSONlsv6bPFUqhwfDpWYdYmHbLKYkTXdjKB66fq6h+tF/b6 jfroiYJ7jl3iq9ayfYQdFC+TPtdj/5uNdp91AibaTkADLJ7tVq1icLgiJCMMEw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XTXZt3DVSzXhD; Thu, 17 Oct 2024 02:58:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49H2wE4Q041813; Thu, 17 Oct 2024 02:58:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49H2wEj2041810; Thu, 17 Oct 2024 02:58:14 GMT (envelope-from git) Date: Thu, 17 Oct 2024 02:58:14 GMT Message-Id: <202410170258.49H2wEj2041810@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: cc7b3f0d0ba1 - main - irc/anope: Fix MySQL database support with MariaDB List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc7b3f0d0ba13ff5308cf513edde09f8b22b549f Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=cc7b3f0d0ba13ff5308cf513edde09f8b22b549f commit cc7b3f0d0ba13ff5308cf513edde09f8b22b549f Author: Rafael Grether AuthorDate: 2024-10-17 02:55:33 +0000 Commit: Vladimir Druzenko CommitDate: 2024-10-17 02:58:09 +0000 irc/anope: Fix MySQL database support with MariaDB PR: 273370 MFH: 2024Q4 --- 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.