From nobody Wed Apr 09 14:00:45 2025 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 4ZXl335zY0z5t4np; Wed, 09 Apr 2025 14:00:47 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZXl321QK6z4Gy4; Wed, 09 Apr 2025 14:00:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744207246; 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=vSRl1NeigWbqapFv5f9RASmSPN8K/bemeh/MyM/a85U=; b=Y4dhG9vpieTmqBX8Zv2ujBAYro3mZ99TnvAGjUgRy+hLV+MVJUJ6qKFDhDwJEW5/RIpDIE wfmumPn6V3pe53cThvlJZ2KAeQOMxE0Eu4+CQRmDrdVy1UTVkwTMpVAveElpa5jiitaD1m f4T4Fv+1g6O5Vpx4KYV1+ec3d/3WSsFIKQLfHlvyyXETUlmUtHHA0/dDpIRZFTwGLBWsdB DMJLIev6RVCR7JjhVriloQ0e5LDfvIbGHpyYpFr26cMu+RWudxyPZjlfoW2OdUhX4qm8h7 6WyZR9kxxkEaAzzGfo22hWqn2QsBWQ3dX23oFmeIolq2JnnDr/Enm5XwVwU2CA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744207246; a=rsa-sha256; cv=none; b=ThO24A94F3ntDrP+5qOfbbknBpBWwrYRH2DDn0Och0ysfFHrlnGsSG5dGC+sv58DfLIL9O o3KulqspV4dRQmdCe4YYrdidsKVH0un22s6VH/QfjOKNEfIFe0PAmVj/qhHqKoijnh/vrT 14dwTc6orc/J477JUP048p4GPUhZyaE91MErMg3q5zjLDy7D+bMVJImryx6cM+NRt0IW4p WaES5XxnwLI0AXPgN7Pn7UmK5Yu79fHUN5nsevAWxu9a6v29us405bQRhZju82ScvVGQSe 09Q6CFBlSW5ctDlqRZqpDZ2eSZyjR1/VfDDVDDfwlpGThdEYEuYYAMmd1hMwUg== 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=1744207246; 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=vSRl1NeigWbqapFv5f9RASmSPN8K/bemeh/MyM/a85U=; b=aLbtCF6Zow+jAxDO8sZ3ccetyonwXh52HOzlqMQrjdq1YSTwZMBh4Ba7wpIm13peDV9HNP OstxGaEt6UIa9JpqvOq9aCSeAnWmbZwit6pUqLW4Pcxcyw0mK4b7xH8p+8K4nkRW3VRK9y WY1zYFWo1P/zomvq6wP8JkAvfk+1pWZpfFwMcNbzVZPQwRDIPq/QL3Hj3agBei2pKlcaOb xzGxFOUhFKXM99EdR1kR37Ed8UzxgSbU2nUoVkJGV+DIgHkwhHCQeuyuSCeDwqUnExT31U tM9iHpi3OidT9R0TF2l7zRRMCHm979fgy6tMR9eFGnIGS+46pP102DF6BEfw8g== 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 4ZXl320fyTz4G6; Wed, 09 Apr 2025 14:00:46 +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 539E0jR1060287; Wed, 9 Apr 2025 14:00:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 539E0j9G060281; Wed, 9 Apr 2025 14:00:45 GMT (envelope-from git) Date: Wed, 9 Apr 2025 14:00:45 GMT Message-Id: <202504091400.539E0j9G060281@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: 6ab2eadcf0e3 - main - science/libkml: Simplify expat fix 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: 6ab2eadcf0e38fa89d446cf4813fa5c6212787a6 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=6ab2eadcf0e38fa89d446cf4813fa5c6212787a6 commit 6ab2eadcf0e38fa89d446cf4813fa5c6212787a6 Author: Po-Chuan Hsieh AuthorDate: 2025-04-09 13:54:40 +0000 Commit: Po-Chuan Hsieh CommitDate: 2025-04-09 13:54:40 +0000 science/libkml: Simplify expat fix --- science/libkml/Makefile | 1 + science/libkml/files/patch-src_kml_base_CMakeLists.txt | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/science/libkml/Makefile b/science/libkml/Makefile index 64659738117c..7079f2ce974f 100644 --- a/science/libkml/Makefile +++ b/science/libkml/Makefile @@ -16,6 +16,7 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ USES= cmake compiler:c++11-lang minizip pathfix +CMAKE_ARGS= -DEXPAT_LIBRARY=${LOCALBASE}/lib/libexpat.so CMAKE_OFF= BUILD_TESTING WITH_JAVA WITH_PYTHON WITH_SWIG CMAKE_ON= BUILD_SHARED_LIBS LDFLAGS+= -lz diff --git a/science/libkml/files/patch-src_kml_base_CMakeLists.txt b/science/libkml/files/patch-src_kml_base_CMakeLists.txt deleted file mode 100644 index 0b4e8ffc3c41..000000000000 --- a/science/libkml/files/patch-src_kml_base_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -Fix linking with CMake >= 3.27 due to changes [1] in the FindEXPAT module. - -[1] https://github.com/Kitware/CMake/commit/13079f382b480c8fe6a68d98afc2cec716a75e59 - ---- src/kml/base/CMakeLists.txt.orig 2017-01-15 08:52:06 UTC -+++ src/kml/base/CMakeLists.txt -@@ -49,4 +49,4 @@ build_target( - SRCS ${SRCS} - INCS ${INCS} - DEPENDS ${KMLBASE_DEPENDS} -- LINKS ${ZLIB_LIBRARY} ${MINIZIP_LIBRARIES} ${URIPARSER_LIBRARY} ${EXPAT_LIBRARY} ) -+ LINKS ${ZLIB_LIBRARY} ${MINIZIP_LIBRARIES} ${URIPARSER_LIBRARY} EXPAT::EXPAT )