Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/gcc3/gcc-3.p5m
changeset 3732 0f62cc221c7e
parent 1948 2d1537e7942d
child 4295 8e6a71e8754b 
--- a/components/gcc3/gcc-3.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/gcc3/gcc-3.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,19 +18,19 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr/.*/man/.* -> default mangler.man.stability volatile >
 # they are installed in share/locale, but that is accessed through a link
 <transform file path=usr/gcc/3.4/lib/locale(.*)$ -> set action.hash /usr/gcc/3.4/share/locale/%<\1> >
 
-# All files and hardlinks installed under /usr/gcc/3.4/bin should have 
+# All files and hardlinks installed under /usr/gcc/3.4/bin should have
 # equivalent links under /usr/sfw/bin for backward compatibility.
 <transform file hardlink path=usr/gcc/3.4/bin/(.*) -> \
     emit link path=usr/sfw/bin/%<1> target=../../gcc/3.4/bin/%<1>>
 
-# All files directly installed under /usr/gcc/3.4/lib should have 
+# All files directly installed under /usr/gcc/3.4/lib should have
 # equivalent links under /usr/sfw/lib for backward compatibility.
 <transform file link path=usr/gcc/3.4/lib/([^/]*.so.[0-9]*)$ -> \
     emit link path=usr/sfw/lib/%<1> target=../../gcc/3.4/lib/%<1>>
@@ -38,25 +38,55 @@
 <transform file link path=usr/gcc/3.4/lib/$(MACH64)/([^/]*.so.[0-9]*)$ -> \
     emit link path=usr/sfw/lib/$(MACH64)/%<1> \
     target=../../../gcc/3.4/lib/$(MACH64)/%<1>>
-
-set name=pkg.fmri value=pkg:/developer/gcc-3@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/developer/gcc-3@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="gcc - The GNU C compiler"
 set name=pkg.description value="GNU C - The GNU C compiler 3.4.3"
 set name=com.oracle.info.description value="the GNU Compiler Collection"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification value=org.opensolaris.category.2008:Development/C
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2000/488 \
-    value=PSARC/2012/255
+set name=org.opensolaris.arc-caseid value=PSARC/2000/488 value=PSARC/2012/255
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+link path=usr/bin/$(GNU_ARCH)-c++ target=../gcc/3.4/bin/$(GNU_ARCH)-c++
+link path=usr/bin/$(GNU_ARCH)-g++ target=../gcc/3.4/bin/$(GNU_ARCH)-g++
+link path=usr/bin/$(GNU_ARCH)-gcc target=../gcc/3.4/bin/$(GNU_ARCH)-gcc
+link path=usr/bin/$(GNU_ARCH)-gcc-3.4.3 \
+    target=../gcc/3.4/bin/$(GNU_ARCH)-gcc-3.4.3
+link path=usr/bin/$(GNU_ARCH)-gcc-3.4.3 \
+    target=../gcc/3.4/bin/$(GNU_ARCH)-gcc-3.4.3
+
+# Mediated links for gcc binaries in /usr/bin
+link path=usr/bin/c++ target=../gcc/3.4/bin/c++ mediator=gcc \
+    mediator-version=3.4
+link path=usr/bin/g++ target=../gcc/3.4/bin/g++ mediator=gcc \
+    mediator-version=3.4
+
+# g77 is not mediated (equivalent binary in gcc45 is gfortran).
+link path=usr/bin/g77 target=../gcc/3.4/bin/g77
+link path=usr/bin/gcc target=../gcc/3.4/bin/gcc mediator=gcc \
+    mediator-version=3.4
+link path=usr/bin/gcov target=../gcc/3.4/bin/gcov mediator=gcc \
+    mediator-version=3.4
+link path=usr/bin/gcpp target=../gcc/3.4/bin/cpp mediator=gcc \
+    mediator-version=3.4
+hardlink path=usr/gcc/3.4/bin/$(GNU_ARCH)-c++ target=$(GNU_ARCH)-g++
 
 
 file path=usr/gcc/3.4/bin/$(GNU_ARCH)-g++
