Add and enable readline option.

To make this work properly rework the readline detection to not use LIBS
but instead use the new @LIBREADLINE@ AC_SUBST (This stops _everything_
being linked to libreadline!).

Bump PKGREVISION.

7 files changed, 164 insertions, 10 deletions

diff --git a/net/bind99/Makefile b/net/bind99/Makefile
index d13f45c5549..53fe4d48e39 100644
--- a/net/bind99/Makefile
+++ b/net/bind99/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2012/07/10 07:52:46 sbd Exp $
+# $NetBSD: Makefile,v 1.8 2012/07/10 10:23:03 sbd Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/ \
 		http://ftp.belnet.be/pub/mirror/ftp.isc.org/isc/bind9/${BIND_VERSION}/
diff --git a/net/bind99/distinfo b/net/bind99/distinfo
index 9eeec13c1e1..d1d9a2b2ac0 100644
--- a/net/bind99/distinfo
+++ b/net/bind99/distinfo
@@ -1,12 +1,16 @@
-$NetBSD: distinfo,v 1.5 2012/06/04 13:24:28 taca Exp $
+$NetBSD: distinfo,v 1.6 2012/07/10 10:23:03 sbd Exp $
 
 SHA1 (bind-9.9.1-P1.tar.gz) = a2263b96ccd8a143ea54b39958142c542bf605a8
 RMD160 (bind-9.9.1-P1.tar.gz) = 5ba6adbfeab5872582095b213e95b97eda59d044
 Size (bind-9.9.1-P1.tar.gz) = 7223197 bytes
+SHA1 (patch-bin_dig_Makefile.in) = d2c2a0b137be7e31fdc15438d107116fc38a38b9
 SHA1 (patch-bin_dig_dighost.c) = 186cdc70605242afb0211dc8802ec75677a65614
+SHA1 (patch-bin_nsupdate_Makefile.in) = 42b39d60468ffa8ed13f77259755b217966de664
 SHA1 (patch-bin_tests_system_Makefile.in) = 3224a66b7d29f6f17d02de1663c61b5e57b91d20
 SHA1 (patch-config.threads.in) = 227b83efe9cb3e301aaac9b97cf42f1fb8ad06b2
-SHA1 (patch-configure) = 6a8b709d8369864c397d4315348c9c96753618f6
+SHA1 (patch-configure) = 8997a0a2881b7c4a576ea67f6c27016421034772
+SHA1 (patch-configure.in) = c815126eb9175e4404fb44a8639a0e091c68f192
+SHA1 (patch-contrib_dlz_config.dlz.in) = f18bec63fbfce7cb2cd72929058ce3770fce458f
 SHA1 (patch-lib_bind9_Makefile.in) = 89e21d21fa512f11a2fdb8d7455abd5d95f20ba5
 SHA1 (patch-lib_dns_Makefile.in) = 1770a8bd86901c618b11d255f3af54748d04b759
 SHA1 (patch-lib_dns_rbt.c) = df4b029369d9fa3b250d8505b5f7590e2cd86654
diff --git a/net/bind99/options.mk b/net/bind99/options.mk
index 38c931d910b..f60d691904c 100644
--- a/net/bind99/options.mk
+++ b/net/bind99/options.mk
@@ -1,8 +1,9 @@
-# $NetBSD: options.mk,v 1.2 2012/07/10 07:52:46 sbd Exp $
+# $NetBSD: options.mk,v 1.3 2012/07/10 10:23:03 sbd Exp $
 
 PKG_OPTIONS_VAR=        PKG_OPTIONS.bind99
 PKG_SUPPORTED_OPTIONS=  bind-dig-sigchase bind-xml-statistics-server
-PKG_SUPPORTED_OPTIONS+=	inet6 threads mysql pgsql ldap dlz-filesystem
+PKG_SUPPORTED_OPTIONS+=	inet6 threads readline mysql pgsql ldap dlz-filesystem
+PKG_SUGGESTED_OPTIONS+=	readline
 
 PTHREAD_OPTS+=		native
 .include "../../mk/pthread.buildlink3.mk"
