svn commit: r454075 - head/net-im/ricochet

[Yuri Victorovich]

Author: yuri
Date: Sun Nov 12 19:19:37 2017
New Revision: 454075
URL: https://svnweb.freebsd.org/changeset/ports/454075

Log:
  net-im/ricochet: add missing dependency (qt5-quickcontrols) and other changes
  
  Other changes
  * Added the TOR option that will allow to disable the Tor dependency for people with alternative Tor installations
  * Fixed the SSL path
  
  PR:		223593
  Reported by:	Vinícius Zavam <egypcio at googlemail.com>
  Approved by:	tcberner (mentor)
  Differential Revision:	https://reviews.freebsd.org/D13027

Modified:
  head/net-im/ricochet/Makefile

Modified: head/net-im/ricochet/Makefile
==============================================================================
--- head/net-im/ricochet/Makefile	Sun Nov 12 19:10:44 2017	(r454074)
+++ head/net-im/ricochet/Makefile	Sun Nov 12 19:19:37 2017	(r454075)
@@ -4,10 +4,10 @@
 PORTNAME=	ricochet
 PORTVERSION=	1.1.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	net-im net-p2p
 
-MAINTAINER=	yuri at rawbw.com
+MAINTAINER=	yuri at FreeBSD.org
 COMMENT=	Anonymous peer-to-peer instant messenger
 
 LICENSE=	RICOCHET
@@ -16,29 +16,30 @@ 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>