--- a/components/gcc47/developer-gcc-47.p5m	Fri Mar 21 00:13:55 2014 -0700
+++ b/components/gcc47/developer-gcc-47.p5m	Fri Mar 21 00:13:55 2014 -0700
@@ -18,13 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
-    value=pkg:/developer/gcc-47@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="GCC 4.7"
-set name=com.oracle.info.description value="the GNU Compiler Collection - GCC"
+    value=pkg:/developer/gcc-$(GCC_V)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="GCC $(GCC_VERSION)"
+set name=com.oracle.info.description \
+    value="the GNU Compiler Collection - GCC $(GCC_VERSION)"
 set name=com.oracle.info.tpno value=14467
 set name=info.classification value=org.opensolaris.category.2008:Development/C \
     value=org.opensolaris.category.2008:Development/C++ \
@@ -35,8 +36,9 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2012/373
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-depend type=require fmri=pkg:/developer/gcc-4/gcc-c++-47
-depend type=require fmri=pkg:/developer/gcc-4/gcc-c-47
-depend type=require fmri=pkg:/developer/gcc-4/gcc-gfortran-47
-depend type=require fmri=pkg:/developer/gcc-4/gcc-gobjc-47
+depend type=group fmri=pkg:/developer/gcc-4/gcc-c++-$(GCC_V)
+depend type=group fmri=pkg:/developer/gcc-4/gcc-c-$(GCC_V)
+depend type=group fmri=pkg:/developer/gcc-4/gcc-common-$(GCC_V)
+depend type=group fmri=pkg:/developer/gcc-4/gcc-gfortran-$(GCC_V)
+depend type=group fmri=pkg:/developer/gcc-4/gcc-gobjc-$(GCC_V)