From 2d69da3d92adb4546e03ac5507a525c7afb6acbb Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Tue, 17 Aug 2021 23:32:15 -0700
Subject: [PATCH 1/7] [lapack-reference] Fix copy openblas's pkgconfig file

---
 ports/lapack-reference/CONTROL        | 17 ----------
 ports/lapack-reference/portfile.cmake |  2 +-
 ports/lapack-reference/vcpkg.json     | 49 +++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 18 deletions(-)
 delete mode 100644 ports/lapack-reference/CONTROL
 create mode 100644 ports/lapack-reference/vcpkg.json

diff --git a/ports/lapack-reference/CONTROL b/ports/lapack-reference/CONTROL
deleted file mode 100644
index 3e18ebd2b3db1c..00000000000000
--- a/ports/lapack-reference/CONTROL
+++ /dev/null
@@ -1,17 +0,0 @@
-Source: lapack-reference
-Version: 3.8.0
-Port-Version: 5
-Description: LAPACK — Linear Algebra PACKage http://www.netlib.org/lapack/
-Default-Features: blas-select
-Build-Depends: vcpkg-gfortran (windows)
-
-Feature: cblas
-Description: Builds CBLAS
-
-Feature: noblas
-Build-Depends: blas
-Description: Use external optimized BLAS
-
-Feature: blas-select
-Build-Depends: lapack-reference[core, noblas](!windows|!static)
-Description: Use external optimized BLAS
diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake
index 70e6059fff383b..58d9eeea53a821 100644
--- a/ports/lapack-reference/portfile.cmake
+++ b/ports/lapack-reference/portfile.cmake
@@ -84,7 +84,7 @@ if(EXISTS "${pcfile}")
     set(_contents "prefix=${CURRENT_INSTALLED_DIR}/debug\n${_contents}")
     file(WRITE "${pcfile}" "${_contents}")
 endif()
-if(NOT USE_OPTIMIZED_BLAS)
+if(NOT USE_OPTIMIZED_BLAS AND NOT (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static"))
     set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/blas.pc")
     if(EXISTS "${pcfile}")
         file(READ "${pcfile}" _contents)
diff --git a/ports/lapack-reference/vcpkg.json b/ports/lapack-reference/vcpkg.json
new file mode 100644
index 00000000000000..531d99f7a6a99b
--- /dev/null
+++ b/ports/lapack-reference/vcpkg.json
@@ -0,0 +1,49 @@
+{
+  "name": "lapack-reference",
+  "version": "3.8.0",
+  "port-version": 6,
+  "description": "LAPACK — Linear Algebra PACKage",
+  "homepage": "http://www.netlib.org/lapack/",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
+    {
+      "name": "vcpkg-gfortran",
+      "platform": "windows"
+    },
+    "zlib"
+  ],
+  "default-features": [
+    "blas-select"
+  ],
+  "features": {
+    "blas-select": {
+      "description": "Use external optimized BLAS",
+      "dependencies": [
+        {
+          "name": "lapack-reference",
+          "default-features": false,
+          "features": [
+            "noblas"
+          ],
+          "platform": "!windows | !static"
+        }
+      ]
+    },
+    "cblas": {
+      "description": "Builds CBLAS"
+    },
+    "noblas": {
+      "description": "Use external optimized BLAS",
+      "dependencies": [
+        "blas"
+      ]
+    }
+  }
+}

From 237fad202277a2687d9d07cfd0cacab9f8b48931 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Tue, 17 Aug 2021 23:35:33 -0700
Subject: [PATCH 2/7] version

---
 versions/baseline.json            | 2 +-
 versions/l-/lapack-reference.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 28551738f9eb5a..06599421e1b6b1 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3010,7 +3010,7 @@
     },
     "lapack-reference": {
       "baseline": "3.8.0",
-      "port-version": 5
+      "port-version": 6
     },
     "lastools": {
       "baseline": "2020-05-09",
diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json
index 96db87c743a626..171e69d92fdae4 100644
--- a/versions/l-/lapack-reference.json
+++ b/versions/l-/lapack-reference.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "22b354b68036dc61920935c13fa6f3a6a1d2faf0",
+      "version": "3.8.0",
+      "port-version": 6
+    },
     {
       "git-tree": "1887fc1fcb0c96df1ea24fffc9b045330426e3b6",
       "version-string": "3.8.0",

From d3895adffc8f11e6a5ed3b9decf0038ef099a36b Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Tue, 17 Aug 2021 23:44:02 -0700
Subject: [PATCH 3/7] Use vcpkg-cmake and vcpkg-cmake-config instead

---
 ports/lapack-reference/portfile.cmake | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake
index 58d9eeea53a821..3a8be513e03d0e 100644
--- a/ports/lapack-reference/portfile.cmake
+++ b/ports/lapack-reference/portfile.cmake
@@ -60,8 +60,7 @@ if(VCPKG_USE_INTERNAL_Fortran)
 else()
     set(USE_OPTIMIZED_BLAS ON)
 endif()
-vcpkg_configure_cmake(
-        PREFER_NINJA
+vcpkg_cmake_configure(
         SOURCE_PATH ${SOURCE_PATH}
         OPTIONS
             "-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}"
@@ -69,8 +68,8 @@ vcpkg_configure_cmake(
             ${FORTRAN_CMAKE}
         )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/lapack-${lapack_ver}) #Should the target path be lapack and not lapack-reference?
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME lapack-${lapack_ver} CONFIG_PATH lib/cmake/lapack-${lapack_ver}) #Should the target path be lapack and not lapack-reference?
 
 set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc")
 if(EXISTS "${pcfile}")

From 20c81e993c8b74b3530164a9aba114f6c928bf8b Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Tue, 17 Aug 2021 23:44:27 -0700
Subject: [PATCH 4/7] version stuff

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

diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json
index 171e69d92fdae4..ac5129e8d0f5a4 100644
--- a/versions/l-/lapack-reference.json
+++ b/versions/l-/lapack-reference.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "22b354b68036dc61920935c13fa6f3a6a1d2faf0",
+      "git-tree": "901cf407c4133b4a80c681cbac416152633b4053",
       "version": "3.8.0",
       "port-version": 6
     },

