summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2017-05-30 07:20:21 +0000
committeradam <adam@pkgsrc.org>2017-05-30 07:20:21 +0000
commitb3b9678113b6e68b1d98ff40da1907e292cc496c (patch)
tree2b961a2fdcf137028ba6fe367d9aafc182d24f1d /graphics
parent5fcb7ecdc3015ea68f570bc80823f1d2da0ef3f6 (diff)
downloadpkgsrc-b3b9678113b6e68b1d98ff40da1907e292cc496c.tar.gz
Minor clean-up
Diffstat (limited to 'graphics')
-rw-r--r--graphics/py-matplotlib-gtk2/distinfo7
-rw-r--r--graphics/py-matplotlib-gtk2/patches/patch-ab13
-rw-r--r--graphics/py-matplotlib/Makefile10
3 files changed, 3 insertions, 27 deletions
diff --git a/graphics/py-matplotlib-gtk2/distinfo b/graphics/py-matplotlib-gtk2/distinfo
deleted file mode 100644
index d9d1e7f23cf..00000000000
--- a/graphics/py-matplotlib-gtk2/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.16 2016/08/03 23:41:48 kamil Exp $
-
-SHA1 (matplotlib-1.5.2.tar.gz) = 2c78d4b1d9cc1e064a7592158977cb22d6606ca7
-RMD160 (matplotlib-1.5.2.tar.gz) = 17406f510748a81dc5fc582a61cfba60b7e4bc9a
-SHA512 (matplotlib-1.5.2.tar.gz) = 7d4688665273d30a08edf0cf2414cf0c05c619335f72b190c6ea125687e74cafe6133b7f3b6588e969c931ec8f970593d44654766205e6cc19f760925826a7e3
-Size (matplotlib-1.5.2.tar.gz) = 50914982 bytes
-SHA1 (patch-ab) = 4448f39b4fd69568fe96c88ddf8ab72dc72b97c7
diff --git a/graphics/py-matplotlib-gtk2/patches/patch-ab b/graphics/py-matplotlib-gtk2/patches/patch-ab
deleted file mode 100644
index b577746c40d..00000000000
--- a/graphics/py-matplotlib-gtk2/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2016/08/03 23:41:48 kamil Exp $
-
---- setup.py.orig 2014-01-21 18:50:49.000000000 +0000
-+++ setup.py
-@@ -139,7 +139,7 @@ if __name__ == '__main__':
-
- required_failed = []
- good_packages = []
-- for package in mpl_packages:
-+ for package in [setupext.Numpy(),setupext.LibAgg(),setupext.BackendGtkAgg(),setupext.BackendGtk()]:
- if isinstance(package, str):
- print_raw('')
- print_raw(package.upper())
diff --git a/graphics/py-matplotlib/Makefile b/graphics/py-matplotlib/Makefile
index af74df93dac..c224832433e 100644
--- a/graphics/py-matplotlib/Makefile
+++ b/graphics/py-matplotlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2017/05/29 20:59:21 adam Exp $
+# $NetBSD: Makefile,v 1.48 2017/05/30 07:20:21 adam Exp $
.include "Makefile.common"
@@ -12,12 +12,7 @@ DEPENDS+= ${PYPKGPREFIX}-pyparsing>=1.5.6:../../devel/py-pyparsing
BUILD_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
BUILD_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
-.include "../../lang/python/pyversion.mk"
-.if "${PYPKGPREFIX}" == "py27"
-DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
-.else
-DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo3
-.endif
+PYTHON_VERSIONED_DEPENDENCIES= cairo
MPL_PACKAGES= mpl_packages
@@ -45,6 +40,7 @@ do-test:
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"