From 58e0d4029e44ebfbe19f3b0fc6cc9dc88eaf1f4b Mon Sep 17 00:00:00 2001
From: Phil Christensen <philc@microsoft.com>
Date: Wed, 12 Jun 2019 21:39:10 -0700
Subject: [PATCH] [libsodium/darts-clone] remove conflicting makefile (#6875)

* [libsodium/darts-clone] remove conflicting makefile
---
 ports/darts-clone/CONTROL        | 2 +-
 ports/darts-clone/portfile.cmake | 2 ++
 ports/libsodium/CONTROL          | 2 +-
 ports/libsodium/portfile.cmake   | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ports/darts-clone/CONTROL b/ports/darts-clone/CONTROL
index 2d34f86c70..a0bfad433c 100644
--- a/ports/darts-clone/CONTROL
+++ b/ports/darts-clone/CONTROL
@@ -1,3 +1,3 @@
 Source: darts-clone
-Version:  1767ab87cffe
+Version:  1767ab87cffe-1
 Description: A static double-array trie structure
diff --git a/ports/darts-clone/portfile.cmake b/ports/darts-clone/portfile.cmake
index 2979e83b5e..d7eb7941c1 100644
--- a/ports/darts-clone/portfile.cmake
+++ b/ports/darts-clone/portfile.cmake
@@ -23,4 +23,6 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
+file(REMOVE ${CURRENT_PACKAGES_DIR}/include/Makefile.am)
+
 file(INSTALL ${SOURCE_PATH}/COPYING.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/darts-clone RENAME copyright)
diff --git a/ports/libsodium/CONTROL b/ports/libsodium/CONTROL
index a994a17296..cff52a1b2d 100644
--- a/ports/libsodium/CONTROL
+++ b/ports/libsodium/CONTROL
@@ -1,3 +1,3 @@
 Source: libsodium
-Version: 1.0.17-2
+Version: 1.0.17-3
 Description: A modern and easy-to-use crypto library
diff --git a/ports/libsodium/portfile.cmake b/ports/libsodium/portfile.cmake
index b8321c6ac4..c18f079923 100644
--- a/ports/libsodium/portfile.cmake
+++ b/ports/libsodium/portfile.cmake
@@ -40,6 +40,8 @@ file(REMOVE_RECURSE
     ${CURRENT_PACKAGES_DIR}/debug/include
 )
 
+file(REMOVE ${CURRENT_PACKAGES_DIR}/include/Makefile.am)
+
 if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     vcpkg_replace_string(
         ${CURRENT_PACKAGES_DIR}/include/sodium/export.h