svn commit: r396041 - in head/sysutils/fusefs-simple-mtpfs: . files
Jan Beich
jbeich at FreeBSD.org
Thu Sep 3 19:37:48 UTC 2015
Author: jbeich
Date: Thu Sep 3 19:37:46 2015
New Revision: 396041
URL: https://svnweb.freebsd.org/changeset/ports/396041
Log:
sysutils/fusefs-simple-mtpfs: update to 0.2.24 (20150903 snapshot)
Switch to |git describe --tags| versioning scheme. Tag offsets better
show the amount of changes happenning between snapshots.
Changes: https://github.com/phatina/simple-mtpfs/compare/76be403...a7ab64c
Modified:
head/sysutils/fusefs-simple-mtpfs/Makefile (contents, props changed)
head/sysutils/fusefs-simple-mtpfs/distinfo (contents, props changed)
head/sysutils/fusefs-simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp (contents, props changed)
Modified: head/sysutils/fusefs-simple-mtpfs/Makefile
==============================================================================
--- head/sysutils/fusefs-simple-mtpfs/Makefile Thu Sep 3 19:37:21 2015 (r396040)
+++ head/sysutils/fusefs-simple-mtpfs/Makefile Thu Sep 3 19:37:46 2015 (r396041)
@@ -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}/multi
USE_GITHUB= yes
GH_ACCOUNT= phatina
-GH_TAGNAME= 76be403
USES= autoreconf compiler:c++11-lib fuse pkgconfig
GNU_CONFIGURE= yes
Modified: head/sysutils/fusefs-simple-mtpfs/distinfo
==============================================================================
--- head/sysutils/fusefs-simple-mtpfs/distinfo Thu Sep 3 19:37:21 2015 (r396040)
+++ head/sysutils/fusefs-simple-mtpfs/distinfo Thu Sep 3 19:37:46 2015 (r396041)
@@ -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
Modified: head/sysutils/fusefs-simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp
==============================================================================
--- head/sysutils/fusefs-simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp Thu Sep 3 19:37:21 2015 (r396040)
+++ head/sysutils/fusefs-simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp Thu Sep 3 19:37:46 2015 (r396041)
@@ -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;
More information about the svn-ports-all
mailing list