From a8f72940e1dabdd65f1e23c2d38a63c0223592c9 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Thu, 7 Jul 2022 23:12:41 -0700
Subject: [PATCH 01/13] [libgeotiff] Fix usage

---
 ports/libgeotiff/fix-usage.patch           | 37 +++++++++++++++++
 ports/libgeotiff/portfile.cmake            |  3 +-
 ports/libgeotiff/public-dependencies.patch | 47 ----------------------
 ports/libgeotiff/vcpkg.json                |  2 +-
 4 files changed, 40 insertions(+), 49 deletions(-)
 create mode 100644 ports/libgeotiff/fix-usage.patch
 delete mode 100644 ports/libgeotiff/public-dependencies.patch

diff --git a/ports/libgeotiff/fix-usage.patch b/ports/libgeotiff/fix-usage.patch
new file mode 100644
index 00000000000000..4910896f9662e1
--- /dev/null
+++ b/ports/libgeotiff/fix-usage.patch
@@ -0,0 +1,37 @@
+diff --git a/libgeotiff/cmake/project-config.cmake.in b/libgeotiff/cmake/project-config.cmake.in
+index 3690489..f0351e1 100644
+--- a/libgeotiff/cmake/project-config.cmake.in
++++ b/libgeotiff/cmake/project-config.cmake.in
+@@ -13,6 +13,9 @@
+ # @PROJECT_NAME_UPPER@_LIBRARY
+ # @PROJECT_NAME_UPPER@_LIBRARIES
+ 
++cmake_policy(PUSH)
++cmake_policy(SET CMP0012 NEW)
++
+ # Tell the user project where to find our headers and libraries
+ get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
+ get_filename_component (_ROOT "${_DIR}/@PROJECT_ROOT_DIR@" ABSOLUTE)
+@@ -22,13 +25,14 @@ set (@PROJECT_NAME@_BINARY_DIRS "${_ROOT}/bin")
+ unset (_ROOT)
+ unset (_DIR)
+ 
++include(CMakeFindDependencyMacro)
++@CONFIG_DEPENDENCIES@
++
+ set (@PROJECT_NAME@_LIBRARIES @GEOTIFF_LIBRARY_TARGET@)
+ if("@BUILD_SHARED_LIBS@")
+   set (@PROJECT_NAME@_SHARED_LIBRARIES ${@PROJECT_NAME@_LIBRARIES})
+ else()
+   set (@PROJECT_NAME@_STATIC_LIBRARIES ${@PROJECT_NAME@_LIBRARIES})
+-  include(CMakeFindDependencyMacro)
+-@CONFIG_DEPENDENCIES@
+ endif()
+ 
+ if(NOT @PROJECT_NAME@_FIND_QUIETLY)
+@@ -52,3 +56,5 @@ set (@PROJECT_NAME_UPPER@_FOUND 1)
+ set (@PROJECT_NAME_UPPER@_LIBRARIES ${@PROJECT_NAME@_LIBRARIES})
+ set (@PROJECT_NAME_UPPER@_INCLUDE_DIR ${@PROJECT_NAME@_INCLUDE_DIRS})
+ set (@PROJECT_NAME_UPPER@_LIBRARY ${@PROJECT_NAME@_LIBRARIES})
++
++cmake_policy(POP)
diff --git a/ports/libgeotiff/portfile.cmake b/ports/libgeotiff/portfile.cmake
index 072a8da74f9855..315aa6aa082a0e 100644
--- a/ports/libgeotiff/portfile.cmake
+++ b/ports/libgeotiff/portfile.cmake
@@ -7,7 +7,7 @@ vcpkg_from_github(
     PATCHES
         cmakelists.patch
         skip-doc-install.patch
-        public-dependencies.patch
+        fix-usage.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -43,4 +43,5 @@ endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
+file(INSTALL "${CMAKE_CURRNET_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${SOURCE_PATH}/libgeotiff/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/libgeotiff/public-dependencies.patch b/ports/libgeotiff/public-dependencies.patch
deleted file mode 100644
index c2729732a3919d..00000000000000
--- a/ports/libgeotiff/public-dependencies.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/libgeotiff/CMakeLists.txt b/libgeotiff/CMakeLists.txt
-index 1840258..fcf2dd0 100644
---- a/libgeotiff/CMakeLists.txt
-+++ b/libgeotiff/CMakeLists.txt
-@@ -311,17 +311,18 @@ endif()
- SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES
-    OUTPUT_NAME ${GEOTIFF_LIB_NAME})
- 
--set(CONFIG_DEPENDENCIES "")
-+set(CONFIG_PUBLIC_DEPENDENCIES "")
-+set(CONFIG_PRIVATE_DEPENDENCIES "")
- if(TARGET TIFF::TIFF)
-     set(TIFF_LIBRARIES TIFF::TIFF)
--    string(APPEND CONFIG_DEPENDENCIES "  find_dependency(TIFF)\n")
-+    string(APPEND CONFIG_PUBLIC_DEPENDENCIES "find_dependency(TIFF)\n")
- endif()
- target_link_libraries(${GEOTIFF_LIBRARY_TARGET} PUBLIC
-     ${TIFF_LIBRARIES})
- 
- if(TARGET PROJ::proj)
-     set(PROJ_LIBRARIES PROJ::proj)
--    string(APPEND CONFIG_DEPENDENCIES "  find_dependency(PROJ CONFIG)\n")
-+    string(APPEND CONFIG_PRIVATE_DEPENDENCIES "  find_dependency(PROJ CONFIG)\n")
- endif()
- target_link_libraries(${GEOTIFF_LIBRARY_TARGET} PRIVATE
-     ${PROJ_LIBRARIES})
-diff --git a/libgeotiff/cmake/project-config.cmake.in b/libgeotiff/cmake/project-config.cmake.in
-index 3690489..87de991 100644
---- a/libgeotiff/cmake/project-config.cmake.in
-+++ b/libgeotiff/cmake/project-config.cmake.in
-@@ -22,13 +22,14 @@ set (@PROJECT_NAME@_BINARY_DIRS "${_ROOT}/bin")
- unset (_ROOT)
- unset (_DIR)
- 
-+include(CMakeFindDependencyMacro)
-+@CONFIG_PUBLIC_DEPENDENCIES@
- set (@PROJECT_NAME@_LIBRARIES @GEOTIFF_LIBRARY_TARGET@)
- if("@BUILD_SHARED_LIBS@")
-   set (@PROJECT_NAME@_SHARED_LIBRARIES ${@PROJECT_NAME@_LIBRARIES})
- else()
-   set (@PROJECT_NAME@_STATIC_LIBRARIES ${@PROJECT_NAME@_LIBRARIES})
--  include(CMakeFindDependencyMacro)
--@CONFIG_DEPENDENCIES@
-+@CONFIG_PRIVATE_DEPENDENCIES@
- endif()
- 
- if(NOT @PROJECT_NAME@_FIND_QUIETLY)
diff --git a/ports/libgeotiff/vcpkg.json b/ports/libgeotiff/vcpkg.json
index d6def89ba1c29e..6a4f05b5b4ac5a 100644
--- a/ports/libgeotiff/vcpkg.json
+++ b/ports/libgeotiff/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libgeotiff",
   "version": "1.7.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Libgeotiff is an open source library on top of libtiff for reading and writing GeoTIFF information tags.",
   "homepage": "https://github.com/OSGeo/libgeotiff",
   "license": "MIT",

From a93196678910803af4eb1eafa35cde31f8ac4966 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Thu, 7 Jul 2022 23:13:06 -0700
Subject: [PATCH 02/13] [liblas] Fix usage

---
 ports/liblas/fix-cmake-configure.patch | 22 ++++++++++++++++
 ports/liblas/fix-usage.patch           | 17 +++++++++++++
 ports/liblas/portfile.cmake            | 35 ++++++++++++++------------
 ports/liblas/usage                     |  5 ++++
 ports/liblas/vcpkg.json                | 12 +++++++--
 5 files changed, 73 insertions(+), 18 deletions(-)
 create mode 100644 ports/liblas/fix-cmake-configure.patch
 create mode 100644 ports/liblas/fix-usage.patch
 create mode 100644 ports/liblas/usage

diff --git a/ports/liblas/fix-cmake-configure.patch b/ports/liblas/fix-cmake-configure.patch
new file mode 100644
index 00000000000000..65534810b943f5
--- /dev/null
+++ b/ports/liblas/fix-cmake-configure.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d246a88..b0417ee 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -107,7 +107,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIBLAS_BUILD_OUTPUT_DIRECTORY})
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBLAS_BUILD_OUTPUT_DIRECTORY})
+ 
+ file(READ "doc/index.txt" README )
+-file(WRITE "README.txt" "${README}")
++file(WRITE "${CMAKE_BINARY_DIR}/README.txt" "${README}")
+ 
+ ###############################################################################
+ # Platform and compiler specific settings
+@@ -337,7 +337,7 @@ set(LIBLAS_DATA_DIR ${LIBLAS_DATA_SUBDIR})
+ ###############################################################################
+ # Installation commands
+ 
+-install(FILES AUTHORS COPYING INSTALL LICENSE.txt README.txt
++install(FILES AUTHORS COPYING INSTALL LICENSE.txt ${CMAKE_BINARY_DIR}/README.txt
+   DESTINATION ${LIBLAS_DATA_DIR}/doc)
+ 
+ ###############################################################################
diff --git a/ports/liblas/fix-usage.patch b/ports/liblas/fix-usage.patch
new file mode 100644
index 00000000000000..90e2817c3bd60e
--- /dev/null
+++ b/ports/liblas/fix-usage.patch
@@ -0,0 +1,17 @@
+diff --git a/cmake/liblas-config.cmake.in b/cmake/liblas-config.cmake.in
+index 175e997..4f3b1ba 100644
+--- a/cmake/liblas-config.cmake.in
++++ b/cmake/liblas-config.cmake.in
+@@ -12,6 +12,12 @@ message (STATUS "Reading ${CMAKE_CURRENT_LIST_FILE}")
+ # libLAS_VERSION is set by version file
+ message (STATUS "libLAS configuration, version " ${libLAS_VERSION})
+ 
++include(CMakeFindDependencyMacro)
++
++if (@WITH_GEOTIFF@)
++    find_dependency(GeoTIFF CONFIG)
++endif()
++
+ # Tell the user project where to find our headers and libraries
+ get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
+ get_filename_component (PROJECT_ROOT_DIR "${_DIR}/@PROJECT_ROOT_DIR@" ABSOLUTE)
diff --git a/ports/liblas/portfile.cmake b/ports/liblas/portfile.cmake
index a50ede2f61d2f8..9dc84dfb1afe15 100644
--- a/ports/liblas/portfile.cmake
+++ b/ports/liblas/portfile.cmake
@@ -12,14 +12,15 @@ vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     PATCHES
         fix-boost-headers.patch
+        fix-cmake-configure.patch
+        fix-usage.patch
 )
 
