Attachment 147867 Details for Bug 194029 – upstream-friendly version

[patch] upstream-friendly version

upstream.diff (text/plain), 5.81 KB, created by Jan Beich on 2014-09-30 22:57:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2014-09-30 22:57:21 UTC

Size: 5.81 KB

patch

obsolete

>Index: net-p2p/transmission-cli/Makefile
>===================================================================
>--- net-p2p/transmission-cli/Makefile	(revision 369670)
>+++ net-p2p/transmission-cli/Makefile	(working copy)
>@@ -21,12 +21,12 @@ LICENSE=	GPLv2
> .endif
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES+=		tar:xz
>+USES+=		autoreconf tar:xz
> 
> CONFLICTS_INSTALL=	${PORTNAME}${PKGNAMESUFFIX}-2.5*
> 
> OPTIONS_DEFINE=	LITE DOCS
>-EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude third-party
>+#EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude third-party
> 
> .include <bsd.port.options.mk>
> 
>@@ -46,20 +46,15 @@ GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/we
> USES+=		gmake iconv libtool pkgconfig
> USE_OPENSSL=	yes
> GNU_CONFIGURE=	yes
>-CPPFLAGS+=	-I${LOCALBASE}/include -DWITH_UTP=1
>+CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> LIBS+=		${ICONV_LIB}
> CONFIGURE_ARGS=--with-zlib=/usr \
>-		 --disable-utp \
>+		 --enable-external-dht \
> 		 --enable-external-natpmp \
> 		${EXTRA_CONF_ARGS}
> CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
>-		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" \
>-		DHT_CFLAGS=" " \
>-		DHT_LIBS="-ldht" \
>-		LIBUTP_CFLAGS=" " \
>-		LIBUTP_LIBS="-lutp" \
>-		LIBUTP_LIBS_QT="-lutp"
>+		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto"
> 
> EXTRA_CONF_ARGS?=--enable-cli \
> 		 --disable-daemon \
>@@ -99,13 +94,9 @@ general-patch:
> # 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' \
>+	@${REINPLACE_CMD} \
> 		-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
> 
>Index: net-p2p/transmission-cli/files/patch-unbundle
>===================================================================
>--- net-p2p/transmission-cli/files/patch-unbundle	(revision 0)
>+++ net-p2p/transmission-cli/files/patch-unbundle	(working copy)
>@@ -0,0 +1,108 @@
>+Index: configure.ac
>+===================================================================
>+--- configure.ac	(revision 14339)
>++++ configure.ac	(working copy)
>+@@ -196,8 +196,23 @@ dnl  dht
>+ 
>+ DHT_CFLAGS="-I\$(top_srcdir)/third-party/dht"
>+ DHT_LIBS="\$(top_builddir)/third-party/dht/libdht.a"
>++DHT_LIBS_QT="\$(top_builddir)/third-party/dht/libdht.a"
>++build_bundled_dht="yes"
>++AC_ARG_ENABLE([external-dht],
>++              AS_HELP_STRING([--enable-external-dht],[Use system external-dht]),
>++              [want_external_dht=${enableval}],
>++              [want_external_dht=no])
>++if test "x$want_external_dht" != "xno" ; then
>++	dnl Would be lovely if it had pkgconfig
>++	DHT_CFLAGS=""
>++	DHT_LIBS="-ldht"
>++	DHT_LIBS_QT="-ldht"
>++	build_bundled_dht="no"
>++fi
>++AM_CONDITIONAL([BUILD_DHT],[test "x$build_bundled_dht" = "xyes"])
>+ AC_SUBST(DHT_CFLAGS)
>+ AC_SUBST(DHT_LIBS)
>++AC_SUBST(DHT_LIBS_QT)
>+ 
>+ 
>+ dnl ----------------------------------------------------------------------------
>+@@ -211,17 +226,30 @@ AC_CHECK_LIB([rt],
>+ 
>+ AC_MSG_CHECKING([ÂµTP])
>+ build_utp="no"
>+-if test "x$CXX" != "x" ; then
>+-    have_utp="yes"
>+-else
>+-    have_utp="no"
>+-fi
>++
>++ac_save_LIBS="$LIBS"
>++LIBS="-lutp"
>++AC_LINK_IFELSE(
>++  [AC_LANG_PROGRAM([#include <libutp/utp.h>],
>++                   [struct UTPFunctionTable func;])],
>++  [have_utp="yes"],
>++  [have_utp="no"]
>++)
>++LIBS=$ac_save_LIBS
>++
>+ AC_ARG_ENABLE([utp],
>+               AS_HELP_STRING([--enable-utp],[build ÂµTP support]),
>+               [want_utp=${enableval}],
>+-              [want_utp=${have_utp}])
>+-if test "x$want_utp" = "xyes" ; then
>++              [want_utp=yes])
>++if test "x$want_utp" = "xyes"; then
>+     if test "x$have_utp" = "xyes"; then
>++        dnl Would be lovely if it had pkgconfig
>++        LIBUTP_CFLAGS=""
>++        LIBUTP_LIBS="-lutp"
>++        LIBUTP_LIBS_QT="-lutp"
>++        AC_DEFINE([WITH_UTP],[1])
>++        build_utp="system"
>++    elif test "x$CXX" != "x"; then
>+         LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/"
>+         LIBUTP_LIBS="\$(top_builddir)/third-party/libutp/libutp.a"
>+         LIBUTP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/libutp/libutp.a"
>+Index: qt/config.pri.in
>+===================================================================
>+--- qt/config.pri.in	(revision 14339)
>++++ qt/config.pri.in	(working copy)
>+@@ -1,3 +1,4 @@
>++DHT_LIBS = @DHT_LIBS_QT@
>+ LIBUTP_LIBS = @LIBUTP_LIBS_QT@ 
>+ LIBUPNP_LIBS = @LIBUPNP_LIBS_QT@
>+ LIBNATPMP_LIBS = @LIBNATPMP_LIBS_QT@
>+Index: qt/qtr.pro
>+===================================================================
>+--- qt/qtr.pro	(revision 14339)
>++++ qt/qtr.pro	(working copy)
>+@@ -27,7 +27,7 @@ INCLUDEPATH = $${EVENT_TOP}/include $${INCLUDEPATH
>+ INCLUDEPATH += $${TRANSMISSION_TOP}
>+ LIBS += $${TRANSMISSION_TOP}/libtransmission/libtransmission.a
>+ LIBS += $${LIBUTP_LIBS}
>+-LIBS += $${TRANSMISSION_TOP}/third-party/dht/libdht.a
>++LIBS += $${DHT_LIBS}
>+ LIBS += $${LIBUPNP_LIBS}
>+ LIBS += $${LIBNATPMP_LIBS}
>+ unix: LIBS += -L$${EVENT_TOP}/lib -lz -lrt
>+Index: third-party/Makefile.am
>+===================================================================
>+--- third-party/Makefile.am	(revision 14339)
>++++ third-party/Makefile.am	(working copy)
>+@@ -1,3 +1,6 @@
>++if BUILD_DHT
>++  DHT_DIR = dht
>++endif
>+ if BUILD_UTP
>+   UTP_DIR = libutp
>+ endif
>+@@ -9,7 +12,7 @@ if BUILD_NATPMP
>+ endif 
>+ 
>+ SUBDIRS = \
>+-  dht \
>++  $(DHT_DIR) \
>+   $(NATPMP_DIR) \
>+   $(MINIUPNP_DIR) \
>+   $(UTP_DIR)
>
>Property changes on: net-p2p/transmission-cli/files/patch-unbundle
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property

Actions: View | Diff

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