From owner-svn-ports-head@freebsd.org Sat Jun 16 17:35:23 2018 Return-Path: Delivered-To: svn-ports-head@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 8DCF9101D06C; Sat, 16 Jun 2018 17:35:23 +0000 (UTC) (envelope-from ultima@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 442C5690C9; Sat, 16 Jun 2018 17:35:23 +0000 (UTC) (envelope-from ultima@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 252EC1733; Sat, 16 Jun 2018 17:35:23 +0000 (UTC) (envelope-from ultima@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5GHZNXA090999; Sat, 16 Jun 2018 17:35:23 GMT (envelope-from ultima@FreeBSD.org) Received: (from ultima@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5GHZND0090998; Sat, 16 Jun 2018 17:35:23 GMT (envelope-from ultima@FreeBSD.org) Message-Id: <201806161735.w5GHZND0090998@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ultima set sender to ultima@FreeBSD.org using -f From: Richard Gallamore Date: Sat, 16 Jun 2018 17:35:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472557 - head/devel/youcompleteme X-SVN-Group: ports-head X-SVN-Commit-Author: ultima X-SVN-Commit-Paths: head/devel/youcompleteme X-SVN-Commit-Revision: 472557 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.26 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: Sat, 16 Jun 2018 17:35:23 -0000 Author: ultima Date: Sat Jun 16 17:35:22 2018 New Revision: 472557 URL: https://svnweb.freebsd.org/changeset/ports/472557 Log: Cleanup and revert regression from r472401 Reported by: mat Modified: head/devel/youcompleteme/Makefile Modified: head/devel/youcompleteme/Makefile ============================================================================== --- head/devel/youcompleteme/Makefile Sat Jun 16 16:08:15 2018 (r472556) +++ head/devel/youcompleteme/Makefile Sat Jun 16 17:35:22 2018 (r472557) @@ -16,15 +16,15 @@ 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@${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} + ${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} USES= cmake python USE_PYTHON= flavors @@ -64,10 +64,8 @@ RUST_RUN_DEPENDS= racerd:devel/racerd VIMFILESDIR= ${PREFIX}/share/vim/vimfiles -.include -.if ${PYTHON_MAJOR_VER} == 3 -CMAKE_ARGS+= -DUSE_PYTHON2:BOOL=OFF -.endif +CMAKE_ARGS_PY3= -DUSE_PYTHON2:BOOL=OFF +CMAKE_ARGS= ${CMAKE_ARGS_PY${PYTHON_MAJOR_VER}} do-install: ${MKDIR} ${STAGEDIR}${VIMFILESDIR}/third_party/ycmd/third_party @@ -90,4 +88,4 @@ do-install-MONO-on: ${RLN} ${PREFIX}/share/omnisharp-server/bin/Release \ ${STAGEDIR}${MONOFILESDIR}/OmniSharp/bin/Release -.include +.include