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

7 files changed, 16 insertions, 18 deletions

diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile
index 994492a60d5..27edaff6de7 100644
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2012/09/15 10:03:34 obache Exp $
+# $NetBSD: Makefile,v 1.24 2013/07/15 02:02:17 ryoon Exp $
 
 DISTNAME=	fluidsynth-1.1.6
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fluidsynth/}
 EXTRACT_SUFX=	.tar.bz2
@@ -29,7 +29,7 @@ LIBS.SunOS+=		-lsocket
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgetopt/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/icecast1/Makefile b/audio/icecast1/Makefile
index a50119884d8..67cf3da386c 100644
--- a/audio/icecast1/Makefile
+++ b/audio/icecast1/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2012/09/12 00:24:39 asau Exp $
+# $NetBSD: Makefile,v 1.30 2013/07/15 02:02:17 ryoon Exp $
 #
 
 DISTNAME=	icecast-1.3.12
-PKGREVISION=	12
+PKGREVISION=	13
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.xiph.org/releases/icecast/
 
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=	--with-readline \
 			--with-libwrap \
 			--with-python \
 			--sysconfdir=${PKG_SYSCONFDIR:Q}
-CPPFLAGS+=		-I${BUILDLINK_PREFIX.readline}/include/readline
+CPPFLAGS+=		-I${BUILDLINK_PREFIX.editlinereadline}/include/readline
 CPPFLAGS+=		${BUILDLINK_CPPFLAGS.${PYPACKAGE}}
 LDFLAGS+=		${BUILDLINK_LDFLAGS.${PYPACKAGE}}
 PTHREAD_OPTS+=		require
@@ -49,7 +49,7 @@ SUBST_FILES.ice=	src/icetypes.h
 SUBST_SED.ice=		-e 's/@SOURCE_BUFFSIZE@/${ICECAST_SOURCE_BUFFSIZE}/'
 SUBST_SED.ice+=		-e 's/@CHUNKLEN@/${ICECAST_CHUNKLEN}/'
 
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/audio/id3ed/Makefile b/audio/id3ed/Makefile
index 2fa7a12b130..aa901277561 100644
--- a/audio/id3ed/Makefile
+++ b/audio/id3ed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2012/09/12 00:24:39 asau Exp $
+# $NetBSD: Makefile,v 1.33 2013/07/15 02:02:17 ryoon Exp $
 #
 
 DISTNAME=	id3ed-1.10.4
@@ -19,7 +19,5 @@ GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake
 
 # uses rl_startup_hook
-USE_GNU_READLINE=	yes
-
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/jack/Makefile b/audio/jack/Makefile
index 5d2e0e156e5..5cd1fa4c7c1 100644
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2013/05/31 12:39:36 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2013/07/15 02:02:17 ryoon Exp $
 #
 
 DISTNAME=	jack-audio-connection-kit-${JACK_VERSION}
@@ -119,7 +119,7 @@ post-extract:
 		${CP} ${FILESDIR}/atomicity.h ${WRKSRC}/config/os/netbsd
 
 .include "../../audio/libsamplerate/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libsmf/Makefile b/audio/libsmf/Makefile
index 68f08660c31..a0dbfbe04ca 100644
--- a/audio/libsmf/Makefile
+++ b/audio/libsmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/09/15 10:03:40 obache Exp $
+# $NetBSD: Makefile,v 1.7 2013/07/15 02:02:17 ryoon Exp $
 #
 
 DISTNAME=	libsmf-1.3
@@ -18,5 +18,5 @@ USE_TOOLS+=	pkg-config
 PKGCONFIG_OVERRIDE+=	smf.pc.in
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libtunepimp/Makefile b/audio/libtunepimp/Makefile
index 4a40a3b3923..3d3ef9980b3 100644
--- a/audio/libtunepimp/Makefile
+++ b/audio/libtunepimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2013/02/06 23:21:35 jperkin Exp $
+# $NetBSD: Makefile,v 1.25 2013/07/15 02:02:17 ryoon Exp $
 
 DISTNAME=		libtunepimp-0.5.3
 PKGREVISION=		11
@@ -35,7 +35,7 @@ pre-configure:
 .include "../../audio/taglib/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../multimedia/libmp4v2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 53f5d94299b..6da29acf0b4 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2013/04/06 20:27:16 rodent Exp $
+# $NetBSD: Makefile,v 1.64 2013/07/15 02:02:17 ryoon Exp $
 #
 
 DISTNAME=	rplay-3.3.2
@@ -36,7 +36,7 @@ post-install:
 .endfor
 
 .include "../../audio/gsm/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
 .include "../../devel/rx/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"