-file(REMOVE ${SOURCE_PATH}/cmake/modules/FindPROJ4.cmake)
-file(REMOVE ${SOURCE_PATH}/cmake/modules/FindGeoTIFF.cmake)
+file(REMOVE "${SOURCE_PATH}/cmake/modules/FindPROJ4.cmake")
+file(REMOVE "${SOURCE_PATH}/cmake/modules/FindGeoTIFF.cmake")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS 
         -DBUILD_OSGEO4W=OFF # Disable osgeo4w
         -DWITH_TESTS=OFF
@@ -28,24 +29,26 @@ vcpkg_configure_cmake(
         -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=${CMAKE_DISABLE_FIND_PACKAGE_JPEG}
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/doc")
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
-file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/share/cmake/libLAS/liblas-depends.cmake)
+file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/share/cmake/libLAS/liblas-depends.cmake")
 
 if (VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+    vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
 else()
-    vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/libLAS)
+    vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/libLAS)
 endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/liblas/usage b/ports/liblas/usage
new file mode 100644
index 00000000000000..ff004a6a167a29
--- /dev/null
+++ b/ports/liblas/usage
@@ -0,0 +1,5 @@
+liblas provides CMake targets:
+
+    # this is heuristically generated, and may not be correct
+    find_package(libLAS CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE liblas liblas_c)
diff --git a/ports/liblas/vcpkg.json b/ports/liblas/vcpkg.json
index 049580bde09398..d43f9cf2dd1885 100644
--- a/ports/liblas/vcpkg.json
+++ b/ports/liblas/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "liblas",
   "version": "1.8.1",
