[geogram, ccfits, chartdir] Build fixes discovered by CI on 2021-10-01

ports/ccfits/portfile.cmake

@@ -1,47 +1,41 @@
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://heasarc.gsfc.nasa.gov/fitsio/ccfits/CCfits-2.5.tar.gz"
+    URLS "https://heasarc.gsfc.nasa.gov/fitsio/CCfits-2.5/CCfits-2.5.tar.gz"
     FILENAME "CCfits-2.5.tar.gz"
     SHA512 63ab4d153063960510cf60651d5c832824cf85f937f84adc5390c7c2fb46eb8e9f5d8cda2554d79d24c7a4f1b6cf0b7a6e20958fb69920b65d7c362c0a5f26b5
 )
 
 vcpkg_extract_source_archive_ex(
-    ARCHIVE ${ARCHIVE}
+    ARCHIVE "${ARCHIVE}"
     OUT_SOURCE_PATH SOURCE_PATH
     PATCHES
         dll_exports.patch
         fix-dependency.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS
-        -DCFITSIO_INCLUDE_DIR=${CURRENT_INSTALLED_DIR}/include/cfitsio
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/lib/CCfits.dll ${CURRENT_PACKAGES_DIR}/bin/CCfits.dll)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/CCfits.dll ${CURRENT_PACKAGES_DIR}/debug/bin/CCfits.dll)
+if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
+    file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/lib/CCfits.dll" "${CURRENT_PACKAGES_DIR}/bin/CCfits.dll")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/CCfits.dll" "${CURRENT_PACKAGES_DIR}/debug/bin/CCfits.dll")
 endif()
 
 # Remove duplicate include files
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 # Patch installed headers to look in the correct subdirectory
-file(GLOB HEADERS ${CURRENT_PACKAGES_DIR}/include/CCfits/*)
+file(GLOB HEADERS "${CURRENT_PACKAGES_DIR}/include/CCfits/*")
 foreach(HEADER IN LISTS HEADERS)
-    file(READ "${HEADER}" _contents)
-    string(REPLACE "\"fitsio.h\"" "\"cfitsio/fitsio.h\"" _contents "${_contents}")
-    file(WRITE "${HEADER}" "${_contents}")
+    vcpkg_replace_string("${HEADER}" "\"fitsio.h\"" "\"cfitsio/fitsio.h\"")
 endforeach()
 
 vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/CCfits/CCfits.h
     "#include \"longnam.h\"" "#include \"cfitsio/longnam.h\""
 )
 
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

ports/ccfits/vcpkg.json

@@ -1,10 +1,14 @@
 {
   "name": "ccfits",
   "version": "2.5",
-  "port-version": 7,
+  "port-version": 8,
   "description": "CCfits is an object oriented interface to the cfitsio library. It is designed to make the capabilities of cfitsio available to programmers working in C++.",
-  "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/ccfits",
+  "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/CCfits/",
   "dependencies": [
-    "cfitsio"
+    "cfitsio",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
   ]
 }

ports/chartdir/portfile.cmake

@@ -7,14 +7,14 @@ if(TRIPLET_SYSTEM_ARCH MATCHES "arm" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Window
 elseif(VCPKG_TARGET_IS_WINDOWS)
 
     vcpkg_download_distfile(ARCHIVE_FILE
-        URLS "http://www.advsofteng.net/chartdir_cpp_win.zip"
+        URLS "https://www.advsofteng.net/chartdir_cpp_win.zip"
         FILENAME "chartdir_cpp_win-7.0.0.zip"
         SHA512 38d9dae641c0341ccee4709138afd37ad4718c34def70a0dc569956bf9c3488d0d66072f604dca4663dc80bd09446a2ba27ef3806fc3b87dda6aaa5453a7316f
     )
 
     vcpkg_extract_source_archive_ex(
         OUT_SOURCE_PATH SOURCE_PATH
-        ARCHIVE ${ARCHIVE_FILE}
+        ARCHIVE "${ARCHIVE_FILE}"
         REF 7.0.0
     )
 
@@ -24,10 +24,10 @@ elseif(VCPKG_TARGET_IS_WINDOWS)
         set(LIBDIR "${SOURCE_PATH}/lib32")
     endif()
 
-    file(COPY "${LIBDIR}/chartdir70.dll"  DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-    file(COPY "${LIBDIR}/chartdir70.lib"  DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-    file(COPY "${LIBDIR}/chartdir70.dll"  DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(COPY "${LIBDIR}/chartdir70.lib"  DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+    file(COPY "${LIBDIR}/chartdir70.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+    file(COPY "${LIBDIR}/chartdir70.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+    file(COPY "${LIBDIR}/chartdir70.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+    file(COPY "${LIBDIR}/chartdir70.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
 
     set(CHARTDIR_LIB "chartdir70.lib")
 
@@ -41,12 +41,12 @@ elseif(VCPKG_TARGET_IS_OSX)
 
     vcpkg_extract_source_archive_ex(
         OUT_SOURCE_PATH SOURCE_PATH
-        ARCHIVE ${ARCHIVE_FILE}
+        ARCHIVE "${ARCHIVE_FILE}"
         REF 7.0.0
     )
 
-    file(COPY "${SOURCE_PATH}/lib/libchartdir.7.dylib"  DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-    file(COPY "${SOURCE_PATH}/lib/libchartdir.7.dylib"  DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+    file(COPY "${SOURCE_PATH}/lib/libchartdir.7.dylib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+    file(COPY "${SOURCE_PATH}/lib/libchartdir.7.dylib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
 
     set(CHARTDIR_LIB "libchartdir.7.dylib")
 
@@ -55,40 +55,39 @@ elseif(VCPKG_TARGET_IS_LINUX)
     if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
 
         vcpkg_download_distfile(ARCHIVE_FILE
-            URLS "http://www.advsofteng.net/chartdir_cpp_linux_64.tar.gz"
+            URLS "https://www.advsofteng.net/chartdir_cpp_linux_64.tar.gz"
             FILENAME "chartdir_cpp_linux_64-7.0.0.tar.gz"
-            SHA512 e7e71b64b3a756b6df174758c392ab4c9310b4d265e521dccbd009eeefd46e021a74572e7212de5564725df20ddf189e1599e88a116b426f1256f7d34b0131aa
+            SHA512 ea2e05f28dd9647fed49feaf130d8034065067463965f144b3fae4eae482579b1ecf528dc86d1b3602887d5ca0c3b1569404489b0f4cb2300b798fed940cd467
         )
 
     else()
 
         vcpkg_download_distfile(ARCHIVE_FILE
-            URLS "http://www.advsofteng.net/chartdir_cpp_linux.tar.gz"
+            URLS "https://www.advsofteng.net/chartdir_cpp_linux.tar.gz"
             FILENAME "chartdir_cpp_linux-7.0.0.tar.gz"
-            SHA512 bf749c9821a901a7071964f22aabb606f90dc853907720a05252165d63d27aa31d10f0aa62995ab92085bb790f3830063fd8042331195b0153a9d49e8a92e871
+            SHA512 54720fb431fa0fb34be3a187ec3886b0f2a7307ea52a0415fab8513117a157f64a8c0e0b01304aac1d313e4557768242e6b12002509fde2e5303d930c78c0e03
         )
 
     endif()
 
     vcpkg_extract_source_archive_ex(
         OUT_SOURCE_PATH SOURCE_PATH
-        ARCHIVE ${ARCHIVE_FILE}
+        ARCHIVE "${ARCHIVE_FILE}"
         REF 7.0.0
     )
 
-    file(COPY "${SOURCE_PATH}/lib/libchartdir.so.7.0.0"  DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
-    file(COPY "${SOURCE_PATH}/lib/libchartdir.so.7.0.0"  DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+    file(COPY "${SOURCE_PATH}/lib/libchartdir.so.7.0.0" DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
+    file(COPY "${SOURCE_PATH}/lib/libchartdir.so.7.0.0" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
 
     set(CHARTDIR_LIB "libchartdir.so.7.0.0")
 
-    file(COPY ${SOURCE_PATH}/lib/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+    file(COPY "${SOURCE_PATH}/lib/fonts" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
 endif()
 
 file(GLOB HEADERS "${SOURCE_PATH}/include/*.h")
-file(COPY ${HEADERS} DESTINATION ${CURRENT_PACKAGES_DIR}/include/${PORT})
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/chartdir.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
-
-configure_file(${SOURCE_PATH}/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
-configure_file(${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in ${CURRENT_PACKAGES_DIR}/share/${PORT}/chartdir-config.cmake @ONLY)
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY ${HEADERS} DESTINATION "${CURRENT_PACKAGES_DIR}/include/${PORT}")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/chartdir.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+file(COPY "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
+configure_file("${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" "${CURRENT_PACKAGES_DIR}/share/${PORT}/chartdir-config.cmake" @ONLY)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

ports/chartdir/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "chartdir",
   "version": "7.0.0",
+  "port-version": 1,
   "description": "ChartDirector is a powerful chart component for creating professional looking charts for web and windows applications.",
   "homepage": "https://www.advsofteng.com/"
 }

scripts/ci.baseline.txt

@@ -352,6 +352,12 @@ gainput:x64-uwp=fail
 gasol:arm64-windows=fail
 gasol:arm-uwp=fail
 gasol:x64-uwp=fail
+geogram:x64-linux=fail
+geogram:x64-osx=fail
+geogram:x64-windows-static-md=fail
+geogram:x64-windows-static=fail
+geogram:x64-windows=fail
+geogram:x86-windows=fail
 geos:arm-uwp=fail
 geos:x64-uwp=fail
 

versions/baseline.json

@@ -1242,7 +1242,7 @@
     },
     "ccfits": {
       "baseline": "2.5",
-      "port-version": 7
+      "port-version": 8
     },
     "cctag": {
       "baseline": "1.0.0",
@@ -1306,7 +1306,7 @@
     },
     "chartdir": {
       "baseline": "7.0.0",
-      "port-version": 0
+      "port-version": 1
     },
     "check": {
       "baseline": "0.15.2",

versions/c-/ccfits.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ebcb81196a7e63b3b7c4b78f67ebc4e5f20c97c3",
+      "version": "2.5",
+      "port-version": 8
+    },
     {
       "git-tree": "adb43da4a1d72e0924081e4699d81337d649400e",
       "version": "2.5",

versions/c-/chartdir.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fc56555cd56d261127f985f6208cb23258dcb262",
+      "version": "7.0.0",
+      "port-version": 1
+    },
     {
       "git-tree": "433c4a83452c8867b63d012a46109a4e3992e13f",
       "version": "7.0.0",