Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libmtp/PLIST,v
retrieving revision 1.3
diff -p -u -r1.3 PLIST
--- PLIST	1 Jan 2018 22:29:24 -0000	1.3
+++ PLIST	29 Jun 2021 22:01:20 -0000
@@ -10,6 +10,7 @@ bin/mtp-filetree
 bin/mtp-folders
 bin/mtp-format
 bin/mtp-getfile
+bin/mtp-getfiles
 bin/mtp-getplaylist
 bin/mtp-newfolder
 bin/mtp-newplaylist
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libmtp/distinfo,v
retrieving revision 1.15
diff -p -u -r1.15 distinfo
--- distinfo	29 Oct 2020 12:55:19 -0000	1.15
+++ distinfo	29 Jun 2021 22:01:20 -0000
@@ -5,6 +5,11 @@ RMD160 (libmtp-1.1.18.tar.gz) = 72e35ac8
 SHA512 (libmtp-1.1.18.tar.gz) = 1a8d503effd83217c339a1aea3a16954d718059edf3110cb2f21cff74cdd1243e7f4880d4e12f8fbdc9a5deed366c4151babe6ecd6f4cf4b7330a27e27bf7cc8
 Size (libmtp-1.1.18.tar.gz) = 832463 bytes
 SHA1 (patch-configure) = f57b708684696e496b1d61783e48fe4b63618d65
+SHA1 (patch-examples_Makefile.am) = c981d084430f7440ce49b47c420d8b64d53d3a5a
+SHA1 (patch-examples_Makefile.in) = a170c29be83d1ccf90dc2a85f3978d9544c28919
+SHA1 (patch-examples_connect.c) = 332a9580d93a6aaeaf89ba7128d4f0c886335093
+SHA1 (patch-examples_connect.h) = 3044080eda8ff90c8b5207e058176922a91056ea
+SHA1 (patch-examples_getfile.c) = e18280cc58f85709bb3cc3d16c80ce8dc810c185
 SHA1 (patch-hotplug.sh.in) = 72216bb36bd0f6274c16c09d121fcffb567ab120
 SHA1 (patch-m4_byteorder.m4) = e6c1170d9099f13c637b3a73d67618d318c7a73d
 SHA1 (patch-src_libusb1-glue.c) = 2c83f2436a7cbc27c8b03f8d22db9bb446f55446
