Date: Tue, 30 Sep 2014 15:17:24 -0500 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Chris Rees <crees@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r369657 - head/net-p2p/transmission-cli Message-ID: <542B0FD4.30605@FreeBSD.org> In-Reply-To: <201409301922.s8UJMOHS069184@svn.freebsd.org> References: <201409301922.s8UJMOHS069184@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --q6wqOSKMT03E4cenLLUq9p3rA9K7VQwqd Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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/ >=20 > Log: > Unbundle libs. > =20 > PR: ports/194029 > Submitted by: Jan Beich > =20 > Also, don't extract the third-party directory if we're not using it h= ere. PORTREVISION? > =20 > Submitted by: mi >=20 > Modified: > head/net-p2p/transmission-cli/Makefile >=20 > Modified: head/net-p2p/transmission-cli/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/net-p2p/transmission-cli/Makefile Tue Sep 30 19:13:29 2014 (r3= 69656) > +++ head/net-p2p/transmission-cli/Makefile Tue Sep 30 19:22:24 2014 (r3= 69657) > @@ -26,6 +26,7 @@ USES+=3D tar:xz > CONFLICTS_INSTALL=3D ${PORTNAME}${PKGNAMESUFFIX}-2.5* > =20 > OPTIONS_DEFINE=3D LITE DOCS > +EXTRACT_AFTER_ARGS=3D--no-same-owner --no-same-permissions --exclude t= hird-party > =20 > .include <bsd.port.options.mk> > =20 > @@ -34,6 +35,10 @@ LIB_DEPENDS?=3D ${GEN_LIB_DEPENDS} > =20 > # General dependencies > GEN_LIB_DEPENDS=3Dlibcurl.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=3D${LOCALBASE}/share/transmission/web/index.html:${POR= TSDIR}/www/transmission-web > =20 > @@ -41,12 +46,21 @@ GEN_RUN_DEPENDS=3D${LOCALBASE}/share/trans > USES+=3D gmake iconv libtool pkgconfig > USE_OPENSSL=3D yes > GNU_CONFIGURE=3D yes > -CPPFLAGS+=3D -I${LOCALBASE}/include > -LIBS+=3D -L${LOCALBASE}/lib ${ICONV_LIB} > +CPPFLAGS+=3D -I${LOCALBASE}/include -DWITH_UTP=3D1 > +LDFLAGS+=3D -L${LOCALBASE}/lib > +LIBS+=3D ${ICONV_LIB} > CONFIGURE_ARGS=3D--with-zlib=3D/usr \ > + --disable-utp \ > + --enable-external-natpmp \ > ${EXTRA_CONF_ARGS} > CONFIGURE_ENV=3D OPENSSL_CFLAGS=3D"-I${OPENSSLINC}" \ > - OPENSSL_LIBS=3D"-L${OPENSSLLIB} -lcrypto" > + OPENSSL_LIBS=3D"-L${OPENSSLLIB} -lcrypto" \ > + DHT_CFLAGS=3D" " \ > + DHT_LIBS=3D"-ldht" \ > + LIBUTP_CFLAGS=3D" " \ > + LIBUTP_LIBS=3D"-lutp" \ > + LIBUTP_LIBS_QT=3D"-lutp" > + > EXTRA_CONF_ARGS?=3D--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)=3D/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 =3D @DHT_LIBS@' >>${WRKSRC}/qt/config.pri.in > =20 > post-patch: general-patch > =20 >=20 --=20 Regards, Bryan Drewery --q6wqOSKMT03E4cenLLUq9p3rA9K7VQwqd Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) iQEcBAEBAgAGBQJUKw/VAAoJEDXXcbtuRpfPonwH/1unMUpx7YOaBC9ipofrfkwm 2NaiMl6H/n6ZnlTqmi1Q7IEkOJ05MXGUnEZxk4+zXszeaFZAyTGzPdXSittpcXNx /dKhJYZ8h94KskjYsZ6DYmpisTK/iOmSONlCsP3D+LzAIOcx3it36MGsNxX+V9jh GQ0+hTahzIypgxcZ0wSdJFgm6yQ3N5no7nYkRaXWQyUE2lWxdzCHxrzLlSGgZpGk /YoW1YbuJ3cDB4+oNuyTUsVUpvuc0kp5MMWQ0Ohv+48t23ZIqTGubBLxzGK63vgS azvbW1WY8j+8ukkWCMVGhtuHKKQpGhKA0XGWnDZE0aoFnuNTiNEtL4FeRNee0qE= =vGh9 -----END PGP SIGNATURE----- --q6wqOSKMT03E4cenLLUq9p3rA9K7VQwqd--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?542B0FD4.30605>