diff --git a/net-libs/enet/enet-1.3.14.recipe b/net-libs/enet/enet-1.3.17.recipe similarity index 73% rename from net-libs/enet/enet-1.3.14.recipe rename to net-libs/enet/enet-1.3.17.recipe index f3c281772..576630cbe 100644 --- a/net-libs/enet/enet-1.3.14.recipe +++ b/net-libs/enet/enet-1.3.17.recipe @@ -12,15 +12,18 @@ COPYRIGHT="2002-2010 Lee Salzman" LICENSE="MIT" REVISION="1" SOURCE_URI="http://enet.bespin.org/download/enet-$portVersion.tar.gz" -CHECKSUM_SHA256="98f6f57aab0a424469619ed3047728f0d3901ce8f0dea919c11e7966d807e870" +CHECKSUM_SHA256="a38f0f194555d558533b8b15c0c478e946310022d0ec7b34334e19e4574dcedc" PATCHES="enet-$portVersion.patchset" -ARCHITECTURES="all ?x86" +ARCHITECTURES="all" SECONDARY_ARCHITECTURES="x86" +libVersion="7.0.5" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" + PROVIDES=" enet$secondaryArchSuffix = $portVersion - lib:libenet$secondaryArchSuffix = 7.0.2 compat >= 7 + lib:libenet$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix @@ -28,7 +31,7 @@ REQUIRES=" PROVIDES_devel=" enet${secondaryArchSuffix}_devel = $portVersion - devel:libenet$secondaryArchSuffix = 7.0.2 compat >= 7 + devel:libenet$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" enet$secondaryArchSuffix == $portVersion base @@ -42,7 +45,7 @@ BUILD_PREREQUIRES=" cmd:autoreconf cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix - cmd:libtoolize + cmd:libtoolize$secondaryArchSuffix cmd:make cmd:sed " @@ -50,7 +53,8 @@ BUILD_PREREQUIRES=" BUILD() { autoreconf -fi - runConfigure ./configure + runConfigure ./configure \ + --disable-static make $jobArgs } @@ -58,18 +62,12 @@ INSTALL() { make install - rm $libDir/libenet.la $libDir/libenet.a + rm $libDir/libenet.la - prepareInstalledDevelLibs libenet + prepareInstalledDevelLib libenet fixPkgconfig # devel package packageEntries devel \ $developDir - - # Remove stuff we don't need in the secondary architecture base package. - if [ -n "$secondaryArchSuffix" ]; then - rm -rf $binDir - rm -rf $documentationDir - fi } diff --git a/net-libs/enet/patches/enet-1.3.14.patchset b/net-libs/enet/patches/enet-1.3.14.patchset deleted file mode 100644 index 93af4dc2d..000000000 --- a/net-libs/enet/patches/enet-1.3.14.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 6e5490810acb68ed42ec4c4dc79e35673aa2b8a5 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 26 Oct 2017 13:44:56 +0200 -Subject: applying patch enet-1.3.0.patch - - -diff --git a/configure.ac b/configure.ac -index da21b7c..eed6745 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -16,6 +16,8 @@ AC_CHECK_FUNC(inet_ntop, [AC_DEFINE(HAS_INET_NTOP)]) - - AC_CHECK_MEMBER(struct msghdr.msg_flags, [AC_DEFINE(HAS_MSGHDR_FLAGS)], , [#include ]) - -+AC_CHECK_LIB(network, connect) -+ - AC_CHECK_TYPE(socklen_t, [AC_DEFINE(HAS_SOCKLEN_T)], , - #include - #include --- -2.14.2 - diff --git a/net-libs/enet/patches/enet-1.3.17.patchset b/net-libs/enet/patches/enet-1.3.17.patchset new file mode 100644 index 000000000..1b1e066e4 --- /dev/null +++ b/net-libs/enet/patches/enet-1.3.17.patchset @@ -0,0 +1,22 @@ +From 66f5467289228d4f678587afbd698de758c0dd3a Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Sat, 1 Jul 2023 20:32:31 +0000 +Subject: applying patch enet-1.3.0.patch + + +diff --git a/configure.ac b/configure.ac +index e0c745d..e9fe2e5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7,6 +7,8 @@ AC_CONFIG_MACRO_DIR([m4]) + AC_PROG_CC + AC_PROG_LIBTOOL + ++AC_CHECK_LIB(network, connect) ++ + AC_CHECK_FUNC(getaddrinfo, [AC_DEFINE(HAS_GETADDRINFO)]) + AC_CHECK_FUNC(getnameinfo, [AC_DEFINE(HAS_GETNAMEINFO)]) + AC_CHECK_FUNC(gethostbyaddr_r, [AC_DEFINE(HAS_GETHOSTBYADDR_R)]) +-- +2.37.3 +