aboutsummaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorMartin Wilke <miwi@FreeBSD.org>2012-05-25 15:13:22 +0000
committerMartin Wilke <miwi@FreeBSD.org>2012-05-25 15:13:22 +0000
commitb50dd51fd3249b64653fbcec9c182bda1b3cf060 (patch)
treee6bd0fba8c4e64936d5c03721942f01ec1419395 /audio
parent90f0e630a4759b4a73fb06ee5e0804142f8d8f8f (diff)
downloadports-b50dd51fd3249b64653fbcec9c182bda1b3cf060.tar.gz
ports-b50dd51fd3249b64653fbcec9c182bda1b3cf060.zip
- Update to 1.1.3
Notes: This is a shlib downgrade please see changelog from 1.0.6 to 1.1.0 http://sourceforge.net/projects/libmtp/files/libmtp/1.1.0/ PR: 168022 Submitted by: Ports Fury
Notes
Notes: svn path=/head/; revision=297426
Diffstat (limited to 'audio')
-rw-r--r--audio/libmtp/Makefile31
-rw-r--r--audio/libmtp/distinfo4
-rw-r--r--audio/libmtp/pkg-plist3
3 files changed, 27 insertions, 11 deletions
diff --git a/audio/libmtp/Makefile b/audio/libmtp/Makefile
index 03ceb407ce7e..2bfa203830f9 100644
--- a/audio/libmtp/Makefile
+++ b/audio/libmtp/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= libmtp
-PORTVERSION= 1.0.6
+PORTVERSION= 1.1.3
CATEGORIES= audio
MASTER_SITES= SF
@@ -15,25 +15,40 @@ COMMENT= Media Transfer Protocol (MTP) library
LICENSE= LGPL21
-GNU_CONFIGURE= yes
+OPTIONS= MTPZ "Enable functionality to connect to MTPZ devices" on
+
USE_GNOME= gnomehack
-USE_LDCONFIG= yes
USE_ICONV= yes
+GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib -liconv
+LDFLAGS+= -L${LOCALBASE}/lib
+
+.include <bsd.port.options.mk>
+
+.if defined(WITHOUT_MTPZ)
+CONFIGURE_ARGS+=--disable-mtpz
+.else
+LIB_DEPENDS+= gcrypt.18:${PORTSDIR}/security/libgcrypt
+.endif
.include <bsd.port.pre.mk>
+
.if ${OSVERSION} < 800069
LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb
-LIBUSB= libusb
+CONFIGURE_ENV+= ac_cv_lib_openusb_openusb_init=no
.else
-LIBUSB=
+CONFIGURE_ENV+= LIBUSB_CFLAGS="-I/usr/include" LIBUSB_LIBS="-lusb" LIBS="-lusb"
.endif
post-patch:
- @${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||' ${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e '/libusb/s//${LIBUSB}/' ${WRKSRC}/libmtp.pc.in
+ @${REINPLACE_CMD} -e \
+ '/^SUBDIRS/s|doc||' ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e \
+ '/LIBUSB_REQUIRES/s|libusb-1.0||' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e \
+ 's|<libusb-1.0/|<|' ${WRKSRC}/src/libusb-glue.h
.include <bsd.port.post.mk>
diff --git a/audio/libmtp/distinfo b/audio/libmtp/distinfo
index 426e79f7eef4..847acb08856a 100644
--- a/audio/libmtp/distinfo
+++ b/audio/libmtp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libmtp-1.0.6.tar.gz) = 589b6400457600e6f0af9f1faa8b119e5a9ab346bf3cc3d65d4b8e51467d1135
-SIZE (libmtp-1.0.6.tar.gz) = 616167
+SHA256 (libmtp-1.1.3.tar.gz) = a794f86cbc1d3b43b654d5a05004f09925fdd44f7a8d87d3f0b4de429e7de8f8
+SIZE (libmtp-1.1.3.tar.gz) = 689357
diff --git a/audio/libmtp/pkg-plist b/audio/libmtp/pkg-plist
index cee6fd8a831c..493cade9754a 100644
--- a/audio/libmtp/pkg-plist
+++ b/audio/libmtp/pkg-plist
@@ -5,6 +5,7 @@ bin/mtp-delfile
bin/mtp-detect
bin/mtp-emptyfolders
bin/mtp-files
+bin/mtp-filetree
bin/mtp-folders
bin/mtp-format
bin/mtp-getfile
@@ -22,5 +23,5 @@ include/libmtp.h
lib/libmtp.a
lib/libmtp.la
lib/libmtp.so
-lib/libmtp.so.11
+lib/libmtp.so.9
libdata/pkgconfig/libmtp.pc