Update libmtp to version 1.1.3

Changes unknown other than now supports Samsung Galaxy phones.

6 files changed, 38 insertions, 11 deletions

diff --git a/devel/libmtp/Makefile b/devel/libmtp/Makefile
index 5ed0689de82..db1359cefe4 100644
--- a/devel/libmtp/Makefile
+++ b/devel/libmtp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2012/02/17 13:52:03 hans Exp $
+# $NetBSD: Makefile,v 1.6 2012/08/14 21:00:46 markd Exp $
 #
 
-DISTNAME=		libmtp-1.0.1
+DISTNAME=		libmtp-1.1.3
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=libmtp/}
 
@@ -27,5 +27,5 @@ LDFLAGS.FreeBSD+=	-liconv
 LDFLAGS.SunOS=		-liconv
 
 .include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libmtp/PLIST b/devel/libmtp/PLIST
index 8d299161780..85d17b72b81 100644
--- a/devel/libmtp/PLIST
+++ b/devel/libmtp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/09/06 23:24:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/08/14 21:00:46 markd Exp $
 bin/mtp-albumart
 bin/mtp-albums
 bin/mtp-connect
@@ -6,11 +6,11 @@ bin/mtp-delfile
 bin/mtp-detect
 bin/mtp-emptyfolders
 bin/mtp-files
+bin/mtp-filetree
 bin/mtp-folders
 bin/mtp-format
 bin/mtp-getfile
 bin/mtp-getplaylist
-bin/mtp-hotplug
 bin/mtp-newfolder
 bin/mtp-newplaylist
 bin/mtp-playlists
diff --git a/devel/libmtp/PLIST.Linux b/devel/libmtp/PLIST.Linux
new file mode 100644
index 00000000000..60e0b925458
--- /dev/null
+++ b/devel/libmtp/PLIST.Linux
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.Linux,v 1.1 2012/08/14 21:00:46 markd Exp $
+bin/mtp-hotplug
diff --git a/devel/libmtp/buildlink3.mk b/devel/libmtp/buildlink3.mk
index 4298b7b2759..c005f176578 100644
--- a/devel/libmtp/buildlink3.mk
+++ b/devel/libmtp/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:20 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2012/08/14 21:00:46 markd Exp $
 
 BUILDLINK_TREE+=	libmtp
 
@@ -8,7 +8,7 @@ LIBMTP_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.libmtp+=	libmtp>=0.3.0
 BUILDLINK_PKGSRCDIR.libmtp?=	../../devel/libmtp
 
-.include "../../devel/libusb/buildlink3.mk"
+.include "../../devel/libusb1/buildlink3.mk"
 .endif # LIBMTP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libmtp
diff --git a/devel/libmtp/distinfo b/devel/libmtp/distinfo
index cd47839bf1d..75e4657d652 100644
--- a/devel/libmtp/distinfo
+++ b/devel/libmtp/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2010/01/18 10:06:15 wiz Exp $
+$NetBSD: distinfo,v 1.3 2012/08/14 21:00:46 markd Exp $
 
-SHA1 (libmtp-1.0.1.tar.gz) = 6b37e62da841531c958bf000f86789b07542021b
-RMD160 (libmtp-1.0.1.tar.gz) = 2fde6e57a07757e15d3d47992c9930395226e014
-Size (libmtp-1.0.1.tar.gz) = 587559 bytes
+SHA1 (libmtp-1.1.3.tar.gz) = aa3dd101320784dc4c3e0ee8b669ae4c903f6275
+RMD160 (libmtp-1.1.3.tar.gz) = dee19deecb323bea290d1960466bb4f6f3b6ff5f
+Size (libmtp-1.1.3.tar.gz) = 689357 bytes
 SHA1 (patch-aa) = 8d962323f099efec2bf2f3ac0ef3109151d5d57d
+SHA1 (patch-configure) = 93bbd6ed620beb100eeeee24b2deb6369bbc14a7
diff --git a/devel/libmtp/patches/patch-configure b/devel/libmtp/patches/patch-configure
new file mode 100644
index 00000000000..96781b74e8c
--- /dev/null
+++ b/devel/libmtp/patches/patch-configure
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure,v 1.1 2012/08/14 21:00:46 markd Exp $
+
+fix == in test
+
+--- configure.orig	2012-07-25 03:06:53.000000000 +0000
++++ configure
+@@ -12672,7 +12672,7 @@ else
+   ac_enable_doxygen=auto
+ fi
+ 
+-if test "x$ac_enable_doxygen" == "xyes"; then
++if test "x$ac_enable_doxygen" = "xyes"; then
+     # Extract the first word of "doxygen", so it can be a program name with args.
+ set dummy doxygen; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+@@ -14125,7 +14125,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.
+-if test x"$GCC" == "xyes" ; then
++if test x"$GCC" = "xyes" ; then
+ 	CFLAGS="$CFLAGS -Wall -Wmissing-prototypes"
+ fi
+