CVS commit: pkgsrc/net/bind910

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Tue Nov  7 02:16:45 UTC 2017

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

Log Message:
bind910: Correct bind-json-statistics-server option build

Switch detection of json-c from homegrown detection of libraries in
hardcoded dirs to pkg-config detection.

Add new USE_TOOLS option pkg-config.

Bump PKGREVISION to 1 for new dependency.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/net/bind910/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/net/bind910/distinfo
cvs rdiff -u -r1.4 -r1.5 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/Makefile
diff -u pkgsrc/net/bind910/Makefile:1.37 pkgsrc/net/bind910/Makefile:1.38
--- pkgsrc/net/bind910/Makefile:1.37    Mon Jul 31 13:37:53 2017
+++ pkgsrc/net/bind910/Makefile Tue Nov  7 02:16:44 2017
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2017/07/31 13:37:53 taca Exp $
+# $NetBSD: Makefile,v 1.38 2017/11/07 02:16:44 kamil Exp $
 
 DISTNAME=      bind-${BIND_VERSION}
 PKGNAME=       ${DISTNAME:S/-P/pl/}
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
 
@@ -21,7 +22,7 @@ BUILD_DEFS+=  BIND_DIR VARBASE
 
 .include "options.mk"
 
-USE_TOOLS+=            pax perl
+USE_TOOLS+=            pax perl pkg-config
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 #CONFIG_SHELL=         sh -x

Index: pkgsrc/net/bind910/distinfo
diff -u pkgsrc/net/bind910/distinfo:1.28 pkgsrc/net/bind910/distinfo:1.29
--- pkgsrc/net/bind910/distinfo:1.28    Mon Jul 31 13:37:53 2017
+++ pkgsrc/net/bind910/distinfo Tue Nov  7 02:16:44 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2017/07/31 13:37:53 taca Exp $
+$NetBSD: distinfo,v 1.29 2017/11/07 02:16:44 kamil Exp $
 
 SHA1 (bind-9.10.6.tar.gz) = a00f58a389616a8ccf8e30fe3150ecf4ce654e31
 RMD160 (bind-9.10.6.tar.gz) = c136d4698351160dd8851c10c117c788ecd88296
@@ -7,7 +7,7 @@ Size (bind-9.10.6.tar.gz) = 9449394 byte
 SHA1 (patch-bin_dig_dighost.c) = 983e23a30d519982cbe88ed2277fcffc9cad616e
 SHA1 (patch-bin_tests_system_Makefile.in) = ba368204f8eeaa12be366a532c75a2e3cc8fae98
 SHA1 (patch-config.threads.in) = 227b83efe9cb3e301aaac9b97cf42f1fb8ad06b2
-SHA1 (patch-configure) = 754a510493ae8fae669a9ff79940ccb04bc1e57e
+SHA1 (patch-configure) = 66e0ba57e77b8a47b5882a1b0b276a25474f7a58
 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.4 pkgsrc/net/bind910/patches/patch-configure:1.5
--- pkgsrc/net/bind910/patches/patch-configure:1.4      Sun Dec 13 17:35:22 2015
+++ pkgsrc/net/bind910/patches/patch-configure  Tue Nov  7 02:16:45 2017
@@ -1,12 +1,12 @@
-$NetBSD: patch-configure,v 1.4 2015/12/13 17:35:22 taca Exp $
+$NetBSD: patch-configure,v 1.5 2017/11/07 02:16:45 kamil Exp $
 
 * Add DragonFly support.
 * Link proper postgresql library.
 * Avoid using "==" for argument of test(1).
 
---- configure.orig     2015-09-09 02:23:40.000000000 +0000
+--- configure.orig     2017-07-24 05:31:21.000000000 +0000
 +++ configure
-@@ -14388,6 +14388,8 @@ case $host in
+@@ -14657,6 +14657,8 @@ case $host in
        use_threads=false ;;
  *-freebsd*)
        use_threads=true ;;
@@ -15,7 +15,39 @@ $NetBSD: patch-configure,v 1.4 2015/12/1
  *-bsdi[234]*)
        # Thread signals do not work reliably on some versions of BSD/OS.
        use_threads=false ;;
-@@ -21276,7 +21278,7 @@ $as_echo "no" >&6; }
+@@ -16956,27 +16958,10 @@ case "$use_libjson" in
+               libjson_libs=""
+               ;;
+       auto|yes)
+-              for d in /usr /usr/local /opt/local
+-              do
+-                      if test -f "${d}/include/json/json.h"
+-                      then
+-                              if test ${d} != /usr
+-                              then
+-                                      libjson_cflags="-I ${d}/include"
+-                                      LIBS="$LIBS -L${d}/lib"
+-                              fi
+-                              have_libjson="yes"
+-                      elif test -f "${d}/include/json-c/json.h"
+-                      then
+-                              if test ${d} != /usr
+-                              then
+-                                      libjson_cflags="-I ${d}/include"
+-                                      LIBS="$LIBS -L${d}/lib"
+-                              fi
+-                              have_libjson="yes"
+-                              have_libjson_c="yes"
+-                      fi
+-              done
++              libjson_cflags="`pkg-config --cflags json-c`"
++              LIBS="`pkg-config --libs json-c`"
++              have_libjson="yes"
++              have_libjson_c="yes"
+               ;;
+       *)
+               if test -f "${use_libjson}/include/json/json.h"
+@@ -21861,7 +21846,7 @@ $as_echo "no" >&6; }
        fi
        if test -n "-L$use_dlz_postgres_lib -lpq"
        then