aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbf <bf@FreeBSD.org>2010-08-07 02:05:37 +0800
committerbf <bf@FreeBSD.org>2010-08-07 02:05:37 +0800
commit7a3073fcb031a2f2c767cde2cb74c6c3991ab934 (patch)
tree05c831bea9240234676d71ded987aa8740e2d967
parent9c16dc422014fc0af63cda1504077940eba84564 (diff)
downloadfreebsd-ports-gnome-7a3073fcb031a2f2c767cde2cb74c6c3991ab934.tar.gz
freebsd-ports-gnome-7a3073fcb031a2f2c767cde2cb74c6c3991ab934.tar.zst
freebsd-ports-gnome-7a3073fcb031a2f2c767cde2cb74c6c3991ab934.zip
update to 0.2.2.14-alpha
PR: 148854 Submitted by: bf Approved by: makc, miwi
-rw-r--r--security/tor-devel/Makefile18
-rw-r--r--security/tor-devel/distinfo6
2 files changed, 11 insertions, 13 deletions
diff --git a/security/tor-devel/Makefile b/security/tor-devel/Makefile
index ca340d731e0f..876939ed8eec 100644
--- a/security/tor-devel/Makefile
+++ b/security/tor-devel/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= tor
-DISTVERSION= 0.2.2.13-alpha
-PORTREVISION= 1
+DISTVERSION= 0.2.2.14-alpha
CATEGORIES= security net ipv6
MASTER_SITES= http://www.torproject.org/dist/ \
http://tor.cypherpunks.at/dist/ \
@@ -24,7 +23,6 @@ LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent
GNU_CONFIGURE= yes
USE_OPENSSL= yes
-WITH_OPENSSL_PORT= yes
CONFIGURE_ARGS+= --with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc
CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
@@ -44,6 +42,10 @@ CONFLICTS= tor-[0-9]*
.include <bsd.port.pre.mk>
+.if ( ${OSVERSION} < 801000 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900011) )
+WITH_OPENSSL_PORT= yes
+.endif
+
.if defined(WITH_BUFFREELISTS)
CONFIGURE_ARGS+= --enable-buf-freelists
.else
@@ -83,15 +85,11 @@ post-patch:
${WRKSRC}/contrib/tor-tsocks.conf.sample
@${REINPLACE_CMD} -e "s|tor-tsocks.conf|tor-tsocks.conf.sample|g" \
${WRKSRC}/contrib/Makefile.in
- @${FIND} -X ${WRKSRC} -type f | ${XARGS} \
- -n 10 ${REINPLACE_CMD} -E \
- -e 's|-g -O2||g' \
- -e 's|-O2||g' \
- -e 's|-g -O||g' \
- -e 's|netinet/in6|netinet6/in6|g'
+ @${REINPLACE_CMD} -e '\|CFLAGS=|{s|-g||;s|-O[0-9]\{0,1\}||;}' \
+ -e 's|netinet/in6|netinet6/in6|g' ${WRKSRC}/configure
post-configure:
- @${FIND} -X ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
+ @${FIND} -X ${WRKSRC} -type f -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
"s|-lpthread|${PTHREAD_LIBS}|g"
pre-su-install:
diff --git a/security/tor-devel/distinfo b/security/tor-devel/distinfo
index d995c6c74fff..5474b3b66823 100644
--- a/security/tor-devel/distinfo
+++ b/security/tor-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (tor-0.2.2.13-alpha.tar.gz) = 8e332a7a91f78cdc3071a6fd77609264
-SHA256 (tor-0.2.2.13-alpha.tar.gz) = abf0386ceec9b04a795ac270cdad40f0497916eaf1cec4f952c915a3a7da3dc2
-SIZE (tor-0.2.2.13-alpha.tar.gz) = 2306769
+MD5 (tor-0.2.2.14-alpha.tar.gz) = 62100f26d9ccdbe9a570d0757946dfb9
+SHA256 (tor-0.2.2.14-alpha.tar.gz) = 0afc7b79007b5265d59dbca0a5e676aa22ea7177c512253d3a06308d30fd895f
+SIZE (tor-0.2.2.14-alpha.tar.gz) = 2527986