Index: head/net-im/ricochet/Makefile
===================================================================
--- head/net-im/ricochet/Makefile	(revision 454074)
+++ head/net-im/ricochet/Makefile	(revision 454075)
@@ -1,44 +1,45 @@
 # Created by: Yuri Victorovich <yuri@rawbw.com>
 # $FreeBSD$
 
 PORTNAME=	ricochet
 PORTVERSION=	1.1.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	net-im net-p2p
 
-MAINTAINER=	yuri@rawbw.com
+MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Anonymous peer-to-peer instant messenger
 
 LICENSE=	RICOCHET
 LICENSE_NAME=	Ricochet
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf
-RUN_DEPENDS=	tor:security/tor
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	ricochet-im
+OPTIONS_DEFINE=	TOR
+OPTIONS_DEFAULT=	TOR
+TOR_DESC=	Install Tor: it is required for ${PORTNAME} to run
 
 USES=		compiler:c++11-lib gmake pkgconfig qmake ssl
+USE_GITHUB=	yes
+GH_ACCOUNT=	ricochet-im
+USE_QT5=	core gui multimedia network qml quick quickcontrols widgets \
+		buildtools_build linguisttools_build
 USE_GL=		gl
-USE_QT5=	core gui network qml quick widgets multimedia buildtools_build linguisttools_build
-QMAKE_ARGS+=	DEFINES+=RICOCHET_NO_PORTABLE OPENSSLDIR=${LOCALBASE}
+QMAKE_ARGS+=	DEFINES+=RICOCHET_NO_PORTABLE OPENSSLDIR=${OPENSSLBASE}
 
 PLIST_FILES=	bin/ricochet \
 		share/applications/ricochet.desktop \
 		share/icons/hicolor/48x48/apps/ricochet.png \
 		share/icons/hicolor/scalable/apps/ricochet.svg
 
+TOR_RUN_DEPENDS=	tor:security/tor
+
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -E 's| -fsanitize=[a-z-]+| |g' \
 		${WRKSRC}/hardened.pri
-.if ${ARCH} == amd64 && ${OSREL:R} == 9
-	@${REINPLACE_CMD} -E 's| -pie| |g' \
-		${WRKSRC}/hardened.pri
-.endif
 
 .include <bsd.port.post.mk>