From nobody Sun Jun 18 07:27:56 2023 X-Original-To: dev-commits-ports-all@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 4QkPcs2J0Nz4fXCB; Sun, 18 Jun 2023 07:27:57 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QkPcs1QnZz3pt0; Sun, 18 Jun 2023 07:27:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687073277; 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=U6oxvWaknlqZBr6fnJUgmpRonsw8Kpbvog2WC7aak98=; b=IW/LKmvf4Oygt1zZ8Fwx/q31q1mNmbrlFOpnpMv05T9LRmGXHNCXmJnZu7ROLLSu3TdG9T PxK3KwEQKvnVl2OV4WGUrASdJVEs4z17NNopCEnfUw9JQ1hBZsNBVOtM64/09dKYF60/UE 5BfAEbAd7SNsD4aeG0cfYpqi7mhvM/i4aUDnaXHo4JQjc6zDaKt3N40vlswHx53f3PtiBC cASyoRejbUwQDnA0KWbNyFsCi8AvXrvRv+TDypdBX+KIL7cpbdeMwcF1jkYHl1ttnq/DQf TWOaop4ZeHemn7zJfSEzgH7yx/oHbkVDJoH2LJ2IrOa96DrDVqGGZH2FAchrWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687073277; 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=U6oxvWaknlqZBr6fnJUgmpRonsw8Kpbvog2WC7aak98=; b=nKd+eIg+aVjC6SaG+v3cMUiXRdyrOKAeifLjKj8areLCVOhq0oOseA3w0OVERFn7Wi70RG 4q6kaD0dO0mE1xXFHdMC0SwXbqImI0r4cqdMFFAHQpJiL+qKCFBMnMvLeQlF5J3n58SjNg uO9P2CdHqqgSeIFeZLsjnezmmb7s87KsyBMhWOxZ2UGb0rwKh2LJYg5u1ZAgOUP3konFuj kejqFrBX3kDtxls4X74zSit8JwXrgGu1hfJIgWq6qgc4luIOKcDd9YvX4vku2PwVwTEGDW s5/WMrTakBr+1OLiTT/RG9ZIm3JR/K7SP3IbaWQ/uQ+y6FHk1rUJX4fgaK0npw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687073277; a=rsa-sha256; cv=none; b=GaHxeGv0NIWz5WKL4C6MzXhUHPGJQ+TjpepEWmWCJ+7kb1CpCtljvic+v/6Roxm5abi86J fgg5xhiRN6o/1ITWffbWTnHu1H8iXBs6/+IQxee7Bg+/Ke2gw2rIt/7xxgMJKaAFqtsLt8 3ilCfZQ0v3wKWGEojlvMYIEvfRu0fpR/vzmYfpq8alzGUyXDosllQqo1GnMjQjyCHfe03g /rY5Xn7LH1a/MNwsB87dz0mxq9fVkaNi0qUve+Np1Zmao2s2axoQT0EZUkPTYoEEIzd5UH d1CKunBC0LUelQCpmNBhXVAjjEyAeyFZILgHmIfaGwjLeV56/uStCzoF5n3llw== 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 4QkPcs0VTTzRTL; Sun, 18 Jun 2023 07:27:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35I7RuKW001455; Sun, 18 Jun 2023 07:27:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35I7RuKw001454; Sun, 18 Jun 2023 07:27:56 GMT (envelope-from git) Date: Sun, 18 Jun 2023 07:27:56 GMT Message-Id: <202306180727.35I7RuKw001454@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Eugene Grosbein Subject: git: a5c2ca9eefbc - main - net-im/jabberd: fix build with MySQL 8.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5c2ca9eefbc427074af49dd4b2630b0b58f6d80 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=a5c2ca9eefbc427074af49dd4b2630b0b58f6d80 commit a5c2ca9eefbc427074af49dd4b2630b0b58f6d80 Author: Eugene Grosbein AuthorDate: 2023-06-18 07:22:19 +0000 Commit: Eugene Grosbein CommitDate: 2023-06-18 07:22:19 +0000 net-im/jabberd: fix build with MySQL 8.0 PORTREVISION not bumped. --- net-im/jabberd/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile index 13f766d673de..419aec13cda0 100644 --- a/net-im/jabberd/Makefile +++ b/net-im/jabberd/Makefile @@ -75,7 +75,6 @@ SQLITE_LIB_DEPENDS= libsqlite3.so:databases/sqlite3 MYSQL_USES= mysql MYSQL_CONFIGURE_ENABLE= mysql -MYSQL_VARS= IGNORE_WITH_MYSQL=80 BDB_USES= bdb BDB_CONFIGURE_ENABLE= db @@ -129,11 +128,17 @@ SUB_LIST+= REQUIRE="LOGIN" .endif REQUIRES_DESC= Add backend requires to startup script +.include + post-patch: .for FILE in c2s.xml jabberd.cfg router-filter.xml router-users.xml \ router.xml s2s.xml sm.xml templates/roster.xml @${MV} ${WRKSRC}/etc/${FILE}.dist.in ${WRKSRC}/etc/${FILE}.sample.in .endfor +.if ${PORT_OPTIONS:MMYSQL} && ${MYSQL_VER:U} == 80 + cd ${WRKSRC}/storage && \ + ${REINPLACE_CMD} 's/my_bool/_Bool/g' authreg_mysql.c storage_mysql.c +.endif post-install: .for DIR in db logs pid