diff --git a/net-libs/miniupnpc/miniupnpc-2.2.3.recipe b/net-libs/miniupnpc/miniupnpc-2.2.3.recipe index 95a9230c1..bc6b32f94 100644 --- a/net-libs/miniupnpc/miniupnpc-2.2.3.recipe +++ b/net-libs/miniupnpc/miniupnpc-2.2.3.recipe @@ -7,7 +7,7 @@ HOMEPAGE="http://miniupnp.free.fr/ https://miniupnp.tuxfamily.org/" COPYRIGHT="2005-2018 Thomas Bernard" LICENSE="BSD (3-clause)" -REVISION="2" +REVISION="3" SOURCE_URI="http://miniupnp.free.fr/files/miniupnpc-$portVersion.tar.gz https://miniupnp.tuxfamily.org/files/miniupnpc-$portVersion.tar.gz" CHECKSUM_SHA256="dce41b4a4f08521c53a0ab163ad2007d18b5e1aa173ea5803bd47a1be3159c24" @@ -47,12 +47,12 @@ BUILD_PREREQUIRES=" BUILD() { cmake . \ - -DCMAKE_INSTALL_PREFIX=$prefix \ -DCMAKE_BUILD_TYPE=release \ + $cmakeDirArgs \ -Wno-dev \ + -DUPNPC_BUILD_STATIC=OFF \ -DUPNPC_BUILD_TESTS=OFF \ - -DUPNPC_BUILD_SAMPLE=OFF \ - $cmakeDirArgs + -DUPNPC_BUILD_SAMPLE=OFF make $jobArgs } @@ -60,17 +60,7 @@ INSTALL() { make install - mkdir -p $includeDir - mv $prefix/include/* $includeDir - rmdir $prefix/include - - if [ -n "$secondaryArchSuffix" ]; then - mv $prefix/lib $prefix/lib2 - mkdir -p $libDir - mv $prefix/lib2/* $libDir/ - rmdir $prefix/lib2 - fi - prepareInstalledDevelLibs libminiupnpc + prepareInstalledDevelLib libminiupnpc packageEntries devel \ $developDir \ $libDir/cmake diff --git a/net-libs/miniupnpc/patches/miniupnpc-2.2.3.patchset b/net-libs/miniupnpc/patches/miniupnpc-2.2.3.patchset index 5ac8fed35..8a827e1ca 100644 --- a/net-libs/miniupnpc/patches/miniupnpc-2.2.3.patchset +++ b/net-libs/miniupnpc/patches/miniupnpc-2.2.3.patchset @@ -1,14 +1,14 @@ -From dad05be8dcf0ab38be3a908b326409dbd3f7386b Mon Sep 17 00:00:00 2001 +From 895b922d86397b057cbe5610f404331ddb7c2aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Tue, 15 Mar 2022 13:13:27 +0100 Subject: Install fix diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0553eeb..6b0904c 100644 +index 0553eeb..524bea3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -221,16 +221,16 @@ endif () +@@ -221,17 +221,17 @@ endif () if (NOT UPNPC_NO_INSTALL) install (FILES @@ -22,6 +22,7 @@ index 0553eeb..6b0904c 100644 - miniupnpctypes.h - portlistingparse.h - miniupnpc_declspec.h +- DESTINATION include/miniupnpc + include/miniupnpc.h + include/miniwget.h + include/upnpcommands.h @@ -32,9 +33,10 @@ index 0553eeb..6b0904c 100644 + include/miniupnpctypes.h + include/portlistingparse.h + include/miniupnpc_declspec.h - DESTINATION include/miniupnpc ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/miniupnpc ) + install(FILES miniupnpc-config.cmake -- -2.30.2 +2.37.3