Index: head/security/tor-devel/Makefile =================================================================== --- head/security/tor-devel/Makefile (revision 433038) +++ head/security/tor-devel/Makefile (revision 433039) @@ -1,128 +1,132 @@ # Created by: peter.thoenen@yahoo.com # $FreeBSD$ PORTNAME= tor -DISTVERSION= 0.3.0.1-alpha +DISTVERSION= 0.3.0.2-alpha CATEGORIES= security net ipv6 MASTER_SITES= TOR PKGNAMESUFFIX= -devel MAINTAINER= yuri@rawbw.com COMMENT= Anonymizing overlay network for TCP LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_mips64= Does not build: error: Need a uint128_t implementation! BROKEN_powerpc64= Does not build BROKEN_sparc64= Does not build: error: Need a uint128_t implementation! USES= cpe gmake 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 GROUPS= _tor USERS= _tor 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 .if !defined(USE_GCC) && empty(CC:T:M*gcc4*) && \ empty(PORT_OPTIONS:MSTATIC_TOR) && empty(ARCH:Mia64) CONFIGURE_ARGS+= --enable-gcc-hardening .else CONFIGURE_ARGS+= --disable-gcc-hardening .endif .if ${PORT_OPTIONS:MSTATIC_TOR} BUILD_DEPENDS += ${LOCALBASE}/lib/libevent.a:devel/libevent2 CONFIGURE_ARGS+= --enable-static-tor \ --with-zlib-dir=/usr/lib --disable-linker-hardening TOR_LIBEVENT_LIBS= ${LOCALBASE}/lib/libevent.a .else CONFIGURE_ARGS+= --enable-linker-hardening LIB_DEPENDS+= libevent.so:devel/libevent2 TOR_LIBEVENT_LIBS= -levent .endif .if ${PORT_OPTIONS:MTCMALLOC} CONFIGURE_ARGS+= --with-tcmalloc .if ${PORT_OPTIONS:MSTATIC_TOR} BUILD_DEPENDS+= ${LOCALBASE}/lib/libtcmalloc.a:devel/google-perftools .else LIB_DEPENDS+= libtcmalloc.so:devel/google-perftools .endif .endif .if ${PORT_OPTIONS:MTOR2WEB} CONFIGURE_ARGS+= --enable-tor2web-mode .endif .if ${PORT_OPTIONS:MTRANSPARENT} CONFIGURE_ARGS+= --enable-transparent .else CONFIGURE_ARGS+= --disable-transparent .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@g" \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|lib/tor|db/tor|' \ ${WRKSRC}/src/config/torrc.*.in \ ${WRKSRC}/doc/tor.1.* \ ${WRKSRC}/doc/tor.html.in post-patch-STATIC_TOR-off: @${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.so@" \ ${WRKSRC}/configure post-patch-STATIC_TOR-on: @${REINPLACE_CMD} -e "s@-ltcmalloc@${LOCALBASE}/lib/libtcmalloc.a@" \ ${WRKSRC}/configure post-configure: @${REINPLACE_CMD} -e '\|^nodist_man1_MANS =|s|$$|$$(install_mans:=.1)|' \ ${WRKSRC}/Makefile post-install: @${MKDIR} ${STAGEDIR}/var/log/tor ${STAGEDIR}/var/run/tor .if ! ${PORT_OPTIONS:MTOR2WEB} check regression-test test: build @cd ${BUILD_WRKSRC} ; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \ ${MAKE_ARGS} check .endif .include Index: head/security/tor-devel/distinfo =================================================================== --- head/security/tor-devel/distinfo (revision 433038) +++ head/security/tor-devel/distinfo (revision 433039) @@ -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 Index: head/security/tor-devel/pkg-plist =================================================================== --- head/security/tor-devel/pkg-plist (revision 433038) +++ head/security/tor-devel/pkg-plist (revision 433039) @@ -1,13 +1,17 @@ bin/tor 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 @dir(_tor,_tor,750) /var/log/tor