Index: head/math/py-matplotlib/Makefile
===================================================================
--- head/math/py-matplotlib/Makefile	(revision 462786)
+++ head/math/py-matplotlib/Makefile	(revision 462787)
@@ -1,112 +1,110 @@
 # Created by: ijliao
 # $FreeBSD$
 
 PORTNAME=	matplotlib
-PORTVERSION=	1.5.3
-PORTREVISION=	3
 DISTVERSIONPREFIX=	v
+DISTVERSION=	2.1.2
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	mainland@apeiron.net
 COMMENT=	Plotting library uses a syntax familiar to MATLAB users
 
 LICENSE=	PSFL
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libtcl86.so:lang/tcl86
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}cycler>0:devel/py-cycler@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:devel/py-dateutil@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${FLAVOR}
 
-USE_GITHUB=	yes
-
 USES=		compiler:c++11-lib gettext pkgconfig python shebangfix uniquefiles:dirs
+USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils
 CFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS_DEFINE=		EXAMPLES GTKBACKEND GTKAGGBACKEND QT4AGGBACKEND \
 			QT5AGGBACKEND TKAGGBACKEND WXAGGBACKEND
 OPTIONS_DEFAULT=	GTKBACKEND GTKAGGBACKEND TKAGGBACKEND
 OPTIONS_SUB=		yes
 .if ${FLAVOR:U:Mpy3*}
 # x11-toolkits/py-gtk2, x11-toolkits/py-wxPython28 do not support Python 3
 OPTIONS_EXCLUDE=	GTKBACKEND GTKAGGBACKEND WXAGGBACKEND
 .endif
 
 GTKBACKEND_DESC=	GTK backend support
 GTKBACKEND_VARS=	GTK_BACKEND=True
 GTKBACKEND_VARS_OFF=	GTK_BACKEND=False
 GTKBACKEND_USE=		GNOME=gtk20,pygtk2,cairo,gdkpixbuf2
 GTKAGGBACKEND_DESC=	GTKAgg backend support
 GTKAGGBACKEND_USE=	GNOME=gtk20,pygtk2,cairo,gdkpixbuf2
 GTKAGGBACKEND_VARS=	GTKAGG_BACKEND=True
 GTKAGGBACKEND_VARS_OFF=	GTKAGG_BACKEND=False
 QT4AGGBACKEND_DESC=	Qt4Agg backend support
 QT4AGGBACKEND_USES=	pyqt:4
 QT4AGGBACKEND_USE=	PYQT=gui
 QT4AGGBACKEND_VARS=	QT4AGG_BACKEND=True
 QT4AGGBACKEND_VARS_OFF=	QT4AGG_BACKEND=False
 QT5AGGBACKEND_DESC=	Qt5Agg backend support
 QT5AGGBACKEND_USES=	pyqt:5
 QT5AGGBACKEND_USE=	PYQT=sip,widgets
 QT5AGGBACKEND_VARS=	QT5AGG_BACKEND=True
 QT5AGGBACKEND_VARS_OFF=	QT5AGG_BACKEND=False
 TKAGGBACKEND_DESC=	TKAgg backend support
 TKAGGBACKEND_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR}
 TKAGGBACKEND_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR}
 TKAGGBACKEND_USES=	tk:run
 TKAGGBACKEND_VARS=	TKAGG_BACKEND=True
 TKAGGBACKEND_VARS_OFF=	TKAGG_BACKEND=False
 WXAGGBACKEND_DESC=	WXAgg backend support
 WXAGGBACKEND_USE=	WX=2.8+
 WXAGGBACKEND_CONFIGURE_ENV=	WX_CONFIG="${WX_CONFIG}"
 WXAGGBACKEND_VARS=	WXAGG_BACKEND=True WX_COMPS=python:lib
 WXAGGBACKEND_VARS_OFF=	WXAGG_BACKEND=False
 
 PORTEXAMPLES=	*
 
 .if defined(PACKAGE_BUILDING)
 GTKBACKEND_BUILD_DEPENDS=	Xvfb:x11-servers/xorg-vfbserver
 GTKAGGBACKEND_BUILD_DEPENDS=	Xvfb:x11-servers/xorg-vfbserver
 QT4AGGBACKEND_BUILD_DEPENDS+=	Xvfb:x11-servers/xorg-vfbserver
 QT5AGGBACKEND_BUILD_DEPENDS+=	Xvfb:x11-servers/xorg-vfbserver
 TKAGGBACKEND_BUILD_DEPENDS+=	Xvfb:x11-servers/xorg-vfbserver
 WXAGGBACKEND_BUILD_DEPENDS=	Xvfb:x11-servers/xorg-vfbserver
 .endif
 
 post-extract:
 	${FIND} ${WRKSRC} -name \*.py | ${XARGS} ${CHMOD} -x
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 			 -e 's|%%TCL_INCLUDEDIR%%|${TCL_INCLUDEDIR}|g' \
 			 -e 's|%%TK_INCLUDEDIR%%|${TK_INCLUDEDIR}|g' \
 			 -e 's|%%TCL_LIBDIR%%|${TCL_LIBDIR}|g' \
 			 -e 's|%%TK_LIBDIR%%|${TK_LIBDIR}|g' \
 			 -e 's|%%TCL_VER%%|${TCL_SHLIB_VER}|g' \
 			 -e 's|%%TK_VER%%|${TK_SHLIB_VER}|g' \
 		${WRKSRC}/setupext.py
 	${REINPLACE_CMD} -e 's|%%GTK_BACKEND%%|${GTK_BACKEND}|g' \
 			 -e 's|%%GTKAGG_BACKEND%%|${GTKAGG_BACKEND}|g' \
 			 -e 's|%%QT4AGG_BACKEND%%|${QT4AGG_BACKEND}|g' \
 			 -e 's|%%QT5AGG_BACKEND%%|${QT5AGG_BACKEND}|g' \
 			 -e 's|%%TKAGG_BACKEND%%|${TKAGG_BACKEND}|g' \
 			 -e 's|%%WXAGG_BACKEND%%|${WXAGG_BACKEND}|g' \
 		${WRKSRC}/setup.cfg
 
 post-install:
 	@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib -name '*.so' \
 		| ${XARGS} ${STRIP_CMD}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${CP} -R ${WRKSRC}/examples/ ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
