cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to ranger 1.6.1, mostly from Kyle Merchant, drop maintainer

Browse Source
This commit is contained in:
sthen 2014-07-12 01:25:55 +00:00
parent 7828d997b8
commit b62b9e9a92
7 changed files with 135 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sysutils/ranger/Makefile
View File

@ -1,17 +1,14 @@
# $OpenBSD: Makefile,v 1.3 2013/03/11 11:41:32 espie Exp $
# $OpenBSD: Makefile,v 1.4 2014/07/12 01:25:55 sthen Exp $
COMMENT = minimalistic console file manager
MODPY_EGG_VERSION = 1.5.4
REVISION = 0
MODPY_EGG_VERSION = 1.6.1
DISTNAME = ranger-${MODPY_EGG_VERSION}
CATEGORIES = sysutils misc
HOMEPAGE = http://www.nongnu.org/ranger/
MAINTAINER = Stuart Henderson <sthen@openbsd.org>
# GPLv3+
PERMIT_PACKAGE_CDROM = Yes
@ -22,7 +19,8 @@ MODULES = lang/python
RUN_DEPENDS = archivers/libarchive \
textproc/py-chardet
TEST_DEPENDS=devel/gmake
TEST_DEPENDS = devel/gmake \
sysutils/ggrep
do-test:
cd ${WRKSRC}; PYTHON=${MODPY_BIN} gmake test

7
sysutils/ranger/distinfo
View File

@ -1,5 +1,2 @@
MD5 (ranger-1.5.4.tar.gz) = H7xim3osfj5Glfshju1yQA==
RMD160 (ranger-1.5.4.tar.gz) = FWDGbRCGrqUphpGIUi8i48W1PGU=
SHA1 (ranger-1.5.4.tar.gz) = bPQlluGORe3PqpDoyWAZNPyu4Ec=
SHA256 (ranger-1.5.4.tar.gz) = 5Yoj7Ywq4HWmaERsPhYka2nS83k074i8Rz5aVS+w2Y0=
SIZE (ranger-1.5.4.tar.gz) = 126735
SHA256 (ranger-1.6.1.tar.gz) = zLIwpdLXHKEWErWvHKUV+dSQtRsVRmeIKOMGJSZ3214=
SIZE (ranger-1.6.1.tar.gz) = 168967

12
sysutils/ranger/patches/patch-Makefile Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Makefile,v 1.1 2014/07/12 01:25:55 sthen Exp $
--- Makefile.orig Sat Jul 12 02:18:06 2014
+++ Makefile Sat Jul 12 02:19:31 2014
@@ -60,7 +60,7 @@ doc: cleandoc
find . -name \*.html -exec sed -i 's|'$(CWD)'|../..|g' -- {} \;
test:
- @for FILE in $(shell grep -IHm 1 doctest -r ranger | cut -d: -f1); do \
+ @for FILE in $(shell ggrep -IHm 1 doctest -r ranger | cut -d: -f1); do \
echo "Testing $$FILE..."; \
RANGER_DOCTEST=1 PYTHONPATH=".:"$$PYTHONPATH ${PYTHON} $$FILE; \
done

28
sysutils/ranger/patches/patch-ranger_data_scope_sh
View File