+hardlink path=usr/gcc/3.4/bin/$(GNU_ARCH)-gcc target=$(GNU_ARCH)-gcc-3.4.3
 file path=usr/gcc/3.4/bin/$(GNU_ARCH)-gcc-3.4.3
+hardlink path=usr/gcc/3.4/bin/c++ \
+    target=../../../../usr/gcc/3.4/bin/$(GNU_ARCH)-g++
 file path=usr/gcc/3.4/bin/cpp
+hardlink path=usr/gcc/3.4/bin/g++ \
+    target=../../../../usr/gcc/3.4/bin/$(GNU_ARCH)-g++
 file path=usr/gcc/3.4/bin/g77
+hardlink path=usr/gcc/3.4/bin/gcc \
+    target=../../../../usr/gcc/3.4/bin/$(GNU_ARCH)-gcc-3.4.3
+hardlink path=usr/gcc/3.4/bin/gcc \
+    target=../../../../usr/gcc/3.4/bin/$(GNU_ARCH)-gcc-3.4.3
 file path=usr/gcc/3.4/bin/gccbug
 file path=usr/gcc/3.4/bin/gcov
 file path=usr/gcc/3.4/include/c++/3.4.3/$(GNU_ARCH)/bits/atomic_word.h
@@ -285,13 +315,18 @@
 file path=usr/gcc/3.4/lib/$(MACH64)/libobjc.a
 file path=usr/gcc/3.4/lib/$(MACH64)/libstdc++.a
 file path=usr/gcc/3.4/lib/$(MACH64)/libsupc++.a
-file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/$(MACH64)/crt1.o variant.arch=sparc
+file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/$(MACH64)/crt1.o \
+    variant.arch=sparc
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/$(MACH64)/crtbegin.o
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/$(MACH64)/crtend.o
-file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/$(MACH64)/crtfastmath.o variant.arch=sparc
-file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/$(MACH64)/crti.o variant.arch=sparc
-file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/$(MACH64)/crtn.o variant.arch=sparc
-file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/$(MACH64)/gcrt1.o variant.arch=sparc
+file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/$(MACH64)/crtfastmath.o \
+    variant.arch=sparc
+file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/$(MACH64)/crti.o \
+    variant.arch=sparc
+file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/$(MACH64)/crtn.o \
+    variant.arch=sparc
+file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/$(MACH64)/gcrt1.o \
+    variant.arch=sparc
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/$(MACH64)/gmon.o
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/$(MACH64)/libgcc.a
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/$(MACH64)/libgcc_eh.a
@@ -304,10 +339,12 @@
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/crtn.o variant.arch=sparc
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/gcrt1.o variant.arch=sparc
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/gmon.o
-file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/include/emmintrin.h variant.arch=i386
+file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/include/emmintrin.h \
+    variant.arch=i386
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/include/float.h
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/include/iso646.h
-file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/include/mmintrin.h variant.arch=i386
+file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/include/mmintrin.h \
+    variant.arch=i386
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/include/objc/NXConstStr.h
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/include/objc/Object.h
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/include/objc/Protocol.h
@@ -319,25 +356,35 @@
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/include/objc/sarray.h
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/include/objc/thr.h
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/include/objc/typedstream.h
-file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/include/pmmintrin.h variant.arch=i386
+file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/include/pmmintrin.h \
+    variant.arch=i386
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/include/stdarg.h
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/include/stdbool.h
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/include/unwind.h
-file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/include/xmmintrin.h variant.arch=i386
+file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/include/xmmintrin.h \
+    variant.arch=i386
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/install-tools/gsyslimits.h
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/install-tools/include/README
-file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/install-tools/include/emmintrin.h variant.arch=i386
+file \
+    path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/install-tools/include/emmintrin.h \
+    variant.arch=i386
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/install-tools/include/float.h
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/install-tools/include/iso646.h
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/install-tools/include/limits.h
-file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/install-tools/include/mmintrin.h variant.arch=i386
-file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/install-tools/include/pmmintrin.h variant.arch=i386
+file \
+    path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/install-tools/include/mmintrin.h \
+    variant.arch=i386
+file \
+    path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/install-tools/include/pmmintrin.h \
+    variant.arch=i386
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/install-tools/include/stdarg.h
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/install-tools/include/stdbool.h
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/install-tools/include/stddef.h
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/install-tools/include/unwind.h
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/install-tools/include/varargs.h
-file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/install-tools/include/xmmintrin.h variant.arch=i386
+file \
+    path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/install-tools/include/xmmintrin.h \
+    variant.arch=i386
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/install-tools/mkheaders.conf
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/libgcc.a
 file path=usr/gcc/3.4/lib/gcc/$(GNU_ARCH)/3.4.3/libgcc_eh.a
