--- a/components/meta-packages/history/SUNWflexlex.p5m	Thu Aug 25 11:32:33 2011 -0700
+++ b/components/meta-packages/history/SUNWflexlex.p5m	Thu Aug 25 12:57:49 2011 -0700
@@ -21,13 +21,9 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-#
-# Legacy package information for SUNWflexlex package
-#
-
-set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
 set name=pkg.renamed value=true
 
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-depend fmri=developer/lexer/[email protected] type=require
+depend fmri=developer/lexer/[email protected] type=require

--- a/components/meta-packages/history/SUNWflexruntime.p5m	Thu Aug 25 11:32:33 2011 -0700
+++ b/components/meta-packages/history/SUNWflexruntime.p5m	Thu Aug 25 12:57:49 2011 -0700
@@ -21,13 +21,9 @@
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
-#
-# Legacy package information for SUNWflexlex package
-#
-
-set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
+set name=pkg.fmri value=pkg:/[email protected],5.11-0.133
 set name=pkg.renamed value=true
 
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-depend fmri=system/library/[email protected] type=require
+depend fmri=system/library/[email protected] type=require

--- a/components/php-5_2/common.mk	Thu Aug 25 11:32:33 2011 -0700
+++ b/components/php-5_2/common.mk	Thu Aug 25 12:57:49 2011 -0700
@@ -144,7 +144,6 @@
 studio_cplusplus_C99MODE = $(studio_cplusplus_C99_ENABLE)
 CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS
 CPPFLAGS += $(CPP_LARGEFILES)
-CPPFLAGS += -I$(IMAP_CLIENT_DIR)
 CPPFLAGS += -I../CPPFLAGSTEST
 LIBS = -lsocket -lnsl -ldl -lposix4
 LD = $(CXX) $(studio_NORUNPATH)