* .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".

20 files changed, 44 insertions, 52 deletions

diff --git a/databases/abook/Makefile b/databases/abook/Makefile
index 7f007038757..4ece65df41d 100644
--- a/databases/abook/Makefile
+++ b/databases/abook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2012/10/02 21:25:15 asau Exp $
+# $NetBSD: Makefile,v 1.25 2013/07/15 02:02:19 ryoon Exp $
 #
 
 DISTNAME=	abook-0.6.0pre2
@@ -15,7 +15,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		msgfmt
-USE_GNU_READLINE=	yes
 GNU_CONFIGURE=		yes
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/databases/deforaos-libdatabase/Makefile b/databases/deforaos-libdatabase/Makefile
index 2c828791d63..d9385fba2ba 100644
--- a/databases/deforaos-libdatabase/Makefile
+++ b/databases/deforaos-libdatabase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/05/09 07:39:31 adam Exp $
+# $NetBSD: Makefile,v 1.3 2013/07/15 02:02:19 ryoon Exp $
 
 DISTNAME=	libDatabase-0.0.0
 PKGNAME=	deforaos-libdatabase-0.0.0
@@ -18,7 +18,7 @@ MAKE_FLAGS+=	PREFIX=${PREFIX}
 .include "../../devel/deforaos-libsystem/buildlink3.mk"
 .include "../../mk/pgsql.buildlink3.mk" # this one defines PGSQL_VERSION among others
 .include "../../databases/postgresql${PGSQL_VERSION}-client/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../databases/sqlite/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../textproc/gtk-doc/buildlink3.mk"
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index e72eb4cdf46..c299473c404 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2013/02/06 23:21:04 jperkin Exp $
+# $NetBSD: Makefile,v 1.50 2013/07/15 02:02:19 ryoon Exp $
 
 DISTNAME=	freetds-0.91
 PKGREVISION=	1
@@ -10,7 +10,6 @@ HOMEPAGE=	http://www.freetds.org/
 COMMENT=	Implementation of TDS protocol used by Sybase and MS-SQL servers
 LICENSE=	gnu-lgpl-v2
 
-USE_GNU_READLINE=	yes	# rl_on_new_line, rl_reset_line_state
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
@@ -44,6 +43,7 @@ pre-build:
 .include "options.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"
+# rl_on_new_line, rl_reset_line_state
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/ldapvi/Makefile b/databases/ldapvi/Makefile
index 10416e5a7f6..c253ce2dbaa 100644
--- a/databases/ldapvi/Makefile
+++ b/databases/ldapvi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2013/04/13 07:55:03 ghen Exp $
+# $NetBSD: Makefile,v 1.16 2013/07/15 02:02:19 ryoon Exp $
 
 DISTNAME=		ldapvi-1.7
 PKGREVISION=		9
@@ -11,7 +11,6 @@ COMMENT=		Interactive LDAP client
 
 GNU_CONFIGURE=		yes
 USE_NCURSES=		yes
-USE_GNU_READLINE=	yes
 
 USE_TOOLS+=		gmake pkg-config
 MAKE_FILE=		GNUmakefile
diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common
index 171e033449f..30d40376ec6 100644
--- a/databases/libgda/Makefile.common
+++ b/databases/libgda/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.51 2012/02/06 11:27:48 wiz Exp $
+# $NetBSD: Makefile.common,v 1.52 2013/07/15 02:02:19 ryoon Exp $
 #
 # used by databases/libgda/Makefile
 # used by databases/libgda-mysql
@@ -53,6 +53,6 @@ SUBST_SED.libs+=	-e 's|$$(top_builddir)/libgda/libgda-3.0.la|${BUILDLINK_PREFIX.
 .include "../../databases/libgda/buildlink3.mk"
 .else
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .endif
diff --git a/databases/mysql5-client/Makefile b/databases/mysql5-client/Makefile
index 356c72fb7d7..41cb2d5ab0c 100644
--- a/databases/mysql5-client/Makefile
+++ b/databases/mysql5-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2013/05/31 12:39:47 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2013/07/15 02:02:19 ryoon Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
 PKGREVISION=		3
@@ -38,5 +38,5 @@ post-install:
 		${DESTDIR}${PREFIX}/share/examples/mysql/my-${f}.cnf
 .endfor
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile
index bad1f675c5e..33a3c598e48 100644
--- a/databases/mysql5-server/Makefile
+++ b/databases/mysql5-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2013/07/12 10:44:54 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2013/07/15 02:02:19 ryoon Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
 PKGREVISION=		2
@@ -60,7 +60,7 @@ CXXFLAGS+=		-D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
 # a build-time dependency.
 #
 BUILDLINK_DEPMETHOD.readline=	build
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 
 post-configure:
 	cd ${WRKSRC}/include && cp -f config.h my_config.h
diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile
index e95550257eb..65bd68b4904 100644
--- a/databases/mysql51-client/Makefile
+++ b/databases/mysql51-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2013/05/31 12:39:47 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2013/07/15 02:02:19 ryoon Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
 PKGREVISION=	2
