Attachment 147849 Details for Bug 194029 – Be sure to not even extact the third-party/ subdirectory

[patch] Be sure to not even extact the third-party/ subdirectory

transmission.system-libs.1.2.diff (text/plain), 1.99 KB, created by Mikhail T. on 2014-09-30 16:08:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail T.

Created: 2014-09-30 16:08:13 UTC

Size: 1.99 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 369613)
>+++ Makefile	(working copy)
>@@ -26,6 +26,7 @@
> CONFLICTS_INSTALL=	${PORTNAME}${PKGNAMESUFFIX}-2.5*
> 
> OPTIONS_DEFINE=	LITE DOCS
>+EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude third-party
> 
> .include <bsd.port.options.mk>
> 
>@@ -34,6 +35,10 @@
> 
> # General dependencies
> GEN_LIB_DEPENDS=libcurl.so:${PORTSDIR}/ftp/curl \
>+		libdht.so:${PORTSDIR}/devel/jech-dht \
>+		libminiupnpc.so:${PORTSDIR}/net/miniupnpc \
>+		libnatpmp.so:${PORTSDIR}/net/libnatpmp \
>+		libutp.so:${PORTSDIR}/net/libutp \
> 		libevent.so:${PORTSDIR}/devel/libevent2
> GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web
> 
>@@ -41,12 +46,21 @@
> USES+=		gmake iconv libtool pkgconfig
> USE_OPENSSL=	yes
> GNU_CONFIGURE=	yes
>-CPPFLAGS+=	-I${LOCALBASE}/include
>-LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB}
>+CPPFLAGS+=	-I${LOCALBASE}/include -DWITH_UTP=1
>+LDFLAGS+=	-L${LOCALBASE}/lib
>+LIBS+=		${ICONV_LIB}
> CONFIGURE_ARGS=--with-zlib=/usr \
>+		 --disable-utp \
>+		 --enable-external-natpmp \
> 		${EXTRA_CONF_ARGS}
> CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
>-		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto"
>+		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" \
>+		DHT_CFLAGS=" " \
>+		DHT_LIBS="-ldht" \
>+		LIBUTP_CFLAGS=" " \
>+		LIBUTP_LIBS="-lutp" \
>+		LIBUTP_LIBS_QT="-lutp"
>+
> EXTRA_CONF_ARGS?=--enable-cli \
> 		 --disable-daemon \
> 		 --without-gtk \
>@@ -82,6 +96,16 @@
> 	@${REINPLACE_CMD} -e 's|utils \\|\\|g' \
> 		${WRKSRC}/Makefile.in
> .endif
>+# Don't conflict with patches but force system libraries
>+	@${REINPLACE_CMD} -e 's|third-party \\|\\|g' \
>+		${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -Ee '/^DHT_(CFLAGS|LIBS)=/d' \
>+		-e 's|third-party/[^ ]*Makefile||g' \
>+		${WRKSRC}/configure
>+	@${REINPLACE_CMD} \
>+		-e 's,TRANSMISSION_TOP}/third-party/dht/libdht.a,DHT_LIBS},' \
>+		${WRKSRC}/qt/qtr.pro
>+	@${ECHO_CMD} 'DHT_LIBS = @DHT_LIBS@' >>${WRKSRC}/qt/config.pri.in
> 
> post-patch: general-patch
>

Actions: View | Diff

Attachments on bug 194029: 147821 | 147822 | 147837 | 147838 | 147840 | 147841 | 147842 | 147843 | 147849 | 147867 | 151021