From 04079115ff3e43b26ddd31a445142f0f2b04df40 Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Tue, 10 Aug 2021 01:21:20 -0700
Subject: [PATCH 1/9] [proj4] Fix the usage

---
 ports/proj4/portfile.cmake | 6 +++---
 ports/proj4/vcpkg.json     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake
index feff73e4fcbce9..931f7d9d896e2a 100644
--- a/ports/proj4/portfile.cmake
+++ b/ports/proj4/portfile.cmake
@@ -65,7 +65,7 @@ endif ()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
 vcpkg_copy_pdbs()
+
+configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage")
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/proj4/vcpkg.json b/ports/proj4/vcpkg.json
index 234f924946256d..2d991260f8af47 100644
--- a/ports/proj4/vcpkg.json
+++ b/ports/proj4/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "proj4",
   "version-string": "7.2.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": "PROJ.4 library for cartographic projections",
   "homepage": "https://github.com/OSGeo/PROJ",
   "dependencies": [

From f81886a19465da3a24e8a832cd79a3671081e9ba Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Tue, 10 Aug 2021 01:22:24 -0700
Subject: [PATCH 2/9] Update the baseline

---
 versions/baseline.json | 2 +-
 versions/p-/proj4.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index ecae6d2b7358e8..66c43209756a8c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5070,7 +5070,7 @@
     },
     "proj4": {
       "baseline": "7.2.1",
-      "port-version": 3
+      "port-version": 4
     },
     "prometheus-cpp": {
       "baseline": "0.12.3",
diff --git a/versions/p-/proj4.json b/versions/p-/proj4.json
index d5bbf1d9afb6a4..f0eb4b5c57b190 100644
--- a/versions/p-/proj4.json
+++ b/versions/p-/proj4.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ef18af3a901a0a9ead7368aa4d92fc3700868e88",
+      "version-string": "7.2.1",
+      "port-version": 4
+    },
     {
       "git-tree": "8fc1b6bdde08a3b1f131df5a4f042885dcc7a58d",
       "version-string": "7.2.1",

From 29bfbc2347c4e32b1aa16e6fa4e5634e6a593f29 Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Tue, 10 Aug 2021 19:16:34 -0700
Subject: [PATCH 3/9] Small changes

---
 ports/proj4/portfile.cmake | 2 +-
 ports/proj4/usage          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake
index 931f7d9d896e2a..d3bc9a208942ff 100644
--- a/ports/proj4/portfile.cmake
+++ b/ports/proj4/portfile.cmake
@@ -67,5 +67,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 vcpkg_copy_pdbs()
 
-configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage")
+configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/proj4/usage b/ports/proj4/usage
index a2297ca02b2729..b9c05fc00aa614 100644
--- a/ports/proj4/usage
+++ b/ports/proj4/usage
@@ -1,4 +1,4 @@
-The package ${PORT}:${TARGET_TRIPLET} provides CMake targets:
+The package @PORT@:@TARGET_TRIPLET@ provides CMake targets:
 
     find_package(PROJ CONFIG REQUIRED)
     target_link_libraries(main PRIVATE PROJ::proj)

From 71796c3893521d07e116b8cca197ffc6bd247a9e Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Tue, 10 Aug 2021 19:18:54 -0700
Subject: [PATCH 4/9] Update the baseline version

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

diff --git a/versions/p-/proj4.json b/versions/p-/proj4.json
index f0eb4b5c57b190..cf25dbe3ca6135 100644
--- a/versions/p-/proj4.json
+++ b/versions/p-/proj4.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "ef18af3a901a0a9ead7368aa4d92fc3700868e88",
+      "git-tree": "fcb4f0c972bdcbe1461e944a173c9ba60feddbee",
       "version-string": "7.2.1",
       "port-version": 4
     },

From 390c40068d79c530226ebe876b75e0009502697f Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Tue, 10 Aug 2021 23:34:17 -0700
Subject: [PATCH 5/9] Remove PREFER_NINJA

---
 ports/proj4/portfile.cmake | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake
