Index: head/sysutils/fusefs-simple-mtpfs/Makefile
===================================================================
--- head/sysutils/fusefs-simple-mtpfs/Makefile	(revision 396040)
+++ head/sysutils/fusefs-simple-mtpfs/Makefile	(revision 396041)
@@ -1,51 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	simple-mtpfs
-PORTVERSION=	0.2.s20150108
+DISTVERSION=	0.2-24
+DISTVERSIONSUFFIX=	-ga7ab64c
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	fusefs-
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Simple MTP fuse filesystem driver
 
 LICENSE=	GPLv2 # or any later version
 
 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
 CONFIGURE_ARGS=	--disable-silent-rules
 MAKEFILE=	makefile
 INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz
 PORTDOCS=	AUTHORS NEWS README.md
 
 OPTIONS_DEFINE=	DOCS
 
 .if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc)
 CONFIGURE_ENV+=	LIBUSB1_CFLAGS=" " LIBUSB1_LIBS="-lusb"
 .endif
 
 # XXX move to PREFIX when bug 193596 lands
 .if exists(/etc/autofs)
 PLIST_FILES+=	/etc/autofs/special_${PORTNAME}
 SUB_FILES+=	special_${PORTNAME}
 .endif
 
 post-install:
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 .if exists(/etc/autofs)
 	@${MKDIR} ${STAGEDIR}/etc/autofs
 	${INSTALL_SCRIPT} ${WRKDIR}/special_${PORTNAME} \
 		${STAGEDIR}/etc/autofs
 .endif
 
 .include <bsd.port.mk>
Index: head/sysutils/fusefs-simple-mtpfs/distinfo
===================================================================
--- head/sysutils/fusefs-simple-mtpfs/distinfo	(revision 396040)
+++ head/sysutils/fusefs-simple-mtpfs/distinfo	(revision 396041)
@@ -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
Index: head/sysutils/fusefs-simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp
===================================================================
--- head/sysutils/fusefs-simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp	(revision 396040)
+++ head/sysutils/fusefs-simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp	(revision 396041)
@@ -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;