From 023dd50fda20816b360ef48d9446e3178b668e95 Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 4 Jun 2013 07:45:01 +0000 Subject: Replace py-Tk/buildlink3.mk with DEPENDS. There are no buildlink3-relevant files here, just a loadable module. --- graphics/py-OpenGL/Makefile | 6 +++--- graphics/py-imagingtk/Makefile | 6 +++--- graphics/py-imagingtk/buildlink3.mk | 3 +-- graphics/py-matplotlib-tk/Makefile | 6 +++--- graphics/skencil/Makefile | 6 +++--- 5 files changed, 13 insertions(+), 14 deletions(-) (limited to 'graphics') diff --git a/graphics/py-OpenGL/Makefile b/graphics/py-OpenGL/Makefile index 39cd2eae28c..d6e49f3609e 100644 --- a/graphics/py-OpenGL/Makefile +++ b/graphics/py-OpenGL/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2013/06/03 10:05:18 wiz Exp $ -# +# $NetBSD: Makefile,v 1.13 2013/06/04 07:45:01 wiz Exp $ DISTNAME= PyOpenGL-3.0.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^Py//} @@ -11,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://pyopengl.sourceforge.net/ COMMENT= Pyhton bindings for OpenGL +DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk + PYDISTUTILSPKG= yes #PY_PATCHPLIST= YES @@ -18,6 +19,5 @@ PYDISTUTILSPKG= yes .include "../../lang/python/extension.mk" .include "../../graphics/Mesa/buildlink3.mk" .include "../../math/py-Numeric/buildlink3.mk" -.include "../../x11/py-Tk/buildlink3.mk" .include "../../lang/tcl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-imagingtk/Makefile b/graphics/py-imagingtk/Makefile index 9afc82e71bf..4602b11817a 100644 --- a/graphics/py-imagingtk/Makefile +++ b/graphics/py-imagingtk/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2013/06/03 10:05:19 wiz Exp $ -# +# $NetBSD: Makefile,v 1.30 2013/06/04 07:45:01 wiz Exp $ DISTNAME= Imaging-1.1.7 PKGNAME= ${PYPKGPREFIX}-imagingtk-1.1.7 @@ -11,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.pythonware.com/products/pil/ COMMENT= Tk support for the Python Imaging Library (PIL) +DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk + DIST_SUBDIR= python PYDISTUTILSPKG= yes BUILDLINK_API_DEPENDS.python20+= python20>=2.0.1nb4 @@ -28,5 +29,4 @@ post-install: .include "../../lang/python/extension.mk" .include "../../graphics/py-imaging/buildlink3.mk" -.include "../../x11/py-Tk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-imagingtk/buildlink3.mk b/graphics/py-imagingtk/buildlink3.mk index ca123bc9edb..ba70ea8192f 100644 --- a/graphics/py-imagingtk/buildlink3.mk +++ b/graphics/py-imagingtk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2013/06/03 10:05:19 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2013/06/04 07:45:01 wiz Exp $ BUILDLINK_TREE+= py-imagingtk @@ -12,7 +12,6 @@ BUILDLINK_ABI_DEPENDS.py-imagingtk+= ${PYPKGPREFIX}-imagingtk>=1.1.7nb4 BUILDLINK_PKGSRCDIR.py-imagingtk?= ../../graphics/py-imagingtk .include "../../graphics/py-imaging/buildlink3.mk" -.include "../../x11/py-Tk/buildlink3.mk" .endif # PY_IMAGINGTK_BUILDLINK3_MK BUILDLINK_TREE+= -py-imagingtk diff --git a/graphics/py-matplotlib-tk/Makefile b/graphics/py-matplotlib-tk/Makefile index 6480cfde551..6caa8bbe132 100644 --- a/graphics/py-matplotlib-tk/Makefile +++ b/graphics/py-matplotlib-tk/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2013/06/03 10:05:19 wiz Exp $ -# +# $NetBSD: Makefile,v 1.18 2013/06/04 07:45:01 wiz Exp $ DISTNAME= matplotlib-1.2.0 PKGNAME= ${PYPKGPREFIX}-matplotlib-tk-1.2.0 @@ -12,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://matplotlib.sourceforge.net/ COMMENT= Tk frontend for matplotlib +DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk + USE_TOOLS+= pkg-config PY_PATCHPLIST= yes PYDISTUTILSPKG= yes @@ -36,6 +37,5 @@ post-patch: .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../math/py-numpy/buildlink3.mk" -.include "../../x11/py-Tk/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/skencil/Makefile b/graphics/skencil/Makefile index 589c119e2b7..30ecdd5c58d 100644 --- a/graphics/skencil/Makefile +++ b/graphics/skencil/Makefile @@ -1,5 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2013/06/03 10:05:21 wiz Exp $ -# +# $NetBSD: Makefile,v 1.24 2013/06/04 07:45:01 wiz Exp $ DISTNAME= skencil-0.6.17 PKGREVISION= 10 @@ -10,6 +9,8 @@ MAINTAINER= uebayasi@NetBSD.org HOMEPAGE= http://sketch.sourceforge.net/ COMMENT= Interactive drawing program +DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk + USE_TOOLS+= pax PYTHON_PATCH_SCRIPTS= sk2ppm.py sk2ps.py skconvert.py skencil.py skshow.py @@ -44,5 +45,4 @@ post-install: .include "../../lang/python/application.mk" .include "../../graphics/py-imaging/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" -.include "../../x11/py-Tk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3