From 9eff776b7dbc2e9ccce9f711d40e3c2b3c50cb2f Mon Sep 17 00:00:00 2001
From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>
Date: Fri, 20 May 2022 23:35:06 +0200
Subject: [PATCH] [libproxy, nspr] Fix cmake warnings (#24809)

* [libproxy]

* [nspr]

* version

* [libproxy] Fix unused variables

* version
---
 ports/libproxy/portfile.cmake | 11 ++++++++---
 ports/libproxy/vcpkg.json     |  3 ++-
 ports/nspr/portfile.cmake     |  4 ++--
 ports/nspr/vcpkg.json         |  2 +-
 versions/baseline.json        |  4 ++--
 versions/l-/libproxy.json     |  5 +++++
 versions/n-/nspr.json         |  5 +++++
 7 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/ports/libproxy/portfile.cmake b/ports/libproxy/portfile.cmake
index 594e4d09fd..6df28f418f 100644
--- a/ports/libproxy/portfile.cmake
+++ b/ports/libproxy/portfile.cmake
@@ -33,17 +33,22 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS ${FEATURE_OPTIONS}
         -DWITH_WEBKIT3=OFF
+    MAYBE_UNUSED_VARIABLES
+        WITH_DOTNET
+        WITH_PERL
+        WITH_PYTHON2
+        WITH_PYTHON3
+        WITH_VALA
 )
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/Modules)
 vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig()
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake"
           "${CMAKE_CURRENT_LIST_DIR}/usage"
           DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
-file(REMOVE_RECURSE "${LIBPROXY_TOOLS}" "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
-vcpkg_fixup_pkgconfig()
diff --git a/ports/libproxy/vcpkg.json b/ports/libproxy/vcpkg.json
index f993e04dcb..8979bbdbfa 100644
--- a/ports/libproxy/vcpkg.json
+++ b/ports/libproxy/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "libproxy",
   "version": "0.4.17",
-  "port-version": 2,
+  "port-version": 3,
   "description": "libproxy is a library that provides automatic proxy configuration management.",
   "homepage": "https://github.com/libproxy/libproxy",
+  "license": "LGPL-2.1-only",
   "supports": "!uwp",
   "dependencies": [
     "libmodman",
diff --git a/ports/nspr/portfile.cmake b/ports/nspr/portfile.cmake
index c22bb99845..80eaa0341d 100644
--- a/ports/nspr/portfile.cmake
+++ b/ports/nspr/portfile.cmake
@@ -52,7 +52,7 @@ vcpkg_configure_make(
     OPTIONS ${OPTIONS}
     OPTIONS_DEBUG ${OPTIONS_DEBUG}
     OPTIONS_RELEASE ${OPTIONS_RELEASE}
-    DISABLE_VERBOSE_FLAGS true
+    DISABLE_VERBOSE_FLAGS
 )
 vcpkg_install_make()
 vcpkg_copy_pdbs()
@@ -97,4 +97,4 @@ if(NOT VCPKG_BUILD_TYPE)
 endif()
 
 # Copy license
-file(INSTALL "${SOURCE_PATH}/nspr/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/nspr" RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/nspr/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/nspr/vcpkg.json b/ports/nspr/vcpkg.json
index 5902427125..f1420b447e 100644
--- a/ports/nspr/vcpkg.json
+++ b/ports/nspr/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "nspr",
   "version": "4.33",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Netscape portable runtime",
   "homepage": "https://releases.mozilla.org/pub/nspr/",
   "license": "MPL-2.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 61b95c0eb7..9486bc70f3 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3918,7 +3918,7 @@
     },
     "libproxy": {
       "baseline": "0.4.17",
-      "port-version": 2
+      "port-version": 3
     },
     "libqcow": {
       "baseline": "20210419",
@@ -4902,7 +4902,7 @@
     },
     "nspr": {
       "baseline": "4.33",
-      "port-version": 1
+      "port-version": 2
     },
     "nss": {
       "baseline": "3.77",
diff --git a/versions/l-/libproxy.json b/versions/l-/libproxy.json
index 1a5479e019..c05418e942 100644
--- a/versions/l-/libproxy.json
+++ b/versions/l-/libproxy.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ff241fdc3665ad4d1dce051fcdd8ee8dc8617c86",
+      "version": "0.4.17",
+      "port-version": 3
+    },
     {
       "git-tree": "a44c6a0f0d04d6ea82c7a29c879dfd13cadb38ca",
       "version": "0.4.17",
diff --git a/versions/n-/nspr.json b/versions/n-/nspr.json
index 966cf7e2d6..342fccc54d 100644
--- a/versions/n-/nspr.json
+++ b/versions/n-/nspr.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a07f5ffc6f4bd4a9154a599898fbac38115c8124",
+      "version": "4.33",
+      "port-version": 2
+    },
     {
       "git-tree": "efd7b94673495b09ee48d1c2a4453f70c5e0bb7c",
       "version": "4.33",