From owner-svn-ports-all@freebsd.org Mon Aug 3 10:46:42 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A5892376739; Mon, 3 Aug 2020 10:46:42 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BKvhL3s5tz4cfV; Mon, 3 Aug 2020 10:46:42 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 67F861360D; Mon, 3 Aug 2020 10:46:42 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 073AkgQF076321; Mon, 3 Aug 2020 10:46:42 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 073AkfdF076319; Mon, 3 Aug 2020 10:46:41 GMT (envelope-from kai@FreeBSD.org) Message-Id: <202008031046.073AkfdF076319@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Mon, 3 Aug 2020 10:46:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r544046 - in head/sysutils/py-ranger: . files X-SVN-Group: ports-head X-SVN-Commit-Author: kai X-SVN-Commit-Paths: in head/sysutils/py-ranger: . files X-SVN-Commit-Revision: 544046 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Aug 2020 10:46:42 -0000 Author: kai Date: Mon Aug 3 10:46:41 2020 New Revision: 544046 URL: https://svnweb.freebsd.org/changeset/ports/544046 Log: 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 (based on) Approved by: maintainer timeout (3+ weeks) MFH: No (contains more additions/improvements than bugfixes) Modified: head/sysutils/py-ranger/Makefile head/sysutils/py-ranger/distinfo head/sysutils/py-ranger/files/patch-ranger_ext_img__display.py Modified: head/sysutils/py-ranger/Makefile ============================================================================== --- head/sysutils/py-ranger/Makefile Mon Aug 3 10:08:10 2020 (r544045) +++ head/sysutils/py-ranger/Makefile Mon Aug 3 10:46:41 2020 (r544046) @@ -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 Modified: head/sysutils/py-ranger/distinfo ============================================================================== --- head/sysutils/py-ranger/distinfo Mon Aug 3 10:08:10 2020 (r544045) +++ head/sysutils/py-ranger/distinfo Mon Aug 3 10:46:41 2020 (r544046) @@ -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 Modified: head/sysutils/py-ranger/files/patch-ranger_ext_img__display.py ============================================================================== --- head/sysutils/py-ranger/files/patch-ranger_ext_img__display.py Mon Aug 3 10:08:10 2020 (r544045) +++ head/sysutils/py-ranger/files/patch-ranger_ext_img__display.py Mon Aug 3 10:46:41 2020 (r544046) @@ -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?)