-  "port-version": 9,
+  "port-version": 10,
   "description": "A C/C++ library for reading and writing the very common LAS LiDAR format.",
   "dependencies": [
     "boost-detail",
@@ -14,7 +14,15 @@
     "boost-system",
     "boost-thread",
     "boost-uuid",
-    "libgeotiff"
+    "libgeotiff",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ],
   "features": {
     "jpeg": {

From c3b5253fd7970c5213d8da6e21e554ff81a8eff1 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Thu, 7 Jul 2022 23:13:44 -0700
Subject: [PATCH 03/13] version

---
 versions/baseline.json      | 4 ++--
 versions/l-/libgeotiff.json | 5 +++++
 versions/l-/liblas.json     | 5 +++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 290f7c1f6a8a8e..4ce3f247230d61 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3630,7 +3630,7 @@
     },
     "libgeotiff": {
       "baseline": "1.7.1",
-      "port-version": 1
+      "port-version": 2
     },
     "libgit2": {
       "baseline": "1.4.2",
@@ -3754,7 +3754,7 @@
     },
     "liblas": {
       "baseline": "1.8.1",
-      "port-version": 9
+      "port-version": 10
     },
     "liblbfgs": {
       "baseline": "1.10",
diff --git a/versions/l-/libgeotiff.json b/versions/l-/libgeotiff.json
index a3b344bf260493..ede74d0b2a6944 100644
--- a/versions/l-/libgeotiff.json
+++ b/versions/l-/libgeotiff.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2c055a277a099805c5827547cc98cb285cecdcce",
+      "version": "1.7.1",
+      "port-version": 2
+    },
     {
       "git-tree": "aa303b0481fcc35024bae8af620ab2271ca9b5b2",
       "version": "1.7.1",
diff --git a/versions/l-/liblas.json b/versions/l-/liblas.json
index 547d1f6321b2c9..33e14b635e7a47 100644
--- a/versions/l-/liblas.json
+++ b/versions/l-/liblas.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "84b81cc5f7594e1e95b9fee174e8bb7986e742f1",
+      "version": "1.8.1",
+      "port-version": 10
+    },
     {
       "git-tree": "9d89f6e4515fcd144d24a7e619ea2de26799a005",
       "version": "1.8.1",

From 010c70f6e0d8e7a2ab4e378c7c38f9383e6e94e1 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Thu, 7 Jul 2022 23:17:54 -0700
Subject: [PATCH 04/13] typo

---
 ports/libgeotiff/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/libgeotiff/portfile.cmake b/ports/libgeotiff/portfile.cmake
index 315aa6aa082a0e..cc240be171de4d 100644
--- a/ports/libgeotiff/portfile.cmake
+++ b/ports/libgeotiff/portfile.cmake
@@ -43,5 +43,5 @@ endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${CMAKE_CURRNET_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${SOURCE_PATH}/libgeotiff/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

From d2a744d92c4b44cdab65b7ec6f5197ede17c47d6 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Thu, 7 Jul 2022 23:18:08 -0700
Subject: [PATCH 05/13] version

---
 versions/l-/libgeotiff.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/l-/libgeotiff.json b/versions/l-/libgeotiff.json
index ede74d0b2a6944..b67f92aa7cb819 100644
--- a/versions/l-/libgeotiff.json
+++ b/versions/l-/libgeotiff.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "2c055a277a099805c5827547cc98cb285cecdcce",
+      "git-tree": "f697d6a9cc5682ce5a07b4cf8fe5ee4ef79ccf91",
       "version": "1.7.1",
       "port-version": 2
     },

From b505ea6e11473ff1f55e0987eab9cb3b3cdcc7bf Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Thu, 7 Jul 2022 23:20:32 -0700
Subject: [PATCH 06/13] Add license

---
 ports/liblas/vcpkg.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/liblas/vcpkg.json b/ports/liblas/vcpkg.json
index d43f9cf2dd1885..482a8301e918c8 100644
--- a/ports/liblas/vcpkg.json
+++ b/ports/liblas/vcpkg.json
@@ -3,6 +3,7 @@
   "version": "1.8.1",
   "port-version": 10,
   "description": "A C/C++ library for reading and writing the very common LAS LiDAR format.",
+  "license": "MIT",
   "dependencies": [
     "boost-detail",
     "boost-filesystem",

From 64ba0d64f4e3a5f4ccebfcc9afe5df5163db31c3 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Thu, 7 Jul 2022 23:20:41 -0700
Subject: [PATCH 07/13] version

---
 versions/l-/liblas.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/l-/liblas.json b/versions/l-/liblas.json
index 33e14b635e7a47..a6564577bd110f 100644
--- a/versions/l-/liblas.json
+++ b/versions/l-/liblas.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "84b81cc5f7594e1e95b9fee174e8bb7986e742f1",
+      "git-tree": "ab40001a6fbade551bc2cc7e6fc6cb9648d035f1",
       "version": "1.8.1",
       "port-version": 10
     },

From fbe44df8dd0c1d4f98cedc55c0ee313908769f68 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Fri, 8 Jul 2022 02:08:07 -0700
Subject: [PATCH 08/13] apply suggestions

---
 ports/libgeotiff/portfile.cmake               |  2 +-
 ...-usage.patch => public-dependencies.patch} | 32 +++++++++++++++++--
 ports/liblas/usage                            |  3 +-
 3 files changed, 31 insertions(+), 6 deletions(-)
 rename ports/libgeotiff/{fix-usage.patch => public-dependencies.patch} (54%)

diff --git a/ports/libgeotiff/portfile.cmake b/ports/libgeotiff/portfile.cmake
index cc240be171de4d..1ddd47bc76d24a 100644
--- a/ports/libgeotiff/portfile.cmake
+++ b/ports/libgeotiff/portfile.cmake
@@ -7,7 +7,7 @@ vcpkg_from_github(
     PATCHES
         cmakelists.patch
         skip-doc-install.patch
-        fix-usage.patch
+        public-dependencies.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/ports/libgeotiff/fix-usage.patch b/ports/libgeotiff/public-dependencies.patch
similarity index 54%
rename from ports/libgeotiff/fix-usage.patch
rename to ports/libgeotiff/public-dependencies.patch
index 4910896f9662e1..4027fff35d3b9f 100644
--- a/ports/libgeotiff/fix-usage.patch
+++ b/ports/libgeotiff/public-dependencies.patch
@@ -1,5 +1,31 @@
+diff --git a/libgeotiff/CMakeLists.txt b/libgeotiff/CMakeLists.txt
+index bd59682..5c80b9d 100644
+--- a/libgeotiff/CMakeLists.txt
++++ b/libgeotiff/CMakeLists.txt
+@@ -332,17 +332,18 @@ endif()
+ SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES
+    OUTPUT_NAME ${GEOTIFF_LIB_NAME})
+ 
+-set(CONFIG_DEPENDENCIES "")
++set(CONFIG_PUBLIC_DEPENDENCIES "")
++set(CONFIG_PRIVATE_DEPENDENCIES "")
+ if(TARGET TIFF::TIFF)
+     set(TIFF_LIBRARIES TIFF::TIFF)
+-    string(APPEND CONFIG_DEPENDENCIES "  find_dependency(TIFF)\n")
++    string(APPEND CONFIG_PUBLIC_DEPENDENCIES "find_dependency(TIFF)\n")
+ endif()
+ target_link_libraries(${GEOTIFF_LIBRARY_TARGET} PUBLIC
+     ${TIFF_LIBRARIES})
+ 
+ if(TARGET PROJ::proj)
+     set(PROJ_LIBRARIES PROJ::proj)
+-    string(APPEND CONFIG_DEPENDENCIES "  find_dependency(PROJ CONFIG)\n")
++    string(APPEND CONFIG_PUBLIC_DEPENDENCIES "  find_dependency(PROJ CONFIG)\n")
+ endif()
+ target_link_libraries(${GEOTIFF_LIBRARY_TARGET} PRIVATE
+     ${PROJ_LIBRARIES})
 diff --git a/libgeotiff/cmake/project-config.cmake.in b/libgeotiff/cmake/project-config.cmake.in
-index 3690489..f0351e1 100644
+index 3690489..774de2d 100644
 --- a/libgeotiff/cmake/project-config.cmake.in
 +++ b/libgeotiff/cmake/project-config.cmake.in
 @@ -13,6 +13,9 @@
@@ -17,8 +43,7 @@ index 3690489..f0351e1 100644
  unset (_DIR)
  
 +include(CMakeFindDependencyMacro)
-+@CONFIG_DEPENDENCIES@
-+
++@CONFIG_PUBLIC_DEPENDENCIES@
  set (@PROJECT_NAME@_LIBRARIES @GEOTIFF_LIBRARY_TARGET@)
  if("@BUILD_SHARED_LIBS@")
    set (@PROJECT_NAME@_SHARED_LIBRARIES ${@PROJECT_NAME@_LIBRARIES})
@@ -26,6 +51,7 @@ index 3690489..f0351e1 100644
    set (@PROJECT_NAME@_STATIC_LIBRARIES ${@PROJECT_NAME@_LIBRARIES})
 -  include(CMakeFindDependencyMacro)
 -@CONFIG_DEPENDENCIES@
++@CONFIG_PRIVATE_DEPENDENCIES@
  endif()
  
  if(NOT @PROJECT_NAME@_FIND_QUIETLY)
diff --git a/ports/liblas/usage b/ports/liblas/usage
index ff004a6a167a29..6afb96371a47f3 100644
--- a/ports/liblas/usage
+++ b/ports/liblas/usage
@@ -1,5 +1,4 @@
-liblas provides CMake targets:
+The package libgeotiff provides a CMake config file:
 
-    # this is heuristically generated, and may not be correct
     find_package(libLAS CONFIG REQUIRED)
     target_link_libraries(main PRIVATE liblas liblas_c)

From 7bc887e323461825732d0f690a20f0f776db6b80 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Fri, 8 Jul 2022 02:08:24 -0700
Subject: [PATCH 09/13] version

---
 versions/l-/libgeotiff.json | 2 +-
 versions/l-/liblas.json     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions/l-/libgeotiff.json b/versions/l-/libgeotiff.json
index b67f92aa7cb819..6d8a59a47c1058 100644
--- a/versions/l-/libgeotiff.json
+++ b/versions/l-/libgeotiff.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "f697d6a9cc5682ce5a07b4cf8fe5ee4ef79ccf91",
+      "git-tree": "7504b7420c23d466eb212fef1e4801d6731fe775",
       "version": "1.7.1",
       "port-version": 2
     },
