CVS commit: pkgsrc/net/bind910

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Thu Feb  8 14:43:07 UTC 2018

Modified Files:
        pkgsrc/net/bind910: distinfo
        pkgsrc/net/bind910/patches: patch-configure

Log Message:
net/bind910: Fix problem in configure where contents of $LIBS would
be lost when json-c support was enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/net/bind910/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/bind910/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/bind910/distinfo
diff -u pkgsrc/net/bind910/distinfo:1.30 pkgsrc/net/bind910/distinfo:1.31
--- pkgsrc/net/bind910/distinfo:1.30    Wed Jan 17 00:31:38 2018
+++ pkgsrc/net/bind910/distinfo Thu Feb  8 14:43:06 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2018/01/17 00:31:38 taca Exp $
+$NetBSD: distinfo,v 1.31 2018/02/08 14:43:06 fhajny Exp $
 
 SHA1 (bind-9.10.6-P1.tar.gz) = adb06033d5538f2412c8f61ffca123e293ca393a
 RMD160 (bind-9.10.6-P1.tar.gz) = 9795dab8352b17638915a4252252fba08111ae17
@@ -7,7 +7,7 @@ Size (bind-9.10.6-P1.tar.gz) = 9452495 b
 SHA1 (patch-bin_dig_dighost.c) = 983e23a30d519982cbe88ed2277fcffc9cad616e
 SHA1 (patch-bin_tests_system_Makefile.in) = ba368204f8eeaa12be366a532c75a2e3cc8fae98
 SHA1 (patch-config.threads.in) = 227b83efe9cb3e301aaac9b97cf42f1fb8ad06b2
-SHA1 (patch-configure) = 66e0ba57e77b8a47b5882a1b0b276a25474f7a58
+SHA1 (patch-configure) = ac796249d34884e87d51602762df1f29cd1fe0bd
 SHA1 (patch-contrib_dlz_config.dlz.in) = f18bec63fbfce7cb2cd72929058ce3770fce458f
 SHA1 (patch-lib_dns_rbt.c) = 7e37f411d084e5363c6a5023e1915d224321c3e3
 SHA1 (patch-lib_lwres_getaddrinfo.c) = 69e9c8049fedcb93bd219c6053163f21ce3b2535

Index: pkgsrc/net/bind910/patches/patch-configure
diff -u pkgsrc/net/bind910/patches/patch-configure:1.5 pkgsrc/net/bind910/patches/patch-configure:1.6
--- pkgsrc/net/bind910/patches/patch-configure:1.5      Tue Nov  7 02:16:45 2017
+++ pkgsrc/net/bind910/patches/patch-configure  Thu Feb  8 14:43:07 2018
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.5 2017/11/07 02:16:45 kamil Exp $
+$NetBSD: patch-configure,v 1.6 2018/02/08 14:43:07 fhajny Exp $
 
 * Add DragonFly support.
 * Link proper postgresql library.
 * Avoid using "==" for argument of test(1).
 
---- configure.orig     2017-07-24 05:31:21.000000000 +0000
+--- configure.orig     2018-01-04 05:35:08.000000000 +0000
 +++ configure
 @@ -14657,6 +14657,8 @@ case $host in
        use_threads=false ;;
@@ -41,7 +41,7 @@ $NetBSD: patch-configure,v 1.5 2017/11/0
 -                      fi
 -              done
 +              libjson_cflags="`pkg-config --cflags json-c`"
-+              LIBS="`pkg-config --libs json-c`"
++              LIBS="$LIBS `pkg-config --libs json-c`"
 +              have_libjson="yes"
 +              have_libjson_c="yes"
                ;;