@@ -35,5 +35,5 @@ post-install:
 		${DESTDIR}${PREFIX}/share/examples/mysql/my-${f}.cnf
 .endfor
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index a39145ac8a1..cf104721bde 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2013/07/12 10:44:54 jperkin Exp $
+# $NetBSD: Makefile,v 1.16 2013/07/15 02:02:19 ryoon Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
 PKGREVISION=	2
@@ -89,7 +89,7 @@ CXXFLAGS+=		-D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
 # is enabled that option sets a full dependency on readline otherwise
 # make this only a build-time dependency.
 BUILDLINK_DEPMETHOD.readline?=	build
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 
 post-configure:
 	cd ${WRKSRC}/include && cp -f config.h my_config.h
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index b00cb10524d..ed5b08bb2e4 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2013/06/04 13:31:21 adam Exp $
+# $NetBSD: Makefile,v 1.9 2013/07/15 02:02:19 ryoon Exp $
 
 PKGNAME=	${DISTNAME:S/-/-client-/}
 SVR4_PKGNAME=	mysqc
@@ -35,5 +35,5 @@ post-install:
 .  endfor
 .endif
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql56-client/Makefile.common b/databases/mysql56-client/Makefile.common
index bfd9fa7b0b3..df2a79238cc 100644
--- a/databases/mysql56-client/Makefile.common
+++ b/databases/mysql56-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2013/06/18 19:59:35 joerg Exp $
+# $NetBSD: Makefile.common,v 1.8 2013/07/15 02:02:19 ryoon Exp $
 #
 # used by databases/mysql56-client/Makefile
 # used by databases/mysql56-server/Makefile
@@ -111,14 +111,14 @@ SUBST_SED.scr=		-e "s,chown,${CHOWN},g"
 SUBST_SED.scr+=		-e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
 SUBST_MESSAGE.scr=	Fixing scripts.
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 
 CMAKE_ARGS+=	-DWITH_EDITLINE=system
-.if !empty(USE_BUILTIN.readline:M[yY][eE][sS]) && !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS])
-CMAKE_ARGS+=	-DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.readline}/lib/libedit.so
-.else
-CMAKE_ARGS+=	-DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.readline}/lib/libreadline.so
+.if !empty(READLINE_TYPE:Meditline)
+CMAKE_ARGS+=	-DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.editlinereadline}/lib/libedit.so
+.elif !empty(READLINE_TYPE:Mreadline)
+CMAKE_ARGS+=	-DEDITLINE_LIBRARY=${BUILDLINK_PREFIX.editlinereadline}/lib/libreadline.so
 .endif
-CMAKE_ARGS+=	-DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.readline}/include/readline
+CMAKE_ARGS+=	-DEDITLINE_INCLUDE_DIR=${BUILDLINK_PREFIX.editlinereadline}/include/readline
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile
index 99c9e3d607d..509c1345262 100644
--- a/databases/mysql56-server/Makefile
+++ b/databases/mysql56-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/07/12 10:44:54 jperkin Exp $
+# $NetBSD: Makefile,v 1.8 2013/07/15 02:02:19 ryoon Exp $
 
 PKGNAME=	${DISTNAME:S/-/-server-/}
 PKGREVISION=	1
@@ -86,6 +86,6 @@ CXXFLAGS+=		-D_POSIX_C_SOURCE=199506L -D__EXTENSIONS__
 
 BUILDLINK_AUTO_DIRS.mysql-client=	no
 .include "../../databases/mysql56-client/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql84-client/Makefile b/databases/postgresql84-client/Makefile
index f33ee0b02d6..fbd4dac2008 100644
--- a/databases/postgresql84-client/Makefile
+++ b/databases/postgresql84-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2013/05/31 12:39:55 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2013/07/15 02:02:19 ryoon Exp $
 
 PKGNAME=	${DISTNAME:C/-/84-client-/}
 PKGREVISION=	1
@@ -42,8 +42,6 @@ CONF_FILES+=	${PREFIX}/share/postgresql/${f}.sample ${PKG_SYSCONFDIR}/${f}
 .endfor
 
 # XXX work around core dumps with the native libedit
-USE_GNU_READLINE=	yes
-
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/databases/postgresql90-client/Makefile b/databases/postgresql90-client/Makefile
index 550646fb2db..5227f04be17 100644
--- a/databases/postgresql90-client/Makefile
+++ b/databases/postgresql90-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2013/02/09 11:19:12 adam Exp $
+# $NetBSD: Makefile,v 1.18 2013/07/15 02:02:19 ryoon Exp $
 
 PKGNAME=	${DISTNAME:C/-/90-client-/}
 COMMENT=	PostgreSQL database client programs
@@ -40,9 +40,7 @@ CONF_FILES+=	share/postgresql/${f}.sample ${PKG_SYSCONFDIR}/${f}
 .endfor
 
 # XXX work around core dumps with the native libedit