diff --git a/versions/l-/liblas.json b/versions/l-/liblas.json
index a6564577bd110f..27762ac0c76534 100644
--- a/versions/l-/liblas.json
+++ b/versions/l-/liblas.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "ab40001a6fbade551bc2cc7e6fc6cb9648d035f1",
+      "git-tree": "e2b136e39dcf28c41bf0b928a05cff81a4337854",
       "version": "1.8.1",
       "port-version": 10
     },

From 022e74b83de85805efaae4802253b9312877c69d Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Fri, 8 Jul 2022 08:37:12 -0700
Subject: [PATCH 10/13] typo

---
 ports/liblas/usage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/liblas/usage b/ports/liblas/usage
index 6afb96371a47f3..52e681e1841a22 100644
--- a/ports/liblas/usage
+++ b/ports/liblas/usage
@@ -1,4 +1,4 @@
-The package libgeotiff provides a CMake config file:
+The package liblas provides a CMake config file:
 
     find_package(libLAS CONFIG REQUIRED)
     target_link_libraries(main PRIVATE liblas liblas_c)

From 75f6d3291f72fac207342709dcb2b85fdf45385a Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Fri, 8 Jul 2022 08:37:23 -0700
Subject: [PATCH 11/13] version

---
 versions/l-/liblas.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/l-/liblas.json b/versions/l-/liblas.json
