diff --git a/ports/winpcap/CONTROL b/ports/winpcap/CONTROL index 14960d89d86c2b..c745c2d96ae12f 100644 --- a/ports/winpcap/CONTROL +++ b/ports/winpcap/CONTROL @@ -1,4 +1,5 @@ Source: winpcap -Version: 4.1.3-3 +Version: 4.1.3 +Port-Version: 4 Homepage: https://www.winpcap.org Description: WinPcap is the industry-standard tool for link-layer network access in Windows environments. diff --git a/ports/winpcap/portfile.cmake b/ports/winpcap/portfile.cmake index 62183624fdd5df..8549c543d26c8a 100644 --- a/ports/winpcap/portfile.cmake +++ b/ports/winpcap/portfile.cmake @@ -45,12 +45,7 @@ vcpkg_extract_source_archive_ex( "${CMAKE_CURRENT_LIST_DIR}/fix-create-lib-batch.patch" ) -file( - COPY - "${CURRENT_PORT_DIR}/create_bin.bat" - DESTINATION - ${SOURCE_PATH} -) +file(COPY "${CURRENT_PORT_DIR}/create_bin.bat" DESTINATION ${SOURCE_PATH}) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") set(PLATFORM Win32) @@ -111,8 +106,7 @@ vcpkg_execute_required_process( LOGNAME create_include-${TARGET_TRIPLET} ) -file( - INSTALL +file(INSTALL "${SOURCE_PATH}/WpdPack/Include/bittypes.h" "${SOURCE_PATH}/WpdPack/Include/ip6_misc.h" "${SOURCE_PATH}/WpdPack/Include/Packet32.h" @@ -122,12 +116,9 @@ file( "${SOURCE_PATH}/WpdPack/Include/pcap-stdinc.h" "${SOURCE_PATH}/WpdPack/Include/remote-ext.h" "${SOURCE_PATH}/WpdPack/Include/Win32-Extensions.h" - DESTINATION - ${CURRENT_PACKAGES_DIR}/include -) + DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file( - INSTALL +file(INSTALL "${SOURCE_PATH}/WpdPack/Include/pcap/bluetooth.h" "${SOURCE_PATH}/WpdPack/Include/pcap/bpf.h" "${SOURCE_PATH}/WpdPack/Include/pcap/namedb.h" @@ -135,9 +126,7 @@ file( "${SOURCE_PATH}/WpdPack/Include/pcap/sll.h" "${SOURCE_PATH}/WpdPack/Include/pcap/usb.h" "${SOURCE_PATH}/WpdPack/Include/pcap/vlan.h" - DESTINATION - ${CURRENT_PACKAGES_DIR}/include/pcap -) + DESTINATION ${CURRENT_PACKAGES_DIR}/include/pcap) vcpkg_execute_required_process( COMMAND ${SOURCE_PATH}/create_lib.bat @@ -150,21 +139,15 @@ if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") set(PCAP_LIBRARY_PATH "${PCAP_LIBRARY_PATH}/x64") endif() -file( - INSTALL +file(INSTALL "${PCAP_LIBRARY_PATH}/Packet.lib" "${PCAP_LIBRARY_PATH}/wpcap.lib" - DESTINATION - ${CURRENT_PACKAGES_DIR}/lib -) + DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file( - INSTALL +file(INSTALL "${PCAP_LIBRARY_PATH}/debug/Packet.lib" "${PCAP_LIBRARY_PATH}/debug/wpcap.lib" - DESTINATION - ${CURRENT_PACKAGES_DIR}/debug/lib -) + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") vcpkg_execute_required_process( @@ -178,21 +161,17 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(PCAP_BINARY_PATH "${PCAP_BINARY_PATH}/x64") endif() - file( - INSTALL + file(INSTALL "${PCAP_BINARY_PATH}/Packet.dll" "${PCAP_BINARY_PATH}/wpcap.dll" - DESTINATION - ${CURRENT_PACKAGES_DIR}/bin - ) + DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file( - INSTALL + file(INSTALL "${PCAP_BINARY_PATH}/Packet.dll" "${PCAP_BINARY_PATH}/wpcap.dll" - DESTINATION - ${CURRENT_PACKAGES_DIR}/debug/bin - ) + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) endif() -configure_file(${COPYRIGHT} ${CURRENT_PACKAGES_DIR}/share/winpcap/copyright COPYONLY) +vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/pcap-stdinc.h "#define inline __inline" "#ifndef __cplusplus\n#define inline __inline\n#endif") + +configure_file(${COPYRIGHT} ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)