Index: sysutils/mtpfs/Makefile
===================================================================
--- sysutils/mtpfs/Makefile
+++ sysutils/mtpfs/Makefile
@@ -3,9 +3,8 @@
 
 PORTNAME=	mtpfs
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.adebenham.com/files/mtp/
 
 MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	MTP device filesystem
@@ -18,8 +17,13 @@
 		libid3tag.so:audio/libid3tag \
 		libmad.so:audio/libmad
 
-USES=		fuse pkgconfig
+USES=		autoreconf fuse pkgconfig gnome
 USE_GNOME=	glib20
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	cjd
+GH_TAGNAME=	fd3864d
+
 GNU_CONFIGURE=	yes
 PLIST_FILES=	bin/mtpfs
 
Index: sysutils/mtpfs/distinfo
===================================================================
--- sysutils/mtpfs/distinfo
+++ sysutils/mtpfs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mtpfs-1.1.tar.gz) = 1baf357de16995a5f0b5bc1b6833517a77456481d861cdba70f1ce1316ce4c1d
-SIZE (mtpfs-1.1.tar.gz) = 108329
+TIMESTAMP = 1548911807
+SHA256 (cjd-mtpfs-1.1-fd3864d_GH0.tar.gz) = 3ccd695b8091e49d7ff696a1acd8ac162212ea9bbe8885136c77c0676958a610
+SIZE (cjd-mtpfs-1.1-fd3864d_GH0.tar.gz) = 81920
Index: sysutils/mtpfs/files/patch-Makefile.am
===================================================================
--- /dev/null
+++ sysutils/mtpfs/files/patch-Makefile.am
@@ -0,0 +1,10 @@
+--- Makefile.am.orig	2016-12-15 23:55:52 UTC
++++ Makefile.am
+@@ -1,6 +1,6 @@
+ bin_PROGRAMS = mtpfs
+ mtpfs_SOURCES = mtpfs.c mtpfs.h
+-mtpfs_CPPFLAGS = -DFUSE_USE_VERSION=22 $(FUSE_CFLAGS) $(GLIB_CFLAGS) $(MTP_CFLAGS)
++mtpfs_CPPFLAGS = -DFUSE_USE_VERSION=26 $(FUSE_CFLAGS) $(GLIB_CFLAGS) $(MTP_CFLAGS)
+ mtpfs_LDADD = $(FUSE_LIBS) $(GLIB_LIBS) $(MTP_LIBS)
+ 
+ if USEMAD
Index: sysutils/mtpfs/files/patch-Makefile.in
===================================================================
--- sysutils/mtpfs/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2012-02-27 01:02:28 UTC
-+++ Makefile.in
-@@ -181,7 +181,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- mtpfs_SOURCES = mtpfs.c mtpfs.h $(am__append_1)
--mtpfs_CPPFLAGS = -DFUSE_USE_VERSION=22 $(FUSE_CFLAGS) $(GLIB_CFLAGS) \
-+mtpfs_CPPFLAGS = -DFUSE_USE_VERSION=26 $(FUSE_CFLAGS) $(GLIB_CFLAGS) \
- 	$(MTP_CFLAGS) $(am__append_2)
- mtpfs_LDADD = $(FUSE_LIBS) $(GLIB_LIBS) $(MTP_LIBS) $(am__append_3)
- all: all-am
Index: sysutils/mtpfs/files/patch-mtpfs.h
===================================================================
--- sysutils/mtpfs/files/patch-mtpfs.h
+++ sysutils/mtpfs/files/patch-mtpfs.h
@@ -1,6 +1,6 @@
---- mtpfs.h.orig	2012-02-24 04:37:14 UTC
+--- mtpfs.h.orig	2016-12-15 23:55:52 UTC
 +++ mtpfs.h
-@@ -18,7 +18,9 @@
+@@ -17,7 +17,9 @@
  #include <fcntl.h>
  #include <dirent.h>
  #include <errno.h>
@@ -11,21 +11,21 @@
  
  #include <libmtp.h>
  #include <glib.h>