@ -1,24 +1,22 @@
$OpenBSD: patch-ranger_data_scope_sh,v 1.1.1.1 2012/07/09 09:20:58 sthen Exp $
$OpenBSD: patch-ranger_data_scope_sh,v 1.2 2014/07/12 01:25:55 sthen Exp $
Meant to use atool (not ported yet), but bsdtar copes with many of these
archives directly so use that instead.
--- ranger/data/scope.sh.orig Thu May 3 18:47:39 2012
+++ ranger/data/scope.sh Mon Jul 9 00:06:14 2012
--- ranger/data/scope.sh.orig Fri May 24 19:45:13 2013
+++ ranger/data/scope.sh Sat Jul 12 02:22:43 2014
@@ -1,4 +1,4 @@
-#!/bin/bash
-#!/usr/bin/env sh
+#!/bin/ksh
# ranger supports enhanced previews. If the option "use_preview_script"
# is set to True and this file exists, this script will be called and its
# output is displayed in ranger. ANSI color codes are supported.
@@ -38,8 +38,8 @@ case "$extension" in
# Archive extensions:
7z|a|ace|alz|arc|arj|bz|bz2|cab|cpio|deb|gz|jar|lha|lz|lzh|lzma|lzo|\
rar|rpm|rz|t7z|tar|tbz|tbz2|tgz|tlz|txz|tZ|tzo|war|xpi|xz|Z|zip)
- als "$path" | head -n $maxln
- success && exit 0 || acat "$path" | head -n $maxln && exit 3
+ bsdtar tf "$path" | head -n $maxln
+ success && exit 0 || gzcat "$path" | head -n $maxln && exit 3
exit 1;;
# PDF documents:
pdf)
@@ -46,7 +46,7 @@ case "$extension" in
# Archive extensions:
7z|a|ace|alz|arc|arj|bz|bz2|cab|cpio|deb|gz|jar|lha|lz|lzh|lzma|lzo|\
rpm|rz|t7z|tar|tbz|tbz2|tgz|tlz|txz|tZ|tzo|war|xpi|xz|Z|zip)
- try als "$path" && { dump | trim; exit 0; }
+ try bsdtar "$path" && { dump | trim; exit 0; }
try acat "$path" && { dump | trim; exit 3; }
try bsdtar -lf "$path" && { dump | trim; exit 0; }
exit 1;;

12
sysutils/ranger/patches/patch-ranger_gui_widgets_statusbar_py Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ranger_gui_widgets_statusbar_py,v 1.1 2014/07/12 01:25:55 sthen Exp $
--- ranger/gui/widgets/statusbar.py.orig Sat Jul 12 02:19:51 2014
+++ ranger/gui/widgets/statusbar.py Sat Jul 12 02:20:04 2014
@@ -305,7 +305,7 @@ class StatusBar(Widget):
def get_free_space(path):
stat = os.statvfs(path)
- return stat.f_bavail * stat.f_bsize
+ return stat.f_bavail * stat.f_frsize
class Message(object):
elapse = None

33
sysutils/ranger/patches/patch-setup_py
View File

