svn commit: r468505 - in head: Mk/Uses devel/godot

[Jan Beich]

Author: jbeich
Date: Fri Apr 27 23:14:32 2018
New Revision: 468505
URL: https://svnweb.freebsd.org/changeset/ports/468505

Log:
  Update USES=compiler:c++14-lang to Clang 6.0 on FreeBSD 10
  
  PR:		227679
  Exp-run by:	antoine (only 10.4)

Modified:
  head/Mk/Uses/compiler.mk   (contents, props changed)
  head/devel/godot/Makefile   (contents, props changed)

Modified: head/Mk/Uses/compiler.mk
==============================================================================
--- head/Mk/Uses/compiler.mk	Fri Apr 27 23:10:39 2018	(r468504)
+++ head/Mk/Uses/compiler.mk	Fri Apr 27 23:14:32 2018	(r468505)
@@ -180,10 +180,10 @@ CC=	clang
 CXX=	clang++
 CHOSEN_COMPILER_TYPE=	clang
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang50:devel/llvm50
-CPP=	${LOCALBASE}/bin/clang-cpp50
-CC=	${LOCALBASE}/bin/clang50
-CXX=	${LOCALBASE}/bin/clang++50
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang60:devel/llvm60
+CPP=	${LOCALBASE}/bin/clang-cpp60
+CC=	${LOCALBASE}/bin/clang60
+CXX=	${LOCALBASE}/bin/clang++60
 CHOSEN_COMPILER_TYPE=	clang
 .endif
 .endif
@@ -202,10 +202,10 @@ CC=	clang
 CXX=	clang++
 CHOSEN_COMPILER_TYPE=	clang
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang50:devel/llvm50
-CPP=	${LOCALBASE}/bin/clang-cpp50
-CC=	${LOCALBASE}/bin/clang50
-CXX=	${LOCALBASE}/bin/clang++50
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang60:devel/llvm60
+CPP=	${LOCALBASE}/bin/clang-cpp60
+CC=	${LOCALBASE}/bin/clang60
+CXX=	${LOCALBASE}/bin/clang++60
 CHOSEN_COMPILER_TYPE=	clang
 .endif
 .endif
@@ -224,11 +224,11 @@ CC=	clang
 CXX=	clang++
 CHOSEN_COMPILER_TYPE=	clang
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang50:devel/llvm50
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang60:devel/llvm60
 CHOSEN_COMPILER_TYPE=	clang
-CPP=	${LOCALBASE}/bin/clang-cpp50
-CC=	${LOCALBASE}/bin/clang50
-CXX=	${LOCALBASE}/bin/clang++50
+CPP=	${LOCALBASE}/bin/clang-cpp60
+CC=	${LOCALBASE}/bin/clang60
+CXX=	${LOCALBASE}/bin/clang++60
 .endif
 .endif
 .endif
@@ -246,11 +246,11 @@ CC=	clang
 CXX=	clang++
 CHOSEN_COMPILER_TYPE=	clang
 .else
-BUILD_DEPENDS+=	${LOCALBASE}/bin/clang50:devel/llvm50
+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang60:devel/llvm60
 CHOSEN_COMPILER_TYPE=	clang
-CPP=	${LOCALBASE}/bin/clang-cpp50
-CC=	${LOCALBASE}/bin/clang50
-CXX=	${LOCALBASE}/bin/clang++50
+CPP=	${LOCALBASE}/bin/clang-cpp60
+CC=	${LOCALBASE}/bin/clang60
+CXX=	${LOCALBASE}/bin/clang++60
 .endif
 .endif
 .endif

Modified: head/devel/godot/Makefile
==============================================================================
--- head/devel/godot/Makefile	Fri Apr 27 23:10:39 2018	(r468504)
+++ head/devel/godot/Makefile	Fri Apr 27 23:14:32 2018	(r468505)
@@ -24,8 +24,8 @@ RUN_DEPENDS=	xdg-user-dir:devel/xdg-user-dirs \
 USE_GITHUB=	yes
 GH_ACCOUNT=	godotengine
 
-# on 10.4 using clang34 fails - so we want to use clang50
-# gl already needs clang50 so this shouldn't add any overhead
+# on 10.4 using clang34 fails - so we want to use clang60
+# gl already needs clang60 so this shouldn't add any overhead
 USES=		compiler:c++14-lang pkgconfig scons ssl
 USE_XORG=	x11 xcursor xi xinerama xrandr
 USE_GL=		gl glew glu