Index: head/multimedia/libmtp/Makefile
===================================================================
--- head/multimedia/libmtp/Makefile	(revision 366785)
+++ head/multimedia/libmtp/Makefile	(revision 366786)
@@ -1,44 +1,49 @@
 # Created by: Petar Zhivkov Petrov <pesho.petrov@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	libmtp
-PORTVERSION=	1.1.6
-PORTREVISION=	3
+PORTVERSION=	1.1.8
 CATEGORIES=	multimedia audio
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Media Transfer Protocol (MTP) library
 
-LICENSE=	LGPL21
+LICENSE=	LGPL21 # or any later version
 
 OPTIONS_DEFINE=	MTPZ
 OPTIONS_DEFAULT=	MTPZ
 MTPZ_DESC=	Enable functionality to connect to MTPZ devices
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-doxygen
 INSTALL_TARGET=	install-strip
 USES=		iconv libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 
+.if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc)
 CONFIGURE_ENV+=	LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb"
+.endif
 
 MTPZ_CONFIGURE_ENABLE=	mtpz
 MTPZ_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
 
 post-patch:
+.if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc)
 	@${REINPLACE_CMD} -e \
-		'/^SUBDIRS/s|doc||' ${WRKSRC}/Makefile.in
+		'/LIBUSB_REQUIRES/s|libusb-1.0||' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
+		'/Libs.private/s|:|& @LIBUSB_LIBS@|' ${WRKSRC}/libmtp.pc.in
+.endif
+	@${REINPLACE_CMD} -e \
 		'/if test/s|==|=| ; \
-		 /LIBUSB_REQUIRES/s|libusb-1.0|| ; \
 		 /endian.h/s|machine|sys|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
-		's|<libusb-1.0/|<|' ${WRKSRC}/src/libusb-glue.h
+		's|Requires|&.private|' ${WRKSRC}/libmtp.pc.in
 	@${REINPLACE_CMD} -e \
 		's|__builtin_bswap|bswap|g' ${WRKSRC}/src/mtpz.c
 
 .include <bsd.port.mk>
Index: head/multimedia/libmtp/distinfo
===================================================================
--- head/multimedia/libmtp/distinfo	(revision 366785)
+++ head/multimedia/libmtp/distinfo	(revision 366786)
@@ -1,2 +1,2 @@
-SHA256 (libmtp-1.1.6.tar.gz) = 3a1c1c83af91de4052eb54feb795c141b4c04a252e0031954ebbf6175970cb0a
-SIZE (libmtp-1.1.6.tar.gz) = 733519
+SHA256 (libmtp-1.1.8.tar.gz) = 3f9e87536aa40e560d0c153a505e38096b1df5ea15fad783691e9a8ca4dd2282
+SIZE (libmtp-1.1.8.tar.gz) = 757109
Index: head/multimedia/libmtp/pkg-plist
===================================================================
--- head/multimedia/libmtp/pkg-plist	(revision 366785)
+++ head/multimedia/libmtp/pkg-plist	(revision 366786)
@@ -1,27 +1,27 @@
 bin/mtp-albumart
 bin/mtp-albums
 bin/mtp-connect
 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-newfolder
 bin/mtp-newplaylist
 bin/mtp-playlists
 bin/mtp-reset
 bin/mtp-sendfile
 bin/mtp-sendtr
 bin/mtp-thumb
 bin/mtp-tracks
 bin/mtp-trexist
 include/libmtp.h
 lib/libmtp.a
 lib/libmtp.so
 lib/libmtp.so.9
-lib/libmtp.so.9.1.0
+lib/libmtp.so.9.2.0
 libdata/pkgconfig/libmtp.pc