[pkgsrc/trunk]: pkgsrc/net/bind912 bind912: Fix build on SunOS. Fix PKG_OPTI...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5697e3b61dfb
branches:  trunk
changeset: 324611:5697e3b61dfb
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Oct 24 11:10:31 2018 +0000

description:
bind912: Fix build on SunOS.  Fix PKG_OPTIONS_VAR.

diffstat:

 net/bind912/distinfo                |   4 ++--
 net/bind912/options.mk              |   6 ++++--
 net/bind912/patches/patch-configure |  25 ++++++++++++++++---------
 3 files changed, 22 insertions(+), 13 deletions(-)

diffs (112 lines):

diff -r 01f26eeead24 -r 5697e3b61dfb net/bind912/distinfo
--- a/net/bind912/distinfo      Wed Oct 24 10:56:10 2018 +0000
+++ b/net/bind912/distinfo      Wed Oct 24 11:10:31 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2018/10/21 15:51:46 taca Exp $
+$NetBSD: distinfo,v 1.4 2018/10/24 11:10:31 jperkin Exp $
 
 SHA1 (bind-9.12.3.tar.gz) = 55131f7ab7d9f970ec3097eba5bbfb06346bcf7a
 RMD160 (bind-9.12.3.tar.gz) = bbfc7901afad2f2bcfa1d0515fd4eac01539da5e
@@ -6,7 +6,7 @@
 Size (bind-9.12.3.tar.gz) = 8616664 bytes
 SHA1 (patch-bin_tests_system_metadata_tests.sh) = d01a492d0b7738760bdbff714248e279a78fef28
 SHA1 (patch-config.threads.in) = 8341bdb11888d3efdde5f115de91b1f46aa40bd0
-SHA1 (patch-configure) = 020f4746544f74606ccc57cb30de7f7501a47e10
+SHA1 (patch-configure) = 7d74eef1002351a5513c7c617e28721b39de65d0
 SHA1 (patch-contrib_dlz_config.dlz.in) = 6c53d61aaaf1a952a867e4c4da0194db94f511d7
 SHA1 (patch-lib_dns_rbt.c) = 8af91b6d40b591d28d15f7f98c9b7a82df234381
 SHA1 (patch-lib_isc_unix_socket.c) = 2b73d1fb3b5d807e83aab125325b7096ed9e4036
diff -r 01f26eeead24 -r 5697e3b61dfb net/bind912/options.mk
--- a/net/bind912/options.mk    Wed Oct 24 10:56:10 2018 +0000
+++ b/net/bind912/options.mk    Wed Oct 24 11:10:31 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.1 2018/09/09 13:16:01 taca Exp $
+# $NetBSD: options.mk,v 1.2 2018/10/24 11:10:31 jperkin Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.bind911
+PKG_OPTIONS_VAR=       PKG_OPTIONS.bind912
 PKG_SUPPORTED_OPTIONS= bind-dig-sigchase bind-xml-statistics-server
 PKG_SUPPORTED_OPTIONS+=        bind-json-statistics-server
 PKG_SUPPORTED_OPTIONS+=        inet6 threads readline mysql pgsql ldap dlz-filesystem
@@ -65,6 +65,7 @@
 
 .if !empty(PKG_OPTIONS:Mgeoip)
 CONFIGURE_ARGS+=       --with-geoip=${PREFIX}
+LDFLAGS+=              -lGeoIP
 .include "../../net/GeoIP/buildlink3.mk"
 .endif
 
@@ -87,6 +88,7 @@
 .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
diff -r 01f26eeead24 -r 5697e3b61dfb net/bind912/patches/patch-configure
--- a/net/bind912/patches/patch-configure       Wed Oct 24 10:56:10 2018 +0000
+++ b/net/bind912/patches/patch-configure       Wed Oct 24 11:10:31 2018 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-configure,v 1.1 2018/09/09 13:16:01 taca Exp $
+$NetBSD: patch-configure,v 1.2 2018/10/24 11:10:31 jperkin Exp $
 
 * Add DragonFly support.
 * Use proper link options for NetBSD.
 * Link proper postgresql library.
 
---- configure.orig     2018-07-24 17:22:12.000000000 +0000
+--- configure.orig     2018-10-06 05:51:22.000000000 +0000
 +++ configure
-@@ -15248,6 +15248,8 @@ case $host in
+@@ -15394,6 +15394,8 @@ case $host in
        use_threads=false ;;
  *-freebsd*)
        use_threads=true ;;
@@ -15,7 +15,7 @@
  *-bsdi[234]*)
        # Thread signals do not work reliably on some versions of BSD/OS.
        use_threads=false ;;
-@@ -17869,27 +17871,10 @@ case "$use_libjson" in
+@@ -18015,27 +18017,10 @@ case "$use_libjson" in
                libjson_libs=""
                ;;
        auto|yes)
@@ -47,7 +47,7 @@
                ;;
        *)
                if test -f "${use_libjson}/include/json/json.h"
-@@ -23288,7 +23273,7 @@ if test "yes" = "$dlopen"; then
+@@ -23384,7 +23369,7 @@ if test "yes" = "$dlopen"; then
                                SO_LD="ld"
                        fi
                        ;;
@@ -56,7 +56,7 @@
                        LDFLAGS="${LDFLAGS} -Wl,-E"
                        SO_CFLAGS="-fpic"
                        if test "yes" = "$use_libtool"; then
-@@ -23299,12 +23284,6 @@ if test "yes" = "$dlopen"; then
+@@ -23395,16 +23380,10 @@ if test "yes" = "$dlopen"; then
                                SO_LD="${CC}"
                        fi
                        ;;
@@ -67,9 +67,16 @@
 -                      SO_STRIP="sed -e s/-Wl,//g"
 -                      ;;
                *-solaris*)
-                       SO_CFLAGS="-KPIC"
-                       SO_LDFLAGS="-G -z text"
-@@ -23557,8 +23536,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
+@@ -23653,8 +23632,8 @@ $as_echo "no" >&6; }
        fi
        if test -n "-L$use_dlz_postgres_lib -lpq"
        then