index d3bc9a208942ff..dd53975976e91b 100644
--- a/ports/proj4/portfile.cmake
+++ b/ports/proj4/portfile.cmake
@@ -44,7 +44,6 @@ endif()
 
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
     OPTIONS ${FEATURE_OPTIONS}
     -DPROJ_LIB_SUBDIR=lib
     -DPROJ_INCLUDE_SUBDIR=include

From 0d769afd0067a8fa49372cc12ed116f3fce3dcae Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Tue, 10 Aug 2021 23:35:38 -0700
Subject: [PATCH 6/9] Update the baseline revision

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

diff --git a/versions/p-/proj4.json b/versions/p-/proj4.json
index cf25dbe3ca6135..0c4b8a99157c85 100644
--- a/versions/p-/proj4.json
+++ b/versions/p-/proj4.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "fcb4f0c972bdcbe1461e944a173c9ba60feddbee",
+      "git-tree": "fb1d0df2bab9b60c863a135b897bcdae009aff57",
       "version-string": "7.2.1",
       "port-version": 4
     },

From d9a5feec634fbf37c108aae85aab4ff56a684b7b Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Tue, 10 Aug 2021 23:44:57 -0700
Subject: [PATCH 7/9] Update the version scheme

---
 ports/proj4/vcpkg.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/proj4/vcpkg.json b/ports/proj4/vcpkg.json
index 2d991260f8af47..770896f9c5f12c 100644
--- a/ports/proj4/vcpkg.json
+++ b/ports/proj4/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "proj4",
-  "version-string": "7.2.1",
+  "version-semver": "7.2.1",
   "port-version": 4,
   "description": "PROJ.4 library for cartographic projections",
   "homepage": "https://github.com/OSGeo/PROJ",

From d977a78384b2edd5fe254c118a9785c64c07100f Mon Sep 17 00:00:00 2001
From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Date: Tue, 10 Aug 2021 23:45:26 -0700
Subject: [PATCH 8/9] Update the baseline version

---
 versions/p-/proj4.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions/p-/proj4.json b/versions/p-/proj4.json
index 0c4b8a99157c85..7050a40bd80b0c 100644
--- a/versions/p-/proj4.json
+++ b/versions/p-/proj4.json
@@ -1,8 +1,8 @@
 {
   "versions": [
     {
-      "git-tree": "fb1d0df2bab9b60c863a135b897bcdae009aff57",
-      "version-string": "7.2.1",
+      "git-tree": "2f808721576b323ef9b66a9745aac0f55019b003",
+      "version-semver": "7.2.1",
       "port-version": 4
     },
     {

From d08828a645652f25484185b910be2494ec948945 Mon Sep 17 00:00:00 2001
From: Billy Robert O'Neal III <bion@microsoft.com>
Date: Wed, 11 Aug 2021 19:47:14 -0700
Subject: [PATCH 9/9] Avoid configure_file to fill out proj4.

---
 ports/proj4/portfile.cmake | 2 +-
 ports/proj4/usage          | 2 +-
 versions/p-/proj4.json     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake
index dd53975976e91b..c19e07b076dfa2 100644
--- a/ports/proj4/portfile.cmake
+++ b/ports/proj4/portfile.cmake
@@ -66,5 +66,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 vcpkg_copy_pdbs()
 
-configure_file("${CURRENT_PORT_DIR}/usage" "${CURRENT_PACKAGES_DIR}/share/${PORT}/usage" @ONLY)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/proj4/usage b/ports/proj4/usage
index b9c05fc00aa614..ebf9f6c8d5aae1 100644
--- a/ports/proj4/usage
+++ b/ports/proj4/usage
@@ -1,4 +1,4 @@
-The package @PORT@:@TARGET_TRIPLET@ provides CMake targets:
+The package proj4 provides CMake targets:
 
     find_package(PROJ CONFIG REQUIRED)
     target_link_libraries(main PRIVATE PROJ::proj)
diff --git a/versions/p-/proj4.json b/versions/p-/proj4.json
index 7050a40bd80b0c..077e213aa2445a 100644
--- a/versions/p-/proj4.json
+++ b/versions/p-/proj4.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "2f808721576b323ef9b66a9745aac0f55019b003",
+      "git-tree": "dee626b6811eafe58cf40fbceeb3cc28dfaf678c",
       "version-semver": "7.2.1",
       "port-version": 4
     },