[Many ports] fix invalid character in feature name (#12306)

2 files changed, 22 insertions, 51 deletions

diff --git a/ports/capstone/CONTROL b/ports/capstone/CONTROL
index 4c94c89a1..60e2a2a53 100644
--- a/ports/capstone/CONTROL
+++ b/ports/capstone/CONTROL
@@ -1,5 +1,6 @@
 Source: capstone
 Version: 4.0.2
+Port-Version: 1
 Homepage: https://github.com/aquynh/capstone
 Description: Multi-architecture disassembly framework
 
@@ -36,8 +37,9 @@ Description: Capstone disassembly support for TMS320C64X
 Feature: x86
 Description: Capstone disassembly support for x86
 
-Feature: x86_reduce
+Feature: x86-reduce
 Description: Capstone disassembly support for x86 without support for less used instructions
+Build-Depends: capstone[x86]
 
 Feature: xcore
 Description: Capstone disassembly support for XCore
diff --git a/ports/capstone/portfile.cmake b/ports/capstone/portfile.cmake
index f0fa68868..3e01523df 100644
--- a/ports/capstone/portfile.cmake
+++ b/ports/capstone/portfile.cmake
@@ -9,35 +9,23 @@ vcpkg_from_github(
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" CS_BUILD_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" CS_BUILD_SHARED)
 
-
-function(check_feature name var)
-    set(${var} OFF PARENT_SCOPE)
-    if (${name} IN_LIST FEATURES)
-        set(${var} ON PARENT_SCOPE)
-    endif ()
-endfunction ()
-
-
-check_feature("arm"         WITH_ARM_SUPPORT)
-check_feature("arm64"       WITH_ARM64_SUPPORT)
-check_feature("evm"         WITH_EVM_SUPPORT)
-check_feature("m680x"       WITH_M680X_SUPPORT)
-check_feature("m68k"        WITH_M68K_SUPPORT)
-check_feature("mips"        WITH_MIPS_SUPPORT)
-check_feature("osxkernel"   WITH_OSXKERNEL_SUPPORT)
-check_feature("ppc"         WITH_PPC_SUPPORT)
-check_feature("sparc"       WITH_SPARC_SUPPORT)
-check_feature("sysz"        WITH_SYSZ_SUPPORT)
-check_feature("tms320c64x"  WITH_C64X_SUPPORT)
-check_feature("x86"         WITH_X86_SUPPORT)
-check_feature("x86_reduce"  WITH_X86_REDUCE)
-check_feature("xcore"       WITH_XCORE_SUPPORT)
-
-check_feature("diet"  CS_BUILD_DIET)
-
-if (WITH_X86_REDUCE AND NOT WITH_X86_SUPPORT)
-    set(WITH_X86_SUPPORT ON)
-endif ()
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    "arm"         CAPSTONE_ARM_SUPPORT
+    "arm64"       CAPSTONE_ARM64_SUPPORT
+    "evm"         CAPSTONE_EVM_SUPPORT
+    "m680x"       CAPSTONE_M680X_SUPPORT
+    "m68k"        CAPSTONE_M68K_SUPPORT
+    "mips"        CAPSTONE_MIPS_SUPPORT
+    "osxkernel"   CAPSTONE_OSXKERNEL_SUPPORT
+    "ppc"         CAPSTONE_PPC_SUPPORT
+    "sparc"       CAPSTONE_SPARC_SUPPORT
+    "sysz"        CAPSTONE_SYSZ_SUPPORT
+    "tms320c64x"  CAPSTONE_TMS320C64X_SUPPORT
+    "x86"         CAPSTONE_X86_SUPPORT
+    "x86-reduce"  CAPSTONE_X86_REDUCE
+    "xcore"       CAPSTONE_XCORE_SUPPORT
+    "diet"        CAPSTONE_BUILD_DIET
+)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
@@ -45,27 +33,11 @@ vcpkg_configure_cmake(
     OPTIONS
         -DCAPSTONE_BUILD_STATIC=${CS_BUILD_STATIC}
         -DCAPSTONE_BUILD_SHARED=${CS_BUILD_SHARED}
-        -DCAPSTONE_BUILD_DIET=${CS_BUILD_DIET}
         -DCAPSTONE_BUILD_TESTS=OFF
         -DCAPSTONE_BUILD_CSTOOL=OFF
         -DCAPSTONE_BUILD_STATIC_RUNTIME=OFF
-
-        -DCAPSTONE_ARM_SUPPORT=${WITH_ARM_SUPPORT}
-        -DCAPSTONE_ARM64_SUPPORT=${WITH_ARM64_SUPPORT}
-        -DCAPSTONE_EVM_SUPPORT=${WITH_EVM_SUPPORT}
-        -DCAPSTONE_M680X_SUPPORT=${WITH_M680X_SUPPORT}
-        -DCAPSTONE_M68K_SUPPORT=${WITH_M68K_SUPPORT}
-        -DCAPSTONE_MIPS_SUPPORT=${WITH_MIPS_SUPPORT}
-        -DCAPSTONE_OSXKERNEL_SUPPORT=${WITH_OSXKERNEL_SUPPORT}
-        -DCAPSTONE_PPC_SUPPORT=${WITH_PPC_SUPPORT}
-        -DCAPSTONE_SPARC_SUPPORT=${WITH_SPARC_SUPPORT}
-        -DCAPSTONE_SYSZ_SUPPORT=${WITH_SYSZ_SUPPORT}
-        -DCAPSTONE_TMS320C64X_SUPPORT=${WITH_C64X_SUPPORT}
-        -DCAPSTONE_X86_SUPPORT=${WITH_X86_SUPPORT}
-        -DCAPSTONE_XCORE_SUPPORT=${WITH_XCORE_SUPPORT}
-
-        -DCAPSTONE_X86_REDUCE=${WITH_X86_REDUCE}
         -DCAPSTONE_X86_ONLY=OFF
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_install_cmake()
@@ -80,7 +52,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
 
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.TXT
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/capstone
-    RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)