Date: Sun, 31 Aug 2014 16:21:47 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366786 - head/multimedia/libmtp Message-ID: <201408311621.s7VGLlmC028152@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Sun Aug 31 16:21:47 2014 New Revision: 366786 URL: http://svnweb.freebsd.org/changeset/ports/366786 QAT: https://qat.redports.org/buildarchive/r366786/ Log: - 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> Modified: head/multimedia/libmtp/Makefile head/multimedia/libmtp/distinfo head/multimedia/libmtp/pkg-plist Modified: head/multimedia/libmtp/Makefile ============================================================================== --- head/multimedia/libmtp/Makefile Sun Aug 31 16:04:10 2014 (r366785) +++ head/multimedia/libmtp/Makefile Sun Aug 31 16:21:47 2014 (r366786) @@ -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 Modified: head/multimedia/libmtp/distinfo ============================================================================== --- head/multimedia/libmtp/distinfo Sun Aug 31 16:04:10 2014 (r366785) +++ head/multimedia/libmtp/distinfo Sun Aug 31 16:21:47 2014 (r366786) @@ -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 Modified: head/multimedia/libmtp/pkg-plist ============================================================================== --- head/multimedia/libmtp/pkg-plist Sun Aug 31 16:04:10 2014 (r366785) +++ head/multimedia/libmtp/pkg-plist Sun Aug 31 16:21:47 2014 (r366786) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408311621.s7VGLlmC028152>