Index: head/devel/ccache/files/patch-ccache.c
===================================================================
--- head/devel/ccache/files/patch-ccache.c	(revision 408671)
+++ head/devel/ccache/files/patch-ccache.c	(revision 408672)
@@ -1,28 +1,28 @@
 Determine whether cc(1) is clang or gcc at compile-time.
 
---- ccache.c.orig	2015-10-15 15:01:14.756621000 -0700
-+++ ccache.c	2015-10-15 15:01:47.738326000 -0700
+--- ccache.c.orig	2015-10-08 19:14:23 UTC
++++ ccache.c
 @@ -1350,6 +1350,11 @@ compiler_is_clang(struct args *args)
  {
  	char *name = basename(args->argv[0]);
  	bool is = strstr(name, "clang") != NULL;
 +#ifdef CC_IS_CLANG
 +	if (strcmp(name, "cc") == 0 || strcmp(name, "CC") == 0 ||
 +	    strcmp(name, "c++") == 0)
 +	        is = true;
 +#endif
  	free(name);
  	return is;
  }
 @@ -1359,6 +1364,11 @@ compiler_is_gcc(struct args *args)
  {
  	char *name = basename(args->argv[0]);
  	bool is = strstr(name, "gcc") || strstr(name, "g++");
 +#ifdef CC_IS_GCC
 +	if (strcmp(name, "cc") == 0 || strcmp(name, "CC") == 0 ||
 +	    strcmp(name, "c++") == 0)
 +	        is = true;
 +#endif
  	free(name);
  	return is;
  }
Index: head/devel/ccache/files/patch-conf.c
===================================================================
--- head/devel/ccache/files/patch-conf.c	(revision 408671)
+++ head/devel/ccache/files/patch-conf.c	(revision 408672)
@@ -1,14 +1,14 @@
---- conf.c.orig	2015-01-16 16:26:23.872241677 -0600
-+++ conf.c	2015-01-16 16:27:00.595237894 -0600
+--- conf.c.orig	2015-10-08 19:14:23 UTC
++++ conf.c
 @@ -321,7 +321,11 @@ conf_create(void)
  	conf->read_only = false;
  	conf->read_only_direct = false;
  	conf->recache = false;
 +#if 1
 +	conf->run_second_cpp = true;
 +#else
  	conf->run_second_cpp = false;
 +#endif
  	conf->sloppiness = 0;
  	conf->stats = true;
  	conf->temporary_dir = x_strdup("");
Index: head/devel/ccache/files/patch-configure
===================================================================
--- head/devel/ccache/files/patch-configure	(revision 408671)
+++ head/devel/ccache/files/patch-configure	(revision 408672)
@@ -1,20 +1,20 @@
---- configure.orig	2015-10-08 12:14:23.000000000 -0700
-+++ configure	2015-10-27 10:49:04.338642000 -0700
-@@ -3672,7 +3672,7 @@
+--- configure.orig	2015-10-08 19:14:23 UTC
++++ configure
+@@ -3672,7 +3672,7 @@ $as_echo "#define _XOPEN_SOURCE 500" >>c
        ;;
      *)
  
 -$as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h
 +$as_echo "#define _XOPEN_SOURCE 700" >>confdefs.h
  
        ;;
    esac
-@@ -3694,7 +3694,7 @@
+@@ -3694,7 +3694,7 @@ $as_echo "#define _XOPEN_SOURCE_EXTENDED
    esac
  
  
 -$as_echo "#define _POSIX_C_SOURCE 200112L" >>confdefs.h
 +$as_echo "#define _POSIX_C_SOURCE 200809L" >>confdefs.h
  
  
  fi