3 files changed, 47 insertions, 21 deletions
diff --git a/ports/libmodplug/004-export-pkgconfig.patch b/ports/libmodplug/004-export-pkgconfig.patch
new file mode 100644
index 000000000..28201a961
--- /dev/null
+++ b/ports/libmodplug/004-export-pkgconfig.patch
@@ -0,0 +1,30 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 468f1a3..8e94458 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -142,6 +142,8 @@ if(HAVE_SINF)
+ endif(HAVE_SINF)
+ 
+ if (NOT WIN32)
++  set(UNIXLIBS "-lstdc++ -lm")
++endif (NOT WIN32)
+   set(prefix "${CMAKE_INSTALL_PREFIX}")
+   set(exec_prefix "${CMAKE_INSTALL_PREFIX}")
+   set(libdir "${CMAKE_INSTALL_PREFIX}/lib")
+@@ -152,4 +154,3 @@ if (NOT WIN32)
+   install(FILES "${PROJECT_BINARY_DIR}/libmodplug.pc"
+     DESTINATION lib/pkgconfig
+   )
+-endif (NOT WIN32)
+diff --git a/libmodplug.pc.in b/libmodplug.pc.in
+index bbf05f9..1699d76 100644
+--- a/libmodplug.pc.in
++++ b/libmodplug.pc.in
+@@ -8,5 +8,5 @@ Description: The ModPlug mod file playing library.
+ Version: @VERSION@
+ Requires: 
+ Libs: -L${libdir} -lmodplug 
+-Libs.private: -lstdc++ -lm
++Libs.private: @UNIXLIBS@
+ Cflags: -I${includedir}
+
diff --git a/ports/libmodplug/CONTROL b/ports/libmodplug/CONTROL
index c8339b104..2d05f206a 100644
--- a/ports/libmodplug/CONTROL
+++ b/ports/libmodplug/CONTROL
@@ -1,5 +1,6 @@
 Source: libmodplug
 Version: 0.8.9.0
-Port-Version: 6
+Port-Version: 7
 Homepage: https://github.com/Konstanty/libmodplug
 Description: The ModPlug mod file playing library.
+Supports: !uwp
diff --git a/ports/libmodplug/portfile.cmake b/ports/libmodplug/portfile.cmake
index 261544349..6ead190d8 100644
--- a/ports/libmodplug/portfile.cmake
+++ b/ports/libmodplug/portfile.cmake
@@ -1,28 +1,21 @@
 set(MODPLUG_HASH 5a39f5913d07ba3e61d8d5afdba00b70165da81d)
 
 if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    vcpkg_from_github(ARCHIVE
-        OUT_SOURCE_PATH SOURCE_PATH
-        REPO Konstanty/libmodplug
-        REF ${MODPLUG_HASH}
-        SHA512 c43bb3190b62c3a4e3636bba121b5593bbf8e6577ca9f2aa04d90b03730ea7fb590e640cdadeb565758b92e81187bc456e693fe37f1f4deace9b9f37556e3ba1
-        PATCHES
-            "001-automagically-define-modplug-static.patch"
-            "002-detect_sinf.patch"
-            "003-use-static-cast-for-ctype.patch"
-    )
-else()
-    vcpkg_from_github(ARCHIVE
-        OUT_SOURCE_PATH SOURCE_PATH
-        REPO Konstanty/libmodplug
-        REF ${MODPLUG_HASH}
-        SHA512 c43bb3190b62c3a4e3636bba121b5593bbf8e6577ca9f2aa04d90b03730ea7fb590e640cdadeb565758b92e81187bc456e693fe37f1f4deace9b9f37556e3ba1
-        PATCHES
-            "002-detect_sinf.patch"
-            "003-use-static-cast-for-ctype.patch"
-    )
+    set(STATIC_PATCH "001-automagically-define-modplug-static.patch")
 endif()
 
+vcpkg_from_github(ARCHIVE
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Konstanty/libmodplug
+    REF ${MODPLUG_HASH}
+    SHA512 c43bb3190b62c3a4e3636bba121b5593bbf8e6577ca9f2aa04d90b03730ea7fb590e640cdadeb565758b92e81187bc456e693fe37f1f4deace9b9f37556e3ba1
+    PATCHES
+        ${STATIC_PATCH}
+        002-detect_sinf.patch
+        003-use-static-cast-for-ctype.patch
+        004-export-pkgconfig.patch
+)
+
 vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA)
 
 vcpkg_install_cmake()
@@ -42,5 +35,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic AND VCPKG_TARGET_IS_WINDOWS)
     vcpkg_copy_pdbs()
 endif()
 
+vcpkg_fixup_pkgconfig()
+
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmodplug)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmodplug/COPYING ${CURRENT_PACKAGES_DIR}/share/libmodplug/copyright)