--- a/components/graphviz/Makefile	Wed Aug 01 10:43:20 2012 -0700
+++ b/components/graphviz/Makefile	Mon Aug 06 12:57:56 2012 -0700
@@ -44,7 +44,7 @@
 # The guile build is broken with studio (7073649), so we disable this for now.
 # CPPFLAGS +=	-I/usr/include/gmp
 # Java header files (--with-javaincludedir allows for only one directory)
-CPPFLAGS +=	-I/usr/java/include -I/usr/java/include/solaris
+CPPFLAGS +=	-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/solaris
 # PHP header files (no --with- flag)
 CPPFLAGS +=	$(shell PATH=$(PATH) php-config --includes)
 CXX +=		$(studio_NORUNPATH)

--- a/components/python/python26/patches/Python26-05-isalibs.patch	Wed Aug 01 10:43:20 2012 -0700
+++ b/components/python/python26/patches/Python26-05-isalibs.patch	Mon Aug 06 12:57:56 2012 -0700
@@ -441,7 +441,7 @@
 + 
 +  PY_CHECK_SIZEOF(wchar_t, 4, [
 +  #include <wchar.h>
-+  #include <stdlib.h
++  #include <stdlib.h>
 +  ])
  fi