3 files changed, 18 insertions, 30 deletions
diff --git a/ports/pdal/PDALConfig.patch b/ports/pdal/PDALConfig.patch
deleted file mode 100644
index 25e9bfcbe..000000000
--- a/ports/pdal/PDALConfig.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/PDALConfig.cmake.in b/PDALConfig.cmake.in
-index a03ef142e..2d06a2937 100644
---- a/PDALConfig.cmake.in
-+++ b/PDALConfig.cmake.in	
-@@ -15,6 +15,9 @@ foreach(_dir @PDAL_CONFIG_LIBRARY_DIRS@)
-   list(APPEND PDAL_LIBRARY_DIRS ${_foo})
- endforeach(_dir)
- 
-+include(CMakeFindDependencyMacro)
-+find_dependency(GeoTIFF)
-+find_dependency(CURL)
- include("${CMAKE_CURRENT_LIST_DIR}/PDALTargets.cmake")
- 
- if (WIN32)
diff --git a/ports/pdal/fix-dependency.patch b/ports/pdal/fix-dependency.patch
index f7351c950..352eb1d43 100644
--- a/ports/pdal/fix-dependency.patch
+++ b/ports/pdal/fix-dependency.patch
@@ -1,20 +1,19 @@
 diff --git a/cmake/geos.cmake b/cmake/geos.cmake
-index 90b79d9..4e144a6 100644
+index 90b79d9..5942ee5 100644
 --- a/cmake/geos.cmake
 +++ b/cmake/geos.cmake
-@@ -1,7 +1,11 @@
+@@ -1,8 +1,5 @@
  #
  # GEOS (required)
  #
 -find_package(GEOS QUIET 3.3)
-+include(SelectLibraryConfigurations)
-+find_library(GEOS_LIBRARY_RELEASE NAMES geos_c libgeos_c)
-+find_library(GEOS_LIBRARY_DEBUG NAMES geos_cd libgeos_cd)
-+select_library_configurations(GEOS)
-+find_path(GEOS_INCLUDE_DIR geos_c.h)
- set_package_properties(GEOS PROPERTIES TYPE REQUIRED
-     PURPOSE "Provides general purpose geometry support")
- 
+-set_package_properties(GEOS PROPERTIES TYPE REQUIRED
+-    PURPOSE "Provides general purpose geometry support")
+-
+-include_directories("${GEOS_INCLUDE_DIR}")
++find_package(geos CONFIG REQUIRED)
++set(GEOS_LIBRARY GEOS::geos GEOS::geos_c GEOS::geos_cxx_flags)
+\ No newline at end of file
 diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake
 index 8178418..31b54d6 100644
 --- a/cmake/modules/FindPostgreSQL.cmake
@@ -46,14 +45,18 @@ index 42cca1e..43b0ced 100644
  add_subdirectory(vendor/kazhdan)
  if (NOT PDAL_HAVE_JSONCPP)
 diff --git a/PDALConfig.cmake.in b/PDALConfig.cmake.in
-index ea695cf..21b66a1 100644
+index a03ef14..9d073e6 100644
 --- a/PDALConfig.cmake.in
 +++ b/PDALConfig.cmake.in
-@@ -18,6 +18,7 @@ endforeach(_dir)
- include(CMakeFindDependencyMacro)
- find_dependency(GeoTIFF)
- find_dependency(CURL)
+@@ -15,6 +15,11 @@ foreach(_dir @PDAL_CONFIG_LIBRARY_DIRS@)
+   list(APPEND PDAL_LIBRARY_DIRS ${_foo})
+ endforeach(_dir)
+ 
++include(CMakeFindDependencyMacro)
++find_dependency(GeoTIFF)
++find_dependency(CURL)
 +find_dependency(Boost COMPONENTS system filesystem)
++find_dependency(geos CONFIG)
  include("${CMAKE_CURRENT_LIST_DIR}/PDALTargets.cmake")
  
  if (WIN32)
diff --git a/ports/pdal/portfile.cmake b/ports/pdal/portfile.cmake
index b6c503d16..8099bed6f 100644
--- a/ports/pdal/portfile.cmake
+++ b/ports/pdal/portfile.cmake
@@ -13,7 +13,6 @@ vcpkg_extract_source_archive_ex(
         0001-win32_compiler_options.cmake.patch
         0002-no-source-dir-writes.patch
         0003-fix-copy-vendor.patch
-        PDALConfig.patch
         fix-dependency.patch
         libpq.patch
         fix-CPL_DLL.patch