* .include "../../devel/readline/buildlink3.mk" with USE_GNU_READLINE=yes

  are replaced with .include "../../devel/readline/buildlink3.mk", and
  USE_GNU_READLINE are removed,

* .include "../../devel/readline/buildlink3.mk" without USE_GNU_READLINE
  are replaced with .include "../../mk/readline.buildlink3.mk".

16 files changed, 27 insertions, 33 deletions

diff --git a/net/bind99/options.mk b/net/bind99/options.mk
index 8bb5fdf028e..1b862be6387 100644
--- a/net/bind99/options.mk
+++ b/net/bind99/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2013/06/06 02:55:03 taca Exp $
+# $NetBSD: options.mk,v 1.8 2013/07/15 02:02:26 ryoon Exp $
 
 PKG_OPTIONS_VAR=        PKG_OPTIONS.bind99
 PKG_SUPPORTED_OPTIONS=  bind-dig-sigchase bind-xml-statistics-server
@@ -92,7 +92,7 @@ CONFIGURE_ARGS+=	--disable-threads
 ### readline support in dig(1) and nsupdate(1).
 ###
 .if !empty(PKG_OPTIONS:Mreadline)
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-readline
 .else
 CONFIGURE_ARGS+=	--without-readline
diff --git a/net/bird/Makefile.common b/net/bird/Makefile.common
index 89ad3259e1c..2290dbcd0ec 100644
--- a/net/bird/Makefile.common
+++ b/net/bird/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2012/10/23 17:18:11 asau Exp $
+# $NetBSD: Makefile.common,v 1.3 2013/07/15 02:02:26 ryoon Exp $
 # used by net/bird/Makefile
 # used by net/bird6/Makefile
 
@@ -15,7 +15,6 @@ LICENSE=	gnu-gpl-v2
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake flex bison
-USE_GNU_READLINE=	yes
 
 CONFIGURE_ARGS+=	--localstatedir=/var
 BIRD6?=			# empty
diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index d65421a9424..761f47f9555 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/10/23 17:18:14 asau Exp $
+# $NetBSD: Makefile,v 1.28 2013/07/15 02:02:26 ryoon Exp $
 
 DISTNAME=	chrony-1.24
 CATEGORIES=	net
@@ -35,6 +35,6 @@ post-install:
 			${DESTDIR}${EGDIR}/$${file};		\
 	done
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/coda/Makefile b/net/coda/Makefile
index cb2e4dfc941..47e2d249c5a 100644
--- a/net/coda/Makefile
+++ b/net/coda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2013/05/31 12:41:32 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2013/07/15 02:02:26 ryoon Exp $
 #
 
 DISTNAME=	coda-6.9.5
@@ -25,7 +25,7 @@ REPLACE_PERL=	coda-src/scripts/tape.pl coda-src/scripts/volmunge
 .include "../../devel/lwp/buildlink3.mk"
 .include "../../devel/rpc2/buildlink3.mk"
 .include "../../devel/rvm/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../lang/python/application.mk"
 
diff --git a/net/irrtoolset5/Makefile b/net/irrtoolset5/Makefile
index bc5868c308a..dd9fc6737e3 100644
--- a/net/irrtoolset5/Makefile
+++ b/net/irrtoolset5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/23 17:18:29 asau Exp $
+# $NetBSD: Makefile,v 1.8 2013/07/15 02:02:27 ryoon Exp $
 #
 
 VERSION=		5.0.1
@@ -33,5 +33,5 @@ CONFIGURE_ENV+=		LEX="${PREFIX}/bin/flex"
 .include "../../devel/flex/buildlink3.mk"
 .endif
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index a416c37140e..24fa41ccfd3 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2013/05/31 12:41:34 wiz Exp $
+# $NetBSD: Makefile,v 1.105 2013/07/15 02:02:27 ryoon Exp $
 
 DISTNAME=	lftp-4.4.6
 PKGREVISION=	1
@@ -17,7 +17,6 @@ LICENSE=	gnu-gpl-v3
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_GNU_READLINE=	yes	# uses _rl_mark_modified_lines
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
@@ -50,6 +49,7 @@ post-install: post-install-perl
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+# uses _rl_mark_modified_lines
 .include "../../devel/readline/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/microdc2/Makefile b/net/microdc2/Makefile
index ecc46b5b8be..6a2579734c7 100644
--- a/net/microdc2/Makefile
+++ b/net/microdc2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2012/10/23 17:18:36 asau Exp $
+# $NetBSD: Makefile,v 1.8 2013/07/15 02:02:27 ryoon Exp $
 #
 
 DISTNAME=	microdc2-0.15.6
@@ -15,7 +15,6 @@ BUILDLINK_API_DEPENDS.libxml2+=	libxml2>=2.6.16
 
 GNU_CONFIGURE=		yes
 
-USE_GNU_READLINE=	yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		ln msgfmt msgmerge
 
diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile
index 9fc5a91abc8..2b491b18d63 100644
--- a/net/ntp4/Makefile
+++ b/net/ntp4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2013/05/31 12:41:35 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2013/07/15 02:02:27 ryoon Exp $
 #
 
 DISTNAME=	ntp-4.2.4p8
@@ -67,5 +67,5 @@ CONFIGURE_ARGS+=	--with-openssl-incdir=${SSLBASE}/include
 CONFIGURE_ARGS+=	--with-openssl-libdir=${SSLBASE}/lib
 CONFIGURE_ARGS+=	--with-crypto=openssl
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/quagga/options.mk b/net/quagga/options.mk
index 3ab2ceba852..b91149b66d2 100644
--- a/net/quagga/options.mk
+++ b/net/quagga/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2012/06/13 14:45:19 gdt Exp $
+# $NetBSD: options.mk,v 1.7 2013/07/15 02:02:27 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.quagga
 PKG_SUPPORTED_OPTIONS=	inet6
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	--disable-ripngd
 ### Include 'vtysh' program.
 ###
 .if !empty(PKG_OPTIONS:Mquagga-vtysh)
