Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id C41891A921F for ; Wed, 6 Apr 2022 18:16:15 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 0688084F91; Wed, 6 Apr 2022 18:16:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3F3A384E80 for ; Wed, 6 Apr 2022 18:16:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id DzJ6VkdjE2Jd for ; Wed, 6 Apr 2022 18:16:13 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id A644084D24 for ; Wed, 6 Apr 2022 18:16:13 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A0030FB24; Wed, 6 Apr 2022 18:16:13 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_164926897316590" MIME-Version: 1.0 Date: Wed, 6 Apr 2022 18:16:13 +0000 From: "Brook Milligan" Subject: CVS commit: pkgsrc/databases/mariadb105-client To: pkgsrc-changes@NetBSD.org Reply-To: brook@netbsd.org X-Mailer: log_accum Message-Id: <20220406181613.A0030FB24@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_164926897316590 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: brook Date: Wed Apr 6 18:16:13 UTC 2022 Modified Files: pkgsrc/databases/mariadb105-client: distinfo Added Files: pkgsrc/databases/mariadb105-client/patches: patch-client_mysql.cc Log Message: mariadb105-client: no need to special case __APPLE__ for pkgsrc builds The file client/mysql.cc uses the readline library, but it has preprocessor conditionals specially for __APPLE__. Pkgsrc expects a common readline, however, and so the build fails. Removing the special case handles __APPLE__ the same as other platforms. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/mariadb105-client/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/databases/mariadb105-client/patches/patch-client_mysql.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_164926897316590 Content-Disposition: inline Content-Length: 2300 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/databases/mariadb105-client/distinfo diff -u pkgsrc/databases/mariadb105-client/distinfo:1.11 pkgsrc/databases/mariadb105-client/distinfo:1.12 --- pkgsrc/databases/mariadb105-client/distinfo:1.11 Sat Feb 19 09:57:51 2022 +++ pkgsrc/databases/mariadb105-client/distinfo Wed Apr 6 18:16:13 2022 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2022/02/19 09:57:51 nia Exp $ +$NetBSD: distinfo,v 1.12 2022/04/06 18:16:13 brook Exp $ BLAKE2s (mariadb-10.5.15.tar.gz) = 947a7041705c273ca23d5882a1378077701fe7ab3b8e02a2914b5a96b9258853 SHA512 (mariadb-10.5.15.tar.gz) = ea3d99fd9ad8adc8187fb5d722ff16cde90c7cca4b3572e410814ae39e0246b7a83b4dc1e72f95de58c1c12a9563fb524dcca2dd1fb8f595cc41625a2fb0af76 @@ -6,6 +6,7 @@ Size (mariadb-10.5.15.tar.gz) = 10280362 SHA1 (patch-BUILD_compile-pentium32-gcov) = 89a7da728f94f19c153b4d2d2d6ba5462acc941f SHA1 (patch-CMakeLists.txt) = 893f329ed03e01144df166debb4d902ad0304811 SHA1 (patch-client_CMakeLists.txt) = 8fdd8a182304f0b84e120ce95334ace23d02ce88 +SHA1 (patch-client_mysql.cc) = 89fe80fb66b8791131a8c6d1b209e57082804a01 SHA1 (patch-extra_wolfssl_wolfssl_certs_intermediate_genintcerts.sh) = cd9a982889b88f811c3e14ebdf9795b0fa5d1fad SHA1 (patch-include_my__global.h) = a3b831f91ba2efea9f78e70ab4f706da23b80403 SHA1 (patch-mysys_my__context.c) = f9c7e6b3b68b857e7781cf5f36c49e88051cfb66 Added files: Index: pkgsrc/databases/mariadb105-client/patches/patch-client_mysql.cc diff -u /dev/null pkgsrc/databases/mariadb105-client/patches/patch-client_mysql.cc:1.1 --- /dev/null Wed Apr 6 18:16:13 2022 +++ pkgsrc/databases/mariadb105-client/patches/patch-client_mysql.cc Wed Apr 6 18:16:13 2022 @@ -0,0 +1,25 @@ +$NetBSD: patch-client_mysql.cc,v 1.1 2022/04/06 18:16:13 brook Exp $ + +Do not special case __APPLE__ for pkgsrc builds. + +--- client/mysql.cc.orig 2022-02-10 20:11:29.000000000 +0000 ++++ client/mysql.cc +@@ -91,14 +91,10 @@ extern "C" { + #if defined(__WIN__) + #include + #else +-# ifdef __APPLE__ +-# include +-# else +-# include +-# if !defined(USE_LIBEDIT_INTERFACE) +-# include +-# endif +-# endif ++#include ++#if !defined(USE_LIBEDIT_INTERFACE) ++# include ++#endif + #define HAVE_READLINE + #endif + #define USE_POPEN --_----------=_164926897316590--