pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

py-matplotlib/buildlink -> DEPENDS



Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By:	adam
Date:		Wed Feb 7 13:31:37 2018 +0100
Changeset:	fe83b64e1237903a6d5ae59f24b473f5f4499b03

Modified Files:
	freecad/Makefile
	py-aesthete/Makefile
	py-aigo/Makefile
	py-aipy/Makefile
	py-annarchy/Makefile
	py-applpy/Makefile
	py-ase/Makefile
	py-astlib/Makefile
	py-astropysics/Makefile
	py-brian/Makefile
	py-cartopy/Makefile
	py-cf-python/Makefile
	py-chaintipy/Makefile
	py-cmtoolkit/Makefile
	py-cogent/Makefile
	py-colorpy/Makefile
	py-control/Makefile
	py-csa/Makefile
	py-cva/Makefile
	py-cvf/Makefile
	py-cxnet/Makefile
	py-dana/Makefile
	py-debacl/Makefile
	py-debinning/Makefile
	py-deltasigma/Makefile
	py-dolo/Makefile
	py-drawnow/Makefile
	py-dreampie/Makefile
	py-dynamicisttoolkit/Makefile
	py-easymodeler/Makefile
	py-ecspy/Makefile
	py-empirical/Makefile
	py-epigrass/Makefile
	py-epipy/Makefile
	py-exocode/Makefile
	py-fanova/Makefile
	py-fdasrsf/Makefile
	py-fipy/Makefile
	py-fluiddyn/Makefile
	py-goreutilities/Makefile
	py-goulib/Makefile
	py-hcluster/Makefile
	py-healpy/Makefile
	py-hessianfree/Makefile
	py-htseq/Makefile
	py-hyperspy/Makefile
	py-lds/Makefile
	py-lifelines/Makefile
	py-luminous/Makefile
	py-matplottheme/Makefile
	py-mcerp/Makefile
	py-model-builder/Makefile
	py-mote/Makefile
	py-mplh5canvas/Makefile
	py-neuronpy/Makefile
	py-nexpy/Makefile
	py-nfg/Makefile
	py-nodepy/Makefile
	py-nsim/Makefile
	py-otb/Makefile
	py-poppy/Makefile
	py-professor/Makefile
	py-pseudopy/Makefile
	py-pweave/Makefile
	py-pyevolve/Makefile
	py-pykit-shared/Makefile
	py-pymvpa/Makefile
	py-pypedal/Makefile
	py-pythics/Makefile
	py-qexpy/Makefile
	py-qit/Makefile
	py-qutip/Makefile
	py-report/Makefile
	py-scikit-image/Makefile
	py-scikits_timeseries/Makefile
	py-scipy-data_fitting/Makefile
	py-scitools/Makefile
	py-sempy/Makefile
	py-solpy/Makefile
	py-spectral/Makefile
	py-speview/Makefile
	py-sphinxreport/Makefile
	py-sphviewer/Makefile
	py-spm1d/Makefile
	py-sppy/Makefile
	py-sunpy/Makefile
	py-thLib/Makefile
	py-topkapi/Makefile
	py-tribe/Makefile
	py-xcal-raman/Makefile
	py-yt/Makefile
	reinteract/Makefile

Log Message:
py-matplotlib/buildlink -> DEPENDS

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fe83b64e1237903a6d5ae59f24b473f5f4499b03

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

diffstat:
 freecad/Makefile               |  4 +---
 py-aesthete/Makefile           |  2 +-
 py-aigo/Makefile               |  2 +-
 py-aipy/Makefile               |  2 +-
 py-annarchy/Makefile           |  2 +-
 py-applpy/Makefile             |  6 +++---
 py-ase/Makefile                |  3 ++-
 py-astlib/Makefile             |  5 +++--
 py-astropysics/Makefile        |  6 +++---
 py-brian/Makefile              |  3 +--
 py-cartopy/Makefile            |  3 ++-
 py-cf-python/Makefile          |  2 +-
 py-chaintipy/Makefile          |  3 +--
 py-cmtoolkit/Makefile          |  2 +-
 py-cogent/Makefile             |  6 +++---
 py-colorpy/Makefile            |  4 +---
 py-control/Makefile            |  5 +++--
 py-csa/Makefile                |  4 ++--
 py-cva/Makefile                |  3 +--
 py-cvf/Makefile                |  4 +---
 py-cxnet/Makefile              |  5 +++--
 py-dana/Makefile               |  3 +--
 py-debacl/Makefile             |  7 +++----
 py-debinning/Makefile          |  2 +-
 py-deltasigma/Makefile         |  4 ++--
 py-dolo/Makefile               |  2 +-
 py-drawnow/Makefile            |  3 ++-
 py-dreampie/Makefile           |  3 ++-
 py-dynamicisttoolkit/Makefile  |  2 +-
 py-easymodeler/Makefile        |  5 ++---
 py-ecspy/Makefile              |  2 +-
 py-empirical/Makefile          |  2 +-
 py-epigrass/Makefile           |  2 +-
 py-epipy/Makefile              |  6 +++---
 py-exocode/Makefile            |  2 +-
 py-fanova/Makefile             |  2 +-
 py-fdasrsf/Makefile            |  5 +++--
 py-fipy/Makefile               |  2 +-
 py-fluiddyn/Makefile           |  6 +++---
 py-goreutilities/Makefile      |  4 ++--
 py-goulib/Makefile             | 16 ++++++++--------
 py-hcluster/Makefile           |  4 ++--
 py-healpy/Makefile             |  2 +-
 py-hessianfree/Makefile        |  5 +++--
 py-htseq/Makefile              | 10 +++-------
 py-hyperspy/Makefile           |  2 +-
 py-lds/Makefile                |  2 +-
 py-lifelines/Makefile          |  7 ++++---
 py-luminous/Makefile           |  2 +-
 py-matplottheme/Makefile       |  3 ++-
 py-mcerp/Makefile              |  2 +-
 py-model-builder/Makefile      |  3 +--
 py-mote/Makefile               |  2 +-
 py-mplh5canvas/Makefile        |  2 +-
 py-neuronpy/Makefile           |  3 +--
 py-nexpy/Makefile              |  7 ++++---
 py-nfg/Makefile                |  2 +-
 py-nodepy/Makefile             |  5 +++--
 py-nsim/Makefile               |  6 +++---
 py-otb/Makefile                |  3 ++-
 py-poppy/Makefile              |  8 ++++----
 py-professor/Makefile          |  4 +---
 py-pseudopy/Makefile           |  2 +-
 py-pweave/Makefile             |  4 ++--
 py-pyevolve/Makefile           |  3 +--
 py-pykit-shared/Makefile       |  4 ++--
 py-pymvpa/Makefile             |  3 +--
 py-pypedal/Makefile            |  4 ++--
 py-pythics/Makefile            |  5 +++--
 py-qexpy/Makefile              |  4 ++--
 py-qit/Makefile                |  3 +--
 py-qutip/Makefile              |  5 +++--
 py-report/Makefile             |  4 ++--
 py-scikit-image/Makefile       |  4 ++--
 py-scikits_timeseries/Makefile |  4 ++--
 py-scipy-data_fitting/Makefile |  2 +-
 py-scitools/Makefile           |  1 -
 py-sempy/Makefile              |  6 ++----
 py-solpy/Makefile              |  4 ++--
 py-spectral/Makefile           |  2 +-
 py-speview/Makefile            |  4 ++--
 py-sphinxreport/Makefile       |  8 ++++----
 py-sphviewer/Makefile          |  5 +++--
 py-spm1d/Makefile              |  3 ++-
 py-sppy/Makefile               |  6 +++---
 py-sunpy/Makefile              |  4 ++--
 py-thLib/Makefile              |  3 ++-
 py-topkapi/Makefile            |  6 ++----
 py-tribe/Makefile              |  6 +++---
 py-xcal-raman/Makefile         |  5 +++--
 py-yt/Makefile                 |  4 ++--
 reinteract/Makefile            |  2 +-
 92 files changed, 176 insertions(+), 184 deletions(-)

diffs:
diff --git a/freecad/Makefile b/freecad/Makefile
index 4c65405d1e..05925ed01a 100644
--- a/freecad/Makefile
+++ b/freecad/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD$
-#
 
 DISTNAME=	freecad-0.16
 CATEGORIES=	cad
@@ -34,7 +33,6 @@ SUBST_STAGE.eol=	post-extract
 SUBST_FILES.eol=	src/App/Application.cpp src/App/FreeCADInit.py src/Main/CMakeLists.txt src/Main/Main*.cpp src/Mod/Inspection/CMakeLists.txt src/Mod/Start/StartPage/CMakeLists.txt
 SUBST_FILTER_CMD.eol=	${TR} -d '\r'
 
-
 REPLACE_PYTHON+=	src/Tools/wiki2qhelp.py src/Tools/PythonToCPP.py src/Tools/githubstats.py src/Tools/updatefromcrowdin.py src/Tools/updatecrowdin.py src/Tools/updateppa.py
 REPLACE_PYTHON+=	src/Tools/generateBase/generateModel_Module.py src/Tools/generateBase/generateDS.py
 REPLACE_PYTHON+=	src/Mod/Test/testmakeWireString.py src/Mod/Test/testPathArray.py src/Mod/Test/testPathArraySel.py src/Mod/Test/unittestgui.py
