--- Makefile	(revision 373664)
+++ Makefile	(working copy)
@@ -2,7 +2,7 @@ 
 # $FreeBSD$
 
 PORTNAME=	tor
-DISTVERSION=	0.2.4.24
+DISTVERSION=	0.2.5.10
 CATEGORIES=	security net ipv6
 MASTER_SITES=	TOR
 
@@ -19,18 +19,19 @@ 
 		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
 
-OPTIONS_DEFINE=	BUFFEREVENTS BUFFREELISTS INSTR_DOWNLOADS \
+OPTIONS_DEFINE=	BUFFEREVENTS BUFFREELISTS INSTR_DOWNLOADS MEMPOOLS \
 		STATIC_TOR TCMALLOC THREADS TOR2WEB TRANSPARENT
 
 BUFFEREVENTS_DESC=	Use libevent's buffered IO
 BUFFREELISTS_DESC=	Freelists for buffer RAM
 INSTR_DOWNLOADS_DESC=	Instrument downloads for analysis
+MEMPOOLS_DESC=		Mempools for relay cells
 STATIC_TOR_DESC=	Build a static tor
 TCMALLOC_DESC=		Use the tcmalloc memory allocation library
 TOR2WEB_DESC=		Faster but non-anonymous hidden services
 TRANSPARENT_DESC=	Transparent proxy support
 
-OPTIONS_DEFAULT=	BUFFREELISTS THREADS TRANSPARENT
+OPTIONS_DEFAULT=	THREADS TRANSPARENT
 
 USE_OPENSSL=	yes
 
@@ -40,7 +41,7 @@ 
 GROUPS=		_tor
 USERS=		_tor
 
-CONFLICTS=	tor-devel-[0-9]*
+CONFLICTS=	tor-[0-9]*
 
 .include <bsd.port.options.mk>
 
@@ -70,6 +71,12 @@ 
 CONFIGURE_ARGS+=	--disable-instrument-downloads
 .endif
 
+.if ${PORT_OPTIONS:MMEMPOOLS}
+CONFIGURE_ARGS+=	--enable-mempools
+.else
+CONFIGURE_ARGS+=	--disable-mempools
+.endif
+
 .if ${PORT_OPTIONS:MSTATIC_TOR}
 BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2
 CONFIGURE_ARGS+=	--enable-static-tor \
@@ -121,7 +128,7 @@ 
 post-configure:
 	@${FIND} -X ${WRKSRC} -type f -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
 		"s|-lpthread|${PTHREAD_LIBS}|g"
-	@${REINPLACE_CMD} -e '\|^nodist_man1_MANS =|s|$$|$$(regular_mans:=.1)|' \
+	@${REINPLACE_CMD} -e '\|^nodist_man1_MANS =|s|$$|$$(install_mans:=.1)|' \
 		${WRKSRC}/Makefile
 
 .if ! ${PORT_OPTIONS:MTOR2WEB}
--- distinfo	(revision 373664)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@ 
-SHA256 (tor-0.2.4.24.tar.gz) = 99b15c6858c04e93a31d3ae90dd69f5021faa2237da93a24fbd246f4f1670ad1
-SIZE (tor-0.2.4.24.tar.gz) = 3002418
+SHA256 (tor-0.2.5.10.tar.gz) = b3dd02a5dcd2ffe14d9a37956f92779d4427edf7905c0bba9b1e3901b9c5a83b
+SIZE (tor-0.2.5.10.tar.gz) = 3166480