CVS commit: pkgsrc/net/bind911

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Oct 24 11:27:28 UTC 2018

Modified Files:
        pkgsrc/net/bind911: distinfo options.mk
        pkgsrc/net/bind911/patches: patch-configure

Log Message:
bind911: Fix build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/bind911/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/bind911/options.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/bind911/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/bind911/distinfo
diff -u pkgsrc/net/bind911/distinfo:1.3 pkgsrc/net/bind911/distinfo:1.4
--- pkgsrc/net/bind911/distinfo:1.3     Sun Oct 21 15:51:14 2018
+++ pkgsrc/net/bind911/distinfo Wed Oct 24 11:27:28 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2018/10/21 15:51:14 taca Exp $
+$NetBSD: distinfo,v 1.4 2018/10/24 11:27:28 jperkin Exp $
 
 SHA1 (bind-9.11.5.tar.gz) = a87a1d6a94be03110ea4776001a75d29a3634cbc
 RMD160 (bind-9.11.5.tar.gz) = 7ac8f391f875d2eba07a1a31495ba1e1209a118a
@@ -6,7 +6,7 @@ SHA512 (bind-9.11.5.tar.gz) = 7e34c8033d
 Size (bind-9.11.5.tar.gz) = 8810710 bytes
 SHA1 (patch-bin_tests_system_metadata_tests.sh) = d01a492d0b7738760bdbff714248e279a78fef28
 SHA1 (patch-config.threads.in) = 8341bdb11888d3efdde5f115de91b1f46aa40bd0
-SHA1 (patch-configure) = 9e488b315253dd9cf84e6658468e26399798b0e6
+SHA1 (patch-configure) = 7f73f26266ebd4556ab160e93dc0738188a70e20
 SHA1 (patch-contrib_dlz_config.dlz.in) = 6c53d61aaaf1a952a867e4c4da0194db94f511d7
 SHA1 (patch-lib_dns_rbt.c) = 8af91b6d40b591d28d15f7f98c9b7a82df234381
 SHA1 (patch-lib_isc_unix_socket.c) = dff0163246985d0750b2c99ce7673b257df3e5bf

Index: pkgsrc/net/bind911/options.mk
diff -u pkgsrc/net/bind911/options.mk:1.1 pkgsrc/net/bind911/options.mk:1.2
--- pkgsrc/net/bind911/options.mk:1.1   Sun Sep  9 13:11:38 2018
+++ pkgsrc/net/bind911/options.mk       Wed Oct 24 11:27:28 2018
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2018/09/09 13:11:38 taca Exp $
+# $NetBSD: options.mk,v 1.2 2018/10/24 11:27:28 jperkin Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.bind911
 PKG_SUPPORTED_OPTIONS= bind-dig-sigchase bind-xml-statistics-server
@@ -65,6 +65,7 @@ CONFIGURE_ARGS+=      --enable-fetchlimit
 
 .if !empty(PKG_OPTIONS:Mgeoip)
 CONFIGURE_ARGS+=       --with-geoip=${PREFIX}
+LDFLAGS+=              -lGeoIP
 .include "../../net/GeoIP/buildlink3.mk"
 .endif
 
@@ -87,6 +88,7 @@ CONFIGURE_ARGS+=      --with-tuning=large
 .if !empty(PKG_OPTIONS:Mbind-xml-statistics-server)
 .include "../../textproc/libxml2/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-libxml2
+LDFLAGS+=              -lxml2
 .else
 CONFIGURE_ARGS+=       --without-libxml2
 .endif

Index: pkgsrc/net/bind911/patches/patch-configure
diff -u pkgsrc/net/bind911/patches/patch-configure:1.1 pkgsrc/net/bind911/patches/patch-configure:1.2
--- pkgsrc/net/bind911/patches/patch-configure:1.1      Sun Sep  9 13:11:38 2018
+++ pkgsrc/net/bind911/patches/patch-configure  Wed Oct 24 11:27:28 2018
@@ -1,12 +1,12 @@
-$NetBSD: patch-configure,v 1.1 2018/09/09 13:11:38 taca Exp $
+$NetBSD: patch-configure,v 1.2 2018/10/24 11:27:28 jperkin Exp $
 
 * Add DragonFly support.
 * Use proper link options for NetBSD.
 * Link proper postgresql library.
 
---- configure.orig     2018-07-24 17:24:11.000000000 +0000
+--- configure.orig     2018-10-06 01:36:17.000000000 +0000
 +++ configure
-@@ -15270,6 +15270,8 @@ case $host in
+@@ -15415,6 +15415,8 @@ case $host in
        use_threads=false ;;
  *-freebsd*)
        use_threads=true ;;
@@ -15,7 +15,7 @@ $NetBSD: patch-configure,v 1.1 2018/09/0
  *-bsdi[234]*)
        # Thread signals do not work reliably on some versions of BSD/OS.
        use_threads=false ;;
-@@ -17817,27 +17819,10 @@ case "$use_libjson" in
+@@ -17962,27 +17964,10 @@ case "$use_libjson" in
                libjson_libs=""
                ;;
        auto|yes)
@@ -47,7 +47,7 @@ $NetBSD: patch-configure,v 1.1 2018/09/0
                ;;
        *)
                if test -f "${use_libjson}/include/json/json.h"
-@@ -23345,7 +23330,7 @@ if test "yes" = "$dlopen"; then
+@@ -23436,7 +23421,7 @@ if test "yes" = "$dlopen"; then
                                SO_LD="ld"
                        fi
                        ;;
@@ -56,7 +56,7 @@ $NetBSD: patch-configure,v 1.1 2018/09/0
                        LDFLAGS="${LDFLAGS} -Wl,-E"
                        SO_CFLAGS="-fpic"
                        if test "yes" = "$use_libtool"; then
-@@ -23356,12 +23341,6 @@ if test "yes" = "$dlopen"; then
+@@ -23447,16 +23432,10 @@ if test "yes" = "$dlopen"; then
                                SO_LD="${CC}"
                        fi
                        ;;
@@ -67,9 +67,16 @@ $NetBSD: patch-configure,v 1.1 2018/09/0
 -                      SO_STRIP="sed -e s/-Wl,//g"
 -                      ;;
                *-solaris*)
-                       SO_CFLAGS="-KPIC"
-                       SO_LDFLAGS="-G -z text"
-@@ -23614,8 +23593,8 @@ $as_echo "no" >&6; }
+-                      SO_CFLAGS="-KPIC"
+-                      SO_LDFLAGS="-G -z text"
+-                      SO_LD="ld"
++                      SO_CFLAGS="-fPIC"
++                      SO_LDFLAGS="-Xcompiler -shared -Wl,-z -Wl,text"
++                      SO_LD="${CC}"
+                       ;;
+               *-hp-hpux*)
+                       SO=sl
+@@ -23705,8 +23684,8 @@ $as_echo "no" >&6; }
        fi
        if test -n "-L$use_dlz_postgres_lib -lpq"
        then