aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrendan Fabeny <bf@FreeBSD.org>2011-09-09 19:26:41 +0000
committerBrendan Fabeny <bf@FreeBSD.org>2011-09-09 19:26:41 +0000
commita508d90c318aafddbd56869bc19490d44f477da9 (patch)
tree1692879280b805b810450bc733c24b72e9b17f79
parent1ad1b85b625983d4344eb0312ffa12c5ef654846 (diff)
downloadports-a508d90c318aafddbd56869bc19490d44f477da9.tar.gz
ports-a508d90c318aafddbd56869bc19490d44f477da9.zip
Notes
-rw-r--r--security/tor-devel/Makefile13
-rw-r--r--security/tor-devel/distinfo4
2 files changed, 11 insertions, 6 deletions
diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile
index 74cfcccbde70..f6628078cc99 100644
--- a/security/tor-devel/Makefile
+++ b/security/tor-devel/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= tor
-DISTVERSION= 0.2.3.2-alpha
-PORTREVISION= 1
+DISTVERSION= 0.2.3.3-alpha
CATEGORIES= security net ipv6
MASTER_SITES= https://www.torproject.org/dist/ \
ftp://ftp.bit.nl/mirror/tor/ \
@@ -72,6 +71,12 @@ MAN1= tor.1 tor-resolve.1 torify.1 tor-gencert.1
.include <bsd.port.pre.mk>
+.if ( (${OSVERSION} >= 703100 && ${OSVERSION} < 800000) || \
+(${OSVERSION} >= 800500 && ${OSVERSION} < 900000) || \
+(${OSVERSION} >= 900003) ) && !defined(USE_GCC)
+CONFIGURE_ARGS+= --enable-gcc-hardening
+.endif
+
.if ( ${OSVERSION} < 704000 || \
(${OSVERSION} >= 800000 && ${OSVERSION} < 802000) || \
(${OSVERSION} >= 900000 && ${OSVERSION} < 900027) )
@@ -80,7 +85,6 @@ WITH_OPENSSL_PORT= yes
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
.if defined(WITH_BUFFEREVENTS)
-BROKEN = there are unresolved problems with BUFFEREVENTS; please disable this option
CONFIGURE_ARGS+= --enable-bufferevents
.else
CONFIGURE_ARGS+= --disable-bufferevents
@@ -117,7 +121,6 @@ TOR_LIBEVENT_LIBS:= -levent_openssl-2.0 ${TOR_LIBEVENT_LIBS}
.if defined(WITH_TCMALLOC)
CONFIGURE_ARGS+= --with-tcmalloc
-LDFLAGS+= -L${LOCALBASE}/lib
.if defined(WITH_STATIC_TOR)
BUILD_DEPENDS += ${LOCALBASE}/lib/libtcmalloc.so:${PORTSDIR}/devel/google-perftools
.else
@@ -145,6 +148,8 @@ post-patch:
${WRKSRC}/contrib/Makefile.in
@${REINPLACE_CMD} -e '\|^install-data-am:|s|install-docDATA||' \
${WRKSRC}/doc/Makefile.in
+ @${REINPLACE_CMD} -e "s|-ltcmalloc|${LOCALBASE}/lib/libtcmalloc.so|" \
+ ${WRKSRC}/configure
post-configure:
@${FIND} -X ${WRKSRC} -type f -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/security/tor-devel/distinfo b/security/tor-devel/distinfo
index c2cf78371474..3afd0a1d7b0e 100644
--- a/security/tor-devel/distinfo
+++ b/security/tor-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tor-0.2.3.2-alpha.tar.gz) = 8f423af73c8d8477752858cfcc0c15860f487a0f9a390e791eaea22f4b467edd
-SIZE (tor-0.2.3.2-alpha.tar.gz) = 2755750
+SHA256 (tor-0.2.3.3-alpha.tar.gz) = 10293bc387769e47dcef308ff1cdeb1fea1b5ad316ff7b82069c43b51da0f129
+SIZE (tor-0.2.3.3-alpha.tar.gz) = 2813912