svn commit: r495919 - in head/math/py-matplotlib: . files

[Tobias C. Berner]

Author: tcberner
Date: Sat Mar 16 17:45:32 2019
New Revision: 495919
URL: https://svnweb.freebsd.org/changeset/ports/495919

Log:
  math/py-matplotlib: remove QT4AGGBACKEND option (Qt4 deprecation)
  
  Approved by:	portmgr (implicit)

Modified:
  head/math/py-matplotlib/Makefile
  head/math/py-matplotlib/files/patch-setup.cfg

Modified: head/math/py-matplotlib/Makefile
==============================================================================
--- head/math/py-matplotlib/Makefile	Sat Mar 16 17:29:46 2019	(r495918)
+++ head/math/py-matplotlib/Makefile	Sat Mar 16 17:45:32 2019	(r495919)
@@ -4,7 +4,7 @@
 PORTNAME=	matplotlib
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.1.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -34,7 +34,7 @@ USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils
 CFLAGS+=	-I${LOCALBASE}/include
 
-OPTIONS_DEFINE=		EXAMPLES GTKBACKEND GTKAGGBACKEND QT4AGGBACKEND \
+OPTIONS_DEFINE=		EXAMPLES GTKBACKEND GTKAGGBACKEND \
 			QT5AGGBACKEND TKAGGBACKEND WXAGGBACKEND
 OPTIONS_DEFAULT=	GTKBACKEND GTKAGGBACKEND TKAGGBACKEND
 OPTIONS_SUB=		yes
@@ -51,11 +51,6 @@ 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
@@ -78,18 +73,11 @@ 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
 
-.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MQT4AGG_BACKEND}
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2019-03-15
-.endif
-
 post-extract:
 	${FIND} ${WRKSRC} -name \*.py | ${XARGS} ${CHMOD} -x
 
@@ -104,7 +92,6 @@ post-patch:
 		${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' \

Modified: head/math/py-matplotlib/files/patch-setup.cfg
==============================================================================
--- head/math/py-matplotlib/files/patch-setup.cfg	Sat Mar 16 17:29:46 2019	(r495918)
+++ head/math/py-matplotlib/files/patch-setup.cfg	Sat Mar 16 17:45:32 2019	(r495919)
@@ -60,7 +60,7 @@
 +#
 +gtk = %%GTK_BACKEND%%
 +gtkagg = %%GTKAGG_BACKEND%%
-+qt4agg = %%QT4AGG_BACKEND%%
++qt4agg = False
 +qt5agg = %%QT5AGG_BACKEND%%
 +tkagg = %%TKAGG_BACKEND%%
 +wxagg = %%WXAGG_BACKEND%%