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

Thomas Zander riggs at FreeBSD.org
Sat Mar 23 18:49:00 UTC 2019 

Author: riggs
Date: Sat Mar 23 18:48:58 2019
New Revision: 496681
URL: https://svnweb.freebsd.org/changeset/ports/496681

Log:
  Update to upstream version 2.2.4
  
  While on it:
  - Pet portlint
  
  PR:		236455
  Submitted by:	lbartoletti at tuxfamily.org
  Approved by:	mainland at apeiron.net (maintainer)

Added:
  head/math/py-matplotlib/files/patch-setup.py   (contents, props changed)
  head/math/py-matplotlib/pkg-plist   (contents, props changed)
Modified:
  head/math/py-matplotlib/Makefile
  head/math/py-matplotlib/distinfo

Modified: head/math/py-matplotlib/Makefile
==============================================================================
--- head/math/py-matplotlib/Makefile	Sat Mar 23 18:44:48 2019	(r496680)
+++ head/math/py-matplotlib/Makefile	Sat Mar 23 18:48:58 2019	(r496681)
@@ -2,10 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	matplotlib
-DISTVERSION=	2.2.3
+DISTVERSION=	2.2.4
 CATEGORIES=	math python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	CHEESESHOP:DEFAULT \
+		https://jqueryui.com/resources/download/:jquery
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
+		jquery-ui-1.12.1.zip:jquery
 
 MAINTAINER=	mainland at apeiron.net
 COMMENT=	Plotting library uses a syntax familiar to MATLAB users
@@ -18,15 +21,17 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libtcl86.so:lang/tcl86
 RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}cycler>0:devel/py-cycler@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=1.4:devel/py-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cycler>=0.10:devel/py-cycler@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=0:devel/py-pyparsing@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}tornado>0:www/py-tornado@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}kiwisolver>=1.0.0:math/py-kiwisolver@${PY_FLAVOR}
 py27_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>0:devel/py-backports.functools_lru_cache@${PY_FLAVOR}
 
 USES=		compiler:c++11-lib gettext gnome pkgconfig python shebangfix uniquefiles:dirs
 USE_PYTHON=	autoplist distutils
+
 CFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS_DEFINE=		EXAMPLES GTKBACKEND GTKAGGBACKEND \
@@ -77,6 +82,7 @@ post-extract:
 	@${FIND} ${WRKSRC} -name '*.py' | ${XARGS} ${CHMOD} -x
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|%%DISTDIR%%|${DISTDIR}|g' ${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e 's|%%GTK_BACKEND%%|${GTK_BACKEND}|g' \
 			 -e 's|%%GTKAGG_BACKEND%%|${GTKAGG_BACKEND}|g' \
 			 -e 's|%%QT5AGG_BACKEND%%|${QT5AGG_BACKEND}|g' \

Modified: head/math/py-matplotlib/distinfo
==============================================================================
--- head/math/py-matplotlib/distinfo	Sat Mar 23 18:44:48 2019	(r496680)
+++ head/math/py-matplotlib/distinfo	Sat Mar 23 18:48:58 2019	(r496681)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1547732863
-SHA256 (matplotlib-2.2.3.tar.gz) = 7355bf757ecacd5f0ac9dd9523c8e1a1103faadf8d33c22664178e17533f8ce5
-SIZE (matplotlib-2.2.3.tar.gz) = 36839609
+TIMESTAMP = 1553231915
+SHA256 (matplotlib-2.2.4.tar.gz) = 029620799e581802961ac1dcff5cb5d3ee2f602e0db9c0f202a90495b37d2126
+SIZE (matplotlib-2.2.4.tar.gz) = 36974286
+SHA256 (jquery-ui-1.12.1.zip) = f8233674366ab36b2c34c577ec77a3d70cac75d2e387d8587f3836345c0f624d
+SIZE (jquery-ui-1.12.1.zip) = 439463

