- Update libmtp to 0.2.0

- Chase shlib version bump in amarok and gnomad2

PR:		ports/115218
Submitted by:	Petar Zhivkov Petrov <pesho.petrov@gmail.com>

9 files changed, 14 insertions, 43 deletions

diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index bbf85aebc345..4599c9030937 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	amarok
 PORTVERSION=	1.4.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
@@ -64,7 +64,7 @@ PLIST_SUB+=	NJB=""
 .if !defined(WITH_MTP)
 PLIST_SUB+=	MTP="@comment "
 .else
-LIB_DEPENDS+=	mtp.7:${PORTSDIR}/audio/libmtp
+LIB_DEPENDS+=	mtp.6:${PORTSDIR}/audio/libmtp
 CONFIGURE_ARGS+=--with-libmtp
 PLIST_SUB+=	MTP=""
 .endif
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index bbf85aebc345..4599c9030937 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	amarok
 PORTVERSION=	1.4.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
@@ -64,7 +64,7 @@ PLIST_SUB+=	NJB=""
 .if !defined(WITH_MTP)
 PLIST_SUB+=	MTP="@comment "
 .else
-LIB_DEPENDS+=	mtp.7:${PORTSDIR}/audio/libmtp
+LIB_DEPENDS+=	mtp.6:${PORTSDIR}/audio/libmtp
 CONFIGURE_ARGS+=--with-libmtp
 PLIST_SUB+=	MTP=""
 .endif
diff --git a/audio/gnomad2/Makefile b/audio/gnomad2/Makefile
index 171d9d4ac75b..9720179b11ab 100644
--- a/audio/gnomad2/Makefile
+++ b/audio/gnomad2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomad2
 PORTVERSION=	2.8.11
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/audio/libmtp/Makefile b/audio/libmtp/Makefile
index f62740c4ff12..5b148df4c180 100644
--- a/audio/libmtp/Makefile
+++ b/audio/libmtp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libmtp
-PORTVERSION=	0.1.5
+PORTVERSION=	0.2.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,4 +25,7 @@ USE_LDCONFIG=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib -liconv
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||' ${WRKSRC}/Makefile.in
+
 .include <bsd.port.mk>
diff --git a/audio/libmtp/distinfo b/audio/libmtp/distinfo
index 27e169dcda2e..504dc0898b5e 100644
--- a/audio/libmtp/distinfo
+++ b/audio/libmtp/distinfo
@@ -1,3 +1,3 @@
-MD5 (libmtp-0.1.5.tar.gz) = 597b62d994d9491531b9e67190f6cfe7
-SHA256 (libmtp-0.1.5.tar.gz) = 57131fa65e051eacf0aad5126362c08623a7fcc00147e9a03080123a3d3cb8fe
-SIZE (libmtp-0.1.5.tar.gz) = 497384
+MD5 (libmtp-0.2.0.tar.gz) = a5b433b9b3b1906b4f6d332a8150b7d0
+SHA256 (libmtp-0.2.0.tar.gz) = e87e048dd3c6a2b741a206e3cd031bf1d5a8d278a0af8db1287174b1971df051
+SIZE (libmtp-0.2.0.tar.gz) = 521246
diff --git a/audio/libmtp/files/patch-examples-common.h b/audio/libmtp/files/patch-examples-common.h
deleted file mode 100644
index 95306d240ac3..000000000000
--- a/audio/libmtp/files/patch-examples-common.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/common.h.orig	Sun Feb 18 22:24:01 2007
-+++ examples/common.h	Sun Feb 18 22:17:34 2007
-@@ -3,7 +3,7 @@
-  * These headers are used by absolutely all sample programs.
-  * Special quirks that apply to all samples go here.
-  */
--#include <libmtp.h>
-+#include <../src/libmtp.h>
- #ifndef _MSC_VER
- #include "config.h"
- #ifdef HAVE_GETOPT_H
diff --git a/audio/libmtp/files/patch-examples-sendfile.c b/audio/libmtp/files/patch-examples-sendfile.c
deleted file mode 100644
index c0bea71bb306..000000000000
--- a/audio/libmtp/files/patch-examples-sendfile.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/sendfile.c.orig	Sun Feb 18 22:25:38 2007
-+++ examples/sendfile.c	Sun Feb 18 22:14:53 2007
-@@ -4,7 +4,7 @@
- #include <sys/types.h>
- #include <fcntl.h>
- #include "common.h"
--#include "libmtp.h"
-+#include "../src/libmtp.h"
- #include "pathutils.h"
- 
- extern LIBMTP_folder_t *folders;
diff --git a/audio/libmtp/files/patch-examples-sendtr.c b/audio/libmtp/files/patch-examples-sendtr.c
deleted file mode 100644
index 3416e7f5b884..000000000000
--- a/audio/libmtp/files/patch-examples-sendtr.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/sendtr.c.orig	Sun Feb 18 22:25:18 2007
-+++ examples/sendtr.c	Sun Feb 18 22:18:04 2007
-@@ -12,7 +12,7 @@
- #include <sys/types.h>
- #include <fcntl.h>
- #include "common.h"
--#include "libmtp.h"
-+#include "../src/libmtp.h"
- #include "pathutils.h"
- 
- extern LIBMTP_folder_t *folders;
diff --git a/audio/libmtp/pkg-plist b/audio/libmtp/pkg-plist
index 0cf0e58a61d6..0bb0bc04505f 100644
--- a/audio/libmtp/pkg-plist
+++ b/audio/libmtp/pkg-plist
@@ -13,6 +13,7 @@ bin/mtp-hotplug
 bin/mtp-newfolder
 bin/mtp-newplaylist
 bin/mtp-playlists
+bin/mtp-reset
 bin/mtp-sendfile
 bin/mtp-sendtr
 bin/mtp-thumb
@@ -22,5 +23,5 @@ include/libmtp.h
 lib/libmtp.a
 lib/libmtp.la
 lib/libmtp.so
-lib/libmtp.so.7
+lib/libmtp.so.6
 libdata/pkgconfig/libmtp.pc