diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2019-04-06 14:46:04 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2019-04-06 14:46:04 +0000 |
| commit | f7db2e9a2c78ce1de14112ce86fb7402a141d7b0 (patch) | |
| tree | 5d10f46d8742b12b4238e65c9916dc43607af63c /math/py-matplotlib | |
| parent | Update py-notebook status (diff) | |
Remove unnecessary jquery-ui-1.12.1.zip from DISTFILES
jquery-ui-1.21.1 is already bundled in the matplot 2.2.4 tarball [1].
This patch fixes r496681.
[1] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236455#c4
PR: 236740
Submitted by: sunpoet (myself)
Approved by: maintainer (timeout, 14 days)
Notes
Notes:
svn path=/head/; revision=498139
Diffstat (limited to 'math/py-matplotlib')
| -rw-r--r-- | math/py-matplotlib/Makefile | 8 | ||||
| -rw-r--r-- | math/py-matplotlib/distinfo | 2 | ||||
| -rw-r--r-- | math/py-matplotlib/files/patch-setup.py | 28 |
3 files changed, 11 insertions, 27 deletions
diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile index 6dfef73f1e62..9d7667ffcc57 100644 --- a/math/py-matplotlib/Makefile +++ b/math/py-matplotlib/Makefile @@ -4,11 +4,8 @@ PORTNAME= matplotlib DISTVERSION= 2.2.4 CATEGORIES= math python -MASTER_SITES= CHEESESHOP:DEFAULT \ - https://jqueryui.com/resources/download/:jquery +MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \ - jquery-ui-1.12.1.zip:jquery MAINTAINER= mainland@apeiron.net COMMENT= Plotting library uses a syntax familiar to MATLAB users @@ -82,7 +79,6 @@ 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' \ @@ -91,6 +87,8 @@ post-patch: ${WRKSRC}/setup.cfg post-install: + ${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/backends/web_backend/jquery-ui-1.12.1 + cd ${WRKSRC}/lib/matplotlib/backends/web_backend/jquery-ui-1.12.1 && ${COPYTREE_SHARE} . ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib/backends/web_backend/jquery-ui-1.12.1 ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/matplotlib -name '*.so' \ | ${XARGS} ${STRIP_CMD} diff --git a/math/py-matplotlib/distinfo b/math/py-matplotlib/distinfo index 2791b84b23fc..8d68c003e904 100644 --- a/math/py-matplotlib/distinfo +++ b/math/py-matplotlib/distinfo @@ -1,5 +1,3 @@ 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 a/math/py-matplotlib/files/patch-setup.py b/math/py-matplotlib/files/patch-setup.py index 01e1a9eaa953..9b533542c000 100644 --- a/math/py-matplotlib/files/patch-setup.py +++ b/math/py-matplotlib/files/patch-setup.py @@ -1,22 +1,10 @@ ---- setup.py.orig 2019-03-22 05:20:14 UTC +--- setup.py.orig 2019-02-26 00:18:32 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) +@@ -189,7 +189,6 @@ class develop_with_jquery(DevelopCommand + + + cmdclass['sdist'] = sdist_with_jquery +-cmdclass['install_lib'] = install_lib_with_jquery + cmdclass['develop'] = develop_with_jquery + |