Attachment 124534 Details for Bug 168022 – file.diff

[patch] file.diff

file.diff (text/plain), 2.41 KB, created by tkato432 on 2012-05-17 19:10:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2012-05-17 19:10:02 UTC

Size: 2.41 KB

patch

obsolete

>diff -urN /usr/ports/audio/libmtp/Makefile audio/libmtp/Makefile
>--- /usr/ports/audio/libmtp/Makefile	2012-01-24 05:26:13.000000000 +0900
>+++ audio/libmtp/Makefile	2012-05-11 03:25:52.000000000 +0900
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	libmtp
>-PORTVERSION=	1.0.6
>+PORTVERSION=	1.1.3
> CATEGORIES=	audio
> MASTER_SITES=	SF
> 
>@@ -15,25 +15,40 @@
> 
> 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 -urN /usr/ports/audio/libmtp/distinfo audio/libmtp/distinfo
>--- /usr/ports/audio/libmtp/distinfo	2011-02-15 16:22:47.000000000 +0900
>+++ audio/libmtp/distinfo	2012-05-06 14:22:41.000000000 +0900
>@@ -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 -urN /usr/ports/audio/libmtp/pkg-plist audio/libmtp/pkg-plist
>--- /usr/ports/audio/libmtp/pkg-plist	2011-02-08 15:48:02.000000000 +0900
>+++ audio/libmtp/pkg-plist	2012-05-06 14:42:46.000000000 +0900
>@@ -5,6 +5,7 @@
> 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 @@
> lib/libmtp.a
> lib/libmtp.la
> lib/libmtp.so
>-lib/libmtp.so.11
>+lib/libmtp.so.9
> libdata/pkgconfig/libmtp.pc

Actions: View | Diff

Attachments on bug 168022: 124534