From owner-svn-ports-all@FreeBSD.ORG Tue Sep 30 19:22:25 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 273F3985; Tue, 30 Sep 2014 19:22:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EDA86DA8; Tue, 30 Sep 2014 19:22:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8UJMOms069185; Tue, 30 Sep 2014 19:22:24 GMT (envelope-from crees@FreeBSD.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8UJMOHS069184; Tue, 30 Sep 2014 19:22:24 GMT (envelope-from crees@FreeBSD.org) Message-Id: <201409301922.s8UJMOHS069184@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: crees set sender to crees@FreeBSD.org using -f From: Chris Rees Date: Tue, 30 Sep 2014 19:22:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369657 - head/net-p2p/transmission-cli X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Sep 2014 19:22:25 -0000 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. 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 @@ -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