diff options
| author | Kai Knoblich <kai@FreeBSD.org> | 2020-08-03 18:46:41 +0800 |
|---|---|---|
| committer | Kai Knoblich <kai@FreeBSD.org> | 2020-08-03 18:46:41 +0800 |
| commit | 4e25ff4752c932685e9d71508b9adc4b6e61a4f0 (patch) | |
| tree | 7603620d66b6cf96596862398a3cecb72b63c3be /sysutils | |
| parent | f55a7be339320844772da608727e5c129c3dc35e (diff) | |
| download | freebsd-ports-gnome-4e25ff4752c932685e9d71508b9adc4b6e61a4f0.tar.gz freebsd-ports-gnome-4e25ff4752c932685e9d71508b9adc4b6e61a4f0.tar.zst freebsd-ports-gnome-4e25ff4752c932685e9d71508b9adc4b6e61a4f0.zip | |
sysutils/py-ranger: Update to 1.9.3
While I'm here:
* Backport a runtime fix for environments that don't have sysutils/screen
installed but have TERM set to "screen".
* Reduce patching by switching manpages to the preferred share/man location.
* Rebase and document the patch that avoids hardcoded paths to w3mimgdisplay
(which is supplied via www/w3m-img).
Changelog:
https://github.com/ranger/ranger/blob/v1.9.3/CHANGELOG.md
PR: 247938
Submitted by: Greg Fitzgerald <gregf@hugops.pw> (based on)
Approved by: maintainer timeout (3+ weeks)
MFH: No (contains more additions/improvements than bugfixes)
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/py-ranger/Makefile | 9 | ||||
| -rw-r--r-- | sysutils/py-ranger/distinfo | 8 | ||||
| -rw-r--r-- | sysutils/py-ranger/files/patch-ranger_ext_img__display.py | 19 |
3 files changed, 24 insertions, 12 deletions
diff --git a/sysutils/py-ranger/Makefile b/sysutils/py-ranger/Makefile index 73c2affc819f..4d0bab80e7ef 100644 --- a/sysutils/py-ranger/Makefile +++ b/sysutils/py-ranger/Makefile @@ -2,12 +2,16 @@ # $FreeBSD$ PORTNAME= ranger -PORTVERSION= 1.9.2 -PORTREVISION= 1 +PORTVERSION= 1.9.3 CATEGORIES= sysutils python MASTER_SITES= https://ranger.github.io/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +# Backport PR #1852 to fix runtime issues for environments that don't have +# sysutils/screen installed but TERM set to "screen". +PATCH_SITES= https://github.com/ranger/ranger/commit/ +PATCHFILES= 081e73152a9391211770fab56676d7d974413ae6.patch:-p1 + MAINTAINER= linpct@gmail.com COMMENT= File manager with VI key bindings @@ -28,7 +32,6 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|setuptools|distutils.core|; \ - s|share/man/man|man/man|; \ s|share/doc/ranger|${DOCSDIR}|; \ s|ranger.desktop|${PYTHON_PKGNAMEPREFIX}ranger.desktop|' ${WRKSRC}/${PYSETUP} @${REINPLACE_CMD} -Ee 's|Exec=(ranger)|Exec=\1-${PYTHON_VER}|' ${WRKSRC}/doc/${PYTHON_PKGNAMEPREFIX}ranger.desktop diff --git a/sysutils/py-ranger/distinfo b/sysutils/py-ranger/distinfo index 953356f0d629..2f6bd7760611 100644 --- a/sysutils/py-ranger/distinfo +++ b/sysutils/py-ranger/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1543550380 -SHA256 (ranger-1.9.2.tar.gz) = 0e1d1b1d3f78c227a6cfa783822e98591ca76a35c643d4814f40f73515d66b8a -SIZE (ranger-1.9.2.tar.gz) = 265295 +TIMESTAMP = 1594637266 +SHA256 (ranger-1.9.3.tar.gz) = ce088a04c91c25263a9675dc5c43514b7ec1b38c8ea43d9a9d00923ff6cdd251 +SIZE (ranger-1.9.3.tar.gz) = 280363 +SHA256 (081e73152a9391211770fab56676d7d974413ae6.patch) = 177c37def1aa1fe8575c0863b34d31aea050f6006f969c658debaf92487fd343 +SIZE (081e73152a9391211770fab56676d7d974413ae6.patch) = 9192 diff --git a/sysutils/py-ranger/files/patch-ranger_ext_img__display.py b/sysutils/py-ranger/files/patch-ranger_ext_img__display.py index e74e34105f3b..73eaedb1f94f 100644 --- a/sysutils/py-ranger/files/patch-ranger_ext_img__display.py +++ b/sysutils/py-ranger/files/patch-ranger_ext_img__display.py @@ -1,10 +1,17 @@ ---- ranger/ext/img_display.py.orig 2017-02-20 16:56:49.277878000 +0800 -+++ ranger/ext/img_display.py 2017-02-20 17:00:01.700857000 +0800 -@@ -25,6 +25,7 @@ +Avoid hardcoded paths to w3mimgdisplay + +--- ranger/ext/img_display.py.orig 2019-12-31 15:07:45 UTC ++++ ranger/ext/img_display.py +@@ -35,11 +35,7 @@ from ranger.core.shared import FileManagerAware W3MIMGDISPLAY_ENV = "W3MIMGDISPLAY_PATH" W3MIMGDISPLAY_OPTIONS = [] W3MIMGDISPLAY_PATHS = [ +- '/usr/lib/w3m/w3mimgdisplay', +- '/usr/libexec/w3m/w3mimgdisplay', +- '/usr/lib64/w3m/w3mimgdisplay', +- '/usr/libexec64/w3m/w3mimgdisplay', +- '/usr/local/libexec/w3m/w3mimgdisplay', + '%%LOCALBASE%%/libexec/w3m/w3mimgdisplay', - '/usr/lib/w3m/w3mimgdisplay', - '/usr/libexec/w3m/w3mimgdisplay', - '/usr/lib64/w3m/w3mimgdisplay', + ] + + # Helper functions shared between the previewers (make them static methods of the base class?) |