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

diff --git a/math/R/Makefile b/math/R/Makefile
index c05ff05588d..a6a2e21fc0e 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.140 2013/06/06 12:54:42 wiz Exp $
+# $NetBSD: Makefile,v 1.141 2013/07/15 02:02:25 ryoon Exp $
 
 DISTNAME=		R-2.15.1
 PKGREVISION=		7
@@ -21,7 +21,6 @@ INSTALL_TARGET=		install install-info
 TEST_TARGET=		check
 USE_TOOLS+=		gmake gzip:run makeinfo perl:run sed unzip:run xmkmf
 USE_TOOLS+=		pkg-config
-USE_GNU_READLINE=	yes		# uses callback interface
 USE_GNU_ICONV=		yes		# latin1 support, iconvlist
 USE_LANGUAGES=		c c++ fortran
 USE_LIBTOOL=		yes
@@ -129,6 +128,7 @@ CONFIGURE_ARGS+=	--enable-mbcs=no
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
+# uses callback interface
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
diff --git a/math/aamath/Makefile b/math/aamath/Makefile
index 0a7189ba3d1..eea9cec5d2f 100644
--- a/math/aamath/Makefile
+++ b/math/aamath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2012/09/11 23:04:16 asau Exp $
+# $NetBSD: Makefile,v 1.6 2013/07/15 02:02:25 ryoon Exp $
 #
 
 DISTNAME=	aamath-0.3
@@ -24,5 +24,5 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/aamath ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/aamath.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/algae/Makefile b/math/algae/Makefile
index 10368de264e..444c40b1c44 100644
--- a/math/algae/Makefile
+++ b/math/algae/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2012/09/11 23:04:16 asau Exp $
+# $NetBSD: Makefile,v 1.26 2013/07/15 02:02:25 ryoon Exp $
 
 DISTNAME=		algae-4.3.6
 PKGREVISION=		2
@@ -15,12 +15,12 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--disable-dlmalloc
 CONFIGURE_ENV=		ac_cv_path_XTERM=xterm
 USE_LANGUAGES=		c fortran77
-USE_GNU_READLINE=	yes	# uses history_truncate_file
 INFO_FILES=		yes
 INSTALL_MAKE_FLAGS=	${MAKE_FLAGS}					\
 			mandir=${PREFIX}/${PKGMANDIR}/man1		\
 			infodir=${PREFIX}/${PKGINFODIR}		\
 			htmldir=${PREFIX}/share/doc/algae
 
+# uses history_truncate_file
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/analitza/Makefile b/math/analitza/Makefile
index 24f7a93f9ce..c7c61b46a26 100644
--- a/math/analitza/Makefile
+++ b/math/analitza/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2013/07/05 13:29:37 ryoon Exp $
+# $NetBSD: Makefile,v 1.18 2013/07/15 02:02:25 ryoon Exp $
 
 DISTNAME=	analitza-${_KDE_VERSION}
 PKGREVISION=	4
@@ -7,7 +7,6 @@ COMMENT=	KDE library for mathematical features
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
-USE_GNU_READLINE=	yes
 BROKEN_READLINE_DETECTION=	yes
 
 .include "../../meta-pkgs/kde4/kde4.mk"
diff --git a/math/bc/Makefile b/math/bc/Makefile
index c003bcc8b80..f3c6ef755b4 100644
--- a/math/bc/Makefile
+++ b/math/bc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/04/06 20:27:24 rodent Exp $
+# $NetBSD: Makefile,v 1.12 2013/07/15 02:02:25 ryoon Exp $
 
 DISTNAME=	bc-1.06
 PKGREVISION=	3
@@ -14,5 +14,5 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-readline
 INFO_FILES=		yes
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/capc-calc/Makefile b/math/capc-calc/Makefile
index caceaea01c7..055f45521cb 100644
--- a/math/capc-calc/Makefile
+++ b/math/capc-calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2012/09/11 23:04:17 asau Exp $
+# $NetBSD: Makefile,v 1.43 2013/07/15 02:02:25 ryoon Exp $
 #
 
 DISTNAME=	calc-2.12.4.1
@@ -23,5 +23,5 @@ INSTALL_MAKE_FLAGS+=	T=${DESTDIR}
 TEST_TARGET=	check
 
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile
index 2a7d13d4059..abd96ac751c 100644
--- a/math/eukleides/Makefile
+++ b/math/eukleides/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2013/06/26 15:50:30 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2013/07/15 02:02:25 ryoon Exp $
 
 DISTNAME=	eukleides-1.5.4
 PKGREVISION=	1
@@ -39,7 +39,7 @@ INSTALL_MAKE_FLAGS=	${MAKE_FLAGS}					\
 pre-install:
 	${FIND} ${WRKSRC} -type f -name '*.orig' -exec ${RM} -f {} \;
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../print/kpathsea/texmf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/fityk/Makefile b/math/fityk/Makefile
index 26aeddd78e2..dbc115bc06a 100644
--- a/math/fityk/Makefile
+++ b/math/fityk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2013/06/06 12:54:43 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2013/07/15 02:02:25 ryoon Exp $
 
 DISTNAME=	fityk-0.9.7
 PKGREVISION=	14
