svn commit: r369657 - head/net-p2p/transmission-cli

[Bryan Drewery]

On 9/30/2014 2:22 PM, Chris Rees wrote:
> Author: crees
> Date: Tue Sep 30 19:22:24 2014
> New Revision: 369657
> URL: http://svnweb.freebsd.org/changeset/ports/369657
> QAT: https://qat.redports.org/buildarchive/r369657/
> 
> Log:
>   Unbundle libs.
>   
>   PR:		ports/194029
>   Submitted by:	Jan Beich
>   
>   Also, don't extract the third-party directory if we're not using it here.

PORTREVISION?

>   
>   Submitted by:	mi
> 
> Modified:
>   head/net-p2p/transmission-cli/Makefile
> 
> Modified: head/net-p2p/transmission-cli/Makefile
> ==============================================================================
> --- head/net-p2p/transmission-cli/Makefile	Tue Sep 30 19:13:29 2014	(r369656)
> +++ head/net-p2p/transmission-cli/Makefile	Tue Sep 30 19:22:24 2014	(r369657)
> @@ -26,6 +26,7 @@ USES+=		tar:xz
>  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 @@ LIB_DEPENDS?=	${GEN_LIB_DEPENDS}
>  
>  # 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 @@ GEN_RUN_DEPENDS=${LOCALBASE}/share/trans
>  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 @@ general-patch:
>  	@${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
>  
> 


-- 
Regards,
Bryan Drewery

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20140930/947c2ca6/attachment.sig>