Added: head/math/py-matplotlib/files/patch-setup.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/py-matplotlib/files/patch-setup.py	Sat Mar 23 18:48:58 2019	(r496681)
@@ -0,0 +1,22 @@
+--- setup.py.orig	2019-03-22 05:20:14 UTC
++++ setup.py
+@@ -153,12 +153,13 @@ def _download_jquery_to(dest):
+     sha = 'f8233674366ab36b2c34c577ec77a3d70cac75d2e387d8587f3836345c0f624d'
+     if not os.path.exists(os.path.join(dest, "jquery-ui-1.12.1")):
+         _makedirs(dest, exist_ok=True)
+-        try:
+-            buff = download_or_cache(url, sha)
+-        except Exception:
+-            raise IOError("Failed to download jquery-ui.  Please download " +
+-                          "{url} and extract it to {dest}.".format(
+-                              url=url, dest=dest))
++        buff = os.path.join("%%DISTDIR%%", "jquery-ui-1.12.1.zip")
++#        try:
++#            buff = download_or_cache(url, sha)
++#        except Exception:
++#            raise IOError("Failed to download jquery-ui.  Please download " +
++#                          "{url} and extract it to {dest}.".format(
++#                              url=url, dest=dest))
+         with ZipFile(buff) as zf:
+             zf.extractall(dest)
+ 

Added: head/math/py-matplotlib/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/py-matplotlib/pkg-plist	Sat Mar 23 18:48:58 2019	(r496681)
@@ -0,0 +1,19 @@
+%%PYTHON_SITELIBDIR%%/matplotlib/backends/web_backend/jquery-ui-1.12.1/AUTHORS.txt
+%%PYTHON_SITELIBDIR%%/matplotlib/backends/web_backend/jquery-ui-1.12.1/LICENSE.txt
+%%PYTHON_SITELIBDIR%%/matplotlib/backends/web_backend/jquery-ui-1.12.1/external/jquery/jquery.js
+%%PYTHON_SITELIBDIR%%/matplotlib/backends/web_backend/jquery-ui-1.12.1/images/ui-icons_444444_256x240.png
+%%PYTHON_SITELIBDIR%%/matplotlib/backends/web_backend/jquery-ui-1.12.1/images/ui-icons_555555_256x240.png
+%%PYTHON_SITELIBDIR%%/matplotlib/backends/web_backend/jquery-ui-1.12.1/images/ui-icons_777620_256x240.png
+%%PYTHON_SITELIBDIR%%/matplotlib/backends/web_backend/jquery-ui-1.12.1/images/ui-icons_777777_256x240.png
+%%PYTHON_SITELIBDIR%%/matplotlib/backends/web_backend/jquery-ui-1.12.1/images/ui-icons_cc0000_256x240.png
+%%PYTHON_SITELIBDIR%%/matplotlib/backends/web_backend/jquery-ui-1.12.1/images/ui-icons_ffffff_256x240.png
+%%PYTHON_SITELIBDIR%%/matplotlib/backends/web_backend/jquery-ui-1.12.1/index.html
+%%PYTHON_SITELIBDIR%%/matplotlib/backends/web_backend/jquery-ui-1.12.1/jquery-ui.css
+%%PYTHON_SITELIBDIR%%/matplotlib/backends/web_backend/jquery-ui-1.12.1/jquery-ui.js
+%%PYTHON_SITELIBDIR%%/matplotlib/backends/web_backend/jquery-ui-1.12.1/jquery-ui.min.css
+%%PYTHON_SITELIBDIR%%/matplotlib/backends/web_backend/jquery-ui-1.12.1/jquery-ui.min.js
+%%PYTHON_SITELIBDIR%%/matplotlib/backends/web_backend/jquery-ui-1.12.1/jquery-ui.structure.css
+%%PYTHON_SITELIBDIR%%/matplotlib/backends/web_backend/jquery-ui-1.12.1/jquery-ui.structure.min.css
+%%PYTHON_SITELIBDIR%%/matplotlib/backends/web_backend/jquery-ui-1.12.1/jquery-ui.theme.css
+%%PYTHON_SITELIBDIR%%/matplotlib/backends/web_backend/jquery-ui-1.12.1/jquery-ui.theme.min.css
+%%PYTHON_SITELIBDIR%%/matplotlib/backends/web_backend/jquery-ui-1.12.1/package.json

More information about the svn-ports-head mailing list