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

17 files changed, 29 insertions, 44 deletions

diff --git a/devel/ald/Makefile b/devel/ald/Makefile
index 1687575e0d6..35ee57dbbfd 100644
--- a/devel/ald/Makefile
+++ b/devel/ald/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/31 11:16:34 asau Exp $
+# $NetBSD: Makefile,v 1.16 2013/07/15 02:02:20 ryoon Exp $
 #
 
 DISTNAME=	ald-0.1.7
@@ -15,5 +15,5 @@ ONLY_FOR_PLATFORM=	*-*-i386
 
 GNU_CONFIGURE=	YES
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cdecl/Makefile b/devel/cdecl/Makefile
index 64f01b21181..bed2ccca2cf 100644
--- a/devel/cdecl/Makefile
+++ b/devel/cdecl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2012/10/31 11:16:44 asau Exp $
+# $NetBSD: Makefile,v 1.29 2013/07/15 02:02:20 ryoon Exp $
 #
 
 DISTNAME=	cdecl-2.5
@@ -11,8 +11,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Utility to explain and compose C and C++ declarations
 
 BUILD_TARGET=		cdecl
-# missing rl_completion_matches
-USE_GNU_READLINE=	yes
 USE_TOOLS+=		lex yacc
 INSTALL_MAKE_FLAGS=	PREFIX=${DESTDIR}${PREFIX} \
 			MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
@@ -23,5 +21,6 @@ INSTALLATION_DIRS=	bin ${EGDIR} ${PKGMANDIR}/man1
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/testset* ${DESTDIR}${EGDIR}
 
+# missing rl_completion_matches
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cgdb/Makefile b/devel/cgdb/Makefile
index 3e5341fa831..f4cad59ef57 100644
--- a/devel/cgdb/Makefile
+++ b/devel/cgdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2012/10/31 11:16:45 asau Exp $
+# $NetBSD: Makefile,v 1.22 2013/07/15 02:02:20 ryoon Exp $
 
 DISTNAME=	cgdb-0.6.5
 CATEGORIES=	devel
@@ -14,7 +14,6 @@ MAKE_JOBS_SAFE=		no
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
 USE_NCURSES=	yes # tigetstr()
-USE_GNU_READLINE=	yes # rl_mark and others
 
 MAKE_ENV+=	AM_LDFLAGS=-L${WRKSRC}/various/util/src
 
@@ -24,6 +23,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cgdb/src/cgdb ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/cgdb
 
+# rl_mark and others
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/elf/Makefile b/devel/elf/Makefile
index 124df73fe97..a7a5ed965dc 100644
--- a/devel/elf/Makefile
+++ b/devel/elf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2013/04/06 15:46:35 rodent Exp $
+# $NetBSD: Makefile,v 1.18 2013/07/15 02:02:20 ryoon Exp $
 #
 
 DISTNAME=	elf-0.5.3
