- Update to 0.2.0.2 alpha

PR:		112493
Submitted by:	bf <bf2006a@yahoo.com>
Approved by:	maintainer

security/tor-devel/Makefile

@@ -6,13 +6,11 @@
 #
 
 PORTNAME=	tor
-PORTVERSION=	0.1.2.12
-PORTREVISION=	1
+DISTVERSION=	0.2.0.2-alpha
 CATEGORIES=	security net
 MASTER_SITES=	http://tor.eff.org/dist/ \
 		http://mirror.onionland.org/dist/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-${PORTVERSION}-rc
 
 MAINTAINER=	peter.thoenen@yahoo.com
 COMMENT=	An anonymizing overlay network for TCP
@@ -23,24 +21,65 @@ LIB_DEPENDS=	event-1.3b:${PORTSDIR}/devel/libevent
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 
+OPTIONS=	CELLPOOL "memory pool allocator for cells" on \
+		THREADS "multi-threading support" on \
+		TRANSPARENT "transparent proxy support" on \
+		VIDALIA "Vidalia graphical Tor controller" off
+
 USE_RC_SUBR=	tor
 SUB_FILES=	pkg-message
 
-CONFLICTS=	tor-1.1.[0-9]*
+CONFLICTS=	tor-0.1.[0-9]*
 
 MANCOMPRESSED=	no
-MAN1=		tor.1 tor-resolve.1 torify.1 
+MAN1=		tor.1 tor-resolve.1 torify.1
+
 .include <bsd.port.pre.mk>
 
+CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
+CONFIGURE_ENV+=	CPPFLAGS+=-I{LOCALBASE}/include \
+		LDFLAGS+=-L{LOCALBASE}/lib
+
+.if defined(WITH_CELLPOOL)
+CONFIGURE_ARGS+=	--enable-cell-pool
+.else
+CONFIGURE_ARGS+=	--disable-cell-pool
+.endif
+
+.if defined(WITH_THREADS)
+CONFIGURE_ARGS+=	--enable-threads
+CONFIGURE_ENV+=	LDFLAGS+={PTHREAD_LIBS}
+.else
+CONFIGURE_ARGS+=	--disable-threads
+.endif
+
+.if defined(WITH_TRANSPARENT)
+CONFIGURE_ARGS+=	--enable-transparent
+.else
+CONFIGURE_ARGS+=	--disable-transparent
+.endif
+
+.ifdef(WITH_VIDALIA)
+RUN_DEPENDS+=	vidalia:${PORTSDIR}/net-mgmt/vidalia
+.endif
+
 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
+#fix typos in configure scripts, undesirable compiler flags, wrong location of in6.h
 	@${FIND} ${WRKSRC} -type f | ${XARGS} \
 		-n 10 ${REINPLACE_CMD} -E \
-		-e 's!-g -O2!!' \
-		-e 's!-O2!!'
+		-e 's|-g -O2||g' \
+		-e 's|-O2||g' \
+		-e 's|-g -O||g' \
+		-e 's|netintet|netinet|g' \
+		-e 's|netinet/in6|netinet6/in6|g'
+
+post-configure:
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
+		's|-lpthread|${PTHREAD_LIBS}|g'
 
 pre-su-install:
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} \

security/tor-devel/distinfo

@@ -1,3 +1,3 @@
-MD5 (tor-0.1.2.12-rc.tar.gz) = 096e46d261a8f66525ecc241904e89c4
-SHA256 (tor-0.1.2.12-rc.tar.gz) = cebd76bbb9b79a2e433f4b588b33a25143f748856968737d1bffac80c427b3bb
-SIZE (tor-0.1.2.12-rc.tar.gz) = 1170674
+MD5 (tor-0.2.0.2-alpha.tar.gz) = 201c472a7e145e7a509755f691e95d3a
+SHA256 (tor-0.2.0.2-alpha.tar.gz) = 478de3c1d5b16e3c8170b141dee0b7e0d53cdacf39ea1085375e8f0a73825e11
+SIZE (tor-0.2.0.2-alpha.tar.gz) = 1285290

security/tor-devel/pkg-plist

@@ -1,4 +1,5 @@
 bin/tor
+bin/tor-gencert
 bin/tor-resolve
 bin/torify
 etc/tor/tor-tsocks.conf.sample