@@ -20,7 +20,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-xyconvert
 
 .include "../../devel/boost-headers/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../math/xylib/buildlink3.mk"
 .include "../../x11/wxGTK28/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/math/genius/Makefile b/math/genius/Makefile
index 7dc7c6748f8..94ec2c80322 100644
--- a/math/genius/Makefile
+++ b/math/genius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2013/06/06 12:54:43 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2013/07/15 02:02:25 ryoon Exp $
 #
 
 DISTNAME=		genius-1.0.16
@@ -17,7 +17,6 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config gmake intltool msgfmt
-USE_GNU_READLINE=	yes
 
 .include "options.mk"
 
diff --git a/math/nickle/Makefile b/math/nickle/Makefile
index 3807f1e1e71..293eaf35f76 100644
--- a/math/nickle/Makefile
+++ b/math/nickle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/05/30 16:58:01 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2013/07/15 02:02:25 ryoon Exp $
 
 DISTNAME=	nickle-2.77
 CATEGORIES=	math lang
@@ -15,10 +15,6 @@ TEST_TARGET=	check
 
 .include "../../mk/bsd.prefs.mk"
 
-.if (${OPSYS} == NetBSD) && empty(OS_VERSION:M6.99.2[1-9]*) && empty(OS_VERSION:M6.99.[345679][0-9]*) && empty(OS_VERSION:M[789].*) || (${OPSYS} == "DragonFly")
 # lex.l:131:5: error: 'rl_catch_signals' undeclared (first use in this function)
-USE_GNU_READLINE=	yes
-.endif
-
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/octave/Makefile b/math/octave/Makefile
index f39d88e036d..0152d8dae7e 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.116 2013/06/04 22:16:38 tron Exp $
+# $NetBSD: Makefile,v 1.117 2013/07/15 02:02:25 ryoon Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 PKGREVISION=	3
@@ -22,7 +22,6 @@ OCTAVE_VER=	3.6.4
 BROKEN=		Internal compiler error occurs on arm32 (even with gcc-2.95.3)
 .endif
 
-USE_GNU_READLINE=	yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		autoconf gsed gmake:run makeinfo perl pkg-config bison
 GNU_CONFIGURE=		yes
diff --git a/math/ordCalc/Makefile b/math/ordCalc/Makefile
index 2bec1c23e41..54251c52b51 100644
--- a/math/ordCalc/Makefile
+++ b/math/ordCalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/09/11 23:04:25 asau Exp $
+# $NetBSD: Makefile,v 1.7 2013/07/15 02:02:26 ryoon Exp $
 #
 
 ORDCALCVER=	0.2
@@ -35,6 +35,6 @@ do-install:
 
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/pari/Makefile b/math/pari/Makefile
index 24392fbb219..211819db82a 100644
--- a/math/pari/Makefile
+++ b/math/pari/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2013/05/31 12:41:24 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2013/07/15 02:02:26 ryoon Exp $
 
 DISTNAME=	pari-2.3.5
 PKGREVISION=	13
@@ -15,7 +15,6 @@ MAKE_JOBS_SAFE=	no
 USE_LIBTOOL=		yes
 USE_TOOLS+=		perl:run
 USE_LANGUAGES+=		c c++
-USE_GNU_READLINE=	yes	# rl_save_prompt()
 HAS_CONFIGURE=		yes
 CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE}
 CONFIGURE_ENV+=		PERL5=${PERL5:Q}
@@ -40,5 +39,6 @@ SUBST_SED.fix-cfg=	-e 's,$$CC $$extraflag,$$CC $$CFLAGS $$extraflag,g'
 .include "options.mk"
 
 .include "../../devel/ncurses/buildlink3.mk"
+# rl_save_prompt()
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 94aa78ce3db..47869ba87a2 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2013/06/06 12:54:44 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2013/07/15 02:02:26 ryoon Exp $
 #
 
 DISTNAME=	pspp-0.6.2
@@ -30,7 +30,7 @@ USE_NCURSES=	yes
 # we only want the charset.alias file, so no buildlinkery for libiconv
 DEPENDS+=       libiconv-[0-9]*:../../converters/libiconv
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 9e42234dd66..e5bf1e59431 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2012/09/15 10:05:32 obache Exp $
+# $NetBSD: Makefile,v 1.43 2013/07/15 02:02:26 ryoon Exp $
 
 DISTNAME=	libqalculate-0.9.7
 PKGNAME=	qalculate-0.9.7
@@ -10,7 +10,6 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://qalculate.sourceforge.net/
 COMMENT=	Modern multi-purpose desktop calculator (console version)
 
-USE_GNU_READLINE=	yes
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/math/units/Makefile b/math/units/Makefile
index 88c8d7c522b..23b86ff717c 100644
--- a/math/units/Makefile
+++ b/math/units/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2012/12/06 11:42:20 jperkin Exp $
+# $NetBSD: Makefile,v 1.9 2013/07/15 02:02:26 ryoon Exp $
 
 DISTNAME=	units-2.01
 CATEGORIES=	math
@@ -22,6 +22,6 @@ REPLACE_PYTHON=	units_cur
 post-install:
 	${LN} -sf ${PREFIX}/bin/gunits ${DESTDIR}${PREFIX}/${PKGGNUDIR}bin/units
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"