git: 6ab2eadcf0e3 - main - science/libkml: Simplify expat fix

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Wed, 09 Apr 2025 14:00:45 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6ab2eadcf0e38fa89d446cf4813fa5c6212787a6

commit 6ab2eadcf0e38fa89d446cf4813fa5c6212787a6
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2025-04-09 13:54:40 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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 )