-USE_GNU_READLINE=	yes
-
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
diff --git a/databases/postgresql91-client/Makefile b/databases/postgresql91-client/Makefile
index 21eae7fd034..a642981fce2 100644
--- a/databases/postgresql91-client/Makefile
+++ b/databases/postgresql91-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/02/09 11:19:15 adam Exp $
+# $NetBSD: Makefile,v 1.14 2013/07/15 02:02:20 ryoon Exp $
 
 PKGNAME=	${DISTNAME:C/-/91-client-/}
 COMMENT=	PostgreSQL database client programs
@@ -40,8 +40,6 @@ CONF_FILES+=	share/postgresql/${f}.sample ${PKG_SYSCONFDIR}/${f}
 .endfor
 
 # XXX work around core dumps with the native libedit
-USE_GNU_READLINE=	yes
-
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/databases/sqlite/Makefile b/databases/sqlite/Makefile
index e26cab540a4..1f0bb389ff7 100644
--- a/databases/sqlite/Makefile
+++ b/databases/sqlite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2013/02/21 15:14:45 gdt Exp $
+# $NetBSD: Makefile,v 1.45 2013/07/15 02:02:20 ryoon Exp $
 
 DISTNAME=		sqlite-2.8.17
 PKGREVISION=		1
@@ -16,7 +16,7 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 OBJDIR=			../sqlite-build
 CONFIGURE_ARGS+=	--without-tcl
-CONFIGURE_ENV+=		config_TARGET_READLINE_INC="-I${BUILDLINK_PREFIX.readline}/include"
+CONFIGURE_ENV+=		config_TARGET_READLINE_INC="-I${BUILDLINK_PREFIX.editlinereadline}/include"
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -38,5 +38,5 @@ post-extract:
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/sqlite.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/sqlite3-tcl/Makefile b/databases/sqlite3-tcl/Makefile
index 05428e3fa77..cb68898feb4 100644
--- a/databases/sqlite3-tcl/Makefile
+++ b/databases/sqlite3-tcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2013/05/20 19:17:15 adam Exp $
+# $NetBSD: Makefile,v 1.48 2013/07/15 02:02:20 ryoon Exp $
 
 DISTNAME=	sqlite-autoconf-3071700
 PKGNAME=	sqlite3-tcl-3.7.17
@@ -22,6 +22,6 @@ PLIST_SUBST+=		TCL_TRIM_DOTS=${PKGVERSION_NOREV:S/.//g}
 BUILDLINK_API_DEPENDS.sqlite3+=	sqlite3>=3.6.10
 
 .include "../../databases/sqlite3/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index ba9262de77d..e231e9d7576 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2013/05/20 19:17:15 adam Exp $
+# $NetBSD: Makefile,v 1.67 2013/07/15 02:02:20 ryoon Exp $
 
 DISTNAME=	sqlite-autoconf-3071700
 PKGNAME=	sqlite3-3.7.17
@@ -43,6 +43,6 @@ CFLAGS+=		-DSQLITE_ENABLE_LOAD_EXTENSION
 # See http://www.sqlite.org/cvstrac/tktview?tn=3555
 LIBS+=			${BUILDLINK_LDADD.dl}
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 4c438395c7e..4debb4c3c80 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2013/05/31 12:39:56 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2013/07/15 02:02:20 ryoon Exp $
 
 DISTNAME=		sqlrelay-0.43
 PKGREVISION=		8
@@ -59,6 +59,6 @@ RCD_SCRIPT_SRC.sqlrelay=	${WRKSRC}/init/netbsd/rc.d/sqlrelay
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/init/netbsd/sqlrelay ${DESTDIR}${EGDIR}/sqlrelay
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../devel/rudiments/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index df65ad9280b..991fc602525 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2013/02/06 23:22:02 jperkin Exp $
+# $NetBSD: Makefile,v 1.35 2013/07/15 02:02:20 ryoon Exp $
 
 # This section contains variables that might be overridden.
 PKGNAME?=	${PKGNAME_BASE}
@@ -25,8 +25,8 @@ GNU_CONFIGURE=		yes
 BUILD_TARGET=		build
 
 CONFIGURE_ARGS+=	--with-readline
-CONFIGURE_ENV+=		INCDIRS=${BUILDLINK_PREFIX.readline:Q}/include
-CONFIGURE_ENV+=		LIBDIRS=${BUILDLINK_PREFIX.readline:Q}/lib
+CONFIGURE_ENV+=		INCDIRS=${BUILDLINK_PREFIX.editlinereadline:Q}/include
+CONFIGURE_ENV+=		LIBDIRS=${BUILDLINK_PREFIX.editlinereadline:Q}/lib
 
 CHECK_HEADERS_SKIP=	src/sqsh_config.h
 
@@ -43,6 +43,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/sample.sqshrc \
 		${DESTDIR}${PREFIX}/share/examples/sqsh
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"