View | Details | Raw Unified | Return to bug 194029 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-3 / +27 lines)
Lines 26-31 Link Here
26
CONFLICTS_INSTALL=	${PORTNAME}${PKGNAMESUFFIX}-2.5*
26
CONFLICTS_INSTALL=	${PORTNAME}${PKGNAMESUFFIX}-2.5*
27
27
28
OPTIONS_DEFINE=	LITE DOCS
28
OPTIONS_DEFINE=	LITE DOCS
29
EXTRACT_AFTER_ARGS=--no-same-owner --no-same-permissions --exclude third-party
29
30
30
.include <bsd.port.options.mk>
31
.include <bsd.port.options.mk>
31
32
Lines 34-39 Link Here
34
35
35
# General dependencies
36
# General dependencies
36
GEN_LIB_DEPENDS=libcurl.so:${PORTSDIR}/ftp/curl \
37
GEN_LIB_DEPENDS=libcurl.so:${PORTSDIR}/ftp/curl \
38
		libdht.so:${PORTSDIR}/devel/jech-dht \
39
		libminiupnpc.so:${PORTSDIR}/net/miniupnpc \
40
		libnatpmp.so:${PORTSDIR}/net/libnatpmp \
41
		libutp.so:${PORTSDIR}/net/libutp \
37
		libevent.so:${PORTSDIR}/devel/libevent2
42
		libevent.so:${PORTSDIR}/devel/libevent2
38
GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web
43
GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web
39
44
Lines 41-52 Link Here
41
USES+=		gmake iconv libtool pkgconfig
46
USES+=		gmake iconv libtool pkgconfig
42
USE_OPENSSL=	yes
47
USE_OPENSSL=	yes
43
GNU_CONFIGURE=	yes
48
GNU_CONFIGURE=	yes
44
CPPFLAGS+=	-I${LOCALBASE}/include
49
CPPFLAGS+=	-I${LOCALBASE}/include -DWITH_UTP=1
45
LIBS+=		-L${LOCALBASE}/lib ${ICONV_LIB}
50
LDFLAGS+=	-L${LOCALBASE}/lib
51
LIBS+=		${ICONV_LIB}
46
CONFIGURE_ARGS=--with-zlib=/usr \
52
CONFIGURE_ARGS=--with-zlib=/usr \
53
		 --disable-utp \
54
		 --enable-external-natpmp \
47
		${EXTRA_CONF_ARGS}
55
		${EXTRA_CONF_ARGS}
48
CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
56
CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
49
		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto"
57
		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" \
58
		DHT_CFLAGS=" " \
59
		DHT_LIBS="-ldht" \
60
		LIBUTP_CFLAGS=" " \
61
		LIBUTP_LIBS="-lutp" \
62
		LIBUTP_LIBS_QT="-lutp"
63
50
EXTRA_CONF_ARGS?=--enable-cli \
64
EXTRA_CONF_ARGS?=--enable-cli \
51
		 --disable-daemon \
65
		 --disable-daemon \
52
		 --without-gtk \
66
		 --without-gtk \
Lines 82-87 Link Here
82
	@${REINPLACE_CMD} -e 's|utils \\|\\|g' \
96
	@${REINPLACE_CMD} -e 's|utils \\|\\|g' \
83
		${WRKSRC}/Makefile.in
97
		${WRKSRC}/Makefile.in
84
.endif
98
.endif
99
# Don't conflict with patches but force system libraries
100
	@${REINPLACE_CMD} -e 's|third-party \\|\\|g' \
101
		${WRKSRC}/Makefile.in
102
	@${REINPLACE_CMD} -Ee '/^DHT_(CFLAGS|LIBS)=/d' \
103
		-e 's|third-party/[^ ]*Makefile||g' \
104
		${WRKSRC}/configure
105
	@${REINPLACE_CMD} \
106
		-e 's,TRANSMISSION_TOP}/third-party/dht/libdht.a,DHT_LIBS},' \
107
		${WRKSRC}/qt/qtr.pro
108
	@${ECHO_CMD} 'DHT_LIBS = @DHT_LIBS@' >>${WRKSRC}/qt/config.pri.in
85
109
86
post-patch: general-patch
110
post-patch: general-patch
87
111

Return to bug 194029