Index: patches/patch-examples_Makefile.am
===================================================================
RCS file: patches/patch-examples_Makefile.am
diff -N patches/patch-examples_Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_Makefile.am	29 Jun 2021 22:01:20 -0000
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Install mtp-getfiles.
+
+--- examples/Makefile.am.orig	2020-09-13 17:38:24.292462197 -0700
++++ examples/Makefile.am	2020-09-13 17:38:49.914437799 -0700
+@@ -29,6 +29,7 @@
+ install-exec-hook:
+ 	ln -f -s mtp-connect$(EXEEXT) $(DESTDIR)$(bindir)/mtp-delfile$(EXEEXT)
+ 	ln -f -s mtp-connect$(EXEEXT) $(DESTDIR)$(bindir)/mtp-getfile$(EXEEXT)
++	ln -f -s mtp-connect$(EXEEXT) $(DESTDIR)$(bindir)/mtp-getfiles$(EXEEXT)
+ 	ln -f -s mtp-connect$(EXEEXT) $(DESTDIR)$(bindir)/mtp-newfolder$(EXEEXT)
+ 	ln -f -s mtp-connect$(EXEEXT) $(DESTDIR)$(bindir)/mtp-sendfile$(EXEEXT)
+ 	ln -f -s mtp-connect$(EXEEXT) $(DESTDIR)$(bindir)/mtp-sendtr$(EXEEXT)
Index: patches/patch-examples_Makefile.in
===================================================================
RCS file: patches/patch-examples_Makefile.in
diff -N patches/patch-examples_Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_Makefile.in	29 Jun 2021 22:01:20 -0000
@@ -0,0 +1,14 @@
+$NetBSD$
+
+Install mtp-getfiles.
+
+--- examples/Makefile.in.orig	2020-08-19 20:11:24.298324652 -0700
++++ examples/Makefile.in	2020-09-13 17:38:55.220287093 -0700
+@@ -893,6 +893,7 @@
+ install-exec-hook:
+ 	ln -f -s mtp-connect$(EXEEXT) $(DESTDIR)$(bindir)/mtp-delfile$(EXEEXT)
+ 	ln -f -s mtp-connect$(EXEEXT) $(DESTDIR)$(bindir)/mtp-getfile$(EXEEXT)
++	ln -f -s mtp-connect$(EXEEXT) $(DESTDIR)$(bindir)/mtp-getfiles$(EXEEXT)
+ 	ln -f -s mtp-connect$(EXEEXT) $(DESTDIR)$(bindir)/mtp-newfolder$(EXEEXT)
+ 	ln -f -s mtp-connect$(EXEEXT) $(DESTDIR)$(bindir)/mtp-sendfile$(EXEEXT)
+ 	ln -f -s mtp-connect$(EXEEXT) $(DESTDIR)$(bindir)/mtp-sendtr$(EXEEXT)
Index: patches/patch-examples_connect.c
===================================================================
RCS file: patches/patch-examples_connect.c
diff -N patches/patch-examples_connect.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_connect.c	29 Jun 2021 22:01:20 -0000
@@ -0,0 +1,44 @@
+$NetBSD$
+
+Install mtp-getfiles.
+
+--- examples/connect.c.orig	2020-07-22 01:57:52.000000000 -0700
++++ examples/connect.c	2020-11-02 15:33:15.204112722 -0800
+@@ -73,6 +73,7 @@
+     device = delfile_device(argc,argv);
+   else if ((strncmp(basename(argv[0]),"mtp-getfile",11) == 0) || (strncmp(basename(argv[0]),"getfile",7) == 0))
+     device = getfile_device(argc,argv);
++    // XXXMRG getfiles_device()?
+   else
+     device = LIBMTP_Get_First_Device();
+ 
+@@ -87,6 +88,8 @@
+     ret = delfile_command(argc,argv);
+   } else if ((strncmp(basename(argv[0]),"mtp-getfile",11) == 0) || (strncmp(basename(argv[0]),"getfile",7) == 0)) {
+     ret = getfile_command(argc,argv);
++  } else if ((strncmp(basename(argv[0]),"mtp-getfiles",12) == 0) || (strncmp(basename(argv[0]),"getfiles",8) == 0)) {
++    ret = getfile_command(argc,argv);
+   } else if ((strncmp(basename(argv[0]),"mtp-newfolder",13) == 0) || (strncmp(basename(argv[0]),"newfolder",9) == 0)) {
+     ret = newfolder_command(argc,argv);
+   } else if ((strncmp(basename(argv[0]),"mtp-sendfile",12) == 0) || (strncmp(basename(argv[0]),"sendfile",8) == 0)) {
+@@ -105,6 +108,7 @@
+         {"delete", 1, 0, 'd'},
+         {"sendfile", 1, 0, 'f'},
+         {"getfile", 1, 0, 'g'},
++        {"getfiles", 1, 0, 'G'},
+         {"newfolder", 1, 0, 'n'},
+         {"sendtrack", 1, 0, 't'},
+         {0, 0, 0, 0}
+@@ -133,6 +137,12 @@
+         ret = getfile_function(arg1,arg2);
+         break;
+ 
++      case 'G':
++        printf("Get file by ID %s\n",optarg);
++        split_arg(optarg,&arg1,&arg2);
++        ret = getfiles_function(arg1,arg2);
++        break;
++
+       case 'n':
+         printf("New folder %s\n",optarg);
+         ret = newfolder_function(optarg);
Index: patches/patch-examples_connect.h
===================================================================
RCS file: patches/patch-examples_connect.h
diff -N patches/patch-examples_connect.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_connect.h	29 Jun 2021 22:01:20 -0000
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Install mtp-getfiles.
+
+--- examples/connect.h.orig	2020-07-22 01:57:52.000000000 -0700
++++ examples/connect.h	2020-11-02 15:33:48.527571695 -0800
+@@ -34,6 +34,9 @@
+ LIBMTP_mtpdevice_t *getfile_device(int, char **);
+ int getfile_command(int, char **);
+ void getfile_usage(void);
++int getfiles_function(char *,char *);
++int getfiles_command(int, char **);
++void getfiles_usage(void);
+ int newfolder_function(char *);
+ int newfolder_command(int,char **);
+ void newfolder_usage(void);
Index: patches/patch-examples_getfile.c
===================================================================
RCS file: patches/patch-examples_getfile.c
diff -N patches/patch-examples_getfile.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_getfile.c	29 Jun 2021 22:01:20 -0000
@@ -0,0 +1,59 @@
+$NetBSD$
+
+Install mtp-getfiles.
+
+--- examples/getfile.c.orig	2020-07-20 04:00:55.000000000 -0700
++++ examples/getfile.c	2020-11-02 15:34:51.914399909 -0800
+@@ -36,6 +36,11 @@
+   fprintf(stderr, "getfile [<deviceid>] <fileid/trackid> <filename>\n");
+ }
+ 
++void getfiles_usage (void)
++{
++  fprintf(stderr, "getfiles <fileid/trackid> <filename> [<fileid/trackid> <filename> ...]\n");
++}
++
+ int
+ getfile_function(char * from_path,char * to_path)
+ {
+@@ -114,3 +119,40 @@
+ 
+   return ret;
+ }
++
++
++int getfiles_command(int argc, char **argv)
++{
++  int ret = 0;
++  int i;
++
++  // We need a series of file IDs and filenames
++  if ( argc == 1 || (argc & 2) == 0 ) {
++    getfiles_usage();
++    return 0;
++  }
++
++  for (i = 1; i < argc; i += 2) {
++    char *subargv[3];
++
++    subargv[0] = argv[0];
++    subargv[1] = argv[i];
++    subargv[2] = argv[i+1];
++
++    ret |= getfile_command(3, subargv);
++  }
++
++  return ret;
++}
++
++int
++getfiles_function(char * from_path, char * to_path)
++{
++  char *subargv[3];
++
++  subargv[0] = "getfiles";
++  subargv[1] = from_path;
++  subargv[2] = to_path;
++
++  return getfile_command(3, subargv);
++}