@@ -82,6 +83,16 @@ CONFIGURE_ARGS+=	--disable-threads
 .endif
 
 ###
+### readline support in dig(1) and nsupdate(1).
+###
+.if !empty(PKG_OPTIONS:Mreadline)
+.include "../../devel/readline/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-readline
+.else
+CONFIGURE_ARGS+=	--without-readline
+.endif
+
+###
 ### dig(1) option +sigchase for DNSSEC signature chasing
 ###
 .if !empty(PKG_OPTIONS:Mbind-dig-sigchase)
diff --git a/net/bind99/patches/patch-bin_dig_Makefile.in b/net/bind99/patches/patch-bin_dig_Makefile.in
new file mode 100644
index 00000000000..a0978836be4
--- /dev/null
+++ b/net/bind99/patches/patch-bin_dig_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD: patch-bin_dig_Makefile.in,v 1.1 2012/07/10 10:23:03 sbd Exp $
+
+Use @LIBREADLINE@.
+
+--- bin/dig/Makefile.in.orig	2012-06-01 15:29:52.000000000 +0000
++++ bin/dig/Makefile.in
+@@ -70,7 +70,7 @@ MANOBJS =	${MANPAGES} ${HTMLPAGES}
+ @BIND9_MAKE_RULES@
+ 
+ dig@EXEEXT@: dig.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
+-	export BASEOBJS="dig.@O@ dighost.@O@ ${UOBJS}"; \
++	export BASEOBJS="dig.@O@ dighost.@O@ ${UOBJS} @LIBREADLINE@"; \
+ 	${FINALBUILDCMD}
+ 
+ host@EXEEXT@: host.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
diff --git a/net/bind99/patches/patch-bin_nsupdate_Makefile.in b/net/bind99/patches/patch-bin_nsupdate_Makefile.in
new file mode 100644
index 00000000000..1383c5534e1
--- /dev/null
+++ b/net/bind99/patches/patch-bin_nsupdate_Makefile.in
@@ -0,0 +1,18 @@
+$NetBSD: patch-bin_nsupdate_Makefile.in,v 1.1 2012/07/10 10:23:03 sbd Exp $
+
+Use @LIBREADLINE@.
+
+--- bin/nsupdate/Makefile.in.orig	2012-06-01 15:29:52.000000000 +0000
++++ bin/nsupdate/Makefile.in
+@@ -44,9 +44,9 @@ ISCCFGDEPLIBS =	../../lib/isccfg/libiscc
+ 
+ DEPLIBS =	${DNSDEPLIBS} ${BIND9DEPLIBS} ${ISCDEPLIBS} ${ISCCFGDEPLIBS}
+ 
+-LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@
++LIBS =		${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} ${ISCLIBS} @LIBS@ @LIBREADLINE@
+ 
+-NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @LIBS@
++NOSYMLIBS =	${LWRESLIBS} ${DNSLIBS} ${BIND9LIBS} ${ISCCFGLIBS} ${ISCNOSYMLIBS} @LIBS@ @LIBREADLINE@
+ 
+ SUBDIRS =
+ 
diff --git a/net/bind99/patches/patch-configure b/net/bind99/patches/patch-configure
index d7fbd266c95..c6f987c9496 100644
--- a/net/bind99/patches/patch-configure
+++ b/net/bind99/patches/patch-configure
@@ -1,11 +1,20 @@
-$NetBSD: patch-configure,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
+$NetBSD: patch-configure,v 1.2 2012/07/10 10:23:03 sbd Exp $
 
 * Add DragonFly support.
 * Link proper postgresql library.
+* Use separate @LIBREADLINE@ AC_SUBST.
 
---- configure.orig	2012-01-30 10:09:37.000000000 +0000
+--- configure.orig	2012-06-01 15:29:52.000000000 +0000
 +++ configure