@@ -360,16 +407,25 @@
 file path=usr/gcc/3.4/lib/locale/nl/LC_MESSAGES/gcc.mo
 file path=usr/gcc/3.4/lib/locale/sv/LC_MESSAGES/gcc.mo
 file path=usr/gcc/3.4/lib/locale/tr/LC_MESSAGES/gcc.mo
+link path=usr/gcc/3.4/libexec/gcc/$(GNU_ARCH)/3.4.3/as \
+    target=../../../../../../gnu/$(GNU_ARCH)/bin/as
+link path=usr/gcc/3.4/libexec/gcc/$(GNU_ARCH)/3.4.3/as \
+    target=../../../../../../gnu/$(GNU_ARCH)/bin/as
 file path=usr/gcc/3.4/libexec/gcc/$(GNU_ARCH)/3.4.3/cc1 mode=0555
 file path=usr/gcc/3.4/libexec/gcc/$(GNU_ARCH)/3.4.3/cc1obj mode=0555
 file path=usr/gcc/3.4/libexec/gcc/$(GNU_ARCH)/3.4.3/cc1plus mode=0555
 file path=usr/gcc/3.4/libexec/gcc/$(GNU_ARCH)/3.4.3/collect2 mode=0555
 file path=usr/gcc/3.4/libexec/gcc/$(GNU_ARCH)/3.4.3/f771 mode=0555
-file path=usr/gcc/3.4/libexec/gcc/$(GNU_ARCH)/3.4.3/install-tools/fixinc.sh mode=0555
-file path=usr/gcc/3.4/libexec/gcc/$(GNU_ARCH)/3.4.3/install-tools/fixincl mode=0555
-file path=usr/gcc/3.4/libexec/gcc/$(GNU_ARCH)/3.4.3/install-tools/mkheaders mode=0555
+file path=usr/gcc/3.4/libexec/gcc/$(GNU_ARCH)/3.4.3/install-tools/fixinc.sh \
+    mode=0555
+file path=usr/gcc/3.4/libexec/gcc/$(GNU_ARCH)/3.4.3/install-tools/fixincl \
+    mode=0555
+file path=usr/gcc/3.4/libexec/gcc/$(GNU_ARCH)/3.4.3/install-tools/mkheaders \
+    mode=0555
 file path=usr/gcc/3.4/share/info/cpp.info
 file path=usr/gcc/3.4/share/info/cppinternals.info
+link path=usr/gcc/3.4/share/info/dir \
+    target=../../../../../var/info/usr_gcc_3.4_share_info_dir
 file path=usr/gcc/3.4/share/info/g77.info
 file path=usr/gcc/3.4/share/info/gcc.info
 file path=usr/gcc/3.4/share/info/gccinstall.info
@@ -382,102 +438,61 @@
 file fsf-funding.7 path=usr/gcc/3.4/share/man/man7/fsf-funding.7
 file gfdl.7 path=usr/gcc/3.4/share/man/man7/gfdl.7
 file gpl.7 path=usr/gcc/3.4/share/man/man7/gpl.7
