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

5 files changed, 11 insertions, 11 deletions

diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile
index 25fdd60dee2..e95cebd26bb 100644
--- a/sysutils/amanda-client/Makefile
+++ b/sysutils/amanda-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2012/10/23 19:50:51 asau Exp $
+# $NetBSD: Makefile,v 1.58 2013/07/15 02:02:28 ryoon Exp $
 #
 
 PKGNAME=		amanda-client-${AMANDA_VERSION}
@@ -57,5 +57,5 @@ post-install:
 		${DESTDIR}${PREFIX}/libexec/amanda
 
 .include "../../sysutils/amanda-common/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common
index c0916a07921..8aee85860d3 100644
--- a/sysutils/bacula/Makefile.common
+++ b/sysutils/bacula/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.61 2013/03/04 21:57:21 wiz Exp $
+# $NetBSD: Makefile.common,v 1.62 2013/07/15 02:02:28 ryoon Exp $
 #
 # used by sysutils/bacula-clientonly/Makefile
 # used by sysutils/bacula-tray-monitor/Makefile
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+=	--with-scriptdir=${PREFIX}/libexec/bacula
 CONFIGURE_ARGS+=	--with-sbin-perm=0755
 CONFIGURE_ARGS+=	--with-working-dir=${BACULA_WORKINGDIR}
 CONFIGURE_ARGS+=	--with-pid-dir=${BACULA_PIDDIR}
-CONFIGURE_ARGS+=	--with-readline=${PREFIX}/include/readline
+CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.editlinereadline}/include/readline
 
 .if ${OPSYS} == "Linux"
 CONFIGURE_ARGS+=	--enable-smartalloc
@@ -77,6 +77,6 @@ EXAMPLESDIR=		${PREFIX}/share/examples/bacula
 pre-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${EXAMPLESDIR}
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile
index c99521d6af7..c1652efaad9 100644
--- a/sysutils/ipmitool/Makefile
+++ b/sysutils/ipmitool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2013/03/02 10:44:43 tron Exp $
+# $NetBSD: Makefile,v 1.13 2013/07/15 02:02:28 ryoon Exp $
 #
 
 DISTNAME=		ipmitool-1.8.11
@@ -13,7 +13,6 @@ COMMENT=		Command-line utility for managing IPMI devices
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		yes
-USE_GNU_READLINE=	yes # ipmitool uses rl_event_hook
 INSTALLATION_DIRS+=	share/examples/ipmitool share/doc/ipmitool
 
 OPSYSVARS+=		CONFIGURE_ARGS
@@ -21,6 +20,7 @@ CONFIGURE_ARGS.NetBSD+=	--disable-intf-open --disable-intf-imb
 CONFIGURE_ARGS.DragonFly+= --disable-intf-open --disable-intf-imb
 CONFIGURE_ARGS.SunOS+=	--enable-solaris-opt
 
+# ipmitool uses rl_event_hook
 .include "../../devel/readline/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/libvirt/Makefile b/sysutils/libvirt/Makefile
index 4da4eb6c51a..1ca18dcc120 100644
--- a/sysutils/libvirt/Makefile
+++ b/sysutils/libvirt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2013/02/06 23:23:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.13 2013/07/15 02:02:28 ryoon Exp $
 
 DISTNAME=	libvirt-0.9.3
 PKGREVISION=	9
@@ -68,7 +68,7 @@ RCD_SCRIPTS=            libvirtd
 .include "../../lang/python/extension.mk"
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../security/cyrus-sasl/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
diff --git a/sysutils/xfsprogs/Makefile b/sysutils/xfsprogs/Makefile
index 1f2ad8c9feb..8d35a638091 100644
--- a/sysutils/xfsprogs/Makefile
+++ b/sysutils/xfsprogs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/10/23 19:51:38 asau Exp $
+# $NetBSD: Makefile,v 1.12 2013/07/15 02:02:29 ryoon Exp $
 
 DISTNAME=	xfsprogs-2.7.3.src
 PKGNAME=	${DISTNAME:S/.src//}
@@ -23,6 +23,6 @@ INSTALL_MAKE_FLAGS+=	prefix=${DESTDIR}${PREFIX} \
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 BUILD_TARGET=
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"