Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Jun 2018 21:51:36 +0000 (UTC)
From:      Richard Gallamore <ultima@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r472401 - head/devel/youcompleteme
Message-ID:  <201806142151.w5ELpa7x037548@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ultima
Date: Thu Jun 14 21:51:36 2018
New Revision: 472401
URL: https://svnweb.freebsd.org/changeset/ports/472401

Log:
  * Add python flavors support. This will allow
  both python 2 and python 3 support.
  
  PR:		228188
  Reported by:	Serge <skh^@hotmail.com>
  Reviewed by:	antoine
  Differential Revision:	https://reviews.freebsd.org/D15417

Modified:
  head/devel/youcompleteme/Makefile

Modified: head/devel/youcompleteme/Makefile
==============================================================================
--- head/devel/youcompleteme/Makefile	Thu Jun 14 21:18:54 2018	(r472400)
+++ head/devel/youcompleteme/Makefile	Thu Jun 14 21:51:36 2018	(r472401)
@@ -3,7 +3,9 @@
 
 PORTNAME=	YouCompleteMe
 DISTVERSION=	g20180417
+PORTREVISION=	1
 CATEGORIES=	devel
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ultima@FreeBSD.org
 COMMENT=	Code-completion engine for Vim
@@ -14,17 +16,18 @@ LICENSE_FILE=	${WRKSRC}/COPYING.txt
 RUN_DEPENDS=	vim:editors/vim \
 		${LOCALBASE}/lib/libboost_thread.so:devel/boost-libs \
 		${LOCALBASE}/lib/${PY_BOOST} \
-		${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}bottle>0:www/py-bottle@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}frozendict>0:devel/py-frozendict@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}parso>0:textproc/py-parso@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests-futures>0:www/py-requests-futures@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}argparse>0:devel/py-argparse@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}bottle>0:www/py-bottle@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}frozendict>0:devel/py-frozendict@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}parso>0:textproc/py-parso@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests-futures>0:www/py-requests-futures@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}waitress>0:www/py-waitress@${FLAVOR}
 
-USES=		cmake python:2.7
+USES=		cmake python
+USE_PYTHON=	flavors
 USE_GITHUB=	yes
 GH_ACCOUNT=	Valloric
 GH_TAGNAME=	6975efd
@@ -61,6 +64,11 @@ RUST_RUN_DEPENDS=	racerd:devel/racerd
 
 VIMFILESDIR=		${PREFIX}/share/vim/vimfiles
 
+.include <bsd.port.pre.mk>
+.if ${PYTHON_MAJOR_VER} == 3
+CMAKE_ARGS+=		-DUSE_PYTHON2:BOOL=OFF
+.endif
+
 do-install:
 		${MKDIR} ${STAGEDIR}${VIMFILESDIR}/third_party/ycmd/third_party
 		(cd ${WRKSRC} && ${COPYTREE_SHARE} "autoload doc plugin python" \
@@ -82,4 +90,4 @@ do-install-MONO-on:
 		${RLN} ${PREFIX}/share/omnisharp-server/bin/Release \
 			${STAGEDIR}${MONOFILESDIR}/OmniSharp/bin/Release
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>



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