update to libmtp-1.1.11

letting SunOS pick up libusb-1 support
adding option for MTPZ libgcrypt support
adding missing license

libmtp 1.1.11 release

Emeric Grange (2):
      added several gopro hero ids
      gopro hero4 mtp detect

Fish Lung (1):
      added xperia z5

Marcus Meissner (58):
      added  p98     https://sourceforge.net/p/libmtp/bugs/1440/
      added wiko rainbow
      added amazon kindle fire 7     https://sourceforge.net/p/libmtp/bugs/1448/
      google pixel c added     https://sourceforge.net/p/libmtp/bugs/1444/
      nvidia shield tegra 4     https://sourceforge.net/p/libmtp/bugs/1447/
      oneplus one a2005 added     https://sourceforge.net/p/libmtp/bugs/1450/
      xiamo redmi2 2014811     https://sourceforge.net/p/libmtp/bugs/1445/
      removed AC_FUNC_MALLOC     https://sourceforge.net/p/libmtp/bugs/1438/
      nokia x2 dual sim     https://sourceforge.net/p/libmtp/bugs/1453/
      sony xperia compact z5 added     https://sourceforge.net/p/libmtp/bugs/1455/
      added nokia C5-00 alternate PID     https://sourceforge.net/p/libmtp/bugs/1457/
      philips w6610     https://sourceforge.net/p/libmtp/support-requests/163/
      added amazon fire hd 8     https://sourceforge.net/p/libmtp/bugs/1460/
      added wileyfox swift     https://sourceforge.net/p/libmtp/feature-requests/146/
      Sony Z3 Tablet Compact     https://sourceforge.net/p/libmtp/bugs/1454/
      added sony e2105 log
      added Prestigio Multipad Color 7     https://sourceforge.net/p/libmtp/feature-requests/148/
      lenovo a1000     https://sourceforge.net/p/libmtp/bugs/1465/
      added lg 810 tablet     https://sourceforge.net/p/libmtp/bugs/1463/
      elephone p6000
      added nook color info     https://sourceforge.net/p/libmtp/bugs/1462/
      ARCHOS Helium 45B
      added acer z530     https://sourceforge.net/p/libmtp/bugs/1469/
      added kyocera kc-s701     https://sourceforge.net/p/libmtp/bugs/1476/
      added Moto Maxx     https://sourceforge.net/p/libmtp/bugs/1477/
      Add support for the ARCHOS 70 Cobalt     https://bugs.launchpad.net/ubuntu/+source/libmtp/+bug/1410177
      added another htc desire 310 id     https://sourceforge.net/p/libmtp/bugs/1481/
      medion p8312 8" tablet-pc.     https://sourceforge.net/p/libmtp/bugs/1480/
      huawei M2-801W log     https://sourceforge.net/p/libmtp/bugs/1479/
      added acer liquid z330     https://sourceforge.net/p/libmtp/bugs/1478/
      fixed regex match failure for some bugs
      corrected the GoPro naming (company/model)     added Marshall London     https://sourceforge.net/p/libmtp/bugs/1490/
      added Xiaomi Pad 1 (2717:0668)     https://sourceforge.net/p/libmtp/bugs/1489/
      added lenovo a10 70f     https://sourceforge.net/p/libmtp/bugs/1488/
      new amazon kindle id added     https://sourceforge.net/p/libmtp/bugs/1491/
      added Kyocera Event     https://sourceforge.net/p/libmtp/bugs/1492/
      asus zenfone 2 debzug
      lenovo a1000 (probably in ADB mode)     https://sourceforge.net/p/libmtp/bugs/1465/
      added htc desire 520     https://sourceforge.net/p/libmtp/support-requests/200/
      added lenovo data
      added fujistsu arrows 202f     https://sourceforge.net/p/libmtp/bugs/1495/
      added Lenovo A10-70L     https://sourceforge.net/p/libmtp/bugs/1497/
      added htc one mini 2     https://sourceforge.net/p/libmtp/bugs/1500/
      added lenovo lifetab s1034x debug     https://sourceforge.net/p/libmtp/bugs/1499/
      added nook glowlight plus     https://sourceforge.net/p/libmtp/bugs/1504/
      added data for orange nura phone     https://sourceforge.net/p/libmtp/bugs/1503/
      do not do force_reset_on_close for the Kyocera Event     https://sourceforge.net/p/libmtp/bugs/1492/
      add huawei honor 7     https://sourceforge.net/p/libmtp/bugs/1507/
      added lenovo lifetab S1034X     https://sourceforge.net/p/libmtp/support-requests/201/
      addone sony xperia z3v     https://sourceforge.net/p/libmtp/feature-requests/153/
      HTC one M9     https://sourceforge.net/p/libmtp/bugs/1508/
      added a microsoft lumia     https://sourceforge.net/p/libmtp/feature-requests/155/
      added oneplus one2 a2003     https://sourceforge.net/p/libmtp/bugs/151/
      added fairphone 2     https://sourceforge.net/p/libmtp/support-requests/202/
      in read, use the maxpacket from the device, not _HS_ packetsize
      allview energy p5     https://sourceforge.net/p/libmtp/bugs/1512/
      Kyocera DIGNO T 302KC     https://sourceforge.net/p/libmtp/bugs/1518/
      1.1.11 release

