Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 18 Apr 2020 09:17:43 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r532006 - in head/math/py-matplotlib: . files
Message-ID:  <202004180917.03I9HhUX088835@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Sat Apr 18 09:17:42 2020
New Revision: 532006
URL: https://svnweb.freebsd.org/changeset/ports/532006

Log:
  Remove optional dependency on pygtk2 and py-wxPython28
  
  With hat:	portmgr

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 Apr 18 08:54:37 2020	(r532005)
+++ head/math/py-matplotlib/Makefile	Sat Apr 18 09:17:42 2020	(r532006)
@@ -3,7 +3,7 @@
 
 PORTNAME=	matplotlib
 DISTVERSION=	2.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -32,25 +32,11 @@ USE_PYTHON=	autoplist distutils
 
 CFLAGS+=	-I${LOCALBASE}/include
 
-OPTIONS_DEFINE=		EXAMPLES GTKBACKEND GTKAGGBACKEND \
-			QT5AGGBACKEND TKAGGBACKEND WXAGGBACKEND
-OPTIONS_DEFAULT=	GTKBACKEND GTKAGGBACKEND TKAGGBACKEND
+OPTIONS_DEFINE=		EXAMPLES \
+			QT5AGGBACKEND TKAGGBACKEND
+OPTIONS_DEFAULT=	TKAGGBACKEND
 OPTIONS_SUB=		yes
-.if ${FLAVOR:Upy36: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_USES=	display
-GTKBACKEND_USE=		GNOME=gtk20,pygtk2,cairo,gdkpixbuf2
-GTKAGGBACKEND_DESC=	GTKAgg backend support
-GTKAGGBACKEND_USES=	display
-GTKAGGBACKEND_USE=	GNOME=gtk20,pygtk2,cairo,gdkpixbuf2
-GTKAGGBACKEND_VARS=	GTKAGG_BACKEND=True
-GTKAGGBACKEND_VARS_OFF=	GTKAGG_BACKEND=False
 QT5AGGBACKEND_DESC=	Qt5Agg backend support
 QT5AGGBACKEND_USES=	display pyqt:5
 QT5AGGBACKEND_USE=	PYQT=sip,widgets
@@ -62,12 +48,6 @@ TKAGGBACKEND_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkint
 TKAGGBACKEND_USES=	display tk:run
 TKAGGBACKEND_VARS=	TKAGG_BACKEND=True
 TKAGGBACKEND_VARS_OFF=	TKAGG_BACKEND=False
-WXAGGBACKEND_DESC=	WXAgg backend support
-WXAGGBACKEND_USES=	display
-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=	*
 
@@ -75,11 +55,8 @@ post-extract:
 	@${FIND} ${WRKSRC} -name '*.py' | ${XARGS} ${CHMOD} -x
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%GTK_BACKEND%%|${GTK_BACKEND}|g' \
-			 -e 's|%%GTKAGG_BACKEND%%|${GTKAGG_BACKEND}|g' \
-			 -e 's|%%QT5AGG_BACKEND%%|${QT5AGG_BACKEND}|g' \
+	@${REINPLACE_CMD} -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:

Modified: head/math/py-matplotlib/files/patch-setup.cfg
==============================================================================
--- head/math/py-matplotlib/files/patch-setup.cfg	Sat Apr 18 08:54:37 2020	(r532005)
+++ head/math/py-matplotlib/files/patch-setup.cfg	Sat Apr 18 09:17:42 2020	(r532006)
@@ -58,12 +58,12 @@
 +#           otherwise skip silently. This is the default
 +#           behavior
 +#
-+gtk = %%GTK_BACKEND%%
-+gtkagg = %%GTKAGG_BACKEND%%
++gtk = False
++gtkagg = False
 +qt4agg = False
 +qt5agg = %%QT5AGG_BACKEND%%
 +tkagg = %%TKAGG_BACKEND%%
-+wxagg = %%WXAGG_BACKEND%%
++wxagg = False
 +#macosx = False
 +
 +[rc_options]



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004180917.03I9HhUX088835>