diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2014-08-31 16:21:47 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2014-08-31 16:21:47 +0000 |
| commit | 0a4169139179f753c457b2d410217571b57421db (patch) | |
| tree | 000a27abcbe77c557a24a2b203ab69a9d871019f /multimedia/libmtp | |
| parent | 882fc1a42bc91f312672aacc2a6ae8a81833942e (diff) | |
| download | ports-0a4169139179f753c457b2d410217571b57421db.tar.gz ports-0a4169139179f753c457b2d410217571b57421db.zip | |
- Update to 1.1.8
- Fix libmtp.pc on 10.0+ where libusb-1.0.pc is actually available
- Move libusb-1.0 dependency to Requires.private to avoid overlinking
- Disable doxygen during build instead of patching Makefile.in
- Add a comment about license containing "or any later version" clause
PR: 193093
Submitte by: Jan Beich <jbeich at vfemail.net>
Notes
Notes:
svn path=/head/; revision=366786
Diffstat (limited to 'multimedia/libmtp')
| -rw-r--r-- | multimedia/libmtp/Makefile | 17 | ||||
| -rw-r--r-- | multimedia/libmtp/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/libmtp/pkg-plist | 2 |
3 files changed, 14 insertions, 9 deletions
diff --git a/multimedia/libmtp/Makefile b/multimedia/libmtp/Makefile index ca533c6d7e2d..7e6c0bf9a497 100644 --- a/multimedia/libmtp/Makefile +++ b/multimedia/libmtp/Makefile @@ -2,21 +2,21 @@ # $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 @@ -24,20 +24,25 @@ 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 diff --git a/multimedia/libmtp/distinfo b/multimedia/libmtp/distinfo index b830e1d24a02..051e53bf75c2 100644 --- a/multimedia/libmtp/distinfo +++ b/multimedia/libmtp/distinfo @@ -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 diff --git a/multimedia/libmtp/pkg-plist b/multimedia/libmtp/pkg-plist index 9dcb05aec7d1..dc8081989bef 100644 --- a/multimedia/libmtp/pkg-plist +++ b/multimedia/libmtp/pkg-plist @@ -23,5 +23,5 @@ 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 |