Index: head/security/zeronet/Makefile
===================================================================
--- head/security/zeronet/Makefile	(revision 448506)
+++ head/security/zeronet/Makefile	(revision 448507)
@@ -1,68 +1,62 @@
 # Created by: Yuri Victorovich <yuri@rawbw.com>
 # $FreeBSD$
 
 PORTNAME=	zeronet
 PORTVERSION=	0.5.7
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	security net-p2p
 
 MAINTAINER=	yuri@rawbw.com
 COMMENT=	Decentralized websites using Bitcoin crypto and BitTorrent network
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}msgpack-python>0:devel/py-msgpack-python \
-		${PYTHON_PKGNAMEPREFIX}gevent>=1.0.2:devel/py-gevent
+		${PYTHON_PKGNAMEPREFIX}gevent>=1.0.2:devel/py-gevent \
+		${PYTHON_PKGNAMEPREFIX}stem>0:security/py-stem
 
 SUB_FILES=	zeronet-service zeronet-cmd pkg-message
 SUB_LIST=	LOCALBASE=${LOCALBASE} USER=${USER} GROUP=${GROUP}
 PLIST_SUB=	USER=${USER} GROUP=${GROUP}
 
 # ZeroNet hasn't been ported to Python 3 yet
 # https://github.com/HelloZeroNet/ZeroNet/issues/149
 USES=		python:2.7
 USE_GITHUB=	yes
 GH_ACCOUNT=	HelloZeroNet
 GH_PROJECT=	ZeroNet
 NO_ARCH=	yes
 
-OPTIONS_DEFINE=	TOR DEBUG
-TOR_DESC=	Enable TOR anonymity network integration
+OPTIONS_DEFINE=	DEBUG
 
-TOR_RUN_DEPENDS=tor:security/tor \
-		${PYTHON_PKGNAMEPREFIX}stem>0:security/py-stem
 DEBUG_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MTOR}
-USER=		_tor
-GROUP=		_tor
-.else
 USER=		nobody
 GROUP=		nobody
-.endif
 
 do-build:
 	@(cd ${WRKSRC} && \
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-d ${WRKSRC} -f ${WRKSRC} && \
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-d ${WRKSRC} -f ${WRKSRC})
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${CP} -R ${WRKSRC}/* ${STAGEDIR}${DATADIR}/
 	@${RM} `${FIND} ${STAGEDIR}${DATADIR} -name "*.orig"`
 	@${RM} `${FIND} ${STAGEDIR}${DATADIR} -name LICENSE`
 	@${RM} ${STAGEDIR}${DATADIR}/README*.md ${STAGEDIR}${DATADIR}/CHANGELOG*.md ${STAGEDIR}${DATADIR}/requirements.txt
 	@${RM} ${STAGEDIR}${DATADIR}/Vagrantfile ${STAGEDIR}${DATADIR}/Dockerfile
 	@${RM} -r `${FIND} ${STAGEDIR}${DATADIR} -name test`
 	@${MKDIR} ${STAGEDIR}/var/db/zeronet
 	@${MKDIR} ${STAGEDIR}/var/log/zeronet
 	@${LN} -s /var/db/zeronet ${STAGEDIR}${DATADIR}/data
 	@${LN} -s /var/log/zeronet ${STAGEDIR}${DATADIR}/log
 	${INSTALL_SCRIPT} ${WRKDIR}/zeronet-cmd ${STAGEDIR}${PREFIX}/bin/zeronet
 	${INSTALL_SCRIPT} ${WRKDIR}/zeronet-service ${STAGEDIR}${PREFIX}/etc/rc.d/zeronet
 
 .include <bsd.port.mk>
Index: head/security/zeronet/files/pkg-message.in
===================================================================
--- head/security/zeronet/files/pkg-message.in	(revision 448506)
+++ head/security/zeronet/files/pkg-message.in	(revision 448507)
@@ -1,30 +1,32 @@
 ======================================================================
 You installed ZeroNet: Decentralized websites using Bitcoin crypto.
 
 It is recommended to run ZeroNet as a service:
 # sysrc zeronet_enable="YES"
 # service zeronet start
 
 To access ZeroNet please navigate to:
 http://localhost:43110
 
 You can also run ZeroNet manually (not recommended) with the command:
 # su -m %%USER%% -c zeronet
 
 To run ZeroNet commands:
 # su -m %%USER%% zeronet cmd {arg1 {arg2 {...}}}
 For example, to create a new ZeroNet site:
 # su -m %%USER%% zeronet siteCreate
 
-For Tor integration (recommended) please have these items:
-* option TOR=on in zeronet package
-* make sure %%LOCALBASE%%/etc/tor/torrc has "ControlPort 9051"
-* make sure tor service runs (service tor start)
+For Tor integration (recommended) please make sure:
+* Tor is installed:
+  # pkg install tor
+* %%LOCALBASE%%/etc/tor/torrc has "ControlPort 9051"
+* Tor service runs:
+  # service tor start
 * zeronet_args in /etc/rc.conf has "--tor enable" or "--tor always"
 
 Without the Tor integration, you need to make sure that your router
 has either UPnP enabled, or port 15441 open.
 
 For more details please see ZeroNet documentation here:
 http://zeronet.readthedocs.io/en/latest
 ======================================================================