[crfsuite] change /include/x.h => /include/crfsuite/x.h (#15785)

This caused conflicts with many ports; in particular params.h conflicted with tesseract.

   crfsuite:/include/cqdb.h
   crfsuite:/include/crf1d.h
   crfsuite:/include/crfsuite.h
   crfsuite:/include/crfsuite.hpp
   crfsuite:/include/crfsuite_api.hpp
   crfsuite:/include/crfsuite_internal.h
   crfsuite:/include/iwa.h
   crfsuite:/include/logging.h
   crfsuite:/include/option.h
   crfsuite:/include/os.h
   crfsuite:/include/params.h    ***
   crfsuite:/include/quark.h
   crfsuite:/include/readdata.h
   crfsuite:/include/rumavl.h
   crfsuite:/include/vecmath.h

7 files changed, 57 insertions, 45 deletions

diff --git a/port_versions/baseline.json b/port_versions/baseline.json
index c2685e0d3..1cb2af9c7 100644
--- a/port_versions/baseline.json
+++ b/port_versions/baseline.json
@@ -1426,7 +1426,7 @@
     },
     "crfsuite": {
       "baseline": "2019-07-21",
-      "port-version": 0
+      "port-version": 1
     },
     "croncpp": {
       "baseline": "2020-09-04",
diff --git a/port_versions/c-/crfsuite.json b/port_versions/c-/crfsuite.json
index a05123c18..604199407 100644
--- a/port_versions/c-/crfsuite.json
+++ b/port_versions/c-/crfsuite.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "65bc9733064d028bb4f2960d824862263f74bfde",
+      "version-date": "2019-07-21",
+      "port-version": 1
+    },
+    {
       "git-tree": "779f57b3fd1e0e2a15df5baf4488ef149f7f0cfd",
       "version-string": "2019-07-21",
       "port-version": 0
diff --git a/ports/crfsuite/CMakeLists.txt b/ports/crfsuite/CMakeLists.txt
index 81ede0ba5..05dfa88d0 100644
--- a/ports/crfsuite/CMakeLists.txt
+++ b/ports/crfsuite/CMakeLists.txt
@@ -1,33 +1,33 @@
-cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
 PROJECT(crfsuite)
-                          
+
 file(GLOB SOURCE_FILE_CQDB
-        "lib/cqdb/src/*.c"
+    "lib/cqdb/src/*.c"
 )
 file(GLOB HEADERS_FILE_CQDB
-        "lib/cqdb/include/*.h"
+    "lib/cqdb/include/*.h"
 )
 
 file(GLOB SOURCE_FILE_CRF
-        "lib/crf/src/*.c"
+    "lib/crf/src/*.c"
 )
 file(GLOB HEADERS_FILE_CRF
-        "lib/crf/src/*.h"
+    "lib/crf/src/*.h"
 )
 file(GLOB SOURCE_FILE_FRONTEND
-	"frontend/*.c"
+    "frontend/*.c"
 )
 file(GLOB HEADERS_FILE_FRONTEND
-	"frontend/*.h"        
+    "frontend/*.h"
 )
 file(GLOB SOURCE_FILE
-	"swig/*.cpp"
-        "frontend/*.c"
+    "swig/*.cpp"
+    "frontend/*.c"
 )
 file(GLOB HEADERS_FILE
-	"include/*.h"        
-        "include/*.hpp"
-        "frontend/*.h"  
+    "include/*.h"
+    "include/*.hpp"
+    "frontend/*.h"
 )
 
 find_library(LBFGS_LIBRARY lbfgs)
@@ -36,15 +36,13 @@ include_directories(lib/cqdb/include/)
 include_directories(include/)
 include_directories(win32/liblbfgs/)
 
-
-add_library (cqdb STATIC ${SOURCE_FILE_CQDB} ${HEADERS_FILE_CQDB})
-add_library (crf STATIC ${SOURCE_FILE_CRF} ${HEADERS_FILE_CRF})
-add_library (crfsuite STATIC ${SOURCE_FILE} ${HEADERS_FILE})
+add_library(cqdb STATIC ${SOURCE_FILE_CQDB} ${HEADERS_FILE_CQDB})
+add_library(crf STATIC ${SOURCE_FILE_CRF} ${HEADERS_FILE_CRF})
+add_library(crfsuite STATIC ${SOURCE_FILE} ${HEADERS_FILE})
 
 target_link_libraries(crf PUBLIC cqdb ${LBFGS_LIBRARY})
 target_link_libraries(crfsuite PUBLIC crf)
 
-
 install(TARGETS cqdb crf crfsuite
     RUNTIME DESTINATION bin
     ARCHIVE DESTINATION lib
@@ -52,14 +50,22 @@ install(TARGETS cqdb crf crfsuite
 )
 
 if (WIN32)
-add_executable(frontend  ${SOURCE_FILE_FRONTEND} ${HEADERS_FILE_FRONTEND})
-target_link_libraries(frontend PUBLIC crf)
-install(TARGETS frontend 
-    RUNTIME DESTINATION tools
-    ARCHIVE DESTINATION lib
-    LIBRARY DESTINATION lib
-)
+    add_executable(frontend  ${SOURCE_FILE_FRONTEND} ${HEADERS_FILE_FRONTEND})
+    target_link_libraries(frontend PUBLIC crf)
+    install(TARGETS frontend
+        RUNTIME DESTINATION tools
+        ARCHIVE DESTINATION lib
+        LIBRARY DESTINATION lib
+        )
 endif()
 
 
-install(FILES ${HEADERS_FILE}  ${HEADERS_FILE_CQDB}  ${HEADERS_FILE_CRF}  ${HEADERS_FILE_FRONTEND} DESTINATION include)
\ No newline at end of file
+install(
+    FILES
+        ${HEADERS_FILE}
+        ${HEADERS_FILE_CQDB}
+        ${HEADERS_FILE_CRF}
+        ${HEADERS_FILE_FRONTEND}
+    DESTINATION
+        include/crfsuite
+    )
diff --git a/ports/crfsuite/CONTROL b/ports/crfsuite/CONTROL
deleted file mode 100644
index 30a261551..000000000
--- a/ports/crfsuite/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: crfsuite
-Version: 2019-07-21
-Homepage: http://www.chokkan.org/software/crfsuite/
-Build-Depends: liblbfgs
-Description:  CRFSuite is an implementation of Conditional Random Fields (CRFs) for labeling sequential data.
\ No newline at end of file
diff --git a/ports/crfsuite/portfile.cmake b/ports/crfsuite/portfile.cmake
index debdde356..19b2399be 100644
--- a/ports/crfsuite/portfile.cmake
+++ b/ports/crfsuite/portfile.cmake
@@ -1,7 +1,4 @@
-if (VCPKG_TARGET_TRIPLET STREQUAL "x64-uwp" OR VCPKG_TARGET_TRIPLET STREQUAL "arm-uwp")
-    message(FATAL_ERROR "crfsuite does not support on this platform")
-endif()
-
+vcpkg_fail_port_install(ON_TARGET uwp)
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
@@ -9,23 +6,23 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO chokkan/crfsuite
     REF 5d1bd3b803bb26582ed5cc274d6b5af6cc7f9cae
-    SHA512   e7f329f96fb0dc0e347b3e7a3e26b23ceb45e6fae7b59ace05633a24d58a31665826ebc5280e5a864f50598772791e4b5b3e7da7f46994655cbe03806f823f73
+    SHA512 e7f329f96fb0dc0e347b3e7a3e26b23ceb45e6fae7b59ace05633a24d58a31665826ebc5280e5a864f50598772791e4b5b3e7da7f46994655cbe03806f823f73
     HEAD_REF master
 )
 
 
-list(REMOVE_ITEM SOURCE_FILE ${SOURCE_PATH}/win32/liblbfgs/lbfgs.lib)
-list(REMOVE_ITEM SOURCE_FILE ${SOURCE_PATH}/win32/liblbfgs/lbfgs_debug.lib)
+list(REMOVE_ITEM SOURCE_FILE "${SOURCE_PATH}/win32/liblbfgs/lbfgs.lib")
+list(REMOVE_ITEM SOURCE_FILE "${SOURCE_PATH}/win32/liblbfgs/lbfgs_debug.lib")
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
 vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     PREFIX_NINJA
 )
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/crfsuite RENAME copyright)
\ No newline at end of file
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/crfsuite/vcpkg.json b/ports/crfsuite/vcpkg.json
new file mode 100644
index 000000000..aa62f95bf
--- /dev/null
+++ b/ports/crfsuite/vcpkg.json
@@ -0,0 +1,11 @@
+{
+  "name": "crfsuite",
+  "version-date": "2019-07-21",
+  "port-version": 1,
+  "description": "CRFSuite is an implementation of Conditional Random Fields (CRFs) for labeling sequential data.",
+  "homepage": "http://www.chokkan.org/software/crfsuite/",
+  "supports": "!uwp",
+  "dependencies": [
+    "liblbfgs"
+  ]
+}
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 939750140..3cf0de85a 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -155,8 +155,6 @@ crashpad:arm-uwp=fail
 crashpad:x64-linux=fail
 crashpad:x64-uwp=fail
 crashpad:x86-windows=fail
-crfsuite:arm-uwp=fail
-crfsuite:x64-uwp=fail
 crossguid:x64-osx=fail
 ctemplate:arm64-windows=fail
 ctemplate:arm-uwp=fail