The update of net/neon to 0.31 has broken the ever more aptly named
net/cadaver:

checking linking against neon... yes
configure: incompatible neon library version 0.31.2: wanted 0.27 28 29 30
configure: error: could not use external neon library

We already had to expand the range of allowable versions to include
0.30, so let's add 0.31 now.  Sync wantlib while here.

OK?

Does anybody use this and can test that it still works?


Index: Makefile
===================================================================
RCS file: /cvs/ports/net/cadaver/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile    12 Jul 2019 20:48:23 -0000      1.27
+++ Makefile    12 Jul 2021 19:21:06 -0000
@@ -3,7 +3,7 @@
 COMMENT=               command-line WebDAV client
 
 DISTNAME=              cadaver-0.23.3
-REVISION=              5
+REVISION=              6
 CATEGORIES=            net www
 
 HOMEPAGE=              http://www.webdav.org/cadaver/
@@ -11,8 +11,7 @@ HOMEPAGE=             http://www.webdav.org/cadaver
 # GPLv2+
 PERMIT_PACKAGE=        Yes
 
-WANTLIB =  c crypto curses expat iconv intl neon proxy pthread readline
-WANTLIB += ssl z
+WANTLIB =  c crypto curses expat intl neon proxy readline ssl z
 
 LIB_DEPENDS=           net/neon
 
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/net/cadaver/patches/patch-configure,v
retrieving revision 1.4
diff -u -p -r1.4 patch-configure
--- patches/patch-configure     8 Sep 2014 06:51:48 -0000       1.4
+++ patches/patch-configure     12 Jul 2021 19:21:06 -0000
@@ -1,12 +1,13 @@
 $OpenBSD: patch-configure,v 1.4 2014/09/08 06:51:48 ajacoutot Exp $
---- configure.orig     Mon Sep  8 08:49:16 2014
-+++ configure  Mon Sep  8 08:49:47 2014
+Index: configure
+--- configure.orig
++++ 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; do
++       for v in 27 28 29 30 31; do
            case $ne_libver in
            0.$v.*) ne_cv_lib_neonver=yes ;;
            esac
@@ -16,8 +17,8 @@ $OpenBSD: patch-configure,v 1.4 2014/09/
  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" >&5
-+$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 
28 29 30" >&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
  
@@ -26,7 +27,7 @@ $OpenBSD: patch-configure,v 1.4 2014/09/
      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; do
++       for v in 27 28 29 30 31; do
            case $ne_libver in
            0.$v.*) ne_cv_lib_neonver=yes ;;
            esac
@@ -36,8 +37,8 @@ $OpenBSD: patch-configure,v 1.4 2014/09/
  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" >&5
-+$as_echo "$as_me: incompatible neon library version $ne_libver: wanted 0.27 
28 29 30" >&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
  
-- 
Christian "naddy" Weisgerber                          na...@mips.inka.de

Reply via email to