From fa284badef3564637974de9fb5c6edb66cbbf51c Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Wed, 18 Aug 2021 00:01:58 -0700
Subject: [PATCH 5/7] Restore the changes about vcpkg-cmake-configure /
 vcpkg-cmake-install

---
 ports/lapack-reference/portfile.cmake | 19 +++++++++++--------
 ports/lapack-reference/vcpkg.json     |  7 +------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/ports/lapack-reference/portfile.cmake b/ports/lapack-reference/portfile.cmake
index 3a8be513e03d0e..4fb353fdd5343e 100644
--- a/ports/lapack-reference/portfile.cmake
+++ b/ports/lapack-reference/portfile.cmake
@@ -60,15 +60,18 @@ if(VCPKG_USE_INTERNAL_Fortran)
 else()
     set(USE_OPTIMIZED_BLAS ON)
 endif()
-vcpkg_cmake_configure(
-        SOURCE_PATH ${SOURCE_PATH}
-        OPTIONS
-            "-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}"
-            "-DCBLAS=${CBLAS}"
-            ${FORTRAN_CMAKE}
-        )
 
-vcpkg_cmake_install()
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        "-DUSE_OPTIMIZED_BLAS=${USE_OPTIMIZED_BLAS}"
+        "-DCBLAS=${CBLAS}"
+        ${FORTRAN_CMAKE}
+)
+
+vcpkg_install_cmake()
+
 vcpkg_cmake_config_fixup(PACKAGE_NAME lapack-${lapack_ver} CONFIG_PATH lib/cmake/lapack-${lapack_ver}) #Should the target path be lapack and not lapack-reference?
 
 set(pcfile "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/lapack.pc")
diff --git a/ports/lapack-reference/vcpkg.json b/ports/lapack-reference/vcpkg.json
index 531d99f7a6a99b..5244d414595a7d 100644
--- a/ports/lapack-reference/vcpkg.json
+++ b/ports/lapack-reference/vcpkg.json
@@ -5,10 +5,6 @@
   "description": "LAPACK — Linear Algebra PACKage",
   "homepage": "http://www.netlib.org/lapack/",
   "dependencies": [
-    {
-      "name": "vcpkg-cmake",
-      "host": true
-    },
     {
       "name": "vcpkg-cmake-config",
       "host": true
@@ -16,8 +12,7 @@
     {
       "name": "vcpkg-gfortran",
       "platform": "windows"
-    },
-    "zlib"
+    }
   ],
   "default-features": [
     "blas-select"

From 6c72bb27d61f827df0f504303d839e052d571213 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Wed, 18 Aug 2021 00:04:36 -0700
Subject: [PATCH 6/7] update version keyword

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

diff --git a/ports/lapack-reference/vcpkg.json b/ports/lapack-reference/vcpkg.json
index 5244d414595a7d..c3f20e0323cf89 100644
--- a/ports/lapack-reference/vcpkg.json
+++ b/ports/lapack-reference/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "lapack-reference",
-  "version": "3.8.0",
+  "version-semver": "3.8.0",
   "port-version": 6,
   "description": "LAPACK — Linear Algebra PACKage",
   "homepage": "http://www.netlib.org/lapack/",

From 8fbd9eb8c4629fb7ca800cfd243ab2b7f9ac236a Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Wed, 18 Aug 2021 00:04:55 -0700
Subject: [PATCH 7/7] version

---
 versions/l-/lapack-reference.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions/l-/lapack-reference.json b/versions/l-/lapack-reference.json
index ac5129e8d0f5a4..99d6f8a7cf3d92 100644
--- a/versions/l-/lapack-reference.json
+++ b/versions/l-/lapack-reference.json
@@ -1,8 +1,8 @@
 {
   "versions": [
     {
-      "git-tree": "901cf407c4133b4a80c681cbac416152633b4053",
-      "version": "3.8.0",
+      "git-tree": "10799c7ec42f8369179ba7a8e927235596cb8bb7",
+      "version-semver": "3.8.0",
       "port-version": 6
     },
     {