-file usr/gcc/3.4/share/info/dir path=var/info/usr_gcc_3.4_share_info_dir mode=0644 preserve=true
-
-hardlink path=usr/gcc/3.4/bin/$(GNU_ARCH)-c++ target=$(GNU_ARCH)-g++
-hardlink path=usr/gcc/3.4/bin/$(GNU_ARCH)-gcc target=$(GNU_ARCH)-gcc-3.4.3
-hardlink path=usr/gcc/3.4/bin/c++ target=../../../../usr/gcc/3.4/bin/$(GNU_ARCH)-g++
-hardlink path=usr/gcc/3.4/bin/g++ target=../../../../usr/gcc/3.4/bin/$(GNU_ARCH)-g++
-hardlink path=usr/gcc/3.4/bin/gcc \
-    target=../../../../usr/gcc/3.4/bin/$(GNU_ARCH)-gcc-3.4.3
-hardlink path=usr/gcc/3.4/bin/gcc \
-    target=../../../../usr/gcc/3.4/bin/$(GNU_ARCH)-gcc-3.4.3
-
-link path=usr/bin/$(GNU_ARCH)-c++ target=../gcc/3.4/bin/$(GNU_ARCH)-c++
-link path=usr/bin/$(GNU_ARCH)-g++ target=../gcc/3.4/bin/$(GNU_ARCH)-g++
-link path=usr/bin/$(GNU_ARCH)-gcc target=../gcc/3.4/bin/$(GNU_ARCH)-gcc
-link path=usr/bin/$(GNU_ARCH)-gcc-3.4.3 \
-    target=../gcc/3.4/bin/$(GNU_ARCH)-gcc-3.4.3
-link path=usr/bin/$(GNU_ARCH)-gcc-3.4.3 \
-    target=../gcc/3.4/bin/$(GNU_ARCH)-gcc-3.4.3
-
-# Mediated links for gcc binaries in /usr/bin
-link path=usr/bin/c++ target=../gcc/3.4/bin/c++ \
-    mediator=gcc mediator-version=3.4
-link path=usr/bin/g++ target=../gcc/3.4/bin/g++ \
-    mediator=gcc mediator-version=3.4
-link path=usr/bin/gcc target=../gcc/3.4/bin/gcc \
-    mediator=gcc mediator-version=3.4
-link path=usr/bin/gcov target=../gcc/3.4/bin/gcov \
-    mediator=gcc mediator-version=3.4
-link path=usr/bin/gcpp target=../gcc/3.4/bin/cpp \
-    mediator=gcc mediator-version=3.4
-
-# g77 is not mediated (equivalent binary in gcc45 is gfortran).
-link path=usr/bin/g77 target=../gcc/3.4/bin/g77
-
-link path=usr/gcc/3.4/libexec/gcc/$(GNU_ARCH)/3.4.3/as \
-    target=../../../../../../gnu/$(GNU_ARCH)/bin/as
-link path=usr/gcc/3.4/libexec/gcc/$(GNU_ARCH)/3.4.3/as \
-    target=../../../../../../gnu/$(GNU_ARCH)/bin/as
 
 # Mediated links for gcc man pages in /usr/share/man
 link path=usr/share/man/man1/c++.1 \
-    target=../../../gcc/3.4/share/man/man1/g++.1 \
-    mediator=gcc mediator-version=3.4
+    target=../../../gcc/3.4/share/man/man1/g++.1 mediator=gcc \
+    mediator-version=3.4
 link path=usr/share/man/man1/g++.1 \
-    target=../../../gcc/3.4/share/man/man1/g++.1 \
-    mediator=gcc mediator-version=3.4
-link path=usr/share/man/man1/gcc.1 \
-    target=../../../gcc/3.4/share/man/man1/gcc.1 \
-    mediator=gcc mediator-version=3.4
-link path=usr/share/man/man1/gcov.1 \
-    target=../../../gcc/3.4/share/man/man1/gcov.1 \
-    mediator=gcc mediator-version=3.4
-link path=usr/share/man/man1/gcpp.1 \
-    target=../../../gcc/3.4/share/man/man1/cpp.1 \
-    mediator=gcc mediator-version=3.4
-link path=usr/share/man/man7/fsf-funding.7 \
-    target=../../../gcc/3.4/share/man/man7/fsf-funding.7 \
-    mediator=gcc mediator-version=3.4
-link path=usr/share/man/man7/gfdl.7 \
-    target=../../../gcc/3.4/share/man/man7/gfdl.7 \
-    mediator=gcc mediator-version=3.4
-link path=usr/share/man/man7/gpl.7 \
-    target=../../../gcc/3.4/share/man/man7/gpl.7 \
-    mediator=gcc mediator-version=3.4
+    target=../../../gcc/3.4/share/man/man1/g++.1 mediator=gcc \
+    mediator-version=3.4
 
 # g77.1 is not mediated (equivalent man page in gcc45 is gfortran.1).