Nicholas Little (1):
      This commit alters the flags for the Nexus 6P device by Huawei - it has     a working get object properties list and its regular object access is     broken with respect to the release date track field.

Reverend Homer (1):
      LIBMP_Create_Folder: fixed doc     https://sourceforge.net/p/libmtp/bugs/1472/     0xFFFFFFFF for root folder instead of 0

9 files changed, 156 insertions, 23 deletions

diff --git a/devel/libmtp/Makefile b/devel/libmtp/Makefile
index d03f1d3bc72..cedd7835ed7 100644
--- a/devel/libmtp/Makefile
+++ b/devel/libmtp/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.10 2015/05/02 10:43:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2016/04/09 10:09:14 richard Exp $
 #
 
-DISTNAME=		libmtp-1.1.9
+DISTNAME=		libmtp-1.1.11
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libmtp/}
 
 MAINTAINER=		ku3@sl.aanet.ru
 HOMEPAGE=		http://libmtp.sourceforge.net/
 COMMENT=		Implementation of Media Transfer Protocol (MTP)
+LICENSE=		gnu-lgpl-v2
 
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
@@ -23,12 +24,9 @@ REPLACE_SH+=		libmtp.sh.in
 LDFLAGS.FreeBSD+=	-liconv
 LDFLAGS.SunOS=		-liconv
 
-.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"
-.if ${OPSYS} == "SunOS"
-.include "../../devel/libusb/buildlink3.mk"
-.else
 .include "../../devel/libusb1/buildlink3.mk"
-.endif
+.include "../../security/libgcrypt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libmtp/buildlink3.mk b/devel/libmtp/buildlink3.mk
index cd71487f787..79de3b080d9 100644
--- a/devel/libmtp/buildlink3.mk
+++ b/devel/libmtp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2014/08/21 14:03:45 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2016/04/09 10:09:14 richard Exp $
 
 BUILDLINK_TREE+=	libmtp
 
@@ -10,11 +10,7 @@ BUILDLINK_PKGSRCDIR.libmtp?=	../../devel/libmtp
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-.if ${OPSYS} == "SunOS"
-.include "../../devel/libusb/buildlink3.mk"
-.else
 .include "../../devel/libusb1/buildlink3.mk"
-.endif
 
 .endif # LIBMTP_BUILDLINK3_MK
 
diff --git a/devel/libmtp/distinfo b/devel/libmtp/distinfo
index 9ab75cc144b..f70d36c065f 100644
--- a/devel/libmtp/distinfo
+++ b/devel/libmtp/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 03:27:43 agc Exp $
+$NetBSD: distinfo,v 1.7 2016/04/09 10:09:14 richard Exp $
 
