diff options
| -rw-r--r-- | sysutils/fusefs-simple-mtpfs/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/fusefs-simple-mtpfs/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/fusefs-simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp | 32 |
3 files changed, 23 insertions, 17 deletions
diff --git a/sysutils/fusefs-simple-mtpfs/Makefile b/sysutils/fusefs-simple-mtpfs/Makefile index f488fc4b2163..6b8e7c50b445 100644 --- a/sysutils/fusefs-simple-mtpfs/Makefile +++ b/sysutils/fusefs-simple-mtpfs/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= simple-mtpfs -PORTVERSION= 0.2.s20150108 +DISTVERSION= 0.2-24 +DISTVERSIONSUFFIX= -ga7ab64c CATEGORIES= sysutils PKGNAMEPREFIX= fusefs- @@ -14,7 +15,6 @@ LIB_DEPENDS= libmtp.so:${PORTSDIR}/multimedia/libmtp USE_GITHUB= yes GH_ACCOUNT= phatina -GH_TAGNAME= 76be403 USES= autoreconf compiler:c++11-lib fuse pkgconfig GNU_CONFIGURE= yes diff --git a/sysutils/fusefs-simple-mtpfs/distinfo b/sysutils/fusefs-simple-mtpfs/distinfo index fcd3e3d4a889..8f4a71704b30 100644 --- a/sysutils/fusefs-simple-mtpfs/distinfo +++ b/sysutils/fusefs-simple-mtpfs/distinfo @@ -1,2 +1,2 @@ -SHA256 (phatina-simple-mtpfs-0.2.s20150108-76be403_GH0.tar.gz) = 5ece6c4ae6dd645ee5ca18df33d4e437087eb8e190f7fc67dfcaa670f3779e20 -SIZE (phatina-simple-mtpfs-0.2.s20150108-76be403_GH0.tar.gz) = 35974 +SHA256 (phatina-simple-mtpfs-0.2-24-ga7ab64c_GH0.tar.gz) = 14b6919eb7c0b190ca5b3273c01f45ac964ddd2b2f9f4cbfcaefecefb48ec915 +SIZE (phatina-simple-mtpfs-0.2-24-ga7ab64c_GH0.tar.gz) = 36665 diff --git a/sysutils/fusefs-simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp b/sysutils/fusefs-simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp index 8d2a846a7f90..d1dbca44fbe2 100644 --- a/sysutils/fusefs-simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp +++ b/sysutils/fusefs-simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp @@ -1,26 +1,32 @@ ---- src/simple-mtpfs-fuse.cpp~ +# Allow fake device file to use with fstab(5) + +--- src/simple-mtpfs-fuse.cpp.orig 2015-08-24 11:34:39 UTC +++ src/simple-mtpfs-fuse.cpp -@@ -314,7 +314,7 @@ bool SMTPFileSystem::parseOptions(int ar +@@ -309,12 +309,6 @@ bool SMTPFileSystem::parseOptions(int ar --m_options.m_device_no; --#ifdef HAVE_LIBUSB1 -+#if 0 //def HAVE_LIBUSB1 - // device file and -- device are mutually exclusive, fail if both set - if (m_options.m_device_no && m_options.m_device_file) { - m_options.m_good = false; -@@ -383,11 +383,9 @@ bool SMTPFileSystem::exec() +- // device file and -- device are mutually exclusive, fail if both set +- if (m_options.m_device_no && m_options.m_device_file) { +- m_options.m_good = false; +- return false; +- } +- + m_options.m_good = true; + return true; + } +@@ -379,11 +373,9 @@ bool SMTPFileSystem::exec() + return false; } - #ifdef HAVE_LIBUSB1 - if (m_options.m_device_file) { - // Try to use device file first, if provided - if (!m_device.connect(m_options.m_device_file)) - return false; -- } else +- } else { + // Try to use device file first, ignore otherwise + if (!m_options.m_device_file || -+ !m_device.connect(m_options.m_device_file)) - #endif // HAVE_LIBUSB1 - { ++ !m_device.connect(m_options.m_device_file)) { // Connect to MTP device by order number, if no device file supplied + if (!m_device.connect(m_options.m_device_no)) + return false; |