index 27762ac0c76534..73388d9f642bbe 100644
--- a/versions/l-/liblas.json
+++ b/versions/l-/liblas.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "e2b136e39dcf28c41bf0b928a05cff81a4337854",
+      "git-tree": "38b4d837c544aaa2125a2f7c8a5e268c7945ac59",
       "version": "1.8.1",
       "port-version": 10
     },

From e026ea7223ceb07bdbd9350f3c20fdcc94b1143b Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Sun, 10 Jul 2022 21:46:24 -0700
Subject: [PATCH 12/13] Revert liblas changes

---
 ports/liblas/fix-cmake-configure.patch | 22 ----------------
 ports/liblas/fix-usage.patch           | 17 -------------
 ports/liblas/portfile.cmake            | 35 ++++++++++++--------------
 ports/liblas/usage                     |  4 ---
 ports/liblas/vcpkg.json                | 13 ++--------
 5 files changed, 18 insertions(+), 73 deletions(-)
 delete mode 100644 ports/liblas/fix-cmake-configure.patch
 delete mode 100644 ports/liblas/fix-usage.patch
 delete mode 100644 ports/liblas/usage

diff --git a/ports/liblas/fix-cmake-configure.patch b/ports/liblas/fix-cmake-configure.patch
deleted file mode 100644
index 65534810b943f5..00000000000000
--- a/ports/liblas/fix-cmake-configure.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d246a88..b0417ee 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -107,7 +107,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIBLAS_BUILD_OUTPUT_DIRECTORY})
- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIBLAS_BUILD_OUTPUT_DIRECTORY})
- 
- file(READ "doc/index.txt" README )
--file(WRITE "README.txt" "${README}")
-+file(WRITE "${CMAKE_BINARY_DIR}/README.txt" "${README}")
- 
- ###############################################################################
- # Platform and compiler specific settings
-@@ -337,7 +337,7 @@ set(LIBLAS_DATA_DIR ${LIBLAS_DATA_SUBDIR})
- ###############################################################################
- # Installation commands
- 
--install(FILES AUTHORS COPYING INSTALL LICENSE.txt README.txt
-+install(FILES AUTHORS COPYING INSTALL LICENSE.txt ${CMAKE_BINARY_DIR}/README.txt
-   DESTINATION ${LIBLAS_DATA_DIR}/doc)
- 
- ###############################################################################
diff --git a/ports/liblas/fix-usage.patch b/ports/liblas/fix-usage.patch
deleted file mode 100644
index 90e2817c3bd60e..00000000000000
--- a/ports/liblas/fix-usage.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/cmake/liblas-config.cmake.in b/cmake/liblas-config.cmake.in
-index 175e997..4f3b1ba 100644
---- a/cmake/liblas-config.cmake.in
-+++ b/cmake/liblas-config.cmake.in
-@@ -12,6 +12,12 @@ message (STATUS "Reading ${CMAKE_CURRENT_LIST_FILE}")
- # libLAS_VERSION is set by version file
- message (STATUS "libLAS configuration, version " ${libLAS_VERSION})
- 
-+include(CMakeFindDependencyMacro)
-+
-+if (@WITH_GEOTIFF@)
-+    find_dependency(GeoTIFF CONFIG)
-+endif()
-+
- # Tell the user project where to find our headers and libraries
- get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
- get_filename_component (PROJECT_ROOT_DIR "${_DIR}/@PROJECT_ROOT_DIR@" ABSOLUTE)
diff --git a/ports/liblas/portfile.cmake b/ports/liblas/portfile.cmake
index 9dc84dfb1afe15..a50ede2f61d2f8 100644
--- a/ports/liblas/portfile.cmake
+++ b/ports/liblas/portfile.cmake
@@ -12,15 +12,14 @@ vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     PATCHES
         fix-boost-headers.patch
-        fix-cmake-configure.patch
-        fix-usage.patch
 )
 