-SHA1 (libmtp-1.1.9.tar.gz) = 31bebf3e49612f712f4ab1a03284dedf7044000f
-RMD160 (libmtp-1.1.9.tar.gz) = e486942e0d7e0e6c9bf3525c6175c7199d3fe3f8
-SHA512 (libmtp-1.1.9.tar.gz) = 6be9f14602b05830ec01defaeb0f237ac4d021f76f4003d7178eda00d8bf86d7fbbeba0053dc111d2ab9eb32f1603c2dc4f2bc128f4cbe4819228486b9b85513
-Size (libmtp-1.1.9.tar.gz) = 760593 bytes
-SHA1 (patch-aa) = 8d962323f099efec2bf2f3ac0ef3109151d5d57d
-SHA1 (patch-configure) = 23d434cb1ff5b8326cbe1d34ded9e6c6b4f01729
+SHA1 (libmtp-1.1.11.tar.gz) = 4f7e79e15e6a0d0a3d76adbd1ca6d6c27d4b8424
+RMD160 (libmtp-1.1.11.tar.gz) = 619154b8b98c25132de26c96024387b8fcacc77e
+SHA512 (libmtp-1.1.11.tar.gz) = 966d5d831695dc02411fbe0a153873d9e5604a00e75bf0d4cc1a957887a2e7656c82209f5bf86150f7b9af037d66a96b3e3523e16d5b52ae013b835febf622c9
+Size (libmtp-1.1.11.tar.gz) = 788911 bytes
+SHA1 (patch-aa) = fe8a7722c460ff66e8106a1e4dcfb1e5188ae5b1
+SHA1 (patch-configure) = 861bd3c416529a68babe1ec9692e45b2ebb7ffcf
+SHA1 (patch-configure.ac) = 8c6d80693dc9ddbf75f75d9cfa86a1f37ef6da1b
+SHA1 (patch-m4_byteorder.m4) = e6c1170d9099f13c637b3a73d67618d318c7a73d
+SHA1 (patch-src_util.c) = f7be6760014323dc2b159e1e44f94e40d96f26d0
diff --git a/devel/libmtp/options.mk b/devel/libmtp/options.mk
new file mode 100644
index 00000000000..4b2c8c68d79
--- /dev/null
+++ b/devel/libmtp/options.mk
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.1 2016/04/09 10:09:14 richard Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.libmtp
+PKG_SUPPORTED_OPTIONS=	mtpz
+PKG_SUGGESTED_OPTIONS=
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mmtpz)
+.include "../../security/libgcrypt/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-mtpz
+.endif
diff --git a/devel/libmtp/patches/patch-aa b/devel/libmtp/patches/patch-aa
index 26e77f151f3..fdf0e487fcd 100644
--- a/devel/libmtp/patches/patch-aa
+++ b/devel/libmtp/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2008/09/06 23:24:08 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2016/04/09 10:09:14 richard Exp $
+
+use '=' instead of '=='
 
 --- hotplug.sh.in.orig	2008-09-07 01:18:04.000000000 +0200
 +++ hotplug.sh.in
diff --git a/devel/libmtp/patches/patch-configure b/devel/libmtp/patches/patch-configure
index 65f9ce9b213..ec0e685ceb1 100644
--- a/devel/libmtp/patches/patch-configure
+++ b/devel/libmtp/patches/patch-configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.2 2015/05/02 10:43:29 ryoon Exp $
+$NetBSD: patch-configure,v 1.3 2016/04/09 10:09:14 richard Exp $
 
 fix == in test
 
---- configure.orig	2015-04-13 18:44:18.000000000 +0000
+--- configure.orig	2016-02-10 20:17:35.000000000 +0000
 +++ configure
-@@ -14558,7 +14558,7 @@ fi
+@@ -15087,7 +15087,7 @@ fi
  # (No need to use AC_SUBST on this default substituted environment variable.)
  # Only add these additional CFLAGS if we are using GCC. Other C compilers may
  # not support them.
@@ -13,3 +13,52 @@ fix == in test
  	CFLAGS="$CFLAGS -Wall -Wmissing-prototypes"
  fi
  
