CVS commit: pkgsrc/graphics

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue May 30 07:20:22 UTC 2017

Modified Files:
        pkgsrc/graphics/py-matplotlib: Makefile
Removed Files:
        pkgsrc/graphics/py-matplotlib-gtk2: distinfo
        pkgsrc/graphics/py-matplotlib-gtk2/patches: patch-ab

Log Message:
Minor clean-up


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/graphics/py-matplotlib/Makefile
cvs rdiff -u -r1.16 -r0 pkgsrc/graphics/py-matplotlib-gtk2/distinfo
cvs rdiff -u -r1.10 -r0 pkgsrc/graphics/py-matplotlib-gtk2/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/py-matplotlib/Makefile
diff -u pkgsrc/graphics/py-matplotlib/Makefile:1.47 pkgsrc/graphics/py-matplotlib/Makefile:1.48
--- pkgsrc/graphics/py-matplotlib/Makefile:1.47 Mon May 29 20:59:21 2017
+++ pkgsrc/graphics/py-matplotlib/Makefile      Tue May 30 07:20:21 2017
@@ -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.
 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"