-file(REMOVE "${SOURCE_PATH}/cmake/modules/FindPROJ4.cmake")
-file(REMOVE "${SOURCE_PATH}/cmake/modules/FindGeoTIFF.cmake")
+file(REMOVE ${SOURCE_PATH}/cmake/modules/FindPROJ4.cmake)
+file(REMOVE ${SOURCE_PATH}/cmake/modules/FindGeoTIFF.cmake)
 
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
     OPTIONS 
         -DBUILD_OSGEO4W=OFF # Disable osgeo4w
         -DWITH_TESTS=OFF
@@ -29,26 +28,24 @@ vcpkg_cmake_configure(
         -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=${CMAKE_DISABLE_FIND_PACKAGE_JPEG}
 )
 
-vcpkg_cmake_install()
-vcpkg_copy_pdbs()
+vcpkg_install_cmake()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/doc")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/doc")
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/doc)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc)
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
-file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/share/cmake/libLAS/liblas-depends.cmake")
+file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/share/cmake/libLAS/liblas-depends.cmake)
 
 if (VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_cmake_config_fixup(CONFIG_PATH cmake)
+    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
 else()
-    vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/libLAS)
+    vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/libLAS)
 endif()
 
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/liblas/usage b/ports/liblas/usage
deleted file mode 100644
index 52e681e1841a22..00000000000000
--- a/ports/liblas/usage
+++ /dev/null
@@ -1,4 +0,0 @@
-The package liblas provides a CMake config file:
-
-    find_package(libLAS CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE liblas liblas_c)
diff --git a/ports/liblas/vcpkg.json b/ports/liblas/vcpkg.json
index 482a8301e918c8..049580bde09398 100644
--- a/ports/liblas/vcpkg.json
+++ b/ports/liblas/vcpkg.json
@@ -1,9 +1,8 @@
 {
   "name": "liblas",
   "version": "1.8.1",
-  "port-version": 10,
+  "port-version": 9,
   "description": "A C/C++ library for reading and writing the very common LAS LiDAR format.",
-  "license": "MIT",
   "dependencies": [
     "boost-detail",
     "boost-filesystem",
@@ -15,15 +14,7 @@
     "boost-system",
     "boost-thread",
     "boost-uuid",
-    "libgeotiff",
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
-    {
-      "name": "vcpkg-cmake-config",
-      "host": true
-    }
+    "libgeotiff"
   ],
   "features": {
     "jpeg": {

From 2f82119e15f1e078ac083a74bbde5249baa4c5c8 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Sun, 10 Jul 2022 21:46:54 -0700
Subject: [PATCH 13/13] version

---
 versions/baseline.json  | 2 +-
 versions/l-/liblas.json | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 4ce3f247230d61..d89e3e8edb4d39 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3754,7 +3754,7 @@
     },
     "liblas": {
       "baseline": "1.8.1",
-      "port-version": 10
+      "port-version": 9
     },
     "liblbfgs": {
       "baseline": "1.10",
diff --git a/versions/l-/liblas.json b/versions/l-/liblas.json
index 73388d9f642bbe..547d1f6321b2c9 100644
--- a/versions/l-/liblas.json
+++ b/versions/l-/liblas.json
@@ -1,10 +1,5 @@
 {
   "versions": [
-    {
-      "git-tree": "38b4d837c544aaa2125a2f7c8a5e268c7945ac59",
-      "version": "1.8.1",
-      "port-version": 10
-    },
     {
       "git-tree": "9d89f6e4515fcd144d24a7e619ea2de26799a005",
       "version": "1.8.1",