+@@ -15684,6 +15684,36 @@ else
+ $as_echo "no" >&6; }
+ 
+ 
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSWAP_32 in sys/byteorder.h" >&5
++$as_echo_n "checking for BSWAP_32 in sys/byteorder.h... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++#include <sys/byteorder.h>
++#ifdef BSWAP_32
++ 	symbol is present
++#endif
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "symbol is present|\<BSWAP_32\>" >/dev/null 2>&1; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++  	 cat >> "src/gphoto2-endian.h" << EOF
++/* Define generic byte swapping functions */
++EOF
++cat >> "src/gphoto2-endian.h" << EOF
++#define swap16(x) BSWAP_16(x)
++#define swap32(x) BSWAP_32(x)
++#define swap64(x) BSWAP_64(x)
++
++EOF
++
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bswap32 in machine/endian.h" >&5
+ $as_echo_n "checking for bswap32 in machine/endian.h... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -15844,6 +15874,11 @@ rm -f conftest*
+ 
+ 
+ 
++fi
++rm -f conftest*
++
++
++
+ 
+ if test "$HAVE_LE32TOH" != "1"; then
+  cat >> "src/gphoto2-endian.h" << EOF
diff --git a/devel/libmtp/patches/patch-configure.ac b/devel/libmtp/patches/patch-configure.ac
new file mode 100644
index 00000000000..d36494195b2
--- /dev/null
+++ b/devel/libmtp/patches/patch-configure.ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure.ac,v 1.1 2016/04/09 10:09:14 richard Exp $
+
+use '=' instead of '=='
+
+--- configure.ac.orig	2016-02-10 20:17:28.000000000 +0000
++++ configure.ac
+@@ -199,7 +199,7 @@ AC_SYS_LARGEFILE
+ # (No need to use AC_SUBST on this default substituted environment variable.)
+ # Only add these additional CFLAGS if we are using GCC. Other C compilers may
+ # not support them.
+-if test x"$GCC" == "xyes" ; then
++if test x"$GCC" = "xyes" ; then
+ 	CFLAGS="$CFLAGS -Wall -Wmissing-prototypes"
+ fi
+ 
diff --git a/devel/libmtp/patches/patch-m4_byteorder.m4 b/devel/libmtp/patches/patch-m4_byteorder.m4
new file mode 100644
index 00000000000..245951957a2
--- /dev/null
+++ b/devel/libmtp/patches/patch-m4_byteorder.m4
@@ -0,0 +1,35 @@
+$NetBSD: patch-m4_byteorder.m4,v 1.1 2016/04/09 10:09:14 richard Exp $
+
+special case SunOS support for byteswapping
+
+--- m4/byteorder.m4.orig	2013-03-17 08:04:49.000000000 +0000
++++ m4/byteorder.m4
+@@ -106,6 +106,20 @@ dnl Linux GLIBC
+ EOF],
+ 
+    [
++dnl SunOS
++  	AC_HAVE_SYMBOL(BSWAP_32,sys/byteorder.h,
++dnl sys/byteorder.h should already be implicitly included
++  	 [cat >> "$1" << EOF
++/* Define generic byte swapping functions */
++EOF
++cat >> "$1" << EOF
++#define swap16(x) BSWAP_16(x)
++#define swap32(x) BSWAP_32(x)
++#define swap64(x) BSWAP_64(x)
++
++EOF],
++
++   [
+ dnl NetBSD
+   	AC_HAVE_SYMBOL(bswap32,machine/endian.h,
+     dnl We're already including machine/endian.h if this test succeeds
+@@ -190,6 +204,7 @@ EOF
+ EOF
+ 	fi
+ ])
++])
+   	  ])
+     ])
+   ])
diff --git a/devel/libmtp/patches/patch-src_util.c b/devel/libmtp/patches/patch-src_util.c
new file mode 100644
index 00000000000..b2953171a51
--- /dev/null
+++ b/devel/libmtp/patches/patch-src_util.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_util.c,v 1.1 2016/04/09 10:09:14 richard Exp $
+
+config.h should always be first
+
+--- src/util.c.orig	2015-10-07 07:43:18.000000000 +0000
++++ src/util.c
+@@ -22,6 +22,7 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#include "config.h"
+ /* MSVC does not have these */
+ #ifndef _MSC_VER
+ #include <sys/time.h>
+@@ -34,7 +35,6 @@
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <string.h>
+-#include "config.h"
+ #include "libmtp.h"
+ #include "util.h"
+