@@ -49,7 +47,7 @@ REPLACE_PYTHON+=	src/Mod/Robot/MovieTool.py src/Mod/OpenSCAD/prototype.py
 #.include "../../wip/calculix/buildlink3.mk"
 
 # Plot module deps
-#.include "../../graphics/py-matplotlib/buildlink3.mk"
+#DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 
 .include "../../lang/python/application.mk"
 .include "../../wip/orocos-kdl/buildlink3.mk"
diff --git a/py-aesthete/Makefile b/py-aesthete/Makefile
index 5a04f096f6..1ece9c410e 100644
--- a/py-aesthete/Makefile
+++ b/py-aesthete/Makefile
@@ -13,6 +13,7 @@ LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	linux-libertine-ttf>=5.1.3:../../fonts/linux-libertine-ttf
 DEPENDS+=	${PYPKGPREFIX}-argparse>=1.1:../../devel/py-argparse
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.2:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-sympy>=0.6.7:../../math/py-sympy
 DEPENDS+=	${PYPKGPREFIX}-lxml>=2.2.6:../../textproc/py-lxml
@@ -28,7 +29,6 @@ post-extract:
 .include "../../devel/py-gobject/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/py-imaging/buildlink3.mk"
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/py-aigo/Makefile b/py-aigo/Makefile
index 0527b52659..f7cd0727ee 100644
--- a/py-aigo/Makefile
+++ b/py-aigo/Makefile
@@ -12,6 +12,7 @@ COMMENT=	Analysis and Inter-comparison of Gene Ontology functional annotations
 LICENSE=	gnu-gpl-v3
 
 CONFLICTS=	${PYPKGPREFIX}-creole-[0-9]*
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-wxWidgets
 
@@ -21,7 +22,6 @@ post-extract:
 do-test:
 	${RUN} cd ${WRKSRC}/tests; ${SETENV} ${TEST_ENV} ${PYTHONBIN} testAIGO.py
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../x11/py-wxWidgets/buildlink3.mk"
diff --git a/py-aipy/Makefile b/py-aipy/Makefile
index a5cc4736f0..a72f7e1e8b 100644
--- a/py-aipy/Makefile
+++ b/py-aipy/Makefile
@@ -13,12 +13,12 @@ LICENSE=	gnu-gpl-v2
 
 #DEPENDS+=	${PYPKGPREFIX}-fits>=3.2:../../graphics/py-fits
 #DEPENDS+=	${PYPKGPREFIX}-ephem-[0-9]*:../../math/py-ephem
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 
 USE_LANGUAGES=	c c++
 
 PYDISTUTILSPKG=	yes
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 BUILDLINK_API_DEPENDS.pynumpy+=	${PYPKGPREFIX}-numpy>=1.0
 .include "../../math/py-numpy/buildlink3.mk"
diff --git a/py-annarchy/Makefile b/py-annarchy/Makefile
index 4959aaeb85..460c3ef3d0 100644
--- a/py-annarchy/Makefile
+++ b/py-annarchy/Makefile
@@ -10,13 +10,13 @@ HOMEPAGE=	https://www.tu-chemnitz.de/informatik/KI/projects/ANNarchy/index.php
 COMMENT=	Artificial Neural Networks architect
 LICENSE=	gnu-gpl-v2
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.17.0:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-sympy>=1.0:../../math/py-sympy
 
 USE_LANGUAGES=	c c++
 
 .include "../../devel/py-cython/buildlink3.mk"
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 BUILDLINK_API_DEPENDS.py-numpy+=	${PYPKGPREFIX}-numpy>=1.8.0
 .include "../../math/py-numpy/buildlink3.mk"
diff --git a/py-applpy/Makefile b/py-applpy/Makefile
index 1c6db96a1f..3af2668667 100644
--- a/py-applpy/Makefile
+++ b/py-applpy/Makefile
@@ -10,12 +10,12 @@ HOMEPAGE=	http://pypi.python.org/pypi/APPLPy/
 COMMENT=	ApplPy is a computational probability package written in Python
 LICENSE=	gnu-gpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+DEPENDS+=	${PYPKGPREFIX}-sympy>=0.7.4.1:../../math/py-sympy
+
 USE_LANGUAGES=	# none
 
 PYDISTUTILSPKG=	yes
 
-
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
-DEPENDS+=	${PYPKGPREFIX}-sympy>=0.7.4.1:../../math/py-sympy
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-ase/Makefile b/py-ase/Makefile
index a377262646..f143799be2 100644
--- a/py-ase/Makefile
+++ b/py-ase/Makefile
@@ -11,6 +11,8 @@ HOMEPAGE=	https://wiki.fysik.dtu.dk/ase/
 COMMENT=	Atomic Simulation Environment
 LICENSE=	gnu-lgpl-v2.1 AND gnu-gpl-v2
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+
 USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gtk2, py-gobject
@@ -25,7 +27,6 @@ post-extract:
 ## It is highly recommended (but not required) to install also these:
 .include "../../devel/py-gobject/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
 
 ##required for basic ASE functionality
diff --git a/py-astlib/Makefile b/py-astlib/Makefile
index 951c3e9b97..c77f96c263 100644
--- a/py-astlib/Makefile
+++ b/py-astlib/Makefile
@@ -10,10 +10,11 @@ HOMEPAGE=	http://astlib.sourceforge.net/
 COMMENT=	Set of python modules for producing simple plots, statistics
 LICENSE=	gnu-lgpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy
