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

Collapse All | Expand All

(-)Makefile (-5 / +12 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	tor
4
PORTNAME=	tor
5
DISTVERSION=	0.2.4.24
5
DISTVERSION=	0.2.5.10
6
CATEGORIES=	security net ipv6
6
CATEGORIES=	security net ipv6
7
MASTER_SITES=	TOR
7
MASTER_SITES=	TOR
8
8
Lines 19-36 Link Here
19
		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
19
		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
20
		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
20
		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
21
21
22
OPTIONS_DEFINE=	BUFFEREVENTS BUFFREELISTS INSTR_DOWNLOADS \
22
OPTIONS_DEFINE=	BUFFEREVENTS BUFFREELISTS INSTR_DOWNLOADS MEMPOOLS \
23
		STATIC_TOR TCMALLOC THREADS TOR2WEB TRANSPARENT
23
		STATIC_TOR TCMALLOC THREADS TOR2WEB TRANSPARENT
24
24
25
BUFFEREVENTS_DESC=	Use libevent's buffered IO
25
BUFFEREVENTS_DESC=	Use libevent's buffered IO
26
BUFFREELISTS_DESC=	Freelists for buffer RAM
26
BUFFREELISTS_DESC=	Freelists for buffer RAM
27
INSTR_DOWNLOADS_DESC=	Instrument downloads for analysis
27
INSTR_DOWNLOADS_DESC=	Instrument downloads for analysis
28
MEMPOOLS_DESC=		Mempools for relay cells
28
STATIC_TOR_DESC=	Build a static tor
29
STATIC_TOR_DESC=	Build a static tor
29
TCMALLOC_DESC=		Use the tcmalloc memory allocation library
30
TCMALLOC_DESC=		Use the tcmalloc memory allocation library
30
TOR2WEB_DESC=		Faster but non-anonymous hidden services
31
TOR2WEB_DESC=		Faster but non-anonymous hidden services
31
TRANSPARENT_DESC=	Transparent proxy support
32
TRANSPARENT_DESC=	Transparent proxy support
32
33
33
OPTIONS_DEFAULT=	BUFFREELISTS THREADS TRANSPARENT
34
OPTIONS_DEFAULT=	THREADS TRANSPARENT
34
35
35
USE_OPENSSL=	yes
36
USE_OPENSSL=	yes
36
37
Lines 40-46 Link Here
40
GROUPS=		_tor
41
GROUPS=		_tor
41
USERS=		_tor
42
USERS=		_tor
42
43
43
CONFLICTS=	tor-devel-[0-9]*
44
CONFLICTS=	tor-[0-9]*
44
45
45
.include <bsd.port.options.mk>
46
.include <bsd.port.options.mk>
46
47
Lines 70-75 Link Here
70
CONFIGURE_ARGS+=	--disable-instrument-downloads
71
CONFIGURE_ARGS+=	--disable-instrument-downloads
71
.endif
72
.endif
72
73
74
.if ${PORT_OPTIONS:MMEMPOOLS}
75
CONFIGURE_ARGS+=	--enable-mempools
76
.else
77
CONFIGURE_ARGS+=	--disable-mempools
78
.endif
79
73
.if ${PORT_OPTIONS:MSTATIC_TOR}
80
.if ${PORT_OPTIONS:MSTATIC_TOR}
74
BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2
81
BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2
75
CONFIGURE_ARGS+=	--enable-static-tor \
82
CONFIGURE_ARGS+=	--enable-static-tor \
Lines 121-127 Link Here
121
post-configure:
128
post-configure:
122
	@${FIND} -X ${WRKSRC} -type f -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
129
	@${FIND} -X ${WRKSRC} -type f -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
123
		"s|-lpthread|${PTHREAD_LIBS}|g"
130
		"s|-lpthread|${PTHREAD_LIBS}|g"
124
	@${REINPLACE_CMD} -e '\|^nodist_man1_MANS =|s|$$|$$(regular_mans:=.1)|' \
131
	@${REINPLACE_CMD} -e '\|^nodist_man1_MANS =|s|$$|$$(install_mans:=.1)|' \
125
		${WRKSRC}/Makefile
132
		${WRKSRC}/Makefile
126
133
127
.if ! ${PORT_OPTIONS:MTOR2WEB}
134
.if ! ${PORT_OPTIONS:MTOR2WEB}
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (tor-0.2.4.24.tar.gz) = 99b15c6858c04e93a31d3ae90dd69f5021faa2237da93a24fbd246f4f1670ad1
1
SHA256 (tor-0.2.5.10.tar.gz) = b3dd02a5dcd2ffe14d9a37956f92779d4427edf7905c0bba9b1e3901b9c5a83b
2
SIZE (tor-0.2.4.24.tar.gz) = 3002418
2
SIZE (tor-0.2.5.10.tar.gz) = 3166480

Return to bug 195486