CVS commit: pkgsrc/net/dnsdist

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu May  8 13:48:43 UTC 2025

Modified Files:
        pkgsrc/net/dnsdist: Makefile distinfo
        pkgsrc/net/dnsdist/patches: patch-configure

Log Message:
dnsdist: Fix readline build.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/net/dnsdist/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/dnsdist/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/dnsdist/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/dnsdist/Makefile
diff -u pkgsrc/net/dnsdist/Makefile:1.32 pkgsrc/net/dnsdist/Makefile:1.33
--- pkgsrc/net/dnsdist/Makefile:1.32    Wed Apr 30 17:37:36 2025
+++ pkgsrc/net/dnsdist/Makefile Thu May  8 13:48:43 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2025/04/30 17:37:36 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2025/05/08 13:48:43 jperkin Exp $
 
 DISTNAME=      dnsdist-1.9.9
 #PKGREVISION=  1
@@ -40,8 +40,15 @@ CONFIGURE_ARGS+=     --without-net-snmp
 CONFIGURE_ARGS+=       --enable-dns-over-https
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 
+.include "../../mk/readline.buildlink3.mk"
+
+.if ${READLINE_TYPE} == "editline"
+CONFIGURE_ARGS+=       --with-libedit
 CONFIGURE_ENV+=                LIBEDIT_CFLAGS="-I${BUILDLINK_PREFIX.editlinereadline}/include"
 CONFIGURE_ENV+=                LIBEDIT_LIBS="-L${BUILDLINK_PREFIX.editlinereadline}/lib ${BUILDLINK_LDADD.editlinereadline}"
+.else
+CONFIGURE_ARGS+=       --without-libedit
+.endif
 
 EGDIR=                 ${PREFIX}/share/examples/dnsdist
 CONF_FILES=            ${EGDIR}/dnsdist.conf-dist ${PKG_SYSCONFDIR}/dnsdist.conf
@@ -60,5 +67,4 @@ RCD_SCRIPTS+=         dnsdist
 .include "../../security/openssl/buildlink3.mk"
 .include "../../www/nghttp2/buildlink3.mk"
 .include "../../mk/atomic64.mk"
-.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/dnsdist/distinfo
diff -u pkgsrc/net/dnsdist/distinfo:1.17 pkgsrc/net/dnsdist/distinfo:1.18
--- pkgsrc/net/dnsdist/distinfo:1.17    Wed Apr 30 17:37:36 2025
+++ pkgsrc/net/dnsdist/distinfo Thu May  8 13:48:43 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2025/04/30 17:37:36 wiz Exp $
+$NetBSD: distinfo,v 1.18 2025/05/08 13:48:43 jperkin Exp $
 
 BLAKE2s (dnsdist-1.9.9.tar.bz2) = d3fe760e21c056d782a2395a86abc009a19795fa661ea84e447ba43cbe05f156
 SHA512 (dnsdist-1.9.9.tar.bz2) = addd72f5324d75811601d9efe7af8846a448694172a14066b3ae53c7e53195f6955a038f97411703f66ce6bafd02846bf3c679839c473de6f7fc9ebecb8e6ca9
 Size (dnsdist-1.9.9.tar.bz2) = 1609983 bytes
-SHA1 (patch-configure) = 68f5c1ebc1d5d5653220a4c99a61d314d9af8029
+SHA1 (patch-configure) = 97baf4de9a110d98beb5d251e8a27a1d184bb8d1

Index: pkgsrc/net/dnsdist/patches/patch-configure
diff -u pkgsrc/net/dnsdist/patches/patch-configure:1.2 pkgsrc/net/dnsdist/patches/patch-configure:1.3
--- pkgsrc/net/dnsdist/patches/patch-configure:1.2      Thu Apr 10 20:50:09 2025
+++ pkgsrc/net/dnsdist/patches/patch-configure  Thu May  8 13:48:43 2025
@@ -1,10 +1,19 @@
-$NetBSD: patch-configure,v 1.2 2025/04/10 20:50:09 wiz Exp $
+$NetBSD: patch-configure,v 1.3 2025/05/08 13:48:43 jperkin Exp $
 
 Fix unportable test(1) operator.
 
---- configure.orig     2024-12-17 09:14:59.000000000 +0000
+--- configure.orig     2025-04-29 09:46:28.000000000 +0000
 +++ configure
-@@ -25928,12 +25928,12 @@ fi
+@@ -18532,7 +18532,7 @@ printf %s "checking whether to link in l
+ # Check whether --with-libedit was given.
+ if test ${with_libedit+y}
+ then :
+-  withval=$with_libedit; with_libedit=$enableval
++  withval=$with_libedit; with_libedit=$withval
+ else $as_nop
+   with_libedit=yes
+ 
+@@ -26247,12 +26247,12 @@ fi
  then :
  
  
@@ -19,7 +28,7 @@ Fix unportable test(1) operator.
  then :
  
        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -D_FORTIFY_SOURCE=3" >&5
-@@ -25982,7 +25982,7 @@ fi
+@@ -26301,7 +26301,7 @@ fi
  
  fi
  
@@ -28,7 +37,7 @@ Fix unportable test(1) operator.
  then :
  
        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -D_FORTIFY_SOURCE=2" >&5
-@@ -26031,7 +26031,7 @@ fi
+@@ -26350,7 +26350,7 @@ fi
  
  fi
  
@@ -37,7 +46,7 @@ Fix unportable test(1) operator.
  then :
  
        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -D_FORTIFY_SOURCE=1" >&5
-@@ -26742,7 +26742,7 @@ fi
+@@ -27061,7 +27061,7 @@ fi
  then :
  
  
@@ -46,7 +55,7 @@ Fix unportable test(1) operator.
  then :
  
        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -flto=thin" >&5
-@@ -26792,7 +26792,7 @@ fi
+@@ -27111,7 +27111,7 @@ fi
  
  fi
  
@@ -55,7 +64,7 @@ Fix unportable test(1) operator.
  then :
  
        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler handles -flto=auto" >&5
-@@ -26842,7 +26842,7 @@ fi
+@@ -27161,7 +27161,7 @@ fi
  
  fi