+
 PYDISTUTILSPKG=	yes
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
-DEPENDS+=		${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-astropysics/Makefile b/py-astropysics/Makefile
index 047c84dc46..2c97464fab 100644
--- a/py-astropysics/Makefile
+++ b/py-astropysics/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=	Astropysics-0.1.dev-r596
 PKGNAME=	${PYPKGPREFIX}-Astropysics-0.1
 PKGREVISION=	2
-CATEGORIES=	math
+CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=A/Astropysics/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
@@ -12,14 +12,14 @@ COMMENT=	Astrophysics libraries for Python
 LICENSE=	apache-2.0
 
 DEPENDS+=	${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
-DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.0:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-fits>=2.3.1:../../graphics/py-fits
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.0:../../math/py-scipy
 
 EGG_NAME=	${DISTNAME:S/-r596//}0
 USE_LANGUAGES=	# none
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # as of 0.1dev-r596
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-brian/Makefile b/py-brian/Makefile
index d663dcf6d5..5a3f75d80c 100644
--- a/py-brian/Makefile
+++ b/py-brian/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.6 2013/06/04 07:45:22 thomasklausner Exp $
-#
 
 DISTNAME=	brian-1.1.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,6 +12,7 @@ HOMEPAGE=	http://www.briansimulator.org/
 COMMENT=	Simulator for spiking neural networks
 #LICENSE=	# TODO: (see mk/license.mk)
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.0:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-sympy>=0.6.5:../../math/py-sympy
 DEPENDS+=	${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
@@ -21,7 +21,6 @@ USE_LANGUAGES=	c c++
 PYDISTUTILSPKG=	yes
 
 .include "../../devel/py-game/buildlink3.mk"
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-cartopy/Makefile b/py-cartopy/Makefile
index 5633a62b58..28ab9b2f67 100644
--- a/py-cartopy/Makefile
+++ b/py-cartopy/Makefile
@@ -10,11 +10,12 @@ HOMEPAGE=	http://scitools.org.uk/cartopy/docs/latest/
 COMMENT=	Cartographic python library with matplotlib support for visualisation
 LICENSE=	gnu-lgpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+
 USE_LANGUAGES=	c c++
 
 .include "../../devel/py-cython/buildlink3.mk"
 .include "../../geography/gdal-lib/buildlink3.mk"
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-cf-python/Makefile b/py-cf-python/Makefile
index cde7e35c89..7b4742dd81 100644
--- a/py-cf-python/Makefile
+++ b/py-cf-python/Makefile
@@ -12,11 +12,11 @@ LICENSE=	mit
 
 PYTHON_VERSIONS_INCOMPATIBLE=	30 34 35 36
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-psutil-2.1.3:../../sysutils/py-psutil
 DEPENDS+=	${PYPKGPREFIX}-netcdf4>=1.1.8:../../wip/py-netcdf4
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-chaintipy/Makefile b/py-chaintipy/Makefile
index 72dd60c681..a7b347fb66 100644
--- a/py-chaintipy/Makefile
+++ b/py-chaintipy/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.2 2012/10/06 17:55:25 asau Exp $
-#
 
 DISTNAME=	ChiantiPy-0.1.tar
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/C/c/S/P/p/S/.tar//}
@@ -12,6 +11,7 @@ HOMEPAGE=	http://sourceforge.net/projects/chiantipy
 COMMENT=	CHIANTI atomic database for astrophysical spectroscopy
 LICENSE=	gnu-gpl-v2
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.2:../../math/py-scipy
 
 WRKSRC=		${WRKDIR}/ChiantiPy-0.1
@@ -21,7 +21,6 @@ PYDISTUTILSPKG=	yes
 
 .include "options.mk"
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-cmtoolkit/Makefile b/py-cmtoolkit/Makefile
index bd88fae171..3b075d70b9 100644
--- a/py-cmtoolkit/Makefile
+++ b/py-cmtoolkit/Makefile
@@ -10,11 +10,11 @@ HOMEPAGE=	https://github.com/AndrewWalker/cmtoolkit
 COMMENT=	Unofficial Python port of the conformalmapping MATLAB toolbox
 LICENSE=	modified-bsd
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
 
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-cogent/Makefile b/py-cogent/Makefile
index 6176b965e9..ece1fe3d0e 100644
--- a/py-cogent/Makefile
+++ b/py-cogent/Makefile
@@ -11,16 +11,16 @@ HOMEPAGE=	http://sourceforge.net/projects/pycogent
 COMMENT=	Cogent A toolkit for statistical analysis of biological sequences
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=	${PYPKGPREFIX}-sqlalchemy>=0.5.6:../../databases/py-sqlalchemy
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-pyrex-[0-9]*:../../lang/py-pyrex
+DEPENDS+=	${PYPKGPREFIX}-sqlalchemy>=0.5.6:../../databases/py-sqlalchemy
 
 PYDISTUTILSPKG=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-pyrex
 
 do-test:
-	( cd ${WRKSRC} && ${PYTHONBIN} runtests.py )
+	cd ${WRKSRC} && ${PYTHONBIN} runtests.py
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 BUILDLINK_API_DEPENDS.pynumpy+=	${PYPKGPREFIX}-numpy>=1.0
 .include "../../math/py-numpy/buildlink3.mk"
diff --git a/py-colorpy/Makefile b/py-colorpy/Makefile
index 13cea53553..876a3b7141 100644
--- a/py-colorpy/Makefile
+++ b/py-colorpy/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.3 2012/11/14 00:16:14 othyro Exp $
-#
 
 DISTNAME=	colorpy-0.1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +10,7 @@ HOMEPAGE=	http://markkness.net/colorpy/ColorPy.html
 COMMENT=	Handling physical descriptions of color and light spectra
 LICENSE=	gnu-gpl-v3 AND gnu-lgpl-v3
 
-
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 #DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.2:../../math/py-scipy
 
 USE_LANGUAGES=	# none
@@ -21,7 +20,6 @@ PYDISTUTILSPKG=	yes
 do-test:
 	${RUN} cd ${WRKSRC}; ${SETENV} ${TEST_ENV} ${PYTHONBIN} test.py
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-control/Makefile b/py-control/Makefile
index 79ecc8434c..5981be745b 100644
--- a/py-control/Makefile
+++ b/py-control/Makefile
@@ -10,13 +10,14 @@ HOMEPAGE=	http://python-control.sourceforge.net
 COMMENT=	Python Control Systems Library
 LICENSE=	2-clause-bsd
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.2:../../math/py-scipy
+
 USE_LANGUAGES=	# none
 
 do-test:
 	${RUN} cd ${WRKSRC}/tests; ${SETENV} ${TEST_ENV} ${PYTHONBIN} test_all.py
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
-DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.2:../../math/py-scipy
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-csa/Makefile b/py-csa/Makefile
index 3ac86e661d..545b8b26e8 100644
--- a/py-csa/Makefile
+++ b/py-csa/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.2 2012/10/06 17:55:31 asau Exp $
-#
 
 DISTNAME=	csa-0.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,6 +10,8 @@ HOMEPAGE=	http://software.incf.org/software/csa/
 COMMENT=	The Connection-Set Algebra implemented in Python
 LICENSE=	gnu-gpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+
 WRKSRC=		${WRKDIR}/csa-0.0.1
 
 USE_LANGUAGES=	# none
@@ -19,7 +20,6 @@ PYDISTUTILSPKG=	yes
 do-test:
 	${RUN} cd ${WRKSRC}/test; ${SETENV} ${TEST_ENV} ${PYTHONBIN} test_csa.py
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-cva/Makefile b/py-cva/Makefile
index f0e5fb5333..dc1a903deb 100644
--- a/py-cva/Makefile
+++ b/py-cva/Makefile
@@ -10,11 +10,10 @@ HOMEPAGE=	https://github.com/robertjw/
 COMMENT=	Calculus of Variations Solver
 LICENSE=	gnu-lgpl-v2.1
 
-WRKSRC=		${WRKDIR}/cva-0.9.4
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-cvf/Makefile b/py-cvf/Makefile
index b87112a82b..22ff97cd58 100644
--- a/py-cvf/Makefile
+++ b/py-cvf/Makefile
@@ -12,8 +12,8 @@ HOMEPAGE=	http://pycvf.sourceforge.net/
 COMMENT=	Python Computer Vision Framework
 LICENSE=	gnu-lgpl-v3
 
-
 DEPENDS+=	${PYPKGPREFIX}-Pyro4>=3.4:../../devel/py-Pyro
+DEPENDS+=	${PYPKGPREFIX}-matplotlib>=0.87.2:../../graphics/py-matplotlib
 #DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.0:../../math/py-scipy
 
 USE_LANGUAGES=	# none
@@ -22,8 +22,6 @@ PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-imaging
 BUILDLINK_API_DEPENDS.pycython+= ${PYPKGPREFIX}-cython>=0.12.1
 .include "../../devel/py-cython/buildlink3.mk"
 .include "../../graphics/py-imaging/buildlink3.mk"
-BUILDLINK_API_DEPENDS.pymatplotlib+=	${PYPKGPREFIX}-matplotlib>=0.87.2
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../x11/py-qt4/buildlink3.mk"
diff --git a/py-cxnet/Makefile b/py-cxnet/Makefile
index 1d2eabd06d..9838370806 100644
--- a/py-cxnet/Makefile
+++ b/py-cxnet/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	cxnet-0.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	math
+CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/cxnet/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
@@ -10,9 +10,10 @@ HOMEPAGE=	http://django.arek.uni-obuda.hu/cxnet/doc
 COMMENT=	Complex networks in education
 LICENSE=	2-clause-bsd
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-dana/Makefile b/py-dana/Makefile
index 0f141dcd2b..2c236b6c1e 100644
--- a/py-dana/Makefile
+++ b/py-dana/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.2 2012/10/07 11:54:18 asau Exp $
-#
 
 DISTNAME=	dana-0.3.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,6 +10,7 @@ HOMEPAGE=	http://dana.loria.fr/
 COMMENT=	Framework for distributed, asynchronous and adaptive computing
 LICENSE=	modified-bsd
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 #DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.0:../../math/py-scipy
 
 WRKSRC=		${WRKDIR}/dana-0.3.1
@@ -21,7 +21,6 @@ PYDISTUTILSPKG=	yes
 do-test:
 	${RUN} cd ${WRKSRC}; ${SETENV} ${TEST_ENV} ${PYTHONBIN} dana/tests/__init__.py
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 BUILDLINK_API_DEPENDS.pynumpy+=	${PYPKGPREFIX}-numpy>=1.0
 .include "../../math/py-numpy/buildlink3.mk"
diff --git a/py-debacl/Makefile b/py-debacl/Makefile
index eb2f7bf99f..ffc330d592 100644
--- a/py-debacl/Makefile
+++ b/py-debacl/Makefile
@@ -10,15 +10,14 @@ HOMEPAGE=	https://github.com/CoAxLab/DeBaCl
 COMMENT=	Density-Based Clustering
 #LICENSE=	# TODO: (see mk/license.mk)
 
-WRKSRC=		${WRKDIR}/debacl-0.2.0
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+DEPENDS+=	${PYPKGPREFIX}-pandas>=0.11.0:../../math/py-pandas
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.2:../../math/py-scipy
 
 USE_LANGUAGES=	# none
 
 PYDISTUTILSPKG=	yes
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
-DEPENDS+=	${PYPKGPREFIX}-pandas>=0.11.0:../../math/py-pandas
 .include "../../math/py-numpy/buildlink3.mk"
-DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.2:../../math/py-scipy
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-debinning/Makefile b/py-debinning/Makefile
index 41cae17899..97782d1e4f 100644
--- a/py-debinning/Makefile
+++ b/py-debinning/Makefile
@@ -11,12 +11,12 @@ COMMENT=	The bias inherent when binning data  into histograms
 #LICENSE=	# TODO: (see mk/license.mk)
 
 #DEPENDS+=	root>=:../../misc/root
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 
 WRKSRC=		${WRKDIR}/debinning
 
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/extension.mk"
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-deltasigma/Makefile b/py-deltasigma/Makefile
index 028f8b616d..8bcf12ed3b 100644
--- a/py-deltasigma/Makefile
+++ b/py-deltasigma/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	deltasigma-0.2.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	math
+CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=d/deltasigma/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
@@ -10,11 +10,11 @@ HOMEPAGE=	https://github.com/ggventurini/python-deltasigma
 COMMENT=	Scale and map to implementable topologies delta sigma modulators
 LICENSE=	modified-bsd
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
 
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-dolo/Makefile b/py-dolo/Makefile
index 940e27b37a..d7e73093ee 100644
--- a/py-dolo/Makefile
+++ b/py-dolo/Makefile
@@ -12,6 +12,7 @@ HOMEPAGE=	http://albop.github.com/dolo/
 COMMENT=	Economic modelling in Python
 LICENSE=	2-clause-bsd
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-yaml>=3.10:../../textproc/py-yaml
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # as of 0.4.9.2
@@ -29,7 +30,6 @@ post-extract:
 			${WRKSRC}/bin/dolo-matlab${PYVERSSUFFIX}
 
 .include "../../devel/py-cython/buildlink3.mk"
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-drawnow/Makefile b/py-drawnow/Makefile
index 12c0dd64c3..aa376798f4 100644
--- a/py-drawnow/Makefile
+++ b/py-drawnow/Makefile
@@ -10,8 +10,9 @@ HOMEPAGE=	https://files.pythonhosted.org/packages/source/d/drawnow/
 COMMENT=	MATLAB-like drawnow
 LICENSE=	mit
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-dreampie/Makefile b/py-dreampie/Makefile
index 4a348d69d5..e1de25f251 100644
--- a/py-dreampie/Makefile
+++ b/py-dreampie/Makefile
@@ -10,6 +10,8 @@ HOMEPAGE=	http://dreampie.sourceforge.net/
 COMMENT=	Advanced graphical interactive Python shell
 LICENSE=	gnu-gpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+
 USE_LANGUAGES=	# none
 
 PYDISTUTILSPKG=	yes
@@ -18,7 +20,6 @@ PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gtk2, py-gobject, py-gtksourceview
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/py-gobject/buildlink3.mk"
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../x11/py-gtksourceview/buildlink3.mk"
diff --git a/py-dynamicisttoolkit/Makefile b/py-dynamicisttoolkit/Makefile
index bee6d87ef8..b0d78ec0da 100644
--- a/py-dynamicisttoolkit/Makefile
+++ b/py-dynamicisttoolkit/Makefile
@@ -10,12 +10,12 @@ HOMEPAGE=	https://github.com/moorepants/DynamicistToolKit
 COMMENT=	Various tools for theoretical and experimental dynamics
 #LICENSE=	# TODO: (see mk/license.mk)
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-pandas>=0.18.1:../../math/py-pandas
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.18.0:../../math/py-scipy
 
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-easymodeler/Makefile b/py-easymodeler/Makefile
index 5abbca581a..3c77e306b7 100644
--- a/py-easymodeler/Makefile
+++ b/py-easymodeler/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	EasyModeler-2.2.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
-CATEGORIES=	math
+CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=E/EasyModeler/}
 EXTRACT_SUFX=	.zip
 
@@ -11,13 +11,12 @@ HOMEPAGE=	https://pypi.python.org/pypi/EasyModeler
 COMMENT=	Simple ODE Tools for Modelers
 ICENSE=		modified-bsd
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
 #DEPENDS+=	${PYPKGPREFIX}-sas7bdat>=2.0.4:../../wip/py-sas7bdat
 
-
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-ecspy/Makefile b/py-ecspy/Makefile
index fc24cf784f..8a6048d3d2 100644
--- a/py-ecspy/Makefile
+++ b/py-ecspy/Makefile
@@ -12,11 +12,11 @@ LICENSE=	gnu-gpl-v3
 
 PYTHON_VERSIONS_ACCEPTED=	27
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-pp>=1.6.0:../../wip/py-pp
 
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-empirical/Makefile b/py-empirical/Makefile
index c4683b227d..3acd94b311 100644
--- a/py-empirical/Makefile
+++ b/py-empirical/Makefile
@@ -10,12 +10,12 @@ HOMEPAGE=	https://files.pythonhosted.org/packages/source/e/empirical/
 COMMENT=	Emperical Method of Fundamental Solutions solver for Python
 LICENSE=	gnu-gpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-sympy>=0.7.2:../../math/py-sympy
 
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-epigrass/Makefile b/py-epigrass/Makefile
index 37c3a98619..a33ca827e5 100644
--- a/py-epigrass/Makefile
+++ b/py-epigrass/Makefile
@@ -12,13 +12,13 @@ LICENSE=	gnu-gpl-v2
 
 USE_LANGUAGES=	# none
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-mysqldb>=1.2.3:../../databases/py-mysqldb
 DEPENDS+=	${PYPKGPREFIX}-networkx>=1.7:../../math/py-networkx
 DEPENDS+=	${PYPKGPREFIX}-redis>=2.8.0:../../databases/py-redis
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-mysqldb
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/py-epipy/Makefile b/py-epipy/Makefile
index d95eb2417b..60b6e6a7cc 100644
--- a/py-epipy/Makefile
+++ b/py-epipy/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	epipy-0.0.2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	math
+CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=e/epipy/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
@@ -10,15 +10,15 @@ HOMEPAGE=	https://github.com/cmrivers/epipy
 COMMENT=	Python tools for epidemiology
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-pandas>=0.12.0:../../math/py-pandas
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-networkx>=1.7:../../math/py-networkx
+DEPENDS+=	${PYPKGPREFIX}-pandas>=0.12.0:../../math/py-pandas
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
 
 USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # as of 0.0.2.1
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-exocode/Makefile b/py-exocode/Makefile
index 64d0cf9e84..587b404db3 100644
--- a/py-exocode/Makefile
+++ b/py-exocode/Makefile
@@ -11,11 +11,11 @@ COMMENT=	Automation of debris disk detection
 LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scikit-image>=0.11.3:../../wip/py-scikit-image
 
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-fanova/Makefile b/py-fanova/Makefile
index 95a651270a..1ae82f5713 100644
--- a/py-fanova/Makefile
+++ b/py-fanova/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Functional ANOVA
 #LICENSE=	# TODO: (see mk/license.mk)
 
 DEPENDS+=	${PYPKGPREFIX}-docutils>=0.11:../../textproc/py-docutils
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 
 PKG_JVMS_ACCEPTED=	sun-jdk7 sun-jdk6 sun-jdk15 sun-jdk14
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/java-vm.mk"
diff --git a/py-fdasrsf/Makefile b/py-fdasrsf/Makefile
index 8031842557..d1b140860e 100644
--- a/py-fdasrsf/Makefile
+++ b/py-fdasrsf/Makefile
@@ -10,6 +10,9 @@ HOMEPAGE=	http://stat.fsu.edu/~dtucker/research.html
 COMMENT=	Functional data analysis using the square root slope framework
 LICENSE=	modified-bsd
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
+
 PYDISTUTILSPKG=	yes
 
 SUBST_CLASSES+=		paths
@@ -19,8 +22,6 @@ SUBST_FILES.paths+=	setup.py
 SUBST_MESSAGE.paths=	Fixing header search paths.
 
 .include "../../devel/py-cython/buildlink3.mk"
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
-DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-fipy/Makefile b/py-fipy/Makefile
index 1d5aa84093..c00e97e142 100644
--- a/py-fipy/Makefile
+++ b/py-fipy/Makefile
@@ -12,6 +12,7 @@ COMMENT=	Finite volume PDE solver in Python
 LICENSE=	public-domain
 
 DEPENDS+=	${PYPKGPREFIX}-gnuplot>=1.8:../../graphics/py-gnuplot
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.0:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-sphinx>=1.0.4:../../textproc/py-sphinx
 #DEPENDS+=	${PYPKGPREFIX}-gist>=1.5.28:../../wip/py-gist
@@ -23,6 +24,5 @@ USE_LANGUAGES=	# none
 do-test:
 	${RUN} cd ${WRKSRC}/fipy; ${SETENV} ${TEST_ENV} ${PYTHONBIN} test.py
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-fluiddyn/Makefile b/py-fluiddyn/Makefile
index a97d99e7e9..1794294f36 100644
--- a/py-fluiddyn/Makefile
+++ b/py-fluiddyn/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.1 2015/08/05 20:29:09 jihbed Exp $
 
 DISTNAME=	fluiddyn-0.0.10a7
- PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=f/fluiddyn/}
 
@@ -10,12 +10,12 @@ HOMEPAGE=	https://files.pythonhosted.org/packages/source/f/fluiddyn/
 COMMENT=	Framework for studying fluid dynamics.
 LICENSE=	modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-psutil>=2.1.3:../../sysutils/py-psutil
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
 
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-goreutilities/Makefile b/py-goreutilities/Makefile
index 99587b884c..c99397f66b 100644
--- a/py-goreutilities/Makefile
+++ b/py-goreutilities/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	GoreUtilities-0.5.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
-CATEGORIES=	graphics math
+CATEGORIES=	graphics math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=G/GoreUtilities/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
@@ -10,11 +10,11 @@ HOMEPAGE=	https://bitbucket.org/gorelab/goreutilities/
 COMMENT=	Some utility functions useful for GoreLab members
 LICENSE=	mit
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-pandas>=0.17.1:../../math/py-pandas
 
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-goulib/Makefile b/py-goulib/Makefile
index b78f94dd16..bf5c361dbe 100644
--- a/py-goulib/Makefile
+++ b/py-goulib/Makefile
@@ -11,19 +11,19 @@ HOMEPAGE=	https://github.com/goulu/goulib
 COMMENT=	Library of useful Python code for scientific + technical applications
 LICENSE=	gnu-lgpl-v3
 
-#DEPENDS+=		${PYPKGPREFIX}-Pillow>=2.4.0:../../graphics/py-Pillow
-DEPENDS+=		${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six
-DEPENDS+=		${PYPKGPREFIX}-networkx>=1.11:../../math/py-networkx
-DEPENDS+=		${PYPKGPREFIX}-scipy>=0.15.0:../../math/py-scipy
-DEPENDS+=		${PYPKGPREFIX}-lxml>=3.6.4:../../textproc/py-lxml
-DEPENDS+=		${PYPKGPREFIX}-xlrd>=0.9.3:../../textproc/py-xlrd
-BUILD_DEPENDS+=		${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
+#DEPENDS+=	${PYPKGPREFIX}-Pillow>=2.4.0:../../graphics/py-Pillow
+DEPENDS+=	${PYPKGPREFIX}-lxml>=3.6.4:../../textproc/py-lxml
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+DEPENDS+=	${PYPKGPREFIX}-networkx>=1.11:../../math/py-networkx
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.0:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-six>=1.10.0:../../lang/py-six
+DEPENDS+=	${PYPKGPREFIX}-xlrd>=0.9.3:../../textproc/py-xlrd
+BUILD_DEPENDS+=	${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
 
 USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # as of 1.9.11
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-hcluster/Makefile b/py-hcluster/Makefile
index b631ca21e0..68a6a2892f 100644
--- a/py-hcluster/Makefile
+++ b/py-hcluster/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.2 2012/10/07 11:54:43 asau Exp $
-#
 
 DISTNAME=	hcluster-0.2.0.tar
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/.tar//}
@@ -12,12 +11,13 @@ HOMEPAGE=	http://code.google.com/p/scipy-cluster/
 COMMENT=	Hierarchical Clustering Package For Scipy
 LICENSE=	modified-bsd
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+
 WRKSRC=		${WRKDIR}/hcluster-0.2.0
 USE_LANGUAGES=	c
 
 PYDISTUTILSPKG=	yes
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-healpy/Makefile b/py-healpy/Makefile
index 1f106298e5..e031b47529 100644
--- a/py-healpy/Makefile
+++ b/py-healpy/Makefile
@@ -11,6 +11,7 @@ COMMENT=	Healpix tools package for Python
 LICENSE=	gnu-gpl-v2
 
 #DEPENDS+=	${PYPKGPREFIX}-fits>=3.2:../../graphics/py-fits
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++ fortran
@@ -21,7 +22,6 @@ PY_PATCHPLIST=	yes
 PYDISTUTILSPKG=	yes
 
 .include "../../devel/py-cython/buildlink3.mk"
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-hessianfree/Makefile b/py-hessianfree/Makefile
index aaacecc461..7897f7125f 100644
--- a/py-hessianfree/Makefile
+++ b/py-hessianfree/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	hessianfree-0.3.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	math
+CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=h/hessianfree/}
 EXTRACT_SUFX=	.zip
 
@@ -11,9 +11,10 @@ HOMEPAGE=	https://github.com/drasmuss/hessianfree
 COMMENT=	Hessian-free optimization for deep networks
 LICENSE=	modified-bsd
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 #.include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-htseq/Makefile b/py-htseq/Makefile
index 6f661b9d3d..bc0af780a4 100644
--- a/py-htseq/Makefile
+++ b/py-htseq/Makefile
@@ -1,19 +1,16 @@
 # $NetBSD$
 
-###########################################################
-#               Generated by fbsd2pkg                     #
-###########################################################
-
-PKGNAME=	${PYPKGPREFIX}-htseq-${PORTVERSION}
 DISTNAME=	HTSeq-${PORTVERSION}
+PKGNAME=	${PYPKGPREFIX}-htseq-${PORTVERSION}
 CATEGORIES=	biology python
 MASTER_SITES=	${MASTER_SITE_PYPI:=H/HTSeq/}
 
 MAINTAINER=	bacon%NetBSD.org@localhost
-
 COMMENT=	Framework to analyze data from high-throughput sequencing assays
 LICENSE=	gnu-gpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+
 # Just assuming C and C++: Adjust this!
 USE_LANGUAGES=	c c++
 
@@ -21,5 +18,4 @@ PORTVERSION=	0.6.1p1
 
 .include "../../lang/python/distutils.mk"
 .include "../../math/py-numpy/buildlink3.mk"
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-hyperspy/Makefile b/py-hyperspy/Makefile
index e74d679478..bbc47e549a 100644
--- a/py-hyperspy/Makefile
+++ b/py-hyperspy/Makefile
@@ -11,6 +11,7 @@ COMMENT=	Multidimensional data analysis toolbox
 LICENSE=	gnu-gpl-v3
 
 #DEPENDS+=	${PYPKGPREFIX}-ipython1>=1.2.1:../../devel/py-ipython1
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
 
 USE_LANGUAGES=	# none
@@ -20,7 +21,6 @@ PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # as of 0.7.2
 post-extract:
 	${MV} ${WRKSRC}/bin/hyperspy ${WRKSRC}/bin/hyperspy${PYVERSSUFFIX}
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-lds/Makefile b/py-lds/Makefile
index 118285e578..6305afcaca 100644
--- a/py-lds/Makefile
+++ b/py-lds/Makefile
@@ -10,12 +10,12 @@ HOMEPAGE=	https://github.com/mattjj/pylds
 COMMENT=	Learning and inference for Gaussian linear dynamical systems
 LICENSE=	mit
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
 
 PYDISTUTILSPKG=	yes
 
 .include "../../devel/py-cython/buildlink3.mk"
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-lifelines/Makefile b/py-lifelines/Makefile
index f22654e4fb..2340aeb8e1 100644
--- a/py-lifelines/Makefile
+++ b/py-lifelines/Makefile
@@ -10,12 +10,13 @@ HOMEPAGE=	https://files.pythonhosted.org/packages/source/l/lifelines/
 COMMENT=	Including Kaplan Meier, Nelson Aalen and regression
 LICENSE=	mit
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+DEPENDS+=	${PYPKGPREFIX}-pandas>=0.12.0:../../math/py-pandas
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
+
 WRKSRC=		${WRKDIR}/lifelines-0.2.2.2
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
-DEPENDS+=	${PYPKGPREFIX}-pandas>=0.12.0:../../math/py-pandas
-DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-luminous/Makefile b/py-luminous/Makefile
index aff5cc997e..c5e8d1df56 100644
--- a/py-luminous/Makefile
+++ b/py-luminous/Makefile
@@ -11,11 +11,11 @@ HOMEPAGE=	http://sourceforge.net/projects/pyluminous/
 COMMENT=	Optical Transfer Matrix and simple Quantum Well modelling
 LICENSE=	gnu-gpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
 
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-matplottheme/Makefile b/py-matplottheme/Makefile
index 1c666bd54e..78b7be0bad 100644
--- a/py-matplottheme/Makefile
+++ b/py-matplottheme/Makefile
@@ -10,8 +10,9 @@ HOMEPAGE=	https://github.com/James-Yu/MatPlotTheme
 COMMENT=	MatPlotTheme is a theming library for MatPlotLib
 LICENSE=	mit
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-mcerp/Makefile b/py-mcerp/Makefile
index f289821fd0..886f833952 100644
--- a/py-mcerp/Makefile
+++ b/py-mcerp/Makefile
@@ -12,11 +12,11 @@ LICENSE=	modified-bsd
 
 USE_LANGUAGES=	# none
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
 
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-model-builder/Makefile b/py-model-builder/Makefile
index ba649a4c85..e111cdd072 100644
--- a/py-model-builder/Makefile
+++ b/py-model-builder/Makefile
@@ -9,6 +9,7 @@ MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://model-builder.sourceforge.net/
 COMMENT=	Graphical ODE simulator
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.0:../../math/py-scipy
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-wxWidgets
@@ -19,9 +20,7 @@ post-extract:
 	${CP} ${FILESDIR}/model-builder.desktop ${WRKSRC}
 	${CP} ${FILESDIR}/MB.png ${WRKSRC}
 
-
 .include "../../lang/python/egg.mk"
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/py-wxWidgets/buildlink3.mk"
diff --git a/py-mote/Makefile b/py-mote/Makefile
index d2dffb741b..379b4fb0dd 100644
--- a/py-mote/Makefile
+++ b/py-mote/Makefile
@@ -12,6 +12,7 @@ COMMENT=	Python library for simulation of distributed algorithms
 LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-ipython>=3.2.1:../../devel/py-ipython
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-networkx>=1.11:../../math/py-networkx
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.0:../../math/py-scipy
 
@@ -20,7 +21,6 @@ USE_LANGUAGES=	# none
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # as of 0.2.2
 
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-mplh5canvas/Makefile b/py-mplh5canvas/Makefile
index 9862e50386..ac42e2fb87 100644
--- a/py-mplh5canvas/Makefile
+++ b/py-mplh5canvas/Makefile
@@ -10,10 +10,10 @@ HOMEPAGE=	http://code.google.com/p/mplh5canvas/
 COMMENT=	Matplotlib backend based on HTML5 Canvas
 LICENSE=	2-clause-bsd
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGRPEFIX}-websocket>=0.7.9:../../wip/py-websocket
 
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-neuronpy/Makefile b/py-neuronpy/Makefile
index 7f64e39b38..327306f18b 100644
--- a/py-neuronpy/Makefile
+++ b/py-neuronpy/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.3 2012/11/14 00:16:15 othyro Exp $
-#
 
 DISTNAME=	neuronpy-0.1.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,12 +11,12 @@ HOMEPAGE=	http://bitbucket.org/tommctavish/neuronpy/
 COMMENT=	The NEURON simulator and analyzing neural data
 LICENSE=	mit
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.0:../../math/py-scipy
 
 USE_LANGUAGES=	# none
 PYDISTUTILSPKG=	yes
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-nexpy/Makefile b/py-nexpy/Makefile
index 401aeadf3d..55051082d6 100644
--- a/py-nexpy/Makefile
+++ b/py-nexpy/Makefile
@@ -10,10 +10,11 @@ HOMEPAGE=	http://nexpy.github.io/nexpy/
 COMMENT=	Python GUI to analyze NeXus data
 LICENSE=	modified-bsd
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-h5py>=2.2.1:../../devel/py-h5py
-.include "../../graphics/py-matplotlib/buildlink3.mk"
+DEPENDS+=	${PYPKGPREFIX}-pyside-qt4.8>=1.2.1:../../wip/py-pyside
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy
+
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
-DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy
-DEPENDS+=	${PYPKGPREFIX}-pyside-qt4.8>=1.2.1:../../wip/py-pyside
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-nfg/Makefile b/py-nfg/Makefile
index 4956298a4d..b354d68df1 100644
--- a/py-nfg/Makefile
+++ b/py-nfg/Makefile
@@ -10,6 +10,7 @@ HOMEPAGE=	https://files.pythonhosted.org/packages/source/P/PyNFG/
 COMMENT=	Python package for implementing and solving Network form games
 LICENSE=	gnu-agpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-networkx>=1.8.1:../../math/py-networkx
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy
 
@@ -21,7 +22,6 @@ post-extract:
 	${MV} ${WRKSRC}/bin/hideandseek.py ${WRKSRC}/bin/hideandseek.py${PYVERSSUFFIX}
 	${MV} ${WRKSRC}/bin/stackelberg.py ${WRKSRC}/bin/stackelberg.py${PYVERSSUFFIX}
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-nodepy/Makefile b/py-nodepy/Makefile
index 4b9fb90f2e..9d6791bfdf 100644
--- a/py-nodepy/Makefile
+++ b/py-nodepy/Makefile
@@ -10,6 +10,9 @@ HOMEPAGE=	http://numerics.kaust.edu.sa/nodepy/
 COMMENT=	Numerical ODE solvers in Python
 LICENSE=	modified-bsd
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+DEPENDS+=	${PYPKGPREFIX}-sympy>=0.7.2:../../math/py-sympy
+
 USE_LANGUAGES=	# none
 
 PYDISTUTILSPKG=	yes
@@ -17,8 +20,6 @@ PYDISTUTILSPKG=	yes
 do-test:
 	${RUN} cd ${WRKSRC}; ${SETENV} ${TEST_ENV} ${PYTHONBIN} unit_tests.py
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
-DEPENDS+=	${PYPKGPREFIX}-sympy>=0.7.2:../../math/py-sympy
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-nsim/Makefile b/py-nsim/Makefile
index 60dc1abbaf..869c624c0f 100644
--- a/py-nsim/Makefile
+++ b/py-nsim/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	nsim-0.1.14
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	math
+CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=n/nsim/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
@@ -10,12 +10,12 @@ HOMEPAGE=	https://github.com/mattja/nsim/
 COMMENT=	Simulate systems from ODEs or SDEs, analyze time series
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-distob>=0.3.0:../../wip/py-distob
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
 
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-otb/Makefile b/py-otb/Makefile
index e913b05d4b..f48de381db 100644
--- a/py-otb/Makefile
+++ b/py-otb/Makefile
@@ -10,11 +10,12 @@ HOMEPAGE=	http://bitbucket.org/forieux/otb/
 COMMENT=	Utility functions for scientific numerical computation
 LICENSE=	mit
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+
 USE_LANGUAGES=	# none
 
 PYDISTUTILSPKG=	yes
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-poppy/Makefile b/py-poppy/Makefile
index 05b50cdba2..929db35944 100644
--- a/py-poppy/Makefile
+++ b/py-poppy/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	poppy-0.5.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	math
+CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/poppy/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
@@ -10,12 +10,12 @@ HOMEPAGE=	https://pythonhosted.org/poppy/
 COMMENT=	Physical optics propagation for optical simulations
 LICENSE=	modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-DEPENDS+=	${PYPKGPREFIX}-scipy>=0.17.0:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-astropy>=1.1.1:../../wip/py-astropy
 DEPENDS+=	${PYPKGPREFIX}-enum>=0.4.6:../../devel/py-enum
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.17.0:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-professor/Makefile b/py-professor/Makefile
index c5123714dd..1f0523902c 100644
--- a/py-professor/Makefile
+++ b/py-professor/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.3 2012/11/14 00:16:15 othyro Exp $
-#
 
 DISTNAME=	professor-1.3.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,10 +10,9 @@ HOMEPAGE=	http://projects.hepforge.org/professor/
 COMMENT=	Parameterisation-based tuning tool for Monte Carlo event generators
 LICENSE=	gnu-gpl-v2
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.2:../../math/py-scipy
 
 USE_LANGUAGES=	# none
 
-BUILDLINK_API_DEPENDS.pymatplotlib+=	${PYPKGPREFIX}-matplotlib>=1.0.1
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pseudopy/Makefile b/py-pseudopy/Makefile
index d3f177a3bf..dd809a70c7 100644
--- a/py-pseudopy/Makefile
+++ b/py-pseudopy/Makefile
@@ -10,6 +10,7 @@ HOMEPAGE=	https://github.com/andrenarchy/pseudopy
 COMMENT=	Compute and visualize pseudospectra of matrices
 LICENSE=	mit
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-shapely>=1.3.2:../../wip/py-shapely
 
@@ -17,7 +18,6 @@ USE_LANGUAGES=	# none
 
 PYDISTUTILSPKG=	yes
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pweave/Makefile b/py-pweave/Makefile
index 34c90f73cc..2e09af55ed 100644
--- a/py-pweave/Makefile
+++ b/py-pweave/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.2 2012/10/07 13:57:27 asau Exp $
-#
 
 DISTNAME=	Pweave-0.20.1
 PKGNAME=	${PYPKGPREFIX}-pweave-0.20.1
@@ -11,10 +10,11 @@ HOMEPAGE=	http://mpastell.com/pweave
 COMMENT=	Scientific reports with embedded python computations
 LICENSE=	gnu-gpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+
 WRKSRC=		${WRKDIR}/Pweave-0.20.1
 
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pyevolve/Makefile b/py-pyevolve/Makefile
index f4b03c9dd8..261566c42b 100644
--- a/py-pyevolve/Makefile
+++ b/py-pyevolve/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.5 2012/11/12 16:26:49 othyro Exp $
-#
 
 DISTNAME=	Pyevolve-0.6rc1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/Pyevolve/pyevolve/}
@@ -11,11 +10,11 @@ HOMEPAGE=	http://pyevolve.sourceforge.net/
 COMMENT=	Complete genetic algorithm framework written in pure python
 #LICENSE=	# TODO: (see mk/license.mk)
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pykit-shared/Makefile b/py-pykit-shared/Makefile
index b12f183803..569c97cee5 100644
--- a/py-pykit-shared/Makefile
+++ b/py-pykit-shared/Makefile
@@ -11,15 +11,15 @@ HOMEPAGE=	https://github.com/androomerrill/pykit-shared
 COMMENT=	Collection of modules shared amongst my other projects
 LICENSE=	2-clause-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-configobj>=4.7.2:../../devel/py-configobj
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-openpyxl>=1.8.0:../../textproc/py-openpyxl
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
 
 USE_LANGUAGES=	# none
 REPLACE_PYTHON=	pkshared/scripts/*.py
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 0.1.11
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
diff --git a/py-pymvpa/Makefile b/py-pymvpa/Makefile
index 76246ebf7e..64530bf7fd 100644
--- a/py-pymvpa/Makefile
+++ b/py-pymvpa/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.3 2012/10/12 20:32:06 asau Exp $
-#
 
 DISTNAME=	pymvpa_0.4.5
 PKGNAME=	${PYPKGPREFIX}-mvpa-0.4.5
@@ -11,6 +10,7 @@ HOMEPAGE=	http://www.pymvpa.org/
 COMMENT=	Multivariate pattern analysis
 LICENSE=	mit
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-rpy>=2.1.3:../../math/py-rpy
 #DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.0:../../math/py-scipy
 
@@ -19,7 +19,6 @@ WRKSRC=		${WRKDIR}/pymvpa-0.4.5
 USE_LANGUAGES=	c c++
 PYDISTUTILSPKG=	yes
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pypedal/Makefile b/py-pypedal/Makefile
index 7b4f14419a..16424c445a 100644
--- a/py-pypedal/Makefile
+++ b/py-pypedal/Makefile
@@ -11,8 +11,9 @@ HOMEPAGE=	http://pypedal.sourceforge.net/
 COMMENT=	Tools for pedigree analysis
 LICENSE=	gnu-lgpl-v2
 
-DEPENDS+=	${PYPKGPREFIX}-networkx>=1.0.1:../../math/py-networkx
 DEPENDS+=	${PYPKGPREFIX}-dot>=1.0.2:../../graphics/py-dot
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+DEPENDS+=	${PYPKGPREFIX}-networkx>=1.0.1:../../math/py-networkx
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-mxDateTime
 
@@ -26,7 +27,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/PyPedal/doc/pypedal.pdf	${DESTDIR}${DOCDIR}
 
 .include "../../lang/python/egg.mk"
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../time/py-mxDateTime/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-pythics/Makefile b/py-pythics/Makefile
index 6c5a776d83..03f02a0de3 100644
--- a/py-pythics/Makefile
+++ b/py-pythics/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=	pythics-0.2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 PKGREVISION=	2
-CATEGORIES=	math
+CATEGORIES=	math python
 MASTER_SITES=	http://pythics.googlecode.com/files/
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
@@ -11,12 +11,13 @@ HOMEPAGE=	http://code.google.com/p/pythics/
 COMMENT=	Python Instrument Control System
 LICENSE=	gnu-gpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+
 USE_LANGUAGES=	# none
 
 PYDISTUTILSPKG=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-elementtree
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../textproc/py-elementtree/buildlink3.mk"
diff --git a/py-qexpy/Makefile b/py-qexpy/Makefile
index 1ec7314bb9..3b614afe27 100644
--- a/py-qexpy/Makefile
+++ b/py-qexpy/Makefile
@@ -10,12 +10,12 @@ HOMEPAGE=	https://github.com/Queens-Physics/QExPy
 COMMENT=	Analysis and data plotting aimed at undergraduate physics
 LICENSE=	gnu-gpl-v3
 
-DEPENDS+=	${PYPKGPREFIX}-scipy>=0.18.0:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-bokeh>=0.12.2:../../wip/py-bokeh
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.18.0:../../math/py-scipy
 
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-qit/Makefile b/py-qit/Makefile
index 3184062932..80097205a0 100644
--- a/py-qit/Makefile
+++ b/py-qit/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.2 2012/10/07 13:57:28 asau Exp $
-#
 
 DISTNAME=	qit-0.9.12
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,6 +10,7 @@ HOMEPAGE=	http://qit.sourceforge.net/
 COMMENT=	Quantum Information Toolkit
 LICENSE=	gnu-gpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.2:../../math/py-scipy
 
 WRKSRC=		${WRKDIR}/qit-0.9.12
@@ -19,7 +19,6 @@ USE_LANGUAGES=	# none
 
 PYDISTUTILSPKG=	yes
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-qutip/Makefile b/py-qutip/Makefile
index 4b48435638..5a2cb95e61 100644
--- a/py-qutip/Makefile
+++ b/py-qutip/Makefile
@@ -10,14 +10,15 @@ HOMEPAGE=	http://code.google.com/p/qutip/
 COMMENT=	Quantum Toolbox in Python
 LICENSE=	gnu-gpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
+
 USE_LANGUAGES=	c fortran
 
 PYDISTUTILSPKG=	yes
 
 .include "../../devel/py-cython/buildlink3.mk"
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
-DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
 .include "../../x11/py-qt4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-report/Makefile b/py-report/Makefile
index e3ebcab033..58b755921b 100644
--- a/py-report/Makefile
+++ b/py-report/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	pyreport-0.3.4c
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
-CATEGORIES=	devel
+CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pyreport/}
 
 MAINTAINER=	kamel.derouiche%gmail.com@localhost
@@ -11,10 +11,10 @@ COMMENT=	Pyreport makes notes out of a python script
 LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-docutils>=0.8.1:../../textproc/py-docutils
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 
 USE_LANGUAGES=	# none
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-docutils
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-scikit-image/Makefile b/py-scikit-image/Makefile
index 3dc4b147a1..7658d450bd 100644
--- a/py-scikit-image/Makefile
+++ b/py-scikit-image/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Image processing routines for SciPy
 LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-Pillow>=2.9.0:../../graphics/py-Pillow
-DEPENDS+=	${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-networkx>=1.9:../../math/py-networkx
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
+DEPENDS+=	${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six
 
 .include "../../devel/py-cython/buildlink3.mk"
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-scikits_timeseries/Makefile b/py-scikits_timeseries/Makefile
index e27fa265c2..0e92f3fca3 100644
--- a/py-scikits_timeseries/Makefile
+++ b/py-scikits_timeseries/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.6 2012/11/12 16:26:51 othyro Exp $
-#
 
 DISTNAME=	scikits.timeseries-0.91.3
 EGG_NAME=	${DISTNAME}
@@ -13,7 +12,8 @@ HOMEPAGE=	http://pytseries.sourceforge.net/
 COMMENT=	Time series manipulation
 LICENSE=	modified-bsd
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-scipy-data_fitting/Makefile b/py-scipy-data_fitting/Makefile
index 08f67988b8..72e4c661ae 100644
--- a/py-scipy-data_fitting/Makefile
+++ b/py-scipy-data_fitting/Makefile
@@ -10,13 +10,13 @@ HOMEPAGE=	https://github.com/razor-x/scipy-data_fitting
 COMMENT=	Data fitting system with SciPy
 LICENSE=	mit
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-sympy>=0.7.4.1.:../../math/py-sympy
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 0.0.1
 
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-scitools/Makefile b/py-scitools/Makefile
index 39ed76a0f6..6d3c89eab5 100644
--- a/py-scitools/Makefile
+++ b/py-scitools/Makefile
@@ -37,7 +37,6 @@ post-extract:
 #.include "../../math/py-numarray/buildlink3.mk"
 #.include "../../graphics/vtk/buildlink3.mk"
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-sempy/Makefile b/py-sempy/Makefile
index af2af9b679..5a85a43206 100644
--- a/py-sempy/Makefile
+++ b/py-sempy/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.3 2013/07/26 21:25:58 jihbed Exp $
-#
 
 DISTNAME=	sempy-0.0.18
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	math
+CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=s/sempy/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
@@ -11,11 +10,10 @@ HOMEPAGE=	https://files.pythonhosted.org/packages/source/s/sempy/
 COMMENT=	Python implementation of the spectral element method
 LICENSE=	gnu-gpl-v2
 
-WRKSRC=		${WRKDIR}/sempy-0.0.18
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-solpy/Makefile b/py-solpy/Makefile
index 9bd7e87c9c..7c923812f6 100644
--- a/py-solpy/Makefile
+++ b/py-solpy/Makefile
@@ -13,12 +13,12 @@ LICENSE=	gnu-lgpl-v3
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36
 
 DEPENDS+=	${PYPKGPREFIX}-ephem>=3.7.5.1:../../math/py-ephem
-DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
 DEPENDS+=	${PYPKGPREFIX}-geopy>=0.12.1:../../wip/py-geopy
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
 
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-spectral/Makefile b/py-spectral/Makefile
index 91ff9491ad..846374a66e 100644
--- a/py-spectral/Makefile
+++ b/py-spectral/Makefile
@@ -11,12 +11,12 @@ COMMENT=	Python module for hyperspectral image processing
 LICENSE=	gnu-gpl-v3
 
 #DEPENDS+=	${PYPKGPREFIX}-OpenGL>=3.0.1:../../graphics/py-OpenGL
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 
 USE_LANGUAGES=	# none
 
 PYDISTUTILSPKG=	yes
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-speview/Makefile b/py-speview/Makefile
index 77f46d2413..73d1f9673d 100644
--- a/py-speview/Makefile
+++ b/py-speview/Makefile
@@ -10,9 +10,10 @@ HOMEPAGE=	https://github.com/ximeg/speview
 COMMENT=	Program to display binary SPE files containing Raman spectra
 LICENSE=	gnu-gpl-v2
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.0:../../math/py-scipy
-DEPENDS+=	${PYPKGPREFIX}-zenity>=0.1.4:../../wip/py-zenity
 DEPENDS+=	${PYPKGPREFIX}-xcal-raman>=0.1.5:../../wip/py-xcal-raman
+DEPENDS+=	${PYPKGPREFIX}-zenity>=0.1.4:../../wip/py-zenity
 
 USE_LANGUAGES=	# none
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-xcal-raman
@@ -20,7 +21,6 @@ PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-xcal-raman
 post-extract:
 	${MV} ${WRKSRC}/speview.py ${WRKSRC}/speview.py${PYVERSSUFFIX}
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-sphinxreport/Makefile b/py-sphinxreport/Makefile
index d92a0ebec5..3cabffdc56 100644
--- a/py-sphinxreport/Makefile
+++ b/py-sphinxreport/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	SphinxReport-2.0
 PKGNAME=	${PYPKGPREFIX}-sphinxreport-2.0
-CATEGORIES=	textproc
+CATEGORIES=	textproc python
 MASTER_SITES=	${MASTER_SITE_PYPI:=S/SphinxReport/}
 
 MAINTAINER=	kamelderouiche%yahoo.com@localhost
@@ -10,14 +10,14 @@ HOMEPAGE=	http://code.google.com/p/sphinx-report/
 COMMENT=	Report generator in python based on Sphinx and matplotlib
 LICENSE=	modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-sqlalchemy>=0.7:../../databases/py-sqlalchemy
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+DEPENDS+=	${PYPKGPREFIX}-openpyxl>=1.6.2:../../textproc/py-openpyxl
 DEPENDS+=	${PYPKGPREFIX}-rpy>=2.1.3:../../math/py-rpy
 DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
-DEPENDS+=	${PYPKGPREFIX}-openpyxl>=1.6.2:../../textproc/py-openpyxl
+DEPENDS+=	${PYPKGPREFIX}-sqlalchemy>=0.7:../../databases/py-sqlalchemy
 
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-sphviewer/Makefile b/py-sphviewer/Makefile
index ac5d19e53c..9535808ed5 100644
--- a/py-sphviewer/Makefile
+++ b/py-sphviewer/Makefile
@@ -10,10 +10,11 @@ HOMEPAGE=	https://code.google.com/p/py-sphviewer/
 COMMENT=	Framework for rendering particle simulations
 LICENSE=	gnu-gpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
+
 PYDISTUTILSPKG=	yes
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
-DEPENDS+=	${PYPKGPREFIX}-scipy>=0.12.1:../../math/py-scipy
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-spm1d/Makefile b/py-spm1d/Makefile
index a8c51fab36..2c10f411a2 100644
--- a/py-spm1d/Makefile
+++ b/py-spm1d/Makefile
@@ -10,9 +10,10 @@ HOMEPAGE=	https://github.com/0todd0000/spm1d
 COMMENT=	One-Dimensional Statistical Parametric Mapping
 LICENSE=	gnu-gpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+
 USE_LANGUAGES=	# none
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-sppy/Makefile b/py-sppy/Makefile
index 3bf84e3e59..21a10b08aa 100644
--- a/py-sppy/Makefile
+++ b/py-sppy/Makefile
@@ -10,13 +10,13 @@ HOMEPAGE=	http://packages.python.org/sppy/
 COMMENT=	Sparse matrix package based on Eigen
 LICENSE=	gnu-lgpl-v3
 
-WRKSRC=		${WRKDIR}/sppy-0.6.3
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.2:../../math/py-scipy
+
 USE_LANGUAGES=	c c++
 
 .include "../../devel/py-cython/buildlink3.mk"
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/eigen3/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
-DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.2:../../math/py-scipy
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-sunpy/Makefile b/py-sunpy/Makefile
index 4043ae4369..78c3726c9e 100644
--- a/py-sunpy/Makefile
+++ b/py-sunpy/Makefile
@@ -10,12 +10,12 @@ HOMEPAGE=	http://www.sunpy.org/
 COMMENT=	Python for Solar Physicists
 LICENSE=	modified-bsd
 
+DEPENDS+=	${PYPKGPREFIX}-astropy>=1.0.4:../../wip/py-astropy
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-pandas>=0.16.2:../../math/py-pandas
 DEPENDS+=	${PYPKGPREFIX}-scipy>=0.15.1:../../math/py-scipy
-DEPENDS+=	${PYPKGPREFIX}-astropy>=1.0.4:../../wip/py-astropy
 
 .include "../../devel/py-cython/buildlink3.mk"
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-thLib/Makefile b/py-thLib/Makefile
index 488f2f771c..f0b2a067c2 100644
--- a/py-thLib/Makefile
+++ b/py-thLib/Makefile
@@ -10,10 +10,11 @@ MAINTAINER=	jihbed.research%gmail.com@localhost
 HOMEPAGE=	http://work.thaslwanter.at/
 COMMENT=	Collection of Python utilities for signal analysis
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+
 USE_LANGUAGES=	# none
 PYDISTUTILSPKG=	yes
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../x11/py-qt4/buildlink3.mk"
diff --git a/py-topkapi/Makefile b/py-topkapi/Makefile
index 5335d16642..41ab61a2a1 100644
--- a/py-topkapi/Makefile
+++ b/py-topkapi/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.4 2014/06/01 12:49:47 thomasklausner Exp $
-#
 
 DISTNAME=	PyTOPKAPI-0.2.0
 PKGNAME=	${DISTNAME:tl:S/py/${PYPKGPREFIX}-/1}
-CATEGORIES=	misc
+CATEGORIES=	misc python
 MASTER_SITES=	https://github.com/downloads/sahg/PyTOPKAPI/
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
@@ -11,6 +10,7 @@ HOMEPAGE=	http://sahg.github.com/PyTOPKAPI
 COMMENT=	TOPKAPI hydrological model in Python
 LICENSE=	modified-bsd
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-rpy>=2.1.3:../../math/py-rpy
 #DEPENDS+=	${PYPKGPREFIX}-scipy>=0.7.0:../../math/py-scipy
 
@@ -18,11 +18,9 @@ DEPENDS+=	${PYPKGPREFIX}-rpy>=2.1.3:../../math/py-rpy
 # (see mk/fetch/fetch.mk), so you have to use a browser for now.
 FETCH_BEFORE_ARGS=	--no-check-certificate
 
-
 USE_LANGUAGES=	# none
 PYDISTUTILSPKG=	yes
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-tribe/Makefile b/py-tribe/Makefile
index 58d9bcff2c..578ed3513a 100644
--- a/py-tribe/Makefile
+++ b/py-tribe/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	tribe-1.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	mail
+CATEGORIES=	mail python
 MASTER_SITES=	${MASTER_SITE_PYPI:=t/tribe/}
 
 MAINTAINER=	kamelderouiche%yahoo.com@localhost
@@ -10,14 +10,14 @@ HOMEPAGE=	https://github.com/DistrictDataLabs/tribe
 COMMENT=	Graph extraction tool for email MBox files
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 DEPENDS+=	${PYPKGPREFIX}-networkx>=1.11:../../math/py-networkx
+DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
 
 USE_LANGUAGES=	# none
 
 post-extract:
 	${MV} ${WRKSRC}/tribe-admin.py ${WRKSRC}/tribe-admin.py${PYVERSSUFFIX}
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-xcal-raman/Makefile b/py-xcal-raman/Makefile
index a3fa3da5d2..5f3449a51e 100644
--- a/py-xcal-raman/Makefile
+++ b/py-xcal-raman/Makefile
@@ -2,7 +2,7 @@
 
 DISTNAME=	xcal_raman-0.1.5
 PKGNAME=	${PYPKGPREFIX}-xcal-raman-0.1.5
-CATEGORIES=	math
+CATEGORIES=	math python
 MASTER_SITES=	${MASTER_SITE_PYPI:=x/xcal_raman/}
 
 MAINTAINER=	jihbed.research%gmail.com@localhost
@@ -10,11 +10,12 @@ HOMEPAGE=	https://pypi.python.org/pypi/xcal_raman
 COMMENT=	Module for x-axis calibration of Raman spectrometers
 LICENSE=	gnu-gpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+
 USE_LANGUAGES=	# none
 
 PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # as of 0.1.5
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/py-yt/Makefile b/py-yt/Makefile
index 300c4d1178..10af360ea8 100644
--- a/py-yt/Makefile
+++ b/py-yt/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.3 2012/11/14 00:16:17 othyro Exp $
-#
 
 DISTNAME=	yt-2.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,9 +10,10 @@ HOMEPAGE=	http://yt-project.org/
 COMMENT=	Analyzing and visualizing astrophysical simulation output
 LICENSE=	gnu-gpl-v3
 
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
+
 USE_LANGUAGES=	c c++
 
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/reinteract/Makefile b/reinteract/Makefile
index 8ae4e9aacc..2f704089f4 100644
--- a/reinteract/Makefile
+++ b/reinteract/Makefile
@@ -12,6 +12,7 @@ COMMENT=	Reinteract is a system for interactive experimentation with Python
 LICENSE=	2-clause-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
+DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 
 GNU_CONFIGURE=	yes
 
@@ -21,7 +22,6 @@ PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # py-gobject
 
 .include "../../devel/py-gobject/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../graphics/py-matplotlib/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"


Home | Main Index | Thread Index | Old Index