Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 24 Nov 2018 13:09:52 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r485770 - head/devel/kdevelop
Message-ID:  <201811241309.wAOD9qKB073324@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <alonso@FreeBSD.org>

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811241309.wAOD9qKB073324>