-link path=usr/share/man/man1/g77.1 \
-    target=../../../gcc/3.4/share/man/man1/g77.1
-
-link path=usr/gcc/3.4/share/info/dir target=../../../../../var/info/usr_gcc_3.4_share_info_dir
-
-license gcc.license license="GPLv2"
+link path=usr/share/man/man1/g77.1 target=../../../gcc/3.4/share/man/man1/g77.1
+link path=usr/share/man/man1/gcc.1 \
+    target=../../../gcc/3.4/share/man/man1/gcc.1 mediator=gcc \
+    mediator-version=3.4
+link path=usr/share/man/man1/gcov.1 \
+    target=../../../gcc/3.4/share/man/man1/gcov.1 mediator=gcc \
+    mediator-version=3.4
+link path=usr/share/man/man1/gcpp.1 \
+    target=../../../gcc/3.4/share/man/man1/cpp.1 mediator=gcc \
+    mediator-version=3.4
+link path=usr/share/man/man7/fsf-funding.7 \
+    target=../../../gcc/3.4/share/man/man7/fsf-funding.7 mediator=gcc \
+    mediator-version=3.4
+link path=usr/share/man/man7/gfdl.7 \
+    target=../../../gcc/3.4/share/man/man7/gfdl.7 mediator=gcc \
+    mediator-version=3.4
+link path=usr/share/man/man7/gpl.7 \
+    target=../../../gcc/3.4/share/man/man7/gpl.7 mediator=gcc \
+    mediator-version=3.4
+file usr/gcc/3.4/share/info/dir path=var/info/usr_gcc_3.4_share_info_dir \
+    mode=0644 preserve=true
+legacy pkg=SUNWgcc desc="GNU C - The GNU C compiler" \
+    name="gcc - The GNU C compiler"
+license gcc.license license=GPLv2
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/as \
+    variant.arch=sparc
 
 # gcc 3.4.3 on x86 uses the CRT files in /usr/lib plus the GNU assembler,
 # and gcc 3.4.3 on SPARC does not.  Any upgrade to this package should
 # reverify this and adjust the following CRT related dependencies accordingly.
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/ld type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/as type=require \
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/ld
+depend type=require fmri=__TBD \
+    pkg.debug.depend.file=usr/gcc/3.4/lib/libstdc++.so
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/as \
     variant.arch=i386
-depend fmri=__TBD pkg.debug.depend.file=usr/bin/as type=require \
-    variant.arch=sparc
-depend fmri=__TBD pkg.debug.depend.file=usr/lib/crt1.o type=require \
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/crt1.o \
     variant.arch=i386
-depend fmri=__TBD pkg.debug.depend.file=usr/lib/crti.o type=require \
-    variant.arch=i386
-depend fmri=__TBD pkg.debug.depend.file=usr/lib/crtn.o type=require \
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/crti.o \
     variant.arch=i386
-depend fmri=__TBD pkg.debug.depend.file=usr/lib/values-Xa.o type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/lib/values-Xc.o type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/lib/values-Xs.o type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/lib/values-Xt.o type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/lib/values-xpg4.o type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/lib/values-xpg6.o type=require
-depend fmri=__TBD pkg.debug.depend.file=usr/gcc/3.4/lib/libstdc++.so type=require
-depend fmri=pkg:/system/header type=require
-
-legacy pkg=SUNWgcc \
-	name="gcc - The GNU C compiler" \
-	desc="GNU C - The GNU C compiler"
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/crtn.o \
+    variant.arch=i386
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/values-Xa.o
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/values-Xc.o
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/values-Xs.o
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/values-Xt.o
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/values-xpg4.o
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/values-xpg6.o
+depend type=require fmri=pkg:/system/header
upstream/oracle/userland-gate