oasis

commit: 4e554f04953e88ec03f645001c5153461d760bc0
parent 5a1e8ee09062969521dee5609d144ecf727805e1
Author: Michael Forney <mforney@mforney.org>
Date:   Mon, 18 Mar 2019 13:41:47 -0700

Rename libfuse to fuse

Although the upstream repository is called libfuse, the distributed
source archives are called fuse, and this is how most other
distributions name the package.

Diffstat:
M
.gitmodules
8
++++----
R
pkg/libfuse/config.h -> pkg/fuse/config.h
0

R
pkg/libfuse/gen.lua -> pkg/fuse/gen.lua
0

R
pkg/libfuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch -> pkg/fuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch
0

A
pkg/fuse/src
1
+
R
pkg/libfuse/ver -> pkg/fuse/ver
0

M
pkg/gen.lua
2
+-
D
pkg/libfuse/src
1
-
M
pkg/sshfs/gen.lua
6
+++---

9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -67,6 +67,10 @@
 [submodule "pkg/fribidi/src"]
 	path = pkg/fribidi/src
 	url = https://github.com/fribidi/fribidi
+[submodule "pkg/fuse/src"]
+	path = pkg/fuse/src
+	url = https://github.com/libfuse/libfuse
+	ignore = all
 [submodule "pkg/git/src"]
 	path = pkg/git/src
 	url = https://github.com/git/git
@@ -100,10 +104,6 @@
 [submodule "pkg/libffi/src"]
 	path = pkg/libffi/src
 	url = https://github.com/libffi/libffi
-[submodule "pkg/libfuse/src"]
-	path = pkg/libfuse/src
-	url = https://github.com/libfuse/libfuse
-	ignore = all
 [submodule "pkg/libinput/src"]
 	path = pkg/libinput/src
 	url = https://github.com/michaelforney/libinput
diff --git a/pkg/libfuse/config.h b/pkg/fuse/config.h
diff --git a/pkg/libfuse/gen.lua b/pkg/fuse/gen.lua
diff --git a/pkg/libfuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch b/pkg/fuse/patch/0001-Fix-build-with-IGNORE_MTAB.patch
diff --git a/pkg/fuse/src b/pkg/fuse/src
@@ -0,0 +1 @@
+Subproject commit 3e2fcf3a630e575bc420df254525834504dc01b7
diff --git a/pkg/libfuse/ver b/pkg/fuse/ver
diff --git a/pkg/gen.lua b/pkg/gen.lua
@@ -23,6 +23,7 @@ subgen 'flex'
 subgen 'fontconfig'
 subgen 'freetype'
 subgen 'fribidi'
+subgen 'fuse'
 subgen 'git'
 subgen 'hostap'
 subgen 'ii'
@@ -35,7 +36,6 @@ subgen 'libdrm'
 subgen 'libevdev'
 subgen 'libevent'
 subgen 'libffi'
-subgen 'libfuse'
 subgen 'libinput'
 subgen 'libjpeg-turbo'
 subgen 'libnl'
diff --git a/pkg/libfuse/src b/pkg/libfuse/src
@@ -1 +0,0 @@
-Subproject commit 3e2fcf3a630e575bc420df254525834504dc01b7
diff --git a/pkg/sshfs/gen.lua b/pkg/sshfs/gen.lua
@@ -1,12 +1,12 @@
 cflags{
 	'-D FUSE_USE_VERSION=31',
 	'-I $dir',
-	'-I pkg/libfuse/src/include',
+	'-I pkg/fuse/src/include',
 }
 
 exe('sshfs', {
-	'sshfs.c', 'nocache.c', '$builddir/pkg/libfuse/libfuse.a',
-}, {'pkg/libfuse/fetch'})
+	'sshfs.c', 'nocache.c', '$builddir/pkg/fuse/libfuse.a',
+}, {'pkg/fuse/fetch'})
 file('bin/sshfs', '755', '$outdir/sshfs')
 man{'$dir/sshfs.1'}