From owner-svn-ports-all@freebsd.org Thu Jul 2 17:38:09 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 499F235BEF6; Thu, 2 Jul 2020 17:38:09 +0000 (UTC) (envelope-from jhixson@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49yQKs1GMyz46RN; Thu, 2 Jul 2020 17:38:09 +0000 (UTC) (envelope-from jhixson@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0E70C1DFFE; Thu, 2 Jul 2020 17:38:09 +0000 (UTC) (envelope-from jhixson@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 062Hc80m059758; Thu, 2 Jul 2020 17:38:08 GMT (envelope-from jhixson@FreeBSD.org) Received: (from jhixson@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 062Hc7mG059752; Thu, 2 Jul 2020 17:38:07 GMT (envelope-from jhixson@FreeBSD.org) Message-Id: <202007021738.062Hc7mG059752@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhixson set sender to jhixson@FreeBSD.org using -f From: John Hixson Date: Thu, 2 Jul 2020 17:38:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541051 - in head/sysutils/mtpfs: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jhixson X-SVN-Commit-Paths: in head/sysutils/mtpfs: . files X-SVN-Commit-Revision: 541051 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jul 2020 17:38:09 -0000 Author: jhixson Date: Thu Jul 2 17:38:07 2020 New Revision: 541051 URL: https://svnweb.freebsd.org/changeset/ports/541051 Log: sysutils/mtpfs: update to use github PR: 200078 Reported by: jensh604@gmail.com Added: head/sysutils/mtpfs/files/patch-Makefile.am (contents, props changed) Modified: head/sysutils/mtpfs/Makefile head/sysutils/mtpfs/distinfo head/sysutils/mtpfs/files/patch-Makefile.in head/sysutils/mtpfs/files/patch-mtpfs.c head/sysutils/mtpfs/files/patch-mtpfs.h Modified: head/sysutils/mtpfs/Makefile ============================================================================== --- head/sysutils/mtpfs/Makefile Thu Jul 2 17:36:57 2020 (r541050) +++ head/sysutils/mtpfs/Makefile Thu Jul 2 17:38:07 2020 (r541051) @@ -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,7 +17,11 @@ LIB_DEPENDS= libmtp.so:multimedia/libmtp \ libid3tag.so:audio/libid3tag \ libmad.so:audio/libmad -USES= fuse gnome pkgconfig +USES= autoreconf fuse gnome pkgconfig +USE_GITHUB= yes +GH_ACCOUNT= cjd +GH_TAGNAME= fd3864dd6f0e8183fa2598d4cf890401d3a1e09a + USE_GNOME= glib20 GNU_CONFIGURE= yes PLIST_FILES= bin/mtpfs Modified: head/sysutils/mtpfs/distinfo ============================================================================== --- head/sysutils/mtpfs/distinfo Thu Jul 2 17:36:57 2020 (r541050) +++ head/sysutils/mtpfs/distinfo Thu Jul 2 17:38:07 2020 (r541051) @@ -1,2 +1,3 @@ -SHA256 (mtpfs-1.1.tar.gz) = 1baf357de16995a5f0b5bc1b6833517a77456481d861cdba70f1ce1316ce4c1d -SIZE (mtpfs-1.1.tar.gz) = 108329 +TIMESTAMP = 1593705811 +SHA256 (cjd-mtpfs-1.1-fd3864dd6f0e8183fa2598d4cf890401d3a1e09a_GH0.tar.gz) = f004136a82452d13362581277eb2496033aa13a6c3f35d0501327248f3120456 +SIZE (cjd-mtpfs-1.1-fd3864dd6f0e8183fa2598d4cf890401d3a1e09a_GH0.tar.gz) = 82022 Added: head/sysutils/mtpfs/files/patch-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/mtpfs/files/patch-Makefile.am Thu Jul 2 17:38:07 2020 (r541051) @@ -0,0 +1,10 @@ +--- Makefile.am.orig 2020-07-02 17:25:56 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 Modified: head/sysutils/mtpfs/files/patch-Makefile.in ============================================================================== --- head/sysutils/mtpfs/files/patch-Makefile.in Thu Jul 2 17:36:57 2020 (r541050) +++ head/sysutils/mtpfs/files/patch-Makefile.in Thu Jul 2 17:38:07 2020 (r541051) @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2012-02-27 01:02:28 UTC +--- Makefile.in.orig 2016-12-15 23:55:52 UTC +++ Makefile.in -@@ -181,7 +181,7 @@ top_build_prefix = @top_build_prefix@ +@@ -287,7 +287,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ mtpfs_SOURCES = mtpfs.c mtpfs.h $(am__append_1) Modified: head/sysutils/mtpfs/files/patch-mtpfs.c ============================================================================== --- head/sysutils/mtpfs/files/patch-mtpfs.c Thu Jul 2 17:36:57 2020 (r541050) +++ head/sysutils/mtpfs/files/patch-mtpfs.c Thu Jul 2 17:38:07 2020 (r541051) @@ -1,45 +1,11 @@ ---- 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 - } +@@ -1774,7 +1774,7 @@ main (int argc, char *argv[]) - 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 ("Start fuse"); - 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 - } - -+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 @@ 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; +- 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; } Modified: head/sysutils/mtpfs/files/patch-mtpfs.h ============================================================================== --- head/sysutils/mtpfs/files/patch-mtpfs.h Thu Jul 2 17:36:57 2020 (r541050) +++ head/sysutils/mtpfs/files/patch-mtpfs.h Thu Jul 2 17:38:07 2020 (r541051) @@ -1,31 +1,11 @@ ---- 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,7 @@ #include #include #include -#include -+#include +#include -+#include #include #include -@@ -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 @@ 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;