[libevent] update to 2.1.11 (#7515)

* [libevent] update to 2.1.11

* [libevent] Move scripts to tools folder

* [libevent] Fix non-Windows build

* [libevent] remove bin folder only for static build

and move script to tools folder no matter static or dynamic

3 files changed, 13 insertions, 46 deletions

diff --git a/ports/libevent/CONTROL b/ports/libevent/CONTROL
index 95a4c37da..a05a77edd 100644
--- a/ports/libevent/CONTROL
+++ b/ports/libevent/CONTROL
@@ -1,5 +1,5 @@
 Source: libevent

-Version: 2.1.10

+Version: 2.1.11

 Build-Depends: openssl

 Homepage: https://github.com/libevent/libevent

 Description: An event notification library

diff --git a/ports/libevent/fix-arm_build.patch b/ports/libevent/fix-arm_build.patch
deleted file mode 100644
index 7bfad0449..000000000
--- a/ports/libevent/fix-arm_build.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 44b6e18..19c024f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -322,7 +322,7 @@ endif()
- # Winsock.
- if(WIN32)
-     set(CMAKE_EXTRA_INCLUDE_FILES winsock2.h ws2tcpip.h)
--    set(CMAKE_REQUIRED_LIBRARIES  ws2_32.lib)
-+    set(CMAKE_REQUIRED_LIBRARIES  ws2_32.lib advapi32.lib shell32.lib)
-     set(CMAKE_REQUIRED_DEFINITIONS -FIwinsock2.h -FIws2tcpip.h)
- endif()
- if (SOLARIS)
-diff --git a/cmake/AddEventLibrary.cmake b/cmake/AddEventLibrary.cmake
-index 411ca9d..869735e 100644
---- a/cmake/AddEventLibrary.cmake
-+++ b/cmake/AddEventLibrary.cmake
-@@ -73,6 +73,8 @@ macro(add_event_library LIB_NAME)
-         list(APPEND ADD_EVENT_LIBRARY_TARGETS "${LIB_NAME}_static")
- 
-         set(ADD_EVENT_LIBRARY_INTERFACE "${LIB_NAME}_static")
-+        
-+        target_link_libraries("${LIB_NAME}_static" PRIVATE ${CMAKE_REQUIRED_LIBRARIES})
-     endif()
- 
-     if (${EVENT_LIBRARY_SHARED})
-@@ -81,7 +83,8 @@ macro(add_event_library LIB_NAME)
-         target_link_libraries("${LIB_NAME}_shared"
-             ${CMAKE_THREAD_LIBS_INIT}
-             ${LIB_PLATFORM}
--            ${LIB_LIBRARIES})
-+            ${LIB_LIBRARIES}
-+            ${CMAKE_REQUIRED_LIBRARIES})
- 
-         if (EVENT_SHARED_FLAGS)
-             set_event_shared_lib_flags("${LIB_NAME}" "${EVENT_SHARED_FLAGS}")
diff --git a/ports/libevent/portfile.cmake b/ports/libevent/portfile.cmake
index ee3fdd3b6..91c915b92 100644
--- a/ports/libevent/portfile.cmake
+++ b/ports/libevent/portfile.cmake
@@ -7,11 +7,10 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libevent/libevent
-    REF release-2.1.10-stable
-    SHA512 8c336df258f7a12164da739b0ea68bebcc8b2ea4f4a839300aa1c5edfb673ac5d6517f882ba04ab35d406489ddd682a319e39fa6784ac0cab73227d42e503a55
+    REF release-2.1.11-stable
+    SHA512 a34ca4ad4d55a989a4f485f929d0ed2438d070d0e12a19d90c2b12783a562419c64db6a2603b093d958a75246d14ffefc8730c69c90b1b2f48339bde947f0e02
     PATCHES
         fix-file_path.patch
-        fix-arm_build.patch
 )
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
@@ -34,16 +33,20 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-
-if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "windows" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+if (VCPKG_TARGET_IS_WINDOWS)
     vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/libevent)
-elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share)
-elseif (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+else ()
     vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share)
 endif()
 
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/libevent/)
+file(RENAME ${CURRENT_PACKAGES_DIR}/bin/event_rpcgen.py ${CURRENT_PACKAGES_DIR}/tools/libevent/event_rpcgen.py)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
 vcpkg_copy_pdbs()
 
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libevent)