From owner-svn-ports-head@freebsd.org Sun Nov 12 19:19:39 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37EDBC7ADAD; Sun, 12 Nov 2017 19:19:39 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E09C872271; Sun, 12 Nov 2017 19:19:38 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vACJJc3Q081403; Sun, 12 Nov 2017 19:19:38 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vACJJcLi081402; Sun, 12 Nov 2017 19:19:38 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201711121919.vACJJcLi081402@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sun, 12 Nov 2017 19:19:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r454075 - head/net-im/ricochet X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: head/net-im/ricochet X-SVN-Commit-Revision: 454075 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Nov 2017 19:19:39 -0000 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 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@rawbw.com +MAINTAINER= yuri@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 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