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

4 files changed, 8 insertions, 22 deletions

diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index cc1c383ba34..c53805fce94 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2013/07/04 21:27:57 adam Exp $
+# $NetBSD: Makefile,v 1.81 2013/07/15 02:02:22 ryoon Exp $
 
 DISTNAME=	gnuplot-4.6.3
 PKGREVISION=	4
@@ -27,21 +27,9 @@ CONFIGURE_ARGS+=	--without-tutorial
 CONFIGURE_ARGS+=	ac_cv_prog_EMACS=
 INFO_FILES=		yes
 
-# Use BSD editline wherever possible:
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin"
-.  if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[01234].*)
-CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
-.include "../../devel/readline/buildlink3.mk"
-.  else
 CONFIGURE_ARGS+=	--with-readline=bsd
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
-.  endif
-.else
-CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
-.include "../../devel/readline/buildlink3.mk"
-.endif
 
 LDFLAGS.SunOS+=		-liconv
 
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 002f5fd6fa1..a3df2a4c89e 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2012/10/06 14:10:56 asau Exp $
+# $NetBSD: Makefile,v 1.58 2013/07/15 02:02:22 ryoon Exp $
 
 DISTNAME=	gphoto2-2.4.14
 CATEGORIES=	graphics
@@ -19,15 +19,13 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-cdk-prefix=${BUILDLINK_PREFIX.cdk}
 CONFIGURE_ARGS+=	--with-jpeg-prefix=${JPEGBASE}
 
-# uses rl_completion_matches() (NetBSD 3.* don't have) and rl_copy_text()
-USE_GNU_READLINE=	yes
-
 CFLAGS.Darwin+= -D_DARWIN_C_SOURCE
 
 .include "../../devel/cdk/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
+# uses rl_completion_matches() (NetBSD 3.* don't have) and rl_copy_text()
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gri/Makefile b/graphics/gri/Makefile
index 9c0cecdb8af..ad990d86155 100644
--- a/graphics/gri/Makefile
+++ b/graphics/gri/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2013/06/23 18:12:46 dholland Exp $
+# $NetBSD: Makefile,v 1.47 2013/07/15 02:02:22 ryoon Exp $
 
 DISTNAME=	gri-2.12.23
 PKGREVISION=	4
@@ -27,5 +27,5 @@ pre-configure:
 
 .include "../../devel/netcdf/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile
index 0f4a9e81355..1189bbc244f 100644
--- a/graphics/scigraphica/Makefile
+++ b/graphics/scigraphica/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2013/06/06 12:54:35 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2013/07/15 02:02:22 ryoon Exp $
 #
 
 DISTNAME=	scigraphica-2.1.0
@@ -11,7 +11,6 @@ HOMEPAGE=	http://scigraphica.sourceforge.net/
 COMMENT=	Data analysis and technical graphics
 
 USE_TOOLS+=		gmake intltool pkg-config
-USE_GNU_READLINE=	YES
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-gnome
@@ -27,6 +26,7 @@ PTHREAD_AUTO_VARS=	yes
 pre-configure:
 	ln -s ${PYTHONBIN} ${TOOLS_DIR}/bin/python
 
+.include "../../devel/readline/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../graphics/libscigraphica/buildlink3.mk"