@@ -23,6 +23,6 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/elf.1 ${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1
 
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/elfsh/Makefile b/devel/elfsh/Makefile
index dbd9855f4f3..d7ffbc9e1a4 100644
--- a/devel/elfsh/Makefile
+++ b/devel/elfsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/10/31 11:16:55 asau Exp $
+# $NetBSD: Makefile,v 1.23 2013/07/15 02:02:20 ryoon Exp $
 #
 
 VERS=		0.51b3
@@ -17,8 +17,6 @@ MAKE_JOBS_SAFE=		no
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
-USE_GNU_READLINE=	yes
-
 SUBST_CLASSES+=		elfsh
 SUBST_STAGE.elfsh=	post-patch
 SUBST_MESSAGE.elfsh=	Fixing hardcoded paths.
diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile
index b0de2f14c06..fb7dcb312b8 100644
--- a/devel/fossil/Makefile
+++ b/devel/fossil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2013/06/30 06:04:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.27 2013/07/15 02:02:20 ryoon Exp $
 
 DISTNAME=	fossil-src-20130618210923
 PKGNAME=	fossil-1.26
@@ -17,7 +17,7 @@ INSTALLATION_DIRS+=	bin
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fossil ${DESTDIR}${PREFIX}/bin
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gps/options.mk b/devel/gps/options.mk
index 0925837c658..a29cc92da98 100644
--- a/devel/gps/options.mk
+++ b/devel/gps/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2013/07/09 10:16:02 marino Exp $
+# $NetBSD: options.mk,v 1.6 2013/07/15 02:02:20 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gps
 PKG_SUPPORTED_OPTIONS=	syslog sqlite readline python pgsql
@@ -13,7 +13,7 @@ PKG_SUGGESTED_OPTIONS=	syslog sqlite readline python
 
 .if !empty(PKG_OPTIONS:Mreadline)
 CONFIGURE_ARGS+= --enable-gpl
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .else
 CONFIGURE_ARGS+= --disable-readline
 .endif
diff --git a/devel/omake/Makefile b/devel/omake/Makefile
index 1931d12a919..4c682d84a76 100644
--- a/devel/omake/Makefile
+++ b/devel/omake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/10/31 11:17:34 asau Exp $
+# $NetBSD: Makefile,v 1.7 2013/07/15 02:02:20 ryoon Exp $
 #
 
 DISTNAME=	omake-${VERSION}-0.rc1
@@ -21,5 +21,5 @@ MAKE_ENV+=	INSTALL_ROOT=${DESTDIR}
 VERSION=	0.9.8.6
 
 .include "../../lang/ocaml/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/opencm/Makefile b/devel/opencm/Makefile
index e3aada4f5da..b7b3ef3f544 100644
--- a/devel/opencm/Makefile
+++ b/devel/opencm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2013/02/06 23:22:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.52 2013/07/15 02:02:20 ryoon Exp $
 #
 
 DISTNAME=	${OPENCM_VERSION}-2-src
@@ -35,7 +35,7 @@ post-install:
 
 .include "../../devel/boehm-gc/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/krb5.buildlink3.mk"
diff --git a/devel/p5-Term-ReadLine/Makefile b/devel/p5-Term-ReadLine/Makefile
index 773e7cf7f37..584afaf8fe7 100644
--- a/devel/p5-Term-ReadLine/Makefile
+++ b/devel/p5-Term-ReadLine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2013/05/31 12:40:46 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2013/07/15 02:02:21 ryoon Exp $
 
 DISTNAME=	Term-ReadLine-Gnu-1.20
 PKGNAME=	p5-${DISTNAME:S/-Gnu//}
@@ -14,7 +14,6 @@ LICENSE=	${PERL5_LICENSE} # see README
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_GNU_READLINE=	yes
 PERL5_PACKLIST=		auto/Term/ReadLine/Gnu/.packlist
 
 MAKE_PARAMS+=	--includedir=${PREFIX}/include --libdir=${PREFIX}/lib
diff --git a/devel/physfs/Makefile b/devel/physfs/Makefile
index 49f0c1da504..f202493a6e5 100644
--- a/devel/physfs/Makefile
+++ b/devel/physfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/31 11:19:24 asau Exp $
+# $NetBSD: Makefile,v 1.20 2013/07/15 02:02:21 ryoon Exp $
 #
 
 DISTNAME=		physfs-1.0.1
@@ -22,7 +22,7 @@ PTHREAD_AUTO_VARS=	yes
 CONFIGURE_ARGS+=	--disable-cdrom
 .endif
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 
 .include "../../mk/curses.buildlink3.mk"
diff --git a/devel/py-readline/Makefile b/devel/py-readline/Makefile
index 953e9793ac5..627f47dd201 100644
--- a/devel/py-readline/Makefile
+++ b/devel/py-readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2013/04/20 09:38:04 obache Exp $
+# $NetBSD: Makefile,v 1.28 2013/07/15 02:02:21 ryoon Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-readline-${PY_DISTVERSION}
@@ -12,8 +12,6 @@ PYTHON_VERSIONS_INCLUDE_3X=	yes
 
 EXTRACT_ELEMENTS=	${PYSUBDIR}/Modules/readline.c
 
-USE_GNU_READLINE=	# defined
-
 PYDISTUTILSPKG=	yes
 PY_PATCHPLIST=	yes
 PY_SETUP_SUBST+= RLPREFIX=${BUILDLINK_PREFIX.readline}
diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index 0ad80a4dc0e..3d7b755026c 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2013/05/31 12:40:56 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2013/07/15 02:02:21 ryoon Exp $
 #
 
 DISTNAME=	rpc2-2.10
@@ -23,6 +23,6 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
 .include "../../devel/lwp/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ruby-readline/Makefile b/devel/ruby-readline/Makefile
index 5c5ee8c290d..3e42bacf713 100644
--- a/devel/ruby-readline/Makefile
+++ b/devel/ruby-readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2013/06/27 16:37:16 taca Exp $
+# $NetBSD: Makefile,v 1.36 2013/07/15 02:02:21 ryoon Exp $
 #
 
 DISTNAME=		${RUBY_DISTNAME}
@@ -27,5 +27,4 @@ post-install:
 .include "options.mk"
 .include "../../lang/ruby/modules.mk"
 .include "../../lang/ruby/Makefile.common"
-.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ruby-readline/options.mk b/devel/ruby-readline/options.mk
index ad771786cf4..9318349c9b0 100644
--- a/devel/ruby-readline/options.mk
+++ b/devel/ruby-readline/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2013/04/08 11:17:12 rodent Exp $
+# $NetBSD: options.mk,v 1.5 2013/07/15 02:02:21 ryoon Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ruby
@@ -21,13 +21,6 @@ PKG_SUGGESTED_OPTIONS+=	readline
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mreadline)
-USE_BUILTIN.readline=	no
-CONFIGURE_ARGS+=	--disable-libedit
-.else
-CHECK_BUILTIN.readline:=	yes
-.  include "../../devel/readline/builtin.mk"
-CHECK_BUILTIN.readline:=	no
-.  if !empty(BUILTIN_LIB_FOUND.edit:M[yY][eE][sS])
 CONFIGURE_ARGS+=	--enable-libedit
-.  endif
+.  include "../../mk/readline.buildlink3.mk"
 .endif
diff --git a/devel/sdcc/Makefile b/devel/sdcc/Makefile
index 5d3aca6c024..f1f55c5c9b3 100644
--- a/devel/sdcc/Makefile
+++ b/devel/sdcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2013/05/31 12:40:57 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2013/07/15 02:02:21 ryoon Exp $
 
 DISTNAME=	sdcc-src-2.8.0
 PKGNAME=	${DISTNAME:S/-src//}
@@ -27,7 +27,6 @@ BUILD_TARGET=	dep all
 
 WRKSRC=			${WRKDIR}/sdcc/
 GNU_CONFIGURE=		YES
-USE_GNU_READLINE=	yes
 USE_TOOLS+=		gmake lex perl:run
 
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/sdcc
diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile
index 849a3272702..2431a3b12f2 100644
--- a/devel/tclreadline/Makefile
+++ b/devel/tclreadline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/10/31 11:19:50 asau Exp $
+# $NetBSD: Makefile,v 1.4 2013/07/15 02:02:21 ryoon Exp $
 #
 
 DISTNAME=	tclreadline-2.1.0
@@ -35,5 +35,5 @@ post-install:
 
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"