[ms-gsl][gnusl][gsl] Rename gnusl->gsl, gsl->ms-gsl.

9 files changed, 58 insertions, 58 deletions

diff --git a/ports/gnusl/CONTROL b/ports/gnusl/CONTROL
deleted file mode 100644
index 9b752b4ae..000000000
--- a/ports/gnusl/CONTROL
+++ /dev/null
@@ -1,3 +0,0 @@
-Source: gnusl
-Version: 2.3
-Description: The GNU Scientific Library (GSL) is a numerical library for C and C++ programmers
diff --git a/ports/gnusl/portfile.cmake b/ports/gnusl/portfile.cmake
deleted file mode 100644
index 765c8e815..000000000
--- a/ports/gnusl/portfile.cmake
+++ /dev/null
@@ -1,43 +0,0 @@
-# Common Ambient Variables:
-#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-#   CURRENT_PORT DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
-#   PORT                      = current port name (zlib, etc)
-#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
-#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
-#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
-#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
-#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
-#
-
-include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/gsl-2.3)
-vcpkg_download_distfile(ARCHIVE
-    URLS "ftp://ftp.gnu.org/gnu/gsl/gsl-2.3.tar.gz"
-    FILENAME "gsl-2.3.tar.gz"
-    SHA512 ada622079f4ac667d95f74b38aa368726fc1b18fd34555bcefe90920d3da93a9289ebff966be43325af806107001bc8973daf9f8418e6c97b866be2296b566ff
-)
-vcpkg_extract_source_archive(${ARCHIVE})
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/0001-configure.patch
-        ${CMAKE_CURRENT_LIST_DIR}/0002-add-fp-control.patch
-)
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS_DEBUG -DINSTALL_HEADERS=OFF
-)
-
-vcpkg_install_cmake()
-
-# Handle copyright
-file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gnusl)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/gnusl/COPYING ${CURRENT_PACKAGES_DIR}/share/gnusl/copyright)
-
-vcpkg_copy_pdbs()
diff --git a/ports/gnusl/0001-configure.patch b/ports/gsl/0001-configure.patch
index 7f80e2e55..7f80e2e55 100644
--- a/ports/gnusl/0001-configure.patch
+++ b/ports/gsl/0001-configure.patch
diff --git a/ports/gnusl/0002-add-fp-control.patch b/ports/gsl/0002-add-fp-control.patch
index dceeb3881..dceeb3881 100644
--- a/ports/gnusl/0002-add-fp-control.patch
+++ b/ports/gsl/0002-add-fp-control.patch
diff --git a/ports/gnusl/CMakeLists.txt b/ports/gsl/CMakeLists.txt
index 704542035..704542035 100644
--- a/ports/gnusl/CMakeLists.txt
+++ b/ports/gsl/CMakeLists.txt
diff --git a/ports/gsl/CONTROL b/ports/gsl/CONTROL
index 3a50432d3..8970dca69 100644
--- a/ports/gsl/CONTROL
+++ b/ports/gsl/CONTROL
@@ -1,3 +1,3 @@
 Source: gsl
-Version: 20170425-8b320e3f5d016f953e55dfc7ec8694c1349d3fe4
-Description: Guideline Support Library
\ No newline at end of file
+Version: 2.3
+Description: The GNU Scientific Library is a numerical library for C and C++ programmers
diff --git a/ports/gsl/portfile.cmake b/ports/gsl/portfile.cmake
index 34a1bb77e..76ab1582b 100644
--- a/ports/gsl/portfile.cmake
+++ b/ports/gsl/portfile.cmake
@@ -1,16 +1,43 @@
-#header-only library
+# Common Ambient Variables:
+#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#   CURRENT_PORT DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
+#   PORT                      = current port name (zlib, etc)
+#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
+#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
+#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
+#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
+#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
+#
+
 include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/gsl-2.3)
+vcpkg_download_distfile(ARCHIVE
+    URLS "ftp://ftp.gnu.org/gnu/gsl/gsl-2.3.tar.gz"
+    FILENAME "gsl-2.3.tar.gz"
+    SHA512 ada622079f4ac667d95f74b38aa368726fc1b18fd34555bcefe90920d3da93a9289ebff966be43325af806107001bc8973daf9f8418e6c97b866be2296b566ff
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO Microsoft/GSL
-    REF 8b320e3f5d016f953e55dfc7ec8694c1349d3fe4
-    SHA512 79d4ecc937cdce2acf79620f12c6d4592159f17aa23c0fd1e978cc571e84ee11d91bd9a45f975546447e1ba20878244312609396a52a76f18872b97ea024aa00
-    HEAD_REF master
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES
+        ${CMAKE_CURRENT_LIST_DIR}/0001-configure.patch
+        ${CMAKE_CURRENT_LIST_DIR}/0002-add-fp-control.patch
 )
 
-file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*")
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS_DEBUG -DINSTALL_HEADERS=OFF
+)
+
+vcpkg_install_cmake()
 
 # Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/gsl)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/gsl/LICENSE ${CURRENT_PACKAGES_DIR}/share/gsl/copyright)
+file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gsl)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/gsl/COPYING ${CURRENT_PACKAGES_DIR}/share/gsl/copyright)
+
+vcpkg_copy_pdbs()
diff --git a/ports/ms-gsl/CONTROL b/ports/ms-gsl/CONTROL
new file mode 100644
index 000000000..c485497e3
--- /dev/null
+++ b/ports/ms-gsl/CONTROL
@@ -0,0 +1,3 @@
+Source: ms-gsl
+Version: 20170425-8b320e3f5d016f953e55dfc7ec8694c1349d3fe4
+Description: Microsoft implementation of the Guidelines Support Library
\ No newline at end of file
diff --git a/ports/ms-gsl/portfile.cmake b/ports/ms-gsl/portfile.cmake
new file mode 100644
index 000000000..a5353e666
--- /dev/null
+++ b/ports/ms-gsl/portfile.cmake
@@ -0,0 +1,16 @@
+#header-only library
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Microsoft/GSL
+    REF 8b320e3f5d016f953e55dfc7ec8694c1349d3fe4
+    SHA512 79d4ecc937cdce2acf79620f12c6d4592159f17aa23c0fd1e978cc571e84ee11d91bd9a45f975546447e1ba20878244312609396a52a76f18872b97ea024aa00
+    HEAD_REF master
+)
+
+file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN "*")
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ms-gsl)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/ms-gsl/LICENSE ${CURRENT_PACKAGES_DIR}/share/ms-gsl/copyright)