From nobody Mon Sep 04 21:31:19 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 4Rfhdz3wwTz4sNyQ; Mon, 4 Sep 2023 21:31:19 +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 4Rfhdz2zLnz4rnP; Mon, 4 Sep 2023 21:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693863079; 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=I+tdTT7DP+p2+DtoI6z1zr/6f0MRkybTtOnhhppJiZE=; b=pLA4QE6/N3nRpCbG5kBU3UKdBWPygbqwYAmT6f8JtguOZ1PA93kFbkcYI0Gbl2ef5fe2Sh sADeqO8/DSZKT8RbVO4TBa59IU1VrE1ZvCFZDJYUgavF5+bZ7z2VwL5qmTkKbiHxFja3Eg YZobWwnoZDdwPo4acjj9Jz/SWSQl3/W4old6tT5pI/AfFU0sl5osaDKOV8goffosOSdVIg vNLyYf7/vpPq+7kDRExXeVS17+EM3b1E41+Wb8ktTg/ImGjCvtrBYt9DJtllOb3gmkLtcA OgQQjvhXI8FoJe7+rsQkw8MfzQxcecT9Hb7TpFCr7NIMjTI8+R1CaK5CrNpgfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693863079; a=rsa-sha256; cv=none; b=hxC17aW4f0+a2jwUXydJaGal4rF1jmv+T+tHDc2KJex/6fotG28wE70cPPC2THZXCZ6oXk aTBhur/Mj78lihbwskhCf7UUCr0GNDv8qtZqUOSGTxwnrAdiBHgCtybqlsa6vrnGCXOIpD Z0wFJ5bFpxkj7YtarU/lI3FiMHyjV0JyStNEHA+W5Qe3+sD30tPiThQICrDpLks5adpdkJ Dc893wbw6VJR7YB50Hf6u1kH/cCg02wAs6zSVRrfOeGwuJ3XTLXmTwbdw1Qj5TkS1EJw7L L76n8lu7ll+7WjG8hDVkSMFwsJuET0Fe/1m6HTNMOaRB7C9f/jQz0dVoMK+keA== 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=1693863079; 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=I+tdTT7DP+p2+DtoI6z1zr/6f0MRkybTtOnhhppJiZE=; b=O7zgWe6T2wj82YtfZRHoIYrWx7H7/oa6C4L39dlyFXQStBDOBSKs6ZQSNsTzZOGGS4UFUK KRjjvy/PRb9PUXLKPN7NJfTRVDF8ZwreHgQCvKRaWeuPsbqq3+enkq1LYUYJlD2DNiE/y0 zFZhsGBIckGXGQzEve9mbwwEyo/hHvy5WSrmrFfOF0eKOMwC78ujWLMnry5smMaQuyI2jP Ke+fMu8cLD0jpKAk05zZxkOOcH1JZPFcHwZ0VlClo+ewbukqoueGY8AmB7XcfgEeEnS02/ L4XZH9rSj0vwnKian+PKqxMZ1fZpzQGJpTy5m0BI8frMC0us9ZbuuN5QXZGxug== 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 4Rfhdz22V0z1M1P; Mon, 4 Sep 2023 21:31:19 +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 384LVJ60091912; Mon, 4 Sep 2023 21:31:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 384LVJhd091909; Mon, 4 Sep 2023 21:31:19 GMT (envelope-from git) Date: Mon, 4 Sep 2023 21:31:19 GMT Message-Id: <202309042131.384LVJhd091909@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: 6a4bcec9b9fc - main - graphics/gdal: Simplify 18e5fa858bb60e1c70006acf2e6b966d411dd8de 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a4bcec9b9fcb4d66a14ab89bb48242701c1c13e Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=6a4bcec9b9fcb4d66a14ab89bb48242701c1c13e commit 6a4bcec9b9fcb4d66a14ab89bb48242701c1c13e Author: Po-Chuan Hsieh AuthorDate: 2023-09-04 21:25:21 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-09-04 21:30:05 +0000 graphics/gdal: Simplify 18e5fa858bb60e1c70006acf2e6b966d411dd8de Use CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX instead of mixed method of Makefile and CMake --- graphics/gdal/Makefile | 1 - graphics/gdal/files/patch-mysql | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile index a06daf493b9f..0f6802fc166f 100644 --- a/graphics/gdal/Makefile +++ b/graphics/gdal/Makefile @@ -199,7 +199,6 @@ 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 index 0ecdfcec739d..9b5d8032dc6f 100644 --- a/graphics/gdal/files/patch-mysql +++ b/graphics/gdal/files/patch-mysql @@ -1,11 +1,10 @@ --- 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} +@@ -23,6 +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) ++set(CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX "mysql") + find_library(MYSQL_LIBRARY NAMES mysqlclient mysqlclient_r) if( NOT CMAKE_C_COMPILER_LOADED ) - message(AUTHOR_WARNING "C language not enabled: Skipping detection of extra link libraries.")