From owner-svn-ports-all@freebsd.org Sat Nov 24 13:09:53 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E6516114E698; Sat, 24 Nov 2018 13:09:52 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8C95777DD2; Sat, 24 Nov 2018 13:09:52 +0000 (UTC) (envelope-from tcberner@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 697F265F6; Sat, 24 Nov 2018 13:09:52 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAOD9qlu073325; Sat, 24 Nov 2018 13:09:52 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAOD9qKB073324; Sat, 24 Nov 2018 13:09:52 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201811241309.wAOD9qKB073324@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 24 Nov 2018 13:09:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485770 - head/devel/kdevelop X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/devel/kdevelop X-SVN-Commit-Revision: 485770 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8C95777DD2 X-Spamd-Result: default: False [1.42 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.07)[0.070,0]; NEURAL_SPAM_MEDIUM(0.71)[0.712,0]; NEURAL_SPAM_LONG(0.64)[0.643,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Nov 2018 13:09:53 -0000 Author: tcberner Date: Sat Nov 24 13:09:51 2018 New Revision: 485770 URL: https://svnweb.freebsd.org/changeset/ports/485770 Log: devel/kdevelop: explicitely depend on a given clang version Don't rely on cmake to find the "right" clang installation, but tell it where it's installed instead. While here, introduce the LLVM_VERSION make variable and have it default to 60 Submitted by: Alonso Schaich Modified: head/devel/kdevelop/Makefile Modified: head/devel/kdevelop/Makefile ============================================================================== --- head/devel/kdevelop/Makefile Sat Nov 24 13:08:12 2018 (r485769) +++ head/devel/kdevelop/Makefile Sat Nov 24 13:09:51 2018 (r485770) @@ -2,6 +2,7 @@ PORTNAME= kdevelop DISTVERSION= 5.3.0 +PORTREVISION= 1 CATEGORIES= devel kde MASTER_SITES= KDE/stable/kdevelop/${DISTVERSION}/src DIST_SUBDIR= KDE/kdevelop @@ -18,7 +19,7 @@ LIB_DEPENDS= libkasten3controllers.so:devel/okteta \ libsvn_client-1.so:devel/subversion \ libboost_thread.so:devel/boost-libs \ libkomparediff2.so:textproc/libkomparediff2 \ - libclang.so.6:devel/llvm60 + libclang.so.${LLVM_VERSION:C/([1-9])([0-9])/\1/}:devel/llvm${LLVM_VERSION} RUN_DEPENDS= gmake:devel/gmake USES= cmake:outsource compiler:c++11-lib desktop-file-utils \ @@ -36,12 +37,16 @@ CONFLICTS= kdevelop-kde4-4* kdevelop-4* kdevplatform-k SHEBANG_FILES= kdevplatform/util/kdevplatform_shell_environment.sh \ kdevplatform/util/.zshrc +CMAKE_ARGS= -DCMAKE_POLICY_DEFAULT_CMP0074=NEW -DLLVM_ROOT=${LOCALBASE}/llvm${LLVM_VERSION} + OPTIONS_DEFINE= WEBENGINE WEBENGINE_DESC= Use WebEngine as help reader WEBENGINE_USES= qt:5 WEBENGINE_USE= QT=location,webchannel,webengine WEBENGINE_USE_OFF= QT=webkit WEBENGINE_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets:BOOL=TRUE + +LLVM_VERSION?= 60 SHEBANG_LANG= zsh zsh_OLD_CMD= /bin/zsh