libmtp: updated to 1.1.6

1.1.6:
Unknown changes

5 files changed, 20 insertions, 86 deletions

diff --git a/devel/libmtp/Makefile b/devel/libmtp/Makefile
index 99f8a07a932..7746ec187e6 100644
--- a/devel/libmtp/Makefile
+++ b/devel/libmtp/Makefile
@@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.15 2018/04/16 13:02:20 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2019/09/21 09:52:42 adam Exp $
 
-DISTNAME=		libmtp-1.1.15
-CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libmtp/}
+DISTNAME=	libmtp-1.1.16
+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
+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
+USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		HAVE_DOXYGEN=false
-
 PKGCONFIG_OVERRIDE+=	libmtp.pc.in
 
 REPLACE_SH=		hotplug.sh.in
diff --git a/devel/libmtp/distinfo b/devel/libmtp/distinfo
index 213a95875fb..d07918219f0 100644
--- a/devel/libmtp/distinfo
+++ b/devel/libmtp/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.11 2018/04/16 13:02:20 wiz Exp $
+$NetBSD: distinfo,v 1.12 2019/09/21 09:52:42 adam Exp $
 
-SHA1 (libmtp-1.1.15.tar.gz) = c043053b0f219ab8968cc183f3a4477ae3337f6d
-RMD160 (libmtp-1.1.15.tar.gz) = 13aba54024d7a541b5ecd652a9f650f7358ecec1
-SHA512 (libmtp-1.1.15.tar.gz) = c85f47ef4e05d7f5b47d06463ca97c123fa068c4b7369aeba496cb1cfa03f0148b3ba73feed7da96269ba94b76b4b81858ee4bda5af67b0aac3b07fe39b5354a
-Size (libmtp-1.1.15.tar.gz) = 805983 bytes
-SHA1 (patch-aa) = fe8a7722c460ff66e8106a1e4dcfb1e5188ae5b1
-SHA1 (patch-configure) = 861bd3c416529a68babe1ec9692e45b2ebb7ffcf
-SHA1 (patch-configure.ac) = 8c6d80693dc9ddbf75f75d9cfa86a1f37ef6da1b
+SHA1 (libmtp-1.1.16.tar.gz) = 2e1c217f4216c3b43e9368f81eb6a234e4b1422f
+RMD160 (libmtp-1.1.16.tar.gz) = 634c4af5a57c9d192697fd3a4234fd3b9325c100
+SHA512 (libmtp-1.1.16.tar.gz) = 0540271930c1c932c5d06dcdd30142d407a4fadd022b195e8339d614fa3ec9b050605bf013b28ac6451f4dfcddf7add949c928acb1382802ab5fd6311c1628a0
+Size (libmtp-1.1.16.tar.gz) = 820516 bytes
+SHA1 (patch-configure) = f57b708684696e496b1d61783e48fe4b63618d65
+SHA1 (patch-hotplug.sh.in) = 72216bb36bd0f6274c16c09d121fcffb567ab120
 SHA1 (patch-m4_byteorder.m4) = e6c1170d9099f13c637b3a73d67618d318c7a73d
 SHA1 (patch-src_util.c) = f7be6760014323dc2b159e1e44f94e40d96f26d0
diff --git a/devel/libmtp/patches/patch-configure b/devel/libmtp/patches/patch-configure
index ec0e685ceb1..a7c6d33eb0c 100644
--- a/devel/libmtp/patches/patch-configure
+++ b/devel/libmtp/patches/patch-configure
@@ -1,6 +1,6 @@
-$NetBSD: patch-configure,v 1.3 2016/04/09 10:09:14 richard Exp $
+$NetBSD: patch-configure,v 1.4 2019/09/21 09:52:42 adam Exp $
 
-fix == in test
+Portability fix.
 
 --- configure.orig	2016-02-10 20:17:35.000000000 +0000
 +++ configure
@@ -13,52 +13,3 @@ 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
deleted file mode 100644
index d36494195b2..00000000000
--- a/devel/libmtp/patches/patch-configure.ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$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-aa b/devel/libmtp/patches/patch-hotplug.sh.in
index fdf0e487fcd..cde6804327c 100644
--- a/devel/libmtp/patches/patch-aa
+++ b/devel/libmtp/patches/patch-hotplug.sh.in
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2016/04/09 10:09:14 richard Exp $
+$NetBSD: patch-hotplug.sh.in,v 1.1 2019/09/21 09:52:42 adam Exp $
 
-use '=' instead of '=='
+Portability fix.
 
 --- hotplug.sh.in.orig	2008-09-07 01:18:04.000000000 +0200
 +++ hotplug.sh.in