Hi,
Requesting a review and commit.
Thanks,
Kyle
On Sat, Aug 10, 2013, at 0:07, Kyle Merchant wrote:
> Hi ports,
>
> Below is a patch to bring ranger to the latest version. Update includes
> a BSD-friendly setsid implementation, overhauled config files, and
> numerous other fixes and feature additions. Please note config files
> need to be updated or use the --clean switch.
>
> Tested on amd64. OKs and/or comments?
>
> ===================================================================
> RCS file: /cvs/ports/sysutils/ranger/Makefile,v
> retrieving revision 1.3
> diff -u -r1.3 Makefile
> --- Makefile 11 Mar 2013 11:41:32 -0000 1.3
> +++ Makefile 10 Aug 2013 03:55:20 -0000
> @@ -2,8 +2,8 @@
>
> 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
> @@ -18,11 +18,11 @@
> MASTER_SITES = ${HOMEPAGE}
>
> MODULES = lang/python
> -# libarchive (bsdtar) used as an alternative to atool; see scope.sh
> patch
> +# libarchive (bsdtar) used as an alternative to atool
> 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
>
> ===================================================================
> RCS file: /cvs/ports/sysutils/ranger/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 distinfo
> --- distinfo 9 Jul 2012 09:20:58 -0000 1.1.1.1
> +++ distinfo 10 Aug 2013 03:55:20 -0000
> @@ -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
>
> ===================================================================
> RCS file: patches/patch-Makefile
> diff -N patches/patch-Makefile
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-Makefile 10 Aug 2013 03:57:41 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- Makefile.orig Thu Aug 8 21:06:30 2013
> ++++ Makefile Thu Aug 8 21:10:50 2013
> +@@ -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
>
> ===================================================================
> RCS file: patches/patch-ranger_gui_widgets_statusbar_py
> diff -N patches/patch-ranger_gui_widgets_statusbar_py
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-ranger_gui_widgets_statusbar_py 10 Aug 2013
> 03:55:20 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- ranger/gui/widgets/statusbar.py.orig Thu Aug 8 19:59:25 2013
> ++++ ranger/gui/widgets/statusbar.py Thu Aug 8 20:00:57 2013
> +@@ -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
>
> ===================================================================
> RCS file: /cvs/ports/sysutils/ranger/patches/patch-setup_py,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 patch-setup_py
> --- patches/patch-setup_py 9 Jul 2012 09:20:58 -0000 1.1.1.1
> +++ patches/patch-setup_py 10 Aug 2013 03:55:20 -0000
> @@ -1,12 +1,12 @@
> $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',
> +--- setup.py.orig Thu Aug 8 19:57:44 2013
> ++++ setup.py Thu Aug 8 19:58:43 2013
> +@@ -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',
>
> ===================================================================
> RCS file: /cvs/ports/sysutils/ranger/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 PLIST
> --- pkg/PLIST 9 Jul 2012 09:20:58 -0000 1.1.1.1
> +++ pkg/PLIST 10 Aug 2013 03:55:20 -0000
> @@ -1,5 +1,8 @@
> @comment $OpenBSD: PLIST,v 1.1.1.1 2012/07/09 09:20:58 sthen Exp $
> bin/ranger
> +bin/rifle
> +lib/python${MODPY_VERSION}/
> +lib/python${MODPY_VERSION}/site-packages/
> 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 +10,6 @@
> 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 +19,32 @@
> 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 +56,6 @@
> 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 +64,11 @@
> 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
> 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 +84,8 @@
> 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 +98,35 @@
>
> 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 +166,33 @@
> 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/examples/
> +share/doc/ranger/examples/README
> +share/doc/ranger/examples/bash_automatic_cd.sh
> +share/doc/ranger/examples/bash_subshell_notice.sh
> +share/doc/ranger/examples/plugin_chmod_keybindings.py
> +share/doc/ranger/examples/plugin_file_filter.py
> +share/doc/ranger/examples/plugin_hello_world.py
> +share/doc/ranger/examples/plugin_new_macro.py
> +share/doc/ranger/examples/plugin_new_sorting_method.py
> +share/doc/ranger/examples/rifle_different_file_opener.conf
> +share/doc/ranger/examples/rifle_sxiv.sh
> +share/doc/ranger/examples/vim_file_chooser.vim
> +share/doc/ranger/tools/
> +share/doc/ranger/tools/print_colors.py
> +share/doc/ranger/tools/print_keys.py