@ -1,12 +1,21 @@
$OpenBSD: patch-setup_py,v 1.1.1.1 2012/07/09 09:20:58 sthen Exp $
--- setup.py.orig Mon Nov 7 13:24:07 2011
+++ setup.py Mon Nov 7 13:24:17 2011
@@ -28,7 +28,7 @@ if __name__ == '__main__':
license=ranger.__license__,
url='http://savannah.nongnu.org/projects/ranger',
scripts=['ranger/data/ranger'],
- data_files=[('share/man/man1', ['doc/ranger.1'])],
+ data_files=[('man/man1', ['doc/ranger.1'])],
package_data={'ranger': ['data/*', 'defaults/rc.conf']},
packages=('ranger',
'ranger.api',
$OpenBSD: patch-setup_py,v 1.2 2014/07/12 01:25:55 sthen Exp $
--- setup.py.orig Fri May 24 19:45:13 2013
+++ setup.py Sat Jul 12 02:20:49 2014
@@ -22,7 +22,7 @@ if __name__ == '__main__':
url='http://ranger.nongnu.org',
scripts=['scripts/ranger', 'scripts/rifle'],
data_files=[
- ('share/man/man1',
+ ('man/man1',
['doc/ranger.1',
'doc/rifle.1']),
('share/doc/ranger',
@@ -34,7 +34,7 @@ if __name__ == '__main__':
_findall('doc/config/colorschemes')),
('share/doc/ranger/config', _findall('doc/config')),
('share/doc/ranger/tools', _findall('doc/tools')),
- ('share/doc/ranger/examples', _findall('doc/examples')),
+ ('share/examples/ranger', _findall('doc/examples')),
],
package_data={'ranger': ['data/*', 'config/rc.conf',
'config/rifle.conf']},

100
sysutils/ranger/pkg/PLIST
View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/07/09 09:20:58 sthen Exp $
@comment $OpenBSD: PLIST,v 1.2 2014/07/12 01:25:55 sthen Exp $
bin/ranger
bin/rifle
lib/python${MODPY_VERSION}/site-packages/ranger/
lib/python${MODPY_VERSION}/site-packages/ranger-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/ranger/__init__.py
@ -7,8 +8,6 @@ lib/python${MODPY_VERSION}/site-packages/ranger/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/api/
lib/python${MODPY_VERSION}/site-packages/ranger/api/__init__.py
lib/python${MODPY_VERSION}/site-packages/ranger/api/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/api/apps.py
lib/python${MODPY_VERSION}/site-packages/ranger/api/apps.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/api/commands.py
lib/python${MODPY_VERSION}/site-packages/ranger/api/commands.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/api/options.py
@ -18,21 +17,32 @@ lib/python${MODPY_VERSION}/site-packages/ranger/colorschemes/__init__.py
lib/python${MODPY_VERSION}/site-packages/ranger/colorschemes/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/colorschemes/default.py
lib/python${MODPY_VERSION}/site-packages/ranger/colorschemes/default.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/colorschemes/default88.py
lib/python${MODPY_VERSION}/site-packages/ranger/colorschemes/default88.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/colorschemes/jungle.py
lib/python${MODPY_VERSION}/site-packages/ranger/colorschemes/jungle.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/colorschemes/snow.py
lib/python${MODPY_VERSION}/site-packages/ranger/colorschemes/snow.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/config/
lib/python${MODPY_VERSION}/site-packages/ranger/config/__init__.py
lib/python${MODPY_VERSION}/site-packages/ranger/config/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/config/commands.py
lib/python${MODPY_VERSION}/site-packages/ranger/config/commands.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/config/rc.conf
lib/python${MODPY_VERSION}/site-packages/ranger/config/rifle.conf
lib/python${MODPY_VERSION}/site-packages/ranger/container/
lib/python${MODPY_VERSION}/site-packages/ranger/container/__init__.py
lib/python${MODPY_VERSION}/site-packages/ranger/container/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/container/bookmarks.py
lib/python${MODPY_VERSION}/site-packages/ranger/container/bookmarks.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/container/directory.py
lib/python${MODPY_VERSION}/site-packages/ranger/container/directory.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/container/file.py
lib/python${MODPY_VERSION}/site-packages/ranger/container/file.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/container/fsobject.py
lib/python${MODPY_VERSION}/site-packages/ranger/container/fsobject.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/container/history.py
lib/python${MODPY_VERSION}/site-packages/ranger/container/history.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/container/settingobject.py
lib/python${MODPY_VERSION}/site-packages/ranger/container/settingobject.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/container/settings.py
lib/python${MODPY_VERSION}/site-packages/ranger/container/settings.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/container/tags.py
lib/python${MODPY_VERSION}/site-packages/ranger/container/tags.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/core/
@ -44,8 +54,6 @@ lib/python${MODPY_VERSION}/site-packages/ranger/core/environment.py
lib/python${MODPY_VERSION}/site-packages/ranger/core/environment.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/core/fm.py
lib/python${MODPY_VERSION}/site-packages/ranger/core/fm.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/core/helper.py
lib/python${MODPY_VERSION}/site-packages/ranger/core/helper.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/core/loader.py
lib/python${MODPY_VERSION}/site-packages/ranger/core/loader.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/core/main.py
@ -54,20 +62,12 @@ lib/python${MODPY_VERSION}/site-packages/ranger/core/runner.py
lib/python${MODPY_VERSION}/site-packages/ranger/core/runner.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/core/shared.py
lib/python${MODPY_VERSION}/site-packages/ranger/core/shared.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/core/tab.py
lib/python${MODPY_VERSION}/site-packages/ranger/core/tab.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/data/
lib/python${MODPY_VERSION}/site-packages/ranger/data/mime.types
lib/python${MODPY_VERSION}/site-packages/ranger/data/ranger
lib/python${MODPY_VERSION}/site-packages/ranger/data/scope.sh
lib/python${MODPY_VERSION}/site-packages/ranger/defaults/
lib/python${MODPY_VERSION}/site-packages/ranger/defaults/__init__.py
lib/python${MODPY_VERSION}/site-packages/ranger/defaults/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/defaults/apps.py
lib/python${MODPY_VERSION}/site-packages/ranger/defaults/apps.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/defaults/commands.py
lib/python${MODPY_VERSION}/site-packages/ranger/defaults/commands.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/defaults/options.py
lib/python${MODPY_VERSION}/site-packages/ranger/defaults/options.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/defaults/rc.conf
@comment lib/python${MODPY_VERSION}/site-packages/ranger/data/scope.sh.orig
lib/python${MODPY_VERSION}/site-packages/ranger/ext/
lib/python${MODPY_VERSION}/site-packages/ranger/ext/__init__.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/__init__.pyc
@ -83,6 +83,8 @@ lib/python${MODPY_VERSION}/site-packages/ranger/ext/get_executables.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/get_executables.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/human_readable.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/human_readable.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/img_display.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/img_display.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/iter_tools.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/iter_tools.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/keybinding_parser.py
@ -95,25 +97,35 @@ lib/python${MODPY_VERSION}/site-packages/ranger/ext/next_available_filename.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/next_available_filename.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/openstruct.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/openstruct.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/popen_forked.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/popen_forked.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/relative_symlink.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/relative_symlink.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/rifle.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/rifle.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/shell_escape.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/shell_escape.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/shutil_generatorized.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/shutil_generatorized.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/signals.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/signals.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/spawn.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/spawn.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/vcs/
lib/python${MODPY_VERSION}/site-packages/ranger/ext/vcs/__init__.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/vcs/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/vcs/bzr.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/vcs/bzr.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/vcs/git.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/vcs/git.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/vcs/hg.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/vcs/hg.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/vcs/vcs.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/vcs/vcs.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/ext/widestring.py
lib/python${MODPY_VERSION}/site-packages/ranger/ext/widestring.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/fsobject/
lib/python${MODPY_VERSION}/site-packages/ranger/fsobject/__init__.py
lib/python${MODPY_VERSION}/site-packages/ranger/fsobject/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/fsobject/directory.py
lib/python${MODPY_VERSION}/site-packages/ranger/fsobject/directory.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/fsobject/file.py
lib/python${MODPY_VERSION}/site-packages/ranger/fsobject/file.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/fsobject/fsobject.py
lib/python${MODPY_VERSION}/site-packages/ranger/fsobject/fsobject.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/fsobject.py
lib/python${MODPY_VERSION}/site-packages/ranger/fsobject.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/gui/
lib/python${MODPY_VERSION}/site-packages/ranger/gui/__init__.py
lib/python${MODPY_VERSION}/site-packages/ranger/gui/__init__.pyc
@ -153,3 +165,33 @@ lib/python${MODPY_VERSION}/site-packages/ranger/gui/widgets/taskview.pyc
lib/python${MODPY_VERSION}/site-packages/ranger/gui/widgets/titlebar.py
lib/python${MODPY_VERSION}/site-packages/ranger/gui/widgets/titlebar.pyc
@man man/man1/ranger.1
@man man/man1/rifle.1
share/doc/ranger/
share/doc/ranger/CHANGELOG
share/doc/ranger/HACKING
share/doc/ranger/README
share/doc/ranger/colorschemes.txt
share/doc/ranger/config/
share/doc/ranger/config/colorschemes/
share/doc/ranger/config/colorschemes/default.py
share/doc/ranger/config/colorschemes/jungle.py
share/doc/ranger/config/colorschemes/snow.py
share/doc/ranger/config/commands.py
share/doc/ranger/config/rc.conf
share/doc/ranger/config/rifle.conf
share/doc/ranger/config/scope.sh
share/doc/ranger/tools/
share/doc/ranger/tools/print_colors.py
share/doc/ranger/tools/print_keys.py
share/examples/ranger/
share/examples/ranger/README
share/examples/ranger/bash_automatic_cd.sh
share/examples/ranger/bash_subshell_notice.sh
share/examples/ranger/plugin_chmod_keybindings.py
share/examples/ranger/plugin_file_filter.py
share/examples/ranger/plugin_hello_world.py
share/examples/ranger/plugin_new_macro.py
share/examples/ranger/plugin_new_sorting_method.py
share/examples/ranger/rifle_different_file_opener.conf
share/examples/ranger/rifle_sxiv.sh
share/examples/ranger/vim_file_chooser.vim