-@@ -49,7 +51,7 @@ static int find_storage(const gchar * pa
+@@ -48,7 +50,7 @@ void check_folders ();
+ static int find_storage (const gchar * path);
  
- 
      /* fuse functions */
--static void * mtpfs_init (void);
-+static void * mtpfs_init (struct fuse_conn_info *);
+-static void *mtpfs_init (void);
++static void *mtpfs_init (struct fuse_conn_info *);
  static int mtpfs_blank ();
  static int mtpfs_release (const char *path, struct fuse_file_info *fi);
  void mtpfs_destroy ();
-@@ -62,7 +64,7 @@ static int mtpfs_write (const gchar * pa
+@@ -65,7 +67,7 @@ static int mtpfs_write (const gchar * path, const gcha
  static int mtpfs_unlink (const gchar * path);
  static int mtpfs_mkdir (const char *path, mode_t mode);
  static int mtpfs_rmdir (const char *path);
 -static int mtpfs_statfs (const char *path, struct statfs *stbuf);
 +static int mtpfs_statfs (const char *path, struct statvfs *stbuf);
- int calc_length(int f);
+ int calc_length (int f);
  
  static LIBMTP_mtpdevice_t *device;
Index: sysutils/mtpfs/files/patch-mtpfs.c
===================================================================
--- sysutils/mtpfs/files/patch-mtpfs.c
+++ sysutils/mtpfs/files/patch-mtpfs.c
@@ -1,45 +1,45 @@
---- mtpfs.c.orig	2012-02-27 00:59:39 UTC
+--- mtpfs.c.orig	2016-12-15 23:55:52 UTC
 +++ mtpfs.c
-@@ -1270,7 +1270,7 @@ mtpfs_rename (const char *oldname, const
+@@ -1601,7 +1601,7 @@ mtpfs_rename (const char *oldname, const char *newname
  }
  
  static int
 -mtpfs_statfs (const char *path, struct statfs *stbuf)
 +mtpfs_statfs (const char *path, struct statvfs *stbuf)
  {
-     DBG("mtpfs_statfs");
-     stbuf->f_bsize=1024;
-@@ -1282,7 +1282,7 @@ mtpfs_statfs (const char *path, struct s
+   DBG ("mtpfs_statfs");
+   stbuf->f_bsize = 1024;
+@@ -1613,7 +1613,7 @@ mtpfs_statfs (const char *path, struct statfs *stbuf)
  }
  
  void *
 -mtpfs_init ()
 +mtpfs_init (struct fuse_conn_info *conn)
  {
-     LIBMTP_devicestorage_t *storage;
-     DBG("mtpfs_init");
-@@ -1298,8 +1298,14 @@ mtpfs_blank()
-     // Do nothing
+   LIBMTP_devicestorage_t *storage;
+   DBG ("mtpfs_init");
+@@ -1624,13 +1624,13 @@ mtpfs_init ()
  }
  
-+int
-+mtpfs_blank_chmod(const char *path, mode_t mode)
-+{
-+	return (0);
-+}
-+
+ int
+-mtpfs_blank ()
++mtpfs_blank_chmod (const char *path, mode_t mode)
+ {
+   // Do nothing
+ }
+ 
  static struct fuse_operations mtpfs_oper = {
--    .chmod   = mtpfs_blank,
-+    .chmod   = mtpfs_blank_chmod,
-     .release = mtpfs_release,
-     .readdir = mtpfs_readdir,
-     .getattr = mtpfs_getattr,
-@@ -1428,7 +1434,7 @@ main (int argc, char *argv[])
+-  .chmod = mtpfs_blank,
++  .chmod = mtpfs_blank_chmod,
+   .release = mtpfs_release,
+   .readdir = mtpfs_readdir,
+   .getattr = mtpfs_getattr,
+@@ -1774,7 +1774,7 @@ main (int argc, char *argv[])
  
-     DBG("Start fuse");
+   DBG ("Start fuse");
  
--    fuse_stat=fuse_main (argc, argv, &mtpfs_oper);
-+    fuse_stat=fuse_main (argc, argv, &mtpfs_oper, NULL);
-     DBG("fuse_main returned %d\n", fuse_stat);
-     return fuse_stat;
+-  fuse_stat = fuse_main (argc, argv, &mtpfs_oper);
++  fuse_stat = fuse_main (argc, argv, &mtpfs_oper, NULL);
+   DBG ("fuse_main returned %d\n", fuse_stat);
+   return fuse_stat;
  }