--- a/components/gcc47/developer-gcc4-gcc-gfortran-47.p5m	Fri Mar 21 00:13:55 2014 -0700
+++ b/components/gcc47/developer-gcc4-gcc-gfortran-47.p5m	Fri Mar 21 00:13:55 2014 -0700
@@ -18,13 +18,13 @@
 #
 # 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.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
-    value=pkg:/developer/gcc-4/gcc-gfortran-47@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value="GCC Fortran Compiler - 4.7"
+    value=pkg:/developer/gcc-4/gcc-gfortran-$(GCC_V)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="GCC Fortran Compiler - $(GCC_VERSION)"
 set name=com.oracle.info.description \
     value="the GNU Compiler Collection - Fortran Compiler"
 set name=com.oracle.info.tpno value=14467
@@ -35,22 +35,24 @@
 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)
-link path=usr/bin/gfortran target=../gcc/4.7/bin/gfortran mediator=gcc \
-    mediator-version=4.7
-hardlink path=usr/gcc/4.7/bin/$(GNU_ARCH)-gfortran target=gfortran
-file path=usr/gcc/4.7/bin/gfortran mode=0555
-file path=usr/gcc/4.7/lib/$(MACH64)/libgfortran.a
-file path=usr/gcc/4.7/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)/libgfortranbegin.a
-file path=usr/gcc/4.7/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/libgfortranbegin.a
-file path=usr/gcc/4.7/lib/libgfortran.a
-file path=usr/gcc/4.7/share/info/gfortran.info
-file path=usr/gcc/4.7/share/man/man1/gfortran.1
+link path=usr/bin/gfortran target=../gcc/$(GCC_VERSION)/bin/gfortran mediator=gcc \
+    mediator-version=$(GCC_VERSION)
+hardlink path=$(GCC_BASEDIR)/bin/$(GNU_ARCH)-gfortran target=gfortran
+file path=$(GCC_BASEDIR)/bin/gfortran
+file path=$(GCC_BASEDIR)/lib/$(MACH64)/libgfortran.a
+file path=$(GCC_BASEDIR)/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)/libgfortranbegin.a
+file path=$(GCC_BASEDIR)/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/libgfortranbegin.a
+file path=$(GCC_BASEDIR)/lib/libgfortran.a
+file path=$(GCC_BASEDIR)/share/info/gfortran.info
+file path=$(GCC_BASEDIR)/share/man/man1/gfortran.1
 link path=usr/share/man/man1/gfortran.1 \
-    target=../../../gcc/4.7/share/man/man1/gfortran.1 mediator=gcc \
-    mediator-version=4.7
-license gcc47.license license="GPLv3 with Runtime Exception"
-depend type=require fmri=pkg:/developer/gcc-4/gcc-c-47
-depend type=require fmri=pkg:/developer/gcc-4/gcc-common-47
+    target=../../../gcc/$(GCC_VERSION)/share/man/man1/gfortran.1 mediator=gcc \
+    mediator-version=$(GCC_VERSION)
+license gcc$(GCC_V).license license="GPLv3 with Runtime Exception"
+depend type=require fmri=pkg:/developer/gcc-4/gcc-c-$(GCC_V)
+depend type=require fmri=pkg:/developer/gcc-4/gcc-common-$(GCC_V)
 depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime
 depend type=require fmri=pkg:/system/library/gcc/gcc-gfortran-runtime
+depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime-$(GCC_V)
+depend type=require fmri=pkg:/system/library/gcc/gcc-gfortran-runtime-$(GCC_V)