From nobody Mon Sep 04 09:08:39 2023 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 4RfN932BFRz4sR72; Mon, 4 Sep 2023 09:08:39 +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 4RfN931gRjz4R3J; Mon, 4 Sep 2023 09:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693818519; 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=uxaS9sH7Xdel/1Hixm4NAF+wsTI+TVvJcDz5KcMJtT0=; b=f3HU38PmKGnKN5S6hWgbJpWTWjj1BGzQyorMU2U8jNJqhUL/Dwgv5qvI8/3nXClHobWBnI IyggN3jXHHm/oxQiOSaQxS6Ew1J4a9UpSZ5wmOqJ4urPKx/WvgDVcwcbUYAbfX8kQXF9Mr DkMuTV9qmeAcRBCZieZ4paTmR/qxlV0O+OC/iJtVFBhmt2QAcH3LpQa7QjkQ0tn+Pl+CUY F9JrSZ6BYNBw2D01yOQN7m92qPya/fg0JDcDm2yh+x0xBidAjfQS0HvBNnZba2zpwxiqZ0 nbXXHd4DIi+6O+EoYCaGbmx1h0W0S9yCx5noemU/sfVs0EMnbfZagaTzmj+oWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693818519; a=rsa-sha256; cv=none; b=DDlEQQc/kKxe+0co7W5fuRSIzV6Uq940FH9uTMwV3d4UY0vnIA6g00VZyOmlXD0zimFP4S ja2o/Z1u3CCT3fX8KbTtuob62l0s87AH1b7+gZBKu1MsTJbsFLEw5g0PoqW0ftAO0QPF0U +VUn+XSzft6+l1gAKLmJWaY0MoLtwDJV8AyTR0KfpPuDUQddO5qL81w6DvcqWpvYV3RJgA PUKbot2u1WLBogeqXRQfM+Og6K5Fz0R1YkZ1V3HoF9Y6LvbRfuiV8lz/7sGJK3ynqaNa2O eifBQJXMMayOeNKf7y2qLDsDdgGH9iQe1K9PbJlKHuMsuKEI9qvJ+EgToJV2kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693818519; 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=uxaS9sH7Xdel/1Hixm4NAF+wsTI+TVvJcDz5KcMJtT0=; b=LTjJkU1WYXMTUB6kP6sBQmsOP0vnbcYnSnlRUb4JkQrvo/VhzFJ6yFig+NK/CdwocuAaUK HfQRkK0qpxMKwk4phoab2Af3j0CZ4Fjsi3jsOZGGFRbPgM9nBYDWjjDdcnClqM/cqaexSi UoD1nK7eP5W4a+dQIQhTYH02Y441+yQ4USfX/AMM/1paurTXxa6BGeXdd2efmUQDB3i3pq /9QUxdU77Sjqya6XG3QE57LmlN2I5eHt982EGWqkPKYAtio/kaZ2D+Zkh7JOYaZYvU2W2n Bv98sPiaXqEzMNoW1JGBkyR+vCxNRcbIn1HXlaHZu+SWg0YystXJifSPgMkfUA== 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 4RfN930c2qz1103; Mon, 4 Sep 2023 09:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38498dDR048564; Mon, 4 Sep 2023 09:08:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38498dHT048561; Mon, 4 Sep 2023 09:08:39 GMT (envelope-from git) Date: Mon, 4 Sep 2023 09:08:39 GMT Message-Id: <202309040908.38498dHT048561@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 18e5fa858bb6 - main - graphics/gdal: Fix MYSQL option 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18e5fa858bb60e1c70006acf2e6b966d411dd8de Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=18e5fa858bb60e1c70006acf2e6b966d411dd8de commit 18e5fa858bb60e1c70006acf2e6b966d411dd8de Author: Po-Chuan Hsieh AuthorDate: 2023-09-04 09:04:30 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-09-04 09:04:30 +0000 graphics/gdal: Fix MYSQL option PR: 269256 Reported by: Martin Birgmeier --- graphics/gdal/Makefile | 1 + graphics/gdal/files/patch-mysql | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile index 0f6802fc166f..a06daf493b9f 100644 --- a/graphics/gdal/Makefile +++ b/graphics/gdal/Makefile @@ -199,6 +199,7 @@ ZSTD_CMAKE_BOOL= GDAL_USE_ZSTD ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/cmake/modules/packages/FindMySQL.cmake # Clean up bundled libraries @${RM} -r ${WRKSRC}/alg/internal_libqhull/ @${RM} -r ${WRKSRC}/frmts/gif/giflib/ diff --git a/graphics/gdal/files/patch-mysql b/graphics/gdal/files/patch-mysql new file mode 100644 index 000000000000..0ecdfcec739d --- /dev/null +++ b/graphics/gdal/files/patch-mysql @@ -0,0 +1,11 @@ +--- cmake/modules/packages/FindMySQL.cmake.orig 2023-07-06 11:14:14 UTC ++++ cmake/modules/packages/FindMySQL.cmake +@@ -23,7 +23,7 @@ if( MYSQL_INCLUDE_DIR AND EXISTS "${MYSQL_INCLUDE_DIR} + "${MYSQL_VERSION_H}" ) + endif() + +-find_library(MYSQL_LIBRARY NAMES mysqlclient mysqlclient_r) ++find_library(MYSQL_LIBRARY NAMES mysqlclient mysqlclient_r PATHS %%LOCALBASE%%/lib/mysql) + + if( NOT CMAKE_C_COMPILER_LOADED ) + message(AUTHOR_WARNING "C language not enabled: Skipping detection of extra link libraries.")