* .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, 14 insertions, 14 deletions

diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index b235a33d1e2..067ed5fe70f 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2012/10/08 13:25:12 asau Exp $
+# $NetBSD: Makefile,v 1.37 2013/07/15 02:02:18 ryoon Exp $
 
 DISTNAME=		felt-3.05.src
 PKGNAME=		felt-3.05
-PKGREVISION=	4
+PKGREVISION=		4
 CATEGORIES=		cad
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=felt/}
 DISTFILES=		felt-3.05.src.tar.gz felt-3.05.ps.gz
@@ -22,8 +22,6 @@ MAKE_ENV+=		CCOPTS=${CFLAGS:M*:Q}
 MAKE_ENV+=		LDOPTS=${LDFLAGS:M*:Q}
 MAKE_ENV+=		SH=${SH:Q}
 
-USE_GNU_READLINE=	YES # uses remove_history() and history_list()
-
 INSTALLATION_DIRS+=	lib/X11/app-defaults share/doc/felt share/examples/felt
 INSTALLATION_DIRS+=	share/examples/felt share/doc/felt
 
@@ -36,6 +34,7 @@ post-install:
 		COPYING CHANGELOG TODO ${DESTDIR}${PREFIX}/share/doc/felt
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${DESTDIR}${PREFIX}/share/examples/felt
 
+# uses remove_history() and history_list()
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"
 
diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index 4e08faf7176..64d7bc0cdc3 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2012/10/08 13:25:13 asau Exp $
+# $NetBSD: Makefile,v 1.27 2013/07/15 02:02:18 ryoon Exp $
 #
 
 DISTNAME=	gnucap-2006-07-08
@@ -21,7 +21,6 @@ CONFLICTS+=	gnucap-2006-07-[0-9]*
 
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake
-USE_GNU_READLINE=	YES
 GNU_CONFIGURE=		YES
 
 INSTALLATION_DIRS=	share/gnucap/manual/html
diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index a2b3163b31c..9fe50d3a64b 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2013/06/06 12:54:07 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2013/07/15 02:02:18 ryoon Exp $
 #
 
 DISTNAME=	magic-7.5.188
@@ -15,7 +15,6 @@ LICENSE=	magic-license
 MAKE_JOBS_SAFE=		no
 
 USE_TOOLS+=	gmake printf csh
-USE_GNU_READLINE=yes	# uses rl_*_completion_function
 MAKE_ENV+=	MAGIC_HOME=${PREFIX:Q}
 MAKE_FLAGS+=	MANDIR=${PREFIX}/${PKGMANDIR}
 GNU_CONFIGURE=	yes
@@ -53,6 +52,7 @@ REPLACE.wish.old=	.*wish
 REPLACE.wish.new=	${PREFIX}/bin/wish
 REPLACE_FILES.wish=	tcltk/tkshell.tcl
 
+# uses rl_*_completion_function
 .include "../../devel/readline/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/blt/buildlink3.mk"
diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile
index af6e800d31d..74e6a29c91a 100644
--- a/cad/ng-spice/Makefile
+++ b/cad/ng-spice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2013/04/06 20:27:16 rodent Exp $
+# $NetBSD: Makefile,v 1.42 2013/07/15 02:02:18 ryoon Exp $
 #
 
 DISTNAME=	ngspice-23
@@ -12,7 +12,6 @@ COMMENT=	Next generation circuit simulation program
 
 USE_LIBTOOL=		YES
 USE_TOOLS+=		gmake makeinfo
-USE_GNU_READLINE=	uses rl_* interface
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--disable-debug
@@ -24,6 +23,7 @@ TEXINFO_REQD=	4.6
 
 .include "../../devel/libgetopt/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
+# uses rl_* interface
 .include "../../devel/readline/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXp/buildlink3.mk"
diff --git a/cad/verilog-current/Makefile b/cad/verilog-current/Makefile
index 6c4e4235f1e..df1fe56c354 100644
--- a/cad/verilog-current/Makefile
+++ b/cad/verilog-current/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.58 2012/10/08 13:25:17 asau Exp $
+# $NetBSD: Makefile,v 1.59 2013/07/15 02:02:18 ryoon Exp $
 #
 
 DISTNAME=	verilog-${SNAPDATE}
 PKGNAME=	verilog-current-${SNAPDATE}
+PKGREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	ftp://icarus.com/pub/eda/verilog/snapshots/
 
@@ -28,5 +29,5 @@ TEST_TARGET=		check
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/gperf/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cad/verilog/Makefile b/cad/verilog/Makefile
index 9a279f47c70..1e1c8e20df4 100644
--- a/cad/verilog/Makefile
+++ b/cad/verilog/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2012/10/08 13:25:16 asau Exp $
+# $NetBSD: Makefile,v 1.36 2013/07/15 02:02:18 ryoon Exp $
 #
 
 DISTNAME=	verilog-0.9.4
+PKGREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	ftp://icarus.com/pub/eda/verilog/v0.9/
 
@@ -23,5 +24,5 @@ TEST_TARGET=		check
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/gperf/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"