Attachment 146444 Details for Bug 193093 – update, v1.1

[patch] update, v1.1

update.diff (text/plain), 2.53 KB, created by Jan Beich on 2014-08-28 12:21:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2014-08-28 12:21:37 UTC

Size: 2.53 KB

patch

obsolete

>Index: multimedia/libmtp/Makefile
>===================================================================
>--- multimedia/libmtp/Makefile	(revision 366395)
>+++ multimedia/libmtp/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	libmtp
>-PORTVERSION=	1.1.6
>-PORTREVISION=	3
>+PORTVERSION=	1.1.8
> CATEGORIES=	multimedia audio
> MASTER_SITES=	SF
> 
>@@ -10,7 +9,7 @@ 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
>@@ -17,6 +16,7 @@ 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|$$| -lusb|' ${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
> 
>Index: multimedia/libmtp/distinfo
>===================================================================
>--- multimedia/libmtp/distinfo	(revision 366395)
>+++ multimedia/libmtp/distinfo	(working copy)
>@@ -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: multimedia/libmtp/pkg-plist
>===================================================================
>--- multimedia/libmtp/pkg-plist	(revision 366395)
>+++ multimedia/libmtp/pkg-plist	(working copy)
>@@ -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

Actions: View | Diff

Attachments on bug 193093: 146441 | 146442 | 146443 | 146444 | 146446 | 146447