Index: devel/valgrind/Makefile
===================================================================
--- devel/valgrind/Makefile	(revision 439232)
+++ devel/valgrind/Makefile	(working copy)
@@ -59,8 +59,6 @@ WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${B
 
 CONFIGURE_ENV+=	ac_cv_path_PERL=${PERL}
 
-USE_GCC=	yes
-
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "amd64"
Index: devel/valgrind/files/patch-configure.ac
===================================================================
--- devel/valgrind/files/patch-configure.ac	(revision 439232)
+++ devel/valgrind/files/patch-configure.ac	(working copy)
@@ -1,9 +1,10 @@
 --- configure.ac.orig	2016-01-13 19:20:20 UTC
 +++ configure.ac
-@@ -145,6 +145,18 @@ case "${is_clang}-${gcc_version}" in
+@@ -145,7 +145,19 @@
       notclang-5.*)
  	AC_MSG_RESULT([ok (${gcc_version})])
  	;;
+-     clang-2.9|clang-3.*|clang-4.*)
 +     notclang-6.*)
 +	AC_MSG_RESULT([ok (${gcc_version})])
 +	;;
@@ -16,6 +17,7 @@
 +     notclang-9.*)
 +	AC_MSG_RESULT([ok (${gcc_version})])
 +	;;
-      clang-2.9|clang-3.*|clang-4.*)
++     clang-2.9|clang-3.*|clang-4.*|clang-5.*)
  	AC_MSG_RESULT([ok (clang-${gcc_version})])
  	;;
+      *)
Index: devel/valgrind-devel/Makefile
===================================================================
--- devel/valgrind-devel/Makefile	(revision 439232)
+++ devel/valgrind-devel/Makefile	(working copy)
@@ -61,8 +61,6 @@ WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${B
 
 CONFIGURE_ENV+=	ac_cv_path_PERL=${PERL}
 
-USE_GCC=	yes
-
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "amd64"
Index: devel/valgrind-devel/files/patch-configure.ac
===================================================================
--- devel/valgrind-devel/files/patch-configure.ac	(revision 439232)
+++ devel/valgrind-devel/files/patch-configure.ac	(working copy)
@@ -1,9 +1,10 @@
 --- configure.ac.orig	2016-01-13 19:20:20 UTC
 +++ configure.ac
-@@ -145,6 +145,18 @@ case "${is_clang}-${gcc_version}" in
+@@ -145,7 +145,19 @@
       notclang-5.*)
  	AC_MSG_RESULT([ok (${gcc_version})])
  	;;
+-     clang-2.9|clang-3.*|clang-4.*)
 +     notclang-6.*)
 +	AC_MSG_RESULT([ok (${gcc_version})])
 +	;;
@@ -16,6 +17,7 @@
 +     notclang-9.*)
 +	AC_MSG_RESULT([ok (${gcc_version})])
 +	;;
-      clang-2.9|clang-3.*|clang-4.*)
++     clang-2.9|clang-3.*|clang-4.*|clang-5.*)
  	AC_MSG_RESULT([ok (clang-${gcc_version})])
  	;;
+      *)