4 files changed, 36 insertions, 41 deletions
diff --git a/ports/libdisasm/CMakeLists.txt b/ports/libdisasm/CMakeLists.txt
index 9d640a9b9..c3a8dfa30 100644
--- a/ports/libdisasm/CMakeLists.txt
+++ b/ports/libdisasm/CMakeLists.txt
@@ -4,32 +4,32 @@ project(libdisasm C)
 set(CMAKE_DEBUG_POSTFIX d)
 
 set(SRCS
-  ia32_implicit.c
-  ia32_implicit.h
-  ia32_insn.c
-  ia32_insn.h
-  ia32_invariant.c
-  ia32_invariant.h
-  ia32_modrm.c
-  ia32_modrm.h
-  ia32_opcode_tables.c
-  ia32_opcode_tables.h
-  ia32_operand.c
-  ia32_operand.h
-  ia32_reg.c
-  ia32_reg.h
-  ia32_settings.c
-  ia32_settings.h
-  libdis.h
-  qword.h
-  x86_disasm.c
-  x86_format.c
-  x86_imm.c
-  x86_imm.h
-  x86_insn.c
-  x86_misc.c
-  x86_operand_list.c
-  x86_operand_list.h
+  libdisasm/ia32_implicit.c
+  libdisasm/ia32_implicit.h
+  libdisasm/ia32_insn.c
+  libdisasm/ia32_insn.h
+  libdisasm/ia32_invariant.c
+  libdisasm/ia32_invariant.h
+  libdisasm/ia32_modrm.c
+  libdisasm/ia32_modrm.h
+  libdisasm/ia32_opcode_tables.c
+  libdisasm/ia32_opcode_tables.h
+  libdisasm/ia32_operand.c
+  libdisasm/ia32_operand.h
+  libdisasm/ia32_reg.c
+  libdisasm/ia32_reg.h
+  libdisasm/ia32_settings.c
+  libdisasm/ia32_settings.h
+  libdisasm/libdis.h
+  libdisasm/qword.h
+  libdisasm/x86_disasm.c
+  libdisasm/x86_format.c
+  libdisasm/x86_imm.c
+  libdisasm/x86_imm.h
+  libdisasm/x86_insn.c
+  libdisasm/x86_misc.c
+  libdisasm/x86_operand_list.c
+  libdisasm/x86_operand_list.h
 )
 
 include_directories(libdisasm)
@@ -44,5 +44,5 @@ install(
 )
 
 if(NOT DISABLE_INSTALL_HEADERS)
-  install(FILES libdis.h DESTINATION include)
+  install(FILES libdisasm/libdis.h DESTINATION include)
 endif()
diff --git a/ports/libdisasm/CONTROL b/ports/libdisasm/CONTROL
index dae49116d..32e725aa6 100644
--- a/ports/libdisasm/CONTROL
+++ b/ports/libdisasm/CONTROL
@@ -1,4 +1,4 @@
 Source: libdisasm
-Version: 0.23-2
+Version: 0.23-3
 Homepage: https://sourceforge.net/projects/bastard
 Description: x86 Disassembler Library.
diff --git a/ports/libdisasm/portfile.cmake b/ports/libdisasm/portfile.cmake
index e4bbaba54..48b646652 100644
--- a/ports/libdisasm/portfile.cmake
+++ b/ports/libdisasm/portfile.cmake
@@ -2,24 +2,21 @@ include(vcpkg_common_functions)
 
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-set(BASE_PATH ${CURRENT_BUILDTREES_DIR}/src/libdisasm-0.23)
-set(SOURCE_PATH ${BASE_PATH}/libdisasm)
-
 vcpkg_download_distfile(ARCHIVE
     URLS "https://sourceforge.net/projects/bastard/files/libdisasm/0.23/libdisasm-0.23.tar.gz"
     FILENAME "libdisasm-0.23.tar.gz"
     SHA512 29eecfbfd8168188242278a1a38f0c90770d0581a52d4600ae6343829dd0d6607b98329f12a3d7409d43dd56dca6a7d1eb25d58a001c2bfd3eb8474c0e7879e7
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES ${CMAKE_CURRENT_LIST_DIR}/sizeofvoid.patch
+vcpkg_extract_source_archive_ex(
+    ARCHIVE ${ARCHIVE}
+    OUT_SOURCE_PATH SOURCE_PATH
+    PATCHES
+       sizeofvoid.patch
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 
-
 vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
   PREFER_NINJA
@@ -29,4 +26,4 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 
 # Handle copyright
-file(INSTALL ${BASE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libdisasm RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/libdisasm/sizeofvoid.patch b/ports/libdisasm/sizeofvoid.patch
index 428c5616c..1e4e008fc 100644
--- a/ports/libdisasm/sizeofvoid.patch
+++ b/ports/libdisasm/sizeofvoid.patch
@@ -1,7 +1,5 @@
-diff --git a/x86_disasm.c b/x86_disasm.c
-index 04574fa..177bfb8 100644
---- a/x86_disasm.c
-+++ b/x86_disasm.c
+--- a/libdisasm/x86_disasm.c
++++ b/libdisasm/x86_disasm.c
 @@ -35,7 +35,7 @@ unsigned int x86_disasm( unsigned char *buf, unsigned int buf_len,
  
          if ( offset >= buf_len ) {