From 83687e606e092b53e440e5c0513703490c068787 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 4 Jun 2013 07:38:49 +0000 Subject: Replace py-curses/buildlink3.mk with DEPENDS. There are no buildlink3-relevant files here, just a loadable module. --- devel/bpython/Makefile | 4 ++-- devel/py-curses/buildlink3.mk | 17 ----------------- sysutils/vxargs/Makefile | 6 +++--- sysutils/xentools3/Makefile | 5 ++--- sysutils/xentools33/Makefile | 5 ++--- sysutils/xentools41/Makefile | 4 ++-- sysutils/xentools42/Makefile | 5 ++--- 7 files changed, 13 insertions(+), 33 deletions(-) delete mode 100644 devel/py-curses/buildlink3.mk diff --git a/devel/bpython/Makefile b/devel/bpython/Makefile index c6442be4e12..6cd0e650cdd 100644 --- a/devel/bpython/Makefile +++ b/devel/bpython/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2013/06/04 07:35:14 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2013/06/04 07:38:49 wiz Exp $ # DISTNAME= bpython-0.12 @@ -13,6 +13,7 @@ LICENSE= mit USE_LANGUAGES= # none +DEPENDS+= ${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses 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 @@ -28,7 +29,6 @@ PKG_SUGGESTED_OPTIONS= # empty .include "../../x11/py-gtk2/buildlink3.mk" .endif -.include "../../devel/py-curses/buildlink3.mk" .include "../../lang/python/distutils.mk" .include "../../lang/python/application.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" diff --git a/devel/py-curses/buildlink3.mk b/devel/py-curses/buildlink3.mk deleted file mode 100644 index 0e522ecfb8e..00000000000 --- a/devel/py-curses/buildlink3.mk +++ /dev/null @@ -1,17 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:27 joerg Exp $ - -BUILDLINK_TREE+= pycurses - -.if !defined(PY_CURSES_BUILDLINK3_MK) -PY_CURSES_BUILDLINK3_MK:= - -. include "../../lang/python/pyversion.mk" - -BUILDLINK_API_DEPENDS.pycurses+= ${PYPKGPREFIX}-curses-[0-9]* -BUILDLINK_ABI_DEPENDS.pycurses+= ${PYPKGPREFIX}-curses>=0nb4 -BUILDLINK_PKGSRCDIR.pycurses?= ../../devel/py-curses - -.include "../../devel/ncurses/buildlink3.mk" -.endif # PY_CURSES_BUILDLINK3_MK - -BUILDLINK_TREE+= -pycurses diff --git a/sysutils/vxargs/Makefile b/sysutils/vxargs/Makefile index 5aba21833e8..b4d6c81b802 100644 --- a/sysutils/vxargs/Makefile +++ b/sysutils/vxargs/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2012/10/23 19:51:30 asau Exp $ -# +# $NetBSD: Makefile,v 1.7 2013/06/04 07:38:49 wiz Exp $ DISTNAME= vxargs-0.3.3 PKGREVISION= 2 @@ -11,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://dharma.cis.upenn.edu/planetlab/vxargs/ COMMENT= Runs parallel jobs with visualization and redirection +DEPENDS+= ${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses + EXTRACT_CMD= ${CP} $${extract_file} ${WRKSRC}/vxargs.py NO_BUILD= yes WRKSRC= ${WRKDIR} @@ -19,7 +20,6 @@ INSTALLATION_DIRS= bin PYTHON_PATCH_SCRIPTS= vxargs.py -.include "../../devel/py-curses/buildlink3.mk" .include "../../lang/python/application.mk" do-install: diff --git a/sysutils/xentools3/Makefile b/sysutils/xentools3/Makefile index 4783054e43b..af06eb615d7 100644 --- a/sysutils/xentools3/Makefile +++ b/sysutils/xentools3/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2013/05/31 12:42:05 wiz Exp $ -# +# $NetBSD: Makefile,v 1.35 2013/06/04 07:38:49 wiz Exp $ VERSION= 3.1.4 DISTNAME= xen-${VERSION} @@ -14,6 +13,7 @@ COMMENT= Userland Tools for Xen #DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline +DEPENDS+= ${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses MAKE_JOBS_SAFE= no @@ -205,7 +205,6 @@ post-install: .include "../../textproc/py-xml/buildlink3.mk" #.include "../../devel/zlib/buildlink3.mk" #.include "../../www/curl/buildlink3.mk" -.include "../../devel/py-curses/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xentools33/Makefile b/sysutils/xentools33/Makefile index 0944b33c4cf..3dcc3ac1862 100644 --- a/sysutils/xentools33/Makefile +++ b/sysutils/xentools33/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2013/05/31 12:42:05 wiz Exp $ -# +# $NetBSD: Makefile,v 1.39 2013/06/04 07:38:49 wiz Exp $ VERSION= 3.3.2 DISTNAME= xen-${VERSION} @@ -16,6 +15,7 @@ LICENSE= gnu-gpl-v2 #DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline +DEPENDS+= ${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware @@ -211,7 +211,6 @@ post-install: .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../textproc/py-xml/buildlink3.mk" -.include "../../devel/py-curses/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" #.include "../../devel/SDL/buildlink3.mk" diff --git a/sysutils/xentools41/Makefile b/sysutils/xentools41/Makefile index cd4221b8084..1aef81012ab 100644 --- a/sysutils/xentools41/Makefile +++ b/sysutils/xentools41/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2013/05/31 12:42:05 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2013/06/04 07:38:49 wiz Exp $ # # VERSION is set in version.mk as it is shared with other packages .include "version.mk" @@ -20,6 +20,7 @@ COMMENT= Userland Tools for Xen 4.1.x LICENSE= gnu-gpl-v2 #DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline +DEPENDS+= ${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses # XXX add version check: Xen requires dev86 >= 0.16.14 BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware @@ -190,7 +191,6 @@ MAKE_ENV+= EXTRA_HOSTCFLAGS=${EXTRA_HOSTCFLAGS:Q} EXTRA_CFLAGS=${EXTRA_CFLAGS:Q} .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../textproc/py-xml/buildlink3.mk" -.include "../../devel/py-curses/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" #.include "../../devel/SDL/buildlink3.mk" .include "../../lang/ocaml/buildlink3.mk" diff --git a/sysutils/xentools42/Makefile b/sysutils/xentools42/Makefile index 6a27185f6b1..165fd41dbcc 100644 --- a/sysutils/xentools42/Makefile +++ b/sysutils/xentools42/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2013/05/31 12:42:05 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2013/06/04 07:38:49 wiz Exp $ # # VERSION is set in version.mk as it is shared with other packages .include "version.mk" @@ -16,7 +16,6 @@ SITES.ipxe-git-v${VERSION_IPXE}.tar.gz += http://xenbits.xensource.com/xen-extfi MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://xen.org/ COMMENT= Userland Tools for Xen 4.2.x - LICENSE= gnu-gpl-v2 # XXX add version check: Xen requires dev86 >= 0.16.14 @@ -24,6 +23,7 @@ BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware .if !exists(/usr/bin/iasl) BUILD_DEPENDS+= acpica-utils-[0-9]*:../../sysutils/acpica-utils .endif +DEPENDS+= ${PYPKGPREFIX}-curses>=0nb4:../../devel/py-curses PKG_SYSCONFSUBDIR= xen @@ -247,7 +247,6 @@ MAKE_ENV+= EXTRA_HOSTCFLAGS=${EXTRA_HOSTCFLAGS:Q} EXTRA_CFLAGS=${EXTRA_CFLAGS:M* .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../textproc/py-xml/buildlink3.mk" -.include "../../devel/py-curses/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" #.include "../../devel/SDL/buildlink3.mk" .include "../../lang/ocaml/buildlink3.mk" -- cgit v1.2.3