Index: head/math/py-matplotlib/distinfo
===================================================================
--- head/math/py-matplotlib/distinfo	(revision 462786)
+++ head/math/py-matplotlib/distinfo	(revision 462787)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479367113
-SHA256 (matplotlib-matplotlib-v1.5.3_GH0.tar.gz) = c72276afc11f0b77cee736a783861039c0284d2e4739de8ca09d2dd1407745aa
-SIZE (matplotlib-matplotlib-v1.5.3_GH0.tar.gz) = 50931479
+TIMESTAMP = 1519469715
+SHA256 (matplotlib-matplotlib-v2.1.2_GH0.tar.gz) = 613d79282a0a8ba88cfc52dbcf1b08ab070dae395c3d313d141ccc3f87e3c9fa
+SIZE (matplotlib-matplotlib-v2.1.2_GH0.tar.gz) = 35181192
Index: head/math/py-matplotlib/pkg-descr
===================================================================
--- head/math/py-matplotlib/pkg-descr	(revision 462786)
+++ head/math/py-matplotlib/pkg-descr	(revision 462787)
@@ -1,8 +1,8 @@
 matplotlib is a python 2D plotting library which produces publication quality
 figures using in a variety of hardcopy formats (PNG, JPG, PS, SVG) and
 interactive GUI environments (WX, GTK, Tkinter) across platforms. matplotlib
 can be used in python scripts, interactively from the python shell (ala matlab
 or mathematica), in web application servers generating dynamic charts, or
 embedded in GTK, Tk or WX applications; see backends.
 
-WWW: http://matplotlib.org/
+WWW: https://matplotlib.org/