-@@ -22166,6 +22166,8 @@ case $host in
+@@ -1341,6 +1341,7 @@ LWRES_PLATFORM_NEEDVSNPRINTF
+ ISC_PLATFORM_NEEDVSNPRINTF
+ LWRES_PLATFORM_NEEDSPRINTF
+ ISC_PLATFORM_NEEDSPRINTF
++LIBREADLINE
+ ISC_PLATFORM_NEEDSTRLCAT
+ ISC_PLATFORM_NEEDSTRLCPY
+ GENRANDOMLIB
+@@ -22166,6 +22167,8 @@ case $host in
  	use_threads=false ;;
  *-freebsd*)
  	use_threads=true ;;
@@ -14,7 +23,70 @@ $NetBSD: patch-configure,v 1.1.1.1 2012/03/07 14:25:00 taca Exp $
  *-bsdi[234]*)
  	# Thread signals do not work reliably on some versions of BSD/OS.
  	use_threads=false ;;
-@@ -27148,7 +27150,7 @@ $as_echo "no" >&6; }
+@@ -24800,23 +24803,47 @@ no)	;;
+ 	then
+ 		readline=-lreadline
+ 	fi
+-	saved_LIBS="$LIBS"
+-	LIBS="$LIBS $readline"
+-	for ac_func in readline
+-do :
+-  ac_fn_c_check_func "$LINENO" "readline" "ac_cv_func_readline"
+-if test "x$ac_cv_func_readline" = x""yes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_READLINE 1
+-_ACEOF
++	as_ac_Lib=`$as_echo "ac_cv_lib_$readline''_readline" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in $readline" >&5
++$as_echo_n "checking for readline in $readline... " >&6; }
++if eval \${$as_ac_Lib+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="$readline  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char readline ();
++int
++main ()
++{
++return readline ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  eval "$as_ac_Lib=yes"
++else
++  eval "$as_ac_Lib=no"
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++eval ac_res=\$$as_ac_Lib
++              { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
++  LIBREADLINE=-lreadline
+ fi
+-done
+-
+-	if test "$ac_cv_func_readline" = "no"
+-	then
+-		LIBS="$saved_LIBS"
+-	fi
+         ;;
+ esac
+ 
+@@ -27148,7 +27175,7 @@ $as_echo "no" >&6; }
  	fi
  	if test -n "-L$use_dlz_postgres_lib -lpq"
  	then
diff --git a/net/bind99/patches/patch-configure.in b/net/bind99/patches/patch-configure.in
new file mode 100644
index 00000000000..0f4e2d99856
--- /dev/null
+++ b/net/bind99/patches/patch-configure.in
@@ -0,0 +1,34 @@
+$NetBSD: patch-configure.in,v 1.1 2012/07/10 10:23:03 sbd Exp $
+
+Use separate @LIBREADLINE@ AC_SUBST.
+
+--- configure.in.orig	2012-06-01 15:29:52.000000000 +0000
++++ configure.in
+@@ -2223,23 +2223,18 @@ AC_SUBST(ISC_PLATFORM_NEEDSTRLCAT)
+ 
+ AC_ARG_WITH(readline,
+         [  --with-readline[=LIBSPEC]    specify readline library [default -lreadline]],
+-        readline="$withval", readline="-lreadline")
++        readline="$withval", readline="readline")
+ case "$readline" in
+ no)	;;
+ *)
+ 	if test "x$readline" = "xyes"
+ 	then
+-		readline=-lreadline
+-	fi
+-	saved_LIBS="$LIBS"
+-	LIBS="$LIBS $readline"
+-	AC_CHECK_FUNCS(readline)
+-	if test "$ac_cv_func_readline" = "no" 
+-	then
+-		LIBS="$saved_LIBS"
++		readline=readline
+ 	fi
++	AC_CHECK_LIB($readline, [readline], LIBREADLINE=-lreadline)
+         ;;
+ esac
++AC_SUBST(LIBREADLINE)
+ 
+ 
+ ISC_PRINT_OBJS=