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

[Yuri Victorovich]

Author: yuri
Date: Sat Sep 22 16:06:30 2018
New Revision: 480392
URL: https://svnweb.freebsd.org/changeset/ports/480392

Log:
  security/tor-devel: Remove the TOR2WEB option because it has been discontinued by the upsteam

Modified:
  head/security/tor-devel/Makefile

Modified: head/security/tor-devel/Makefile
==============================================================================
--- head/security/tor-devel/Makefile	Sat Sep 22 15:55:14 2018	(r480391)
+++ head/security/tor-devel/Makefile	Sat Sep 22 16:06:30 2018	(r480392)
@@ -3,6 +3,7 @@
 
 PORTNAME=	tor
 DISTVERSION=	0.3.5.2
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	-alpha
 CATEGORIES=	security net ipv6
 MASTER_SITES=	TOR
@@ -26,14 +27,13 @@ CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/i
 		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
 
-OPTIONS_DEFINE=	MANPAGES DOCS STATIC_TOR TCMALLOC TOR2WEB
+OPTIONS_DEFINE=	MANPAGES DOCS STATIC_TOR TCMALLOC
 OPTIONS_GROUP=	COMPRESSION
 OPTIONS_GROUP_COMPRESSION=ZSTD LZMA
 OPTIONS_DEFAULT=MANPAGES ZSTD LZMA
 OPTIONS_SUB=	yes
 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
 COMPRESSION_DESC=	Supported compression libraries
 
 USE_RC_SUBR=	tor
@@ -49,7 +49,6 @@ CONFLICTS_INSTALL=	tor-[0-9]*
 STATIC_TOR_USES=	ssl:build
 STATIC_TOR_USES_OFF=	ssl
 
-TOR2WEB_CONFIGURE_ENABLE=	tor2web-mode
 ZSTD_CONFIGURE_ENABLE=		zstd
 ZSTD_CONFIGURE_ENV=TOR_ZSTD_LIBS="${TOR_ZSTD_LIBS}"
 LZMA_CONFIGURE_ENABLE=		lzma
@@ -97,16 +96,6 @@ LIB_DEPENDS+=		libtcmalloc.so:devel/google-perftools
 .endif
 .endif
 
-pre-everything::
-.if ${PORT_OPTIONS:MTOR2WEB}
-	@${ECHO_MSG}
-	@${ECHO_MSG} "Warning: The expert option 'tor2web' is chosen."
-	@${ECHO_MSG} "         With this option tor cannot be used for regular traffic,"
-	@${ECHO_MSG} "         only for non-anonymous hidden service traffic."
-	@${ECHO_MSG} "         Please make sure you understand this option."
-	@${ECHO_MSG}
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -E -e "s@(-z) (relro|now)@-Wl,\1,\2 at g" \
 		${WRKSRC}/configure
@@ -126,10 +115,8 @@ post-patch-STATIC_TOR-on:
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor ${STAGEDIR}/var/db/tor
 
-.if ! ${PORT_OPTIONS:MTOR2WEB}
 check regression-test test: build
-	@cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
+	@cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_ARGS} check
-.endif
 
 .include <bsd.port.mk>