-USE_GNU_READLINE=	# uses rl_pending_input
+# uses rl_pending_input
 .  include "../../devel/readline/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-vtysh
 PLIST_CAT+=		${PKGDIR}/PLIST.vtysh
diff --git a/net/samba/Makefile b/net/samba/Makefile
index f62df2f932c..476fe8a9d0e 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.235 2013/07/03 20:00:47 adam Exp $
+# $NetBSD: Makefile,v 1.236 2013/07/15 02:02:27 ryoon Exp $
 
 DISTNAME=	samba-${VERSION}
 CATEGORIES=	net
@@ -47,7 +47,6 @@ USE_TOOLS+=		gmake mktemp perl:run pkg-config
 REPLACE_PERL=		script/findsmb.in
 
 BROKEN_GETTEXT_DETECTION=yes
-USE_GNU_READLINE=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--libdir=${SAMBA_LIBDIR}
 CONFIGURE_ARGS+=	--with-libiconv=${BUILDLINK_PREFIX.iconv}
diff --git a/net/samba35/Makefile b/net/samba35/Makefile
index 8404b31a025..7a55a2006d5 100644
--- a/net/samba35/Makefile
+++ b/net/samba35/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2013/06/12 12:35:35 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2013/07/15 02:02:27 ryoon Exp $
 
 .include "../../net/samba/Makefile.mirrors"
 
@@ -51,7 +51,6 @@ USE_TOOLS+=		gmake mktemp perl:run
 REPLACE_PERL=		script/findsmb.in
 
 BROKEN_GETTEXT_DETECTION=yes
-USE_GNU_READLINE=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--libdir=${SAMBA_LIBDIR}
 CONFIGURE_ARGS+=	--with-libiconv=${BUILDLINK_PREFIX.iconv}
diff --git a/net/scli/Makefile b/net/scli/Makefile
index 32c991d9879..453bc6d06a9 100644
--- a/net/scli/Makefile
+++ b/net/scli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2012/10/23 17:19:07 asau Exp $
+# $NetBSD: Makefile,v 1.31 2013/07/15 02:02:27 ryoon Exp $
 #
 
 DISTNAME=		scli-0.3.1
@@ -13,13 +13,13 @@ COMMENT=		SNMP command line interface
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config gmake
 
-USE_GNU_READLINE=	yes # history_list
 BUILDLINK_API_DEPENDS.readline+=	readline>=4.0
 
 INFO_FILES=		yes
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
+# history_list
 .include "../../devel/readline/buildlink3.mk"
 .include "../../net/gnet/buildlink3.mk"
 .include "../../net/gsnmp/buildlink3.mk"
diff --git a/net/socat/Makefile b/net/socat/Makefile
index 1b890429d02..f87b016a5ef 100644
--- a/net/socat/Makefile
+++ b/net/socat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2013/05/10 00:46:53 riastradh Exp $
+# $NetBSD: Makefile,v 1.29 2013/07/15 02:02:27 ryoon Exp $
 
 DISTNAME=	socat-1.7.2.1
 CATEGORIES=	net
@@ -10,7 +10,6 @@ COMMENT=	"netcat++" (extended design, new implementation)
 LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=		YES
-USE_GNU_READLINE=	YES
 ONLY_FOR_COMPILER=	gcc	# uses -Werror in the configure script
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/net/tnftp/Makefile b/net/tnftp/Makefile
index c6d7df6eb70..d8614fdb1ad 100644
--- a/net/tnftp/Makefile
+++ b/net/tnftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2013/02/16 09:34:38 obache Exp $
+# $NetBSD: Makefile,v 1.32 2013/07/15 02:02:27 ryoon Exp $
 
 DISTNAME=		tnftp-20070806
 SVR4_PKGNAME=		tnftp
@@ -31,12 +31,12 @@ do-extract:
 	@${CP} -R ${FILESDIR} ${WRKSRC}
 	@${RM} -f ${WRKSRC}/INSTALL
 
-# Use readline/builtin.mk to check for an editline library on the
+# Use mk/readline.builtin.mk to check for an editline library on the
 # system.  If we use the system editline library, then use the built-in
 # termcap library.
 #
 CHECK_BUILTIN.readline:=	yes
-.include "../../devel/readline/builtin.mk"
+.include "../../mk/readline.builtin.mk"
 CHECK_BUILTIN.readline:=	no
 
 .if !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS])
diff --git a/net/yafc/Makefile b/net/yafc/Makefile
index fe5e0e3308f..f374fcf9647 100644
--- a/net/yafc/Makefile
+++ b/net/yafc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2013/04/06 20:27:27 rodent Exp $
+# $NetBSD: Makefile,v 1.20 2013/07/15 02:02:27 ryoon Exp $
 
 DISTNAME=	yafc-0.7.10
 PKGREVISION=	3
@@ -11,7 +11,6 @@ HOMEPAGE=	http://yafc.sourceforge.net/
 COMMENT=	Yet another FTP client
 
 GNU_CONFIGURE=		yes
-USE_GNU_READLINE=	yes
 
 CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
 INFO_FILES=		yes
diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index 2fc8c7689d9..b0b42520ec2 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2013/05/09 07:39:18 adam Exp $
+# $NetBSD: Makefile,v 1.53 2013/07/15 02:02:27 ryoon Exp $
 #
 
 DISTNAME=	yaz-4.1.6
@@ -28,7 +28,7 @@ REPLACE.tclsh.new=	${TCLSH}
 REPLACE_FILES.tclsh=	util/yaz-asncomp
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"