summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2017-10-02 23:21:13 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-10-02 23:21:13 +0200
commit236b3fe39fb2997bdd480ccd5e2ddff43b882be0 (patch)
treef2769b7ac2476bb2903ed1a8da485ee185704ccb
parent22597783aec209bfb9bc05e678920ca7429f87b1 (diff)
downloadarbor-236b3fe39fb2997bdd480ccd5e2ddff43b882be0.tar.gz
arbor-236b3fe39fb2997bdd480ccd5e2ddff43b882be0.tar.xz
sshfs-fuse: add upstream patch fixing the man page install location
-rw-r--r--packages/sys-fs/sshfs-fuse/files/a73dda48bd9b9bdc925b180fd7dab4c9689da09f.patch40
-rw-r--r--packages/sys-fs/sshfs-fuse/sshfs-fuse-3.3.0-r1.exheres-0 (renamed from packages/sys-fs/sshfs-fuse/sshfs-fuse-3.3.0.exheres-0)4
2 files changed, 44 insertions, 0 deletions
diff --git a/packages/sys-fs/sshfs-fuse/files/a73dda48bd9b9bdc925b180fd7dab4c9689da09f.patch b/packages/sys-fs/sshfs-fuse/files/a73dda48bd9b9bdc925b180fd7dab4c9689da09f.patch
new file mode 100644
index 0000000..afa40f3
--- /dev/null
+++ b/packages/sys-fs/sshfs-fuse/files/a73dda48bd9b9bdc925b180fd7dab4c9689da09f.patch
@@ -0,0 +1,40 @@
+Source/Upstream: https://github.com/libfuse/sshfs/commit/a73dda48bd9b9bdc925b180fd7dab4c9689da09f
+Reason: Install man page to the correct directory
+
+From a73dda48bd9b9bdc925b180fd7dab4c9689da09f Mon Sep 17 00:00:00 2001
+From: Nikolaus Rath <Nikolaus@rath.org>
+Date: Fri, 22 Sep 2017 10:35:52 +0100
+Subject: [PATCH] Install manpage in man1/, not 1/
+
+Fixes: #95.
+---
+ ChangeLog.rst | 5 +++++
+ meson.build | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/ChangeLog.rst b/ChangeLog.rst
+index f2e6bc3..76a0bb1 100644
+--- a/ChangeLog.rst
++++ b/ChangeLog.rst
+@@ -1,3 +1,8 @@
++Unreleased Changes
++------------------
++
++* Manpage is now installed in correct directory.
++
+ SSHFS 3.3.0 (2017-09-20)
+ ------------------------
+
+diff --git a/meson.build b/meson.build
+index 12e4d06..20d588c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -58,7 +58,7 @@ executable('sshfs', sshfs_sources,
+ if rst2man.found()
+ custom_target('manpages', input: [ 'sshfs.rst' ], output: [ 'sshfs.1' ],
+ command: [rst2man, '@INPUT@', '@OUTPUT@'], install: true,
+- install_dir: join_paths(get_option('mandir'), '1'))
++ install_dir: join_paths(get_option('mandir'), 'man1'))
+ else
+ message('rst2man not found, not building manual page.')
+ endif
diff --git a/packages/sys-fs/sshfs-fuse/sshfs-fuse-3.3.0.exheres-0 b/packages/sys-fs/sshfs-fuse/sshfs-fuse-3.3.0-r1.exheres-0
index 3feb5d6..c7a49e4 100644
--- a/packages/sys-fs/sshfs-fuse/sshfs-fuse-3.3.0.exheres-0
+++ b/packages/sys-fs/sshfs-fuse/sshfs-fuse-3.3.0-r1.exheres-0
@@ -30,6 +30,10 @@ DEPENDENCIES="
dev-python/pytest[python_abis:*(-)?]
"
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/a73dda48bd9b9bdc925b180fd7dab4c9689da09f.patch
+)
+
MESON_SRC_CONFIGURE_PARAMS=( --sbindir=/usr/$(exhost --target)/bin )
src_prepare() {