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

6 files changed, 13 insertions, 16 deletions

diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index bf920e0c8fa..a7f3ad39386 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2013/05/19 07:35:56 adam Exp $
+# $NetBSD: Makefile,v 1.51 2013/07/15 02:02:21 ryoon Exp $
 
 DISTNAME=	atari800-3.0.0
 CATEGORIES=	emulators
@@ -36,7 +36,7 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/*.rom ${WRKDIR}/*.xfd ${WRKDIR}/*.atr \
 		${WRKSRC}/atari800.cfg ${DESTDIR}${PREFIX}/share/atari800/
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
diff --git a/emulators/gpsim-devel/Makefile b/emulators/gpsim-devel/Makefile
index 27453f17b7b..76c2916d78c 100644
--- a/emulators/gpsim-devel/Makefile
+++ b/emulators/gpsim-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2013/06/06 12:53:56 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2013/07/15 02:02:21 ryoon Exp $
 #
 
 DISTNAME=	gpsim-20050905
@@ -18,14 +18,12 @@ USE_LIBTOOL=	YES
 
 GCC_REQD+=		3.0
 
-USE_GNU_READLINE=	YES
-# rl_callback_read_char, rl_copy_text,
-# rl_callback_handler_remove, rl_forced_update_display,
-# rl_callback_handler_install
-
 CONFLICTS=	eXdbm-[0-9]* gpsim-[0-9]*
 
 .include "../../devel/popt/buildlink3.mk"
+# rl_callback_read_char, rl_copy_text,
+# rl_callback_handler_remove, rl_forced_update_display,
+# rl_callback_handler_install
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/emulators/gpsim/Makefile b/emulators/gpsim/Makefile
index 5ddb26829c8..c5703d7beea 100644
--- a/emulators/gpsim/Makefile
+++ b/emulators/gpsim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2013/06/11 12:58:42 ryoon Exp $
+# $NetBSD: Makefile,v 1.43 2013/07/15 02:02:21 ryoon Exp $
 #
 
 DISTNAME=	gpsim-0.26.1
@@ -14,7 +14,6 @@ USE_LANGUAGES=	c c++
 
 USE_TOOLS+=	gmake pkg-config
 USE_LIBTOOL=	YES
-USE_GNU_READLINE=	YES
 
 INSTALLATION_DIRS=	share/doc/gpsim
 
diff --git a/emulators/or1ksim/Makefile b/emulators/or1ksim/Makefile
index b02820ebe34..c0f99cbec98 100644
--- a/emulators/or1ksim/Makefile
+++ b/emulators/or1ksim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/10/03 12:55:16 asau Exp $
+# $NetBSD: Makefile,v 1.6 2013/07/15 02:02:21 ryoon Exp $
 #
 
 DISTNAME=	or1ksim-0.2.0rc2
@@ -12,7 +12,7 @@ COMMENT=	OpenRISC emulator
 
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS+=	--target=or32
-USE_GNU_READLINE=	YES # rl_event_hook
 
+# rl_event_hook
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index ed04e89f15a..8062a51f367 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2013/06/06 12:54:19 wiz Exp $
+# $NetBSD: Makefile,v 1.109 2013/07/15 02:02:21 ryoon Exp $
 
 DISTNAME=		vice-2.4
 PKGREVISION=		5
@@ -49,7 +49,7 @@ CPPFLAGS+=		-DHAVE_STDINT_H
 CPPFLAGS+=		-DHAVE_STDINT_H
 .endif
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/emulators/xtrs/Makefile b/emulators/xtrs/Makefile
index 0cb96030818..f56667dc5d9 100644
--- a/emulators/xtrs/Makefile
+++ b/emulators/xtrs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2013/04/06 21:07:32 rodent Exp $
+# $NetBSD: Makefile,v 1.20 2013/07/15 02:02:21 ryoon Exp $
 #
 
 DISTNAME=	xtrs-4.9d
@@ -48,6 +48,6 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/cassette ${DESTDIR}${PREFIX}/bin
 
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"