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

[Dmitry Marakasov]

Author: amdmi3
Date: Wed Feb  1 14:42:00 2017
New Revision: 433039
URL: https://svnweb.freebsd.org/changeset/ports/433039

Log:
  - Update to 0.3.0.2-alpha
  - Manpages now require asciidoc and are optional
  
  PR:		216418
  Submitted by:	neel at neelc.org
  Approved by:	yuri at rawbw.com (maintainer)

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

Modified: head/security/tor-devel/Makefile
==============================================================================
--- head/security/tor-devel/Makefile	Wed Feb  1 14:40:48 2017	(r433038)
+++ head/security/tor-devel/Makefile	Wed Feb  1 14:42:00 2017	(r433039)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tor
-DISTVERSION=	0.3.0.1-alpha
+DISTVERSION=	0.3.0.2-alpha
 CATEGORIES=	security net ipv6
 MASTER_SITES=	TOR
 PKGNAMESUFFIX=	-devel
@@ -22,19 +22,20 @@ CPE_VENDOR=	torproject
 #CPE_VERSION=	${DISTVERSION:C/-.*//}
 #CPE_UPDATE=	${DISTVERSION:C/.*-//}
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc
+CONFIGURE_ARGS=	--with-openssl-dir="${OPENSSLBASE}"
 CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \
 		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
 
-OPTIONS_DEFINE=	STATIC_TOR TCMALLOC TOR2WEB TRANSPARENT
+OPTIONS_DEFINE=	MANPAGES STATIC_TOR TCMALLOC TOR2WEB TRANSPARENT
+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
 TRANSPARENT_DESC=	Transparent proxy support
 
-OPTIONS_DEFAULT=	TRANSPARENT
+OPTIONS_DEFAULT=	MANPAGES TRANSPARENT
 
 USE_RC_SUBR=	tor
 SUB_FILES=	pkg-message
@@ -47,6 +48,9 @@ CONFLICTS=	tor-[0-9]*
 STATIC_TOR_USES=	ssl:build
 STATIC_TOR_USES_OFF=	ssl
 
+MANPAGES_BUILD_DEPENDS=	asciidoc:textproc/asciidoc
+MANPAGES_CONFIGURE_OFF=	--disable-asciidoc
+
 .include <bsd.port.options.mk>
 
 .if !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \

Modified: head/security/tor-devel/distinfo
==============================================================================
--- head/security/tor-devel/distinfo	Wed Feb  1 14:40:48 2017	(r433038)
+++ head/security/tor-devel/distinfo	Wed Feb  1 14:42:00 2017	(r433039)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1482222281
-SHA256 (tor-0.3.0.1-alpha.tar.gz) = 7013353f0cbd2af8c0144f6167339f6eb252eb35ca9a2db2971310171108b064
-SIZE (tor-0.3.0.1-alpha.tar.gz) = 5704559
+TIMESTAMP = 1485182220
+SHA256 (tor-0.3.0.2-alpha.tar.gz) = 736f135ab2b6473ccbeb454a845451555a99d72b4c6015e77c7689392bfec17c
+SIZE (tor-0.3.0.2-alpha.tar.gz) = 5733704

Modified: head/security/tor-devel/pkg-plist
==============================================================================
--- head/security/tor-devel/pkg-plist	Wed Feb  1 14:40:48 2017	(r433038)
+++ head/security/tor-devel/pkg-plist	Wed Feb  1 14:42:00 2017	(r433039)
@@ -3,10 +3,14 @@ bin/tor-gencert
 bin/tor-resolve
 bin/torify
 @sample etc/tor/torrc.sample
-man/man1/tor-gencert.1.gz
-man/man1/tor-resolve.1.gz
-man/man1/tor.1.gz
-man/man1/torify.1.gz
+%%MANPAGES%%man/man1/tor-gencert.1.gz
+%%MANPAGES%%man/man1/tor-resolve.1.gz
+%%MANPAGES%%man/man1/tor.1.gz
+%%MANPAGES%%man/man1/torify.1.gz
+%%MANPAGES%%%%PORTDOCS%%%%DOCSDIR%%/tor-gencert.html
+%%MANPAGES%%%%PORTDOCS%%%%DOCSDIR%%/tor-resolve.html
+%%MANPAGES%%%%PORTDOCS%%%%DOCSDIR%%/tor.html
+%%MANPAGES%%%%PORTDOCS%%%%DOCSDIR%%/torify.html
 %%DATADIR%%/geoip
 %%DATADIR%%/geoip6
 @dir(_tor,_tor,750) /var/run/tor