diff --git math/py-matplotlib/Makefile math/py-matplotlib/Makefile index 5adb1ee9d1cd..419e88a701c4 100644 --- math/py-matplotlib/Makefile +++ math/py-matplotlib/Makefile @@ -2,9 +2,12 @@ # $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 +DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \ + jquery-ui-1.12.1.zip:jquery PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= mainland@apeiron.net @@ -18,11 +21,12 @@ 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 @@ -77,6 +81,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' \ diff --git math/py-matplotlib/distinfo math/py-matplotlib/distinfo index 791da95bb981..2791b84b23fc 100644 --- math/py-matplotlib/distinfo +++ math/py-matplotlib/distinfo @@ -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 diff --git math/py-matplotlib/files/patch-setup.py math/py-matplotlib/files/patch-setup.py new file mode 100644 index 000000000000..01e1a9eaa953 --- /dev/null +++ math/py-matplotlib/files/patch-setup.py @@ -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) +