3 files changed, 24 insertions, 22 deletions
diff --git a/ports/yara/CMakeLists.txt b/ports/yara/CMakeLists.txt
index 5b01e1c3b..b25a162b1 100644
--- a/ports/yara/CMakeLists.txt
+++ b/ports/yara/CMakeLists.txt
@@ -37,6 +37,7 @@ set(
   libyara/ahocorasick.c
   libyara/arena.c
   libyara/atoms.c
+  libyara/base64.c
   libyara/bitmask.c
   libyara/compiler.c
   libyara/endian.c
@@ -51,16 +52,17 @@ set(
   libyara/libyara.c
   libyara/mem.c
   libyara/modules.c
-  libyara/modules/cuckoo.c
-  libyara/modules/dotnet.c
-  libyara/modules/elf.c
-  libyara/modules/hash.c
-  libyara/modules/math.c
-  libyara/modules/macho.c
-  libyara/modules/pe.c
-  libyara/modules/pe_utils.c
-  libyara/modules/tests.c
-  libyara/modules/time.c
+  libyara/modules/cuckoo/cuckoo.c
+  libyara/modules/dotnet/dotnet.c
+  libyara/modules/elf/elf.c
+  libyara/modules/hash/hash.c
+  libyara/modules/math/math.c
+  libyara/modules/macho/macho.c
+  libyara/modules/pe/pe.c
+  libyara/modules/pe/pe_utils.c
+  libyara/modules/tests/tests.c
+  libyara/modules/time/time.c
+  libyara/notebook.c
   libyara/object.c
   libyara/parser.c
   libyara/proc.c
@@ -81,13 +83,13 @@ set(
 
 set(
   yara_sources
-  args.c
-  threading.c
-  yara.c
+  cli/args.c
+  cli/threading.c
+  cli/yara.c
 )
 set( yarac_sources
-  args.c
-  yarac.c
+  cli/args.c
+  cli/yarac.c
 )
 
 
diff --git a/ports/yara/CONTROL b/ports/yara/CONTROL
index 15095947b..fdd5e4f85 100644
--- a/ports/yara/CONTROL
+++ b/ports/yara/CONTROL
@@ -1,5 +1,5 @@
 Source: yara
-Version: 3.10.0-1
+Version: 4.0.2
 Homepage: https://github.com/VirusTotal/yara
 Description: The pattern matching swiss knife
 Build-Depends: openssl, jansson
diff --git a/ports/yara/portfile.cmake b/ports/yara/portfile.cmake
index d606f0b03..4dbcf958e 100644
--- a/ports/yara/portfile.cmake
+++ b/ports/yara/portfile.cmake
@@ -1,12 +1,10 @@
-include(vcpkg_common_functions)
-
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO VirusTotal/yara
-  REF v3.10.0
-  SHA512 034658e835d59a42f03c062e99b40e96906c5a7de4285037c835d211f53062f8e439ade45e3400c4c35ef64502112e8d3b8d4c575e3265c69286cff2ad919ed9
+  REF v4.0.2
+  SHA512 22575cb7b48eead3b5051ce13beb3deef88a1b605de20ec8e5fc2651c0dd0009eb6c0ecddb8600a43a757ceb6ea298e94f71a26d2f9acb31a73830e18c81d10c
   HEAD_REF dev
 )
 
@@ -15,10 +13,12 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
   PREFER_NINJA
-  OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON -DDISABLE_INSTALL_TOOLS=ON
+  OPTIONS_DEBUG 
+      -DDISABLE_INSTALL_HEADERS=ON 
+      -DDISABLE_INSTALL_TOOLS=ON
 )
 
 vcpkg_install_cmake()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/yara RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)