View | Details | Raw Unified | Return to bug 193093 | Differences between
and this patch

Collapse All | Expand All

(-)multimedia/libmtp/Makefile (-6 / +11 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	libmtp
4
PORTNAME=	libmtp
5
PORTVERSION=	1.1.6
5
PORTVERSION=	1.1.8
6
PORTREVISION=	3
7
CATEGORIES=	multimedia audio
6
CATEGORIES=	multimedia audio
8
MASTER_SITES=	SF
7
MASTER_SITES=	SF
9
8
Lines 10-16 MASTER_SITES= SF Link Here
10
MAINTAINER=	ports@FreeBSD.org
9
MAINTAINER=	ports@FreeBSD.org
11
COMMENT=	Media Transfer Protocol (MTP) library
10
COMMENT=	Media Transfer Protocol (MTP) library
12
11
13
LICENSE=	LGPL21
12
LICENSE=	LGPL21 # or any later version
14
13
15
OPTIONS_DEFINE=	MTPZ
14
OPTIONS_DEFINE=	MTPZ
16
OPTIONS_DEFAULT=	MTPZ
15
OPTIONS_DEFAULT=	MTPZ
Lines 17-22 OPTIONS_DEFAULT= MTPZ Link Here
17
MTPZ_DESC=	Enable functionality to connect to MTPZ devices
16
MTPZ_DESC=	Enable functionality to connect to MTPZ devices
18
17
19
GNU_CONFIGURE=	yes
18
GNU_CONFIGURE=	yes
19
CONFIGURE_ARGS=	--disable-doxygen
20
INSTALL_TARGET=	install-strip
20
INSTALL_TARGET=	install-strip
21
USES=		iconv libtool pathfix pkgconfig
21
USES=		iconv libtool pathfix pkgconfig
22
USE_LDCONFIG=	yes
22
USE_LDCONFIG=	yes
Lines 24-43 USE_LDCONFIG= yes Link Here
24
CPPFLAGS+=	-I${LOCALBASE}/include
24
CPPFLAGS+=	-I${LOCALBASE}/include
25
LIBS+=		-L${LOCALBASE}/lib
25
LIBS+=		-L${LOCALBASE}/lib
26
26
27
.if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc)
27
CONFIGURE_ENV+=	LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb"
28
CONFIGURE_ENV+=	LIBUSB_CFLAGS=" " LIBUSB_LIBS="-lusb"
29
.endif
28
30
29
MTPZ_CONFIGURE_ENABLE=	mtpz
31
MTPZ_CONFIGURE_ENABLE=	mtpz
30
MTPZ_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
32
MTPZ_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
31
33
32
post-patch:
34
post-patch:
35
.if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc)
33
	@${REINPLACE_CMD} -e \
36
	@${REINPLACE_CMD} -e \
34
		'/^SUBDIRS/s|doc||' ${WRKSRC}/Makefile.in
37
		'/LIBUSB_REQUIRES/s|libusb-1.0||' ${WRKSRC}/configure
35
	@${REINPLACE_CMD} -e \
38
	@${REINPLACE_CMD} -e \
39
		'/Libs.private/s|:|& @LIBUSB_LIBS@|' ${WRKSRC}/libmtp.pc.in
40
.endif
41
	@${REINPLACE_CMD} -e \
36
		'/if test/s|==|=| ; \
42
		'/if test/s|==|=| ; \
37
		 /LIBUSB_REQUIRES/s|libusb-1.0|| ; \
38
		 /endian.h/s|machine|sys|' ${WRKSRC}/configure
43
		 /endian.h/s|machine|sys|' ${WRKSRC}/configure
39
	@${REINPLACE_CMD} -e \
44
	@${REINPLACE_CMD} -e \
40
		's|<libusb-1.0/|<|' ${WRKSRC}/src/libusb-glue.h
45
		's|Requires|&.private|' ${WRKSRC}/libmtp.pc.in
41
	@${REINPLACE_CMD} -e \
46
	@${REINPLACE_CMD} -e \
42
		's|__builtin_bswap|bswap|g' ${WRKSRC}/src/mtpz.c
47
		's|__builtin_bswap|bswap|g' ${WRKSRC}/src/mtpz.c
43
48
(-)multimedia/libmtp/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (libmtp-1.1.6.tar.gz) = 3a1c1c83af91de4052eb54feb795c141b4c04a252e0031954ebbf6175970cb0a
1
SHA256 (libmtp-1.1.8.tar.gz) = 3f9e87536aa40e560d0c153a505e38096b1df5ea15fad783691e9a8ca4dd2282
2
SIZE (libmtp-1.1.6.tar.gz) = 733519
2
SIZE (libmtp-1.1.8.tar.gz) = 757109
(-)multimedia/libmtp/pkg-plist (-1 / +1 lines)
Lines 23-27 include/libmtp.h Link Here
23
lib/libmtp.a
23
lib/libmtp.a
24
lib/libmtp.so
24
lib/libmtp.so
25
lib/libmtp.so.9
25
lib/libmtp.so.9
26
lib/libmtp.so.9.1.0
26
lib/libmtp.so.9.2.0
27
libdata/pkgconfig/libmtp.pc
27
libdata/pkgconfig/libmtp.pc

Return to bug 193093