svn commit: r307645 - head/security/tor-devel

[Brendan Fabeny]

Author: bf
Date: Thu Nov 22 11:30:22 2012
New Revision: 307645
URL: http://svnweb.freebsd.org/changeset/ports/307645

Log:
  update to 0.2.4.6-alpha
  
  Feature safe:	yes

Modified:
  head/security/tor-devel/Makefile
  head/security/tor-devel/distinfo

Modified: head/security/tor-devel/Makefile
==============================================================================
--- head/security/tor-devel/Makefile	Thu Nov 22 11:27:07 2012	(r307644)
+++ head/security/tor-devel/Makefile	Thu Nov 22 11:30:22 2012	(r307645)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tor
-DISTVERSION=	0.2.3.24-rc
+DISTVERSION=	0.2.4.6-alpha
 CATEGORIES=	security net ipv6
 MASTER_SITES=	https://www.torproject.org/dist/ \
 		ftp://ftp.bit.nl/mirror/tor/ \
@@ -116,6 +116,10 @@ CONFIGURE_ARGS+=	--disable-gcc-hardening
 WITH_OPENSSL_PORT=	yes
 .endif
 
+.if  ( ${OSVERSION} < 800038 )
+CPPFLAGS+=	-DSTAILQ_ENTRY=SIMPLEQ_ENTRY
+.endif
+
 .if ${PORT_OPTIONS:MBUFFEREVENTS}
 CONFIGURE_ARGS+=	--enable-bufferevents
 .else
@@ -181,9 +185,8 @@ post-patch:
 	@${MV} ${WRKSRC}/contrib/tor-tsocks.conf \
 		${WRKSRC}/contrib/tor-tsocks.conf.sample
 	@${REINPLACE_CMD} -e "s|tor-tsocks.conf|tor-tsocks.conf.sample|g" \
-		${WRKSRC}/contrib/Makefile.in
-	@${REINPLACE_CMD} -e '\|^install-data-am:|s|install-docDATA||' \
-		${WRKSRC}/doc/Makefile.in
+		-e "\|^install-data-am:|s|install-docDATA||" \
+		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -E -e "s at -ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \
 		-e "s@(-z) (relro|now)@-Wl,\1,\2 at g" \
 		${WRKSRC}/configure
@@ -191,8 +194,8 @@ post-patch:
 post-configure:
 	@${FIND} -X ${WRKSRC} -type f -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
 		"s|-lpthread|${PTHREAD_LIBS}|g"
-	@${REINPLACE_CMD} -e '\|^nodist_man_MANS =|s|$$|${MAN1}|' \
-		${WRKSRC}/doc/Makefile
+	@${REINPLACE_CMD} -e '\|^nodist_man1_MANS =|s|$$|${MAN1:S@^@doc/@}|' \
+		${WRKSRC}/Makefile
 
 post-install:
 	${MKDIR} /var/run/tor

Modified: head/security/tor-devel/distinfo
==============================================================================
--- head/security/tor-devel/distinfo	Thu Nov 22 11:27:07 2012	(r307644)
+++ head/security/tor-devel/distinfo	Thu Nov 22 11:30:22 2012	(r307645)
@@ -1,2 +1,2 @@
-SHA256 (tor-0.2.3.24-rc.tar.gz) = 6ac663f32e4d36e633672cafdd43d691d4e0b6f14a2344fe4e016cc3dbbd6019
-SIZE (tor-0.2.3.24-rc.tar.gz) = 3187711
+SHA256 (tor-0.2.4.6-alpha.tar.gz) = 2b7b3c9d1568dec9213965ab15d83702411efcbe9143e37e571a766cea670012
+SIZE (tor-0.2.4.6-alpha.tar.gz) = 3208046