Replace py-readline/buildlink3.mk with DEPENDS.

There are no buildlink3-relevant files here, just a loadable module.

5 files changed, 8 insertions, 24 deletions

diff --git a/chat/spectrum/Makefile b/chat/spectrum/Makefile
index 5804b5b26df..220f084168c 100644
--- a/chat/spectrum/Makefile
+++ b/chat/spectrum/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2013/06/03 10:04:40 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2013/06/04 07:35:14 wiz Exp $
 
 DISTNAME=		spectrum-1.4.8
 PKGREVISION=		21
@@ -12,6 +12,7 @@ LICENSE=		gnu-gpl-v3
 
 DEPENDS+=		${PYPKGPREFIX}-xmpppy>=0.4.1:../../chat/py-xmpppy
 DEPENDS+=		${PYPKGPREFIX}-expat>=0nb4:../../textproc/py-expat
+DEPENDS+=		${PYPKGPREFIX}-readline>=0nb2:../../devel/py-readline
 
 USE_TOOLS+=		pkg-config msgfmt xgettext
 USE_CMAKE=		yes
@@ -115,7 +116,6 @@ post-install:
 .include "../../devel/cmake/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/py-readline/buildlink3.mk"
 # .include "../../devel/libev/buildlink3.mk"
 .include "../../devel/poco/buildlink3.mk"
 .include "../../graphics/ImageMagick/buildlink3.mk"
diff --git a/devel/bpython/Makefile b/devel/bpython/Makefile
index 56ce2ab0a79..c6442be4e12 100644
--- a/devel/bpython/Makefile
+++ b/devel/bpython/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/06/03 10:04:43 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2013/06/04 07:35:14 wiz Exp $
 #
 
 DISTNAME=	bpython-0.12
@@ -14,6 +14,7 @@ LICENSE=	mit
 USE_LANGUAGES=	# none
 
 DEPENDS+=	${PYPKGPREFIX}-pygments>=1.6:../../textproc/py-pygments
+DEPENDS+=	${PYPKGPREFIX}-readline>=0nb2:../../devel/py-readline
 DEPENDS+=	${PYPKGPREFIX}-urwid>=0.9.9.1:../../devel/py-urwid
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.bpython
@@ -27,7 +28,6 @@ PKG_SUGGESTED_OPTIONS=  # empty
 .include "../../x11/py-gtk2/buildlink3.mk"
 .endif
 
-.include "../../devel/py-readline/buildlink3.mk"
 .include "../../devel/py-curses/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../lang/python/application.mk"
diff --git a/devel/py-logilab-common/Makefile b/devel/py-logilab-common/Makefile
index cc454bb5c8e..55d0d05f0cb 100644
--- a/devel/py-logilab-common/Makefile
+++ b/devel/py-logilab-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/10/31 11:19:32 asau Exp $
+# $NetBSD: Makefile,v 1.5 2013/06/04 07:35:14 wiz Exp $
 #
 
 VERS=			0.53.0
@@ -26,6 +26,5 @@ post-install:
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../lang/python/egg.mk"
-#.include "../../devel/py-readline/buildlink3.mk"
 .include "../../time/py-mxDateTime/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-readline/buildlink3.mk b/devel/py-readline/buildlink3.mk
deleted file mode 100644
index 56566a75839..00000000000
--- a/devel/py-readline/buildlink3.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.8 2012/05/07 01:53:28 dholland Exp $
-
-BUILDLINK_TREE+=	pyreadline
-
-.if !defined(PYREADLINE_BUILDLINK3_MK)
-PYREADLINE_BUILDLINK3_MK:=
-
-.include "../../lang/python/pyversion.mk"
-
-BUILDLINK_API_DEPENDS.pyreadline+=		${PYPKGPREFIX}-readline-[0-9]*
-BUILDLINK_ABI_DEPENDS.pyreadline+=	${PYPKGPREFIX}-readline>=0nb2
-BUILDLINK_PKGSRCDIR.pyreadline?=	../../devel/py-readline
-.endif # PYREADLINE_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-pyreadline
diff --git a/shells/lshell/Makefile b/shells/lshell/Makefile
index c1e53a5a75e..895ffe27c25 100644
--- a/shells/lshell/Makefile
+++ b/shells/lshell/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2012/09/11 23:25:08 asau Exp $
-#
+# $NetBSD: Makefile,v 1.11 2013/06/04 07:35:15 wiz Exp $
 
 DISTNAME=	lshell-0.9.15.1
 CATEGORIES=	shells python
@@ -10,6 +9,8 @@ HOMEPAGE=	http://ghantoos.org/limited-shell-lshell/
 COMMENT=	Lshell restricts user's environment to specified commands
 LICENSE=	gnu-gpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-readline>=0nb2:../../devel/py-readline
+
 PKG_GROUPS=	lshellg
 PKG_SHELL=	bin/lshell
 
@@ -37,5 +38,4 @@ CONF_FILES=		${PREFIX}/${EGDIR}/lshell.conf \
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
-.include "../../devel/py-readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"