Index: head/sysutils/mtpfs/Makefile =================================================================== --- head/sysutils/mtpfs/Makefile (revision 476168) +++ head/sysutils/mtpfs/Makefile (revision 476169) @@ -1,23 +1,26 @@ # Created by: John Hixson # $FreeBSD$ PORTNAME= mtpfs PORTVERSION= 1.1 PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://www.adebenham.com/files/mtp/ MAINTAINER= jhixson@gmail.com COMMENT= MTP device filesystem +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libmtp.so:multimedia/libmtp \ libid3.so:audio/id3lib \ libid3tag.so:audio/libid3tag \ libmad.so:audio/libmad USES= fuse pkgconfig USE_GNOME= glib20 GNU_CONFIGURE= yes PLIST_FILES= bin/mtpfs .include Index: head/sysutils/mtpfs/files/patch-Makefile.in =================================================================== --- head/sysutils/mtpfs/files/patch-Makefile.in (revision 476168) +++ head/sysutils/mtpfs/files/patch-Makefile.in (revision 476169) @@ -1,11 +1,11 @@ ---- Makefile.in 2012-02-26 17:02:28.000000000 -0800 -+++ Makefile.in 2012-12-12 19:11:25.155523995 -0800 -@@ -181,7 +181,7 @@ +--- 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: head/sysutils/mtpfs/files/patch-mtpfs.c =================================================================== --- head/sysutils/mtpfs/files/patch-mtpfs.c (revision 476168) +++ head/sysutils/mtpfs/files/patch-mtpfs.c (revision 476169) @@ -1,45 +1,45 @@ ---- mtpfs.c 2012-02-26 16:59:39.000000000 -0800 -+++ mtpfs.c 2012-12-12 19:11:46.955525173 -0800 -@@ -1270,7 +1270,7 @@ +--- mtpfs.c.orig 2012-02-27 00:59:39 UTC ++++ mtpfs.c +@@ -1270,7 +1270,7 @@ mtpfs_rename (const char *oldname, const } 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 @@ +@@ -1282,7 +1282,7 @@ mtpfs_statfs (const char *path, struct s } void * -mtpfs_init () +mtpfs_init (struct fuse_conn_info *conn) { LIBMTP_devicestorage_t *storage; DBG("mtpfs_init"); -@@ -1298,8 +1298,14 @@ +@@ -1298,8 +1298,14 @@ mtpfs_blank() // Do nothing } +int +mtpfs_blank_chmod(const char *path, mode_t mode) +{ + return (0); +} + 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 @@ +@@ -1428,7 +1434,7 @@ main (int argc, char *argv[]) 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; } Index: head/sysutils/mtpfs/files/patch-mtpfs.h =================================================================== --- head/sysutils/mtpfs/files/patch-mtpfs.h (revision 476168) +++ head/sysutils/mtpfs/files/patch-mtpfs.h (revision 476169) @@ -1,31 +1,31 @@ ---- mtpfs.h 2012-02-23 20:37:14.000000000 -0800 -+++ mtpfs.h 2012-12-12 19:10:01.055523958 -0800 +--- mtpfs.h.orig 2012-02-24 04:37:14 UTC ++++ mtpfs.h @@ -18,7 +18,9 @@ #include #include #include -#include +#include +#include +#include #include #include -@@ -49,7 +51,7 @@ +@@ -49,7 +51,7 @@ static int find_storage(const gchar * pa /* fuse functions */ -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 @@ +@@ -62,7 +64,7 @@ static int mtpfs_write (const gchar * pa 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); static LIBMTP_mtpdevice_t *device; Index: head/sysutils/mtpfs/pkg-descr =================================================================== --- head/sysutils/mtpfs/pkg-descr (revision 476168) +++ head/sysutils/mtpfs/pkg-descr (revision 476169) @@ -1,4 +1,4 @@ MTPFS is a FUSE filesystem that supports reading and writing from any MTP device (as supported by libmtp) -WWW: http://www.adebenham.com/mtpfs/ +WWW: https://www.adebenham.com/mtpfs/