--- security/tor/Makefile	(revision 425042)
+++ security/tor/Makefile	(working copy)
@@ -16,16 +16,22 @@ BROKEN_mips64=	Does not build: error: Need a uint1
 BROKEN_powerpc64=	Does not build
 BROKEN_sparc64=	Does not build: error: Need a uint128_t implementation!
 
-USES=		cpe gmake
+USES=		cpe gmake localbase
 CPE_VENDOR=	torproject
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc
-CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \
-		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
+CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="${CPPFLAGS}" \
+		TOR_LDFLAGS_libevent="${LDFLAGS}" \
 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
 
-OPTIONS_DEFINE=	STATIC_TOR TCMALLOC TOR2WEB TRANSPARENT
+OPTIONS_DEFINE=	BACKTRACE STATIC_TOR TCMALLOC TOR2WEB TRANSPARENT
 
+# XXX bug 203333: libexecinfo in base doesn't support stack unwinding
+BACKTRACE_DESC=		Stack backtrace support via (lib)execinfo
+BACKTRACE_BUILD_DEPENDS=libexecinfo>0:devel/libexecinfo
+BACKTRACE_RUN_DEPENDS=	libexecinfo>0:devel/libexecinfo
+BACKTRACE_LDFLAGS=	-Wl,-rpath,${LOCALBASE}/lib
+
 STATIC_TOR_DESC=	Build a static tor
 TCMALLOC_DESC=		Use the tcmalloc memory allocation library
 TOR2WEB_DESC=		(EXPERT OPTION) Faster but non-anonymous hidden services