diff --git a/ports/clfft/portfile.cmake b/ports/clfft/portfile.cmake
index 79e83bf6da..bd52b12305 100644
--- a/ports/clfft/portfile.cmake
+++ b/ports/clfft/portfile.cmake
@@ -29,4 +29,4 @@ endif()
 vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION ${CURRENT_PACKAGES_DIR}/share/clfft/copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/clfft/vcpkg.json b/ports/clfft/vcpkg.json
index d20cfa8bc6..15886ab2ff 100644
--- a/ports/clfft/vcpkg.json
+++ b/ports/clfft/vcpkg.json
@@ -1,9 +1,10 @@
 {
   "name": "clfft",
   "version": "2.12.2",
-  "port-version": 4,
+  "port-version": 5,
   "description": "clFFT is an OpenCL 1.2 accelerated Fast Fourier Transform library.",
   "homepage": "https://github.com/clMathLibraries/clFFT",
+  "license": "Apache-2.0",
   "dependencies": [
     "opencl",
     {
diff --git a/ports/constexpr/portfile.cmake b/ports/constexpr/portfile.cmake
index 65773ccec2..493e78d7b3 100644
--- a/ports/constexpr/portfile.cmake
+++ b/ports/constexpr/portfile.cmake
@@ -7,10 +7,8 @@ vcpkg_from_github(
     HEAD_REF master
 )
 
-# Put the licence file where vcpkg expects it
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/constexpr/LICENSE)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/constexpr/LICENSE ${CURRENT_PACKAGES_DIR}/share/constexpr/copyright)
-
 # Copy the constexpr header files
-file(GLOB HEADER_FILES ${SOURCE_PATH}/src/include/*.h)
-file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+file(GLOB HEADER_FILES "${SOURCE_PATH}/src/include/*.h")
+file(COPY ${HEADER_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/constexpr/vcpkg.json b/ports/constexpr/vcpkg.json
index 85a8a46c97..b7f266515f 100644
--- a/ports/constexpr/vcpkg.json
+++ b/ports/constexpr/vcpkg.json
@@ -1,7 +1,8 @@
 {
   "name": "constexpr",
-  "version-string": "1.0",
-  "port-version": 2,
+  "version": "1.0",
+  "port-version": 3,
   "description": "Small MIT License Library of general stdlib functions written as C++11 constexpr functions.",
-  "homepage": "https://github.com/elbeno/constexpr"
+  "homepage": "https://github.com/elbeno/constexpr",
+  "license": "MIT"
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 772478c7fb..ccb26bf25e 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1418,7 +1418,7 @@
     },
     "clfft": {
       "baseline": "2.12.2",
-      "port-version": 4
+      "port-version": 5
     },
     "cli": {
       "baseline": "2.0.1",
@@ -1542,7 +1542,7 @@
     },
     "constexpr": {
       "baseline": "1.0",
-      "port-version": 2
+      "port-version": 3
     },
     "constexpr-contracts": {
       "baseline": "2020-08-09",
diff --git a/versions/c-/clfft.json b/versions/c-/clfft.json
index d1c9665e0e..33be216903 100644
--- a/versions/c-/clfft.json
+++ b/versions/c-/clfft.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b935ce5f9e186f9be8fe85d6d228043bede4cd04",
+      "version": "2.12.2",
+      "port-version": 5
+    },
     {
       "git-tree": "fdb3022cd3081e404b7c49ceaa5bd03ad0dc64f4",
       "version": "2.12.2",
diff --git a/versions/c-/constexpr.json b/versions/c-/constexpr.json
index 09ba13ef2e..d5b38750f4 100644
--- a/versions/c-/constexpr.json
+++ b/versions/c-/constexpr.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c3d2008ccf999119285610e0a76ed0c46c59632b",
+      "version": "1.0",
+      "port-version": 3
+    },
     {
       "git-tree": "26c459ddb2becb06ea5c1fcb7a55e282b2aae704",
       "version-string": "1.0",