cadaver, bump version, drop x86_gcc2 (#8659)

2026-04-22 03:30:05 +02:00 · 2023-05-17 13:06:23 +02:00
parent ab76615747
commit 01e97a0d7a
3 changed files with 72 additions and 141 deletions
--- a/net-misc/cadaver/cadaver-0.23.3.recipe
+++ b/net-misc/cadaver/cadaver-0.23.3.recipe
@@ -1,65 +0,0 @@
-SUMMARY="A command line WebDAV client"
-DESCRIPTION="It supports file upload, download, on-screen display, namespace \
-operations (move/copy), collection creation and deletion, and locking \
-operations."
-HOMEPAGE="http://www.webdav.org/cadaver/"
-COPYRIGHT="1998-2008 Joe Orton
-	2002-2003 GRASE Lab, UCSC"
-LICENSE="GNU GPL v2"
-REVISION="5"
-SOURCE_URI="http://www.webdav.org/cadaver/cadaver-$portVersion.tar.gz"
-CHECKSUM_SHA256="fd4ce68a3230ba459a92bcb747fc6afa91e46d803c1d5ffe964b661793c13fca"
-PATCHES="cadaver-$portVersion.patchset"
-
-ARCHITECTURES="all"
-
-PROVIDES="
-	cadaver = $portVersion
-	cmd:cadaver
-	"
-REQUIRES="
-	haiku
-	lib:libintl
-	lib:libncurses
-	lib:libneon
-	lib:libreadline
-	lib:libssl
-	lib:libxml2
-	lib:libz
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libintl
-	devel:libncurses
-	devel:libneon
-	devel:libreadline >= 8
-	devel:libssl
-	devel:libxml2
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:automake
-	cmd:bison
-	cmd:gcc
-	cmd:libtoolize
-	cmd:make
-	cmd:neon_config
-	cmd:pkg_config
-	"
-
-defineDebugInfoPackage cadaver \
-	"$binDir"/cadaver
-
-BUILD()
-{
-	runConfigure ./configure
-	make $jobArgs
-}
-
-INSTALL()
-{
-	make install
-}
--- a/net-misc/cadaver/cadaver-0.24.recipe
+++ b/net-misc/cadaver/cadaver-0.24.recipe
@@ -0,0 +1,72 @@
+SUMMARY="A command line WebDAV client"
+DESCRIPTION="It supports file upload, download, on-screen display, namespace \
+operations (move/copy), collection creation and deletion, and locking \
+operations."
+HOMEPAGE="https://notroj.github.io/cadaver/"
+COPYRIGHT="1998-2008 Joe Orton
+	2002-2003 GRASE Lab, UCSC"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="https://notroj.github.io/cadaver/cadaver-$portVersion.tar.gz"
+CHECKSUM_SHA256="46cff2f3ebd32cd32836812ca47bcc75353fc2be757f093da88c0dd8f10fd5f6"
+
+ARCHITECTURES="all !x86_gcc2"
+SECONDARY_ARCHITECTURES="x86"
+
+commandBinDir=$binDir
+commandSuffix=$secondaryArchSuffix
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
+
+PROVIDES="
+	cadaver$secondaryArchSuffix = $portVersion
+	cmd:cadaver$commandSuffix
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libncurses$secondaryArchSuffix
+	lib:libneon$secondaryArchSuffix
+	lib:libreadline$secondaryArchSuffix
+	lib:libssl$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libiconv$secondaryArchSuffix
+	devel:libncurses$secondaryArchSuffix
+	devel:libneon$secondaryArchSuffix
+	devel:libreadline$secondaryArchSuffix >= 8
+	devel:libssl$secondaryArchSuffix
+	devel:libxml2$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:automake
+	cmd:bison
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	cmd:neon_config
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+defineDebugInfoPackage cadaver$secondaryArchSuffix \
+	"$commandBinDir"/cadaver
+
+BUILD()
+{
+	runConfigure --omit-dirs binDir ./configure \
+		--bindir=$commandBinDir
+	make $jobArgs
+}
+
+INSTALL()
+{
+	make install
+}
--- a/net-misc/cadaver/patches/cadaver-0.23.3.patchset
+++ b/net-misc/cadaver/patches/cadaver-0.23.3.patchset
@@ -1,76 +0,0 @@
-From 020a6b304799e9560f5678dcbc04bb7cbe6037f5 Mon Sep 17 00:00:00 2001
-From: fbrosson <fbrosson@localhost>
-Date: Sat, 24 Nov 2018 21:03:08 +0000
-Subject: Also accept neon 0.30. Thanks @kenmays & @Begasus
-
-
-diff --git a/configure.ac b/configure.ac
-index 93cdb01..a26f60e 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -33,7 +33,7 @@ AC_ARG_ENABLE(netrc,
- AC_HELP_STRING([--disable-netrc], [enable .netrc support]),,
- enable_netrc=yes)
- 
-NE_REQUIRE_VERSIONS([0], [27 28 29])
-+NE_REQUIRE_VERSIONS([0], [27 28 29 30 31])
- 
- dnl Don't enable zlib or ACL support in neon
- NEON_WITHOUT_ZLIB
-- 
-2.19.1
-
-
-From 73180ea67376142a133189527f0eede8e9e30b8a Mon Sep 17 00:00:00 2001
-From: fbrosson <fbrosson@localhost>
-Date: Sat, 24 Nov 2018 21:20:10 +0000
-Subject: Also accept neon 0.30. Patching configure to workaround other issues.
-
-
-diff --git a/configure b/configure
-index 1679f3e..1eb77cd 100755
--- a/configure
-+++ b/configure
-@@ -9595,7 +9595,7 @@ fi
- $as_echo "$ne_cv_lib_neon" >&6; }
-     if test "$ne_cv_lib_neon" = "yes"; then
-        ne_cv_lib_neonver=no
-       for v in 27 28 29; do
-+       for v in 27 28 29 30 31; do
-           case $ne_libver in
-           0.$v.*) ne_cv_lib_neonver=yes ;;
-           esac
-@@ -10242,8 +10242,8 @@ _ACEOF
-     fi
- 
- else
-    { $as_echo "$as_me:$LINENO: incompatible neon library version $ne_libver: wanted 0.27 28 29" >&5
-$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 28 29" >&6;}
-+    { $as_echo "$as_me:$LINENO: incompatible neon library version $ne_libver: wanted 0.27 28 29 30 31" >&5
-+$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 28 29 30 31" >&6;}
-     neon_got_library=no
- fi
- 
-@@ -10328,7 +10328,7 @@ fi
- $as_echo "$ne_cv_lib_neon" >&6; }
-     if test "$ne_cv_lib_neon" = "yes"; then
-        ne_cv_lib_neonver=no
-       for v in 27 28 29; do
-+       for v in 27 28 29 30 31; do
-           case $ne_libver in
-           0.$v.*) ne_cv_lib_neonver=yes ;;
-           esac
-@@ -10975,8 +10975,8 @@ _ACEOF
-     fi
- 
- else
-    { $as_echo "$as_me:$LINENO: incompatible neon library version $ne_libver: wanted 0.27 28 29" >&5
-$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 28 29" >&6;}
-+    { $as_echo "$as_me:$LINENO: incompatible neon library version $ne_libver: wanted 0.27 28 29 30 31" >&5
-+$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 28 29 30 31" >&6;}
-     neon_got_library=no
- fi
- 
-- 
-2.19.1
-