--- a/components/a2ps/Makefile	Mon Jan 24 16:29:04 2011 -0800
+++ b/components/a2ps/Makefile	Wed Jan 26 13:22:43 2011 -0800
@@ -28,7 +28,7 @@
 COMPONENT_DESCRIPTION=	"GNU Any to PostScript filter"
 COMPONENT_CLASSIFICATION="System/Printing"
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
-COMPONENT_PROJECT_URL=	http://http.gnu.org/software/a2ps/
+COMPONENT_PROJECT_URL=	http://www.gnu.org/software/a2ps/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC)b.tar.gz
 COMPONENT_ARCHIVE_HASH=	sha1:cfc79a3e54115e569f667fa3fd2c2ec16d22b31a
 COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/a2ps/$(COMPONENT_ARCHIVE)
@@ -58,10 +58,6 @@
 
 SFWPROGS =	a2ps card composeglyphs fixnt fixps ogonkify pdiff psmandup \
 		psset texi2dvi4a2ps
-PROTOSFWLINKS = $(SFWPROGS:%=$(PROTOSFWBIN)/%)
-
-$(PROTOSFWLINKS):	$(PROTOSFWBIN)
-	$(RM) [email protected] ; $(SYMLINK) ../../bin/$(@F) [email protected]
 
 PROTOETCLPFD = $(PROTO_DIR)/etc/lp/fd
 FILTERDEFS =	a2ps.fd
@@ -70,9 +66,11 @@
 $(PROTOFILTERDEFS):	$(PROTOETCLPFD)
 	$(INSTALL) -m 444 $(@F) $(@D)
 
-$(PROTOSFWBIN) $(PROTOETCLPFD):	$(INSTALL_32)
+$(PROTOETCLPFD):	$(INSTALL_32)
 	$(MKDIR) [email protected]
 
+include ../../make-rules/shared-targets.mk
+
 # common targets
 build:		$(BUILD_32)
 
@@ -80,104 +78,4 @@
 
 BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-REQUIRED_TOOL +=	$(CCC)
-REQUIRED_TOOL +=	$(CC)
-REQUIRED_TOOL +=	/sbin/uname
-REQUIRED_TOOL +=	/usr/bin/$(MACH64)/ld
-REQUIRED_TOOL +=	/usr/bin/$(MACH64)/nm
-REQUIRED_TOOL +=	/usr/bin/$(MACH64)/sort
-REQUIRED_TOOL +=	/usr/bin/basename
-REQUIRED_TOOL +=	/usr/bin/bash
-REQUIRED_TOOL +=	/usr/bin/cat
-REQUIRED_TOOL +=	/usr/bin/chmod
-REQUIRED_TOOL +=	/usr/bin/cmp
-REQUIRED_TOOL +=	/usr/bin/cp
-REQUIRED_TOOL +=	/usr/bin/date
-REQUIRED_TOOL +=	/usr/bin/echo
-REQUIRED_TOOL +=	/usr/bin/egrep
-REQUIRED_TOOL +=	/usr/bin/emacs
-REQUIRED_TOOL +=	/usr/bin/env
-REQUIRED_TOOL +=	/usr/bin/expr
-REQUIRED_TOOL +=	/usr/bin/fgrep
-REQUIRED_TOOL +=	/usr/bin/file
-REQUIRED_TOOL +=	/usr/bin/flex
-REQUIRED_TOOL +=	/usr/bin/gfind
-REQUIRED_TOOL +=	/usr/bin/ggrep
-REQUIRED_TOOL +=	/usr/bin/ginstall
-REQUIRED_TOOL +=	/usr/bin/gmake
-REQUIRED_TOOL +=	/usr/bin/gpatch
-REQUIRED_TOOL +=	/usr/bin/grep
-REQUIRED_TOOL +=	/usr/bin/gsed
-REQUIRED_TOOL +=	/usr/bin/gtar
-REQUIRED_TOOL +=	/usr/bin/gzip
-REQUIRED_TOOL +=	/usr/bin/hostname
-REQUIRED_TOOL +=	/usr/bin/ksh93
-REQUIRED_TOOL +=	/usr/bin/imake
-REQUIRED_TOOL +=	/usr/bin/install-info
-REQUIRED_TOOL +=	/usr/bin/ld
-REQUIRED_TOOL +=	/usr/bin/ln
-REQUIRED_TOOL +=	/usr/bin/ls
-REQUIRED_TOOL +=	/usr/bin/make
-REQUIRED_TOOL +=	/usr/bin/mkdir
-REQUIRED_TOOL +=	/usr/bin/msgfmt
-REQUIRED_TOOL +=	/usr/bin/mv
-REQUIRED_TOOL +=	/usr/bin/nm
-REQUIRED_TOOL +=	/usr/bin/psselect
-REQUIRED_TOOL +=	/usr/bin/rm
-REQUIRED_TOOL +=	/usr/bin/sed
-REQUIRED_TOOL +=	/usr/bin/sleep
-REQUIRED_TOOL +=	/usr/bin/sort
-REQUIRED_TOOL +=	/usr/bin/touch
-REQUIRED_TOOL +=	/usr/bin/tr
-REQUIRED_TOOL +=	/usr/bin/uniq
-REQUIRED_TOOL +=	/usr/bin/xgettext
-REQUIRED_TOOL +=	/usr/bin/xmkmf
-REQUIRED_TOOL +=	/usr/gnu/bin/echo
-REQUIRED_TOOL +=	/usr/gnu/bin/m4
-REQUIRED_TOOL +=	/usr/gnu/bin/pwd
-REQUIRED_TOOL +=	/usr/gnu/bin/sort
-REQUIRED_TOOL +=	/usr/gnu/bin/uname
-REQUIRED_TOOL +=	/usr/lib/cpp
-REQUIRED_TOOL +=	/usr/perl5/bin/perl
-
-REQUIRED_FILE +=	/lib/libc.so
-REQUIRED_FILE +=	/lib/libm.so
-REQUIRED_FILE +=	/usr/include/alloca.h
-REQUIRED_FILE +=	/usr/include/assert.h
-REQUIRED_FILE +=	/usr/include/ctype.h
-REQUIRED_FILE +=	/usr/include/dirent.h
-REQUIRED_FILE +=	/usr/include/errno.h
-REQUIRED_FILE +=	/usr/include/fcntl.h
-REQUIRED_FILE +=	/usr/include/fnmatch.h
-REQUIRED_FILE +=	/usr/include/inttypes.h
-REQUIRED_FILE +=	/usr/include/libintl.h
-REQUIRED_FILE +=	/usr/include/limits.h
-REQUIRED_FILE +=	/usr/include/locale.h
-REQUIRED_FILE +=	/usr/include/malloc.h
-REQUIRED_FILE +=	/usr/include/math.h
-REQUIRED_FILE +=	/usr/include/memory.h
-REQUIRED_FILE +=	/usr/include/nl_types.h
-REQUIRED_FILE +=	/usr/include/pwd.h
-REQUIRED_FILE +=	/usr/include/signal.h
-REQUIRED_FILE +=	/usr/include/stdarg.h
-REQUIRED_FILE +=	/usr/include/stdbool.h
-REQUIRED_FILE +=	/usr/include/stddef.h
-REQUIRED_FILE +=	/usr/include/stdio.h
-REQUIRED_FILE +=	/usr/include/stdlib.h
-REQUIRED_FILE +=	/usr/include/string.h
-REQUIRED_FILE +=	/usr/include/strings.h
-REQUIRED_FILE +=	/usr/include/sys/ioctl.h
-REQUIRED_FILE +=	/usr/include/sys/mman.h
-REQUIRED_FILE +=	/usr/include/sys/param.h
-REQUIRED_FILE +=	/usr/include/sys/stat.h
-REQUIRED_FILE +=	/usr/include/sys/time.h
-REQUIRED_FILE +=	/usr/include/sys/types.h
-REQUIRED_FILE +=	/usr/include/sys/wait.h
-REQUIRED_FILE +=	/usr/include/termios.h
-REQUIRED_FILE +=	/usr/include/time.h
-REQUIRED_FILE +=	/usr/include/unistd.h
-REQUIRED_FILE +=	/usr/include/varargs.h
-REQUIRED_FILE +=	/usr/include/wchar.h
-REQUIRED_FILE +=	/usr/share/lib/make
-
 include ../../make-rules/depend.mk

--- a/components/bzip2/SUNWbzip.p5m	Mon Jan 24 16:29:04 2011 -0800
+++ b/components/bzip2/SUNWbzip.p5m	Wed Jan 26 13:22:43 2011 -0800
@@ -22,7 +22,7 @@
 #
 
 #
-# Legacy package information for renamed SUNWa2ps package
+# Legacy package information for renamed SUNWbzip package
 #
 
 set name=pkg.fmri value=pkg:/[email protected],5.11-0.133

--- a/components/bzip2/bzip2.p5m	Mon Jan 24 16:29:04 2011 -0800
+++ b/components/bzip2/bzip2.p5m	Wed Jan 26 13:22:43 2011 -0800
@@ -69,7 +69,7 @@
 link path=usr/lib/$(MACH64)/libbz2.so target=libbz2.so.1 variant.arch=$(ARCH)
 link path=usr/lib/libbz2.so target=libbz2.so.1 variant.arch=$(ARCH)
 
-license bzip2.license license="bzip2.license"
+license bzip2.license license="bzip2 license"
 
 legacy arch=$(ARCH) category=system \
 	name="The bzip compression utility" \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/make/Makefile	Wed Jan 26 13:22:43 2011 -0800
@@ -0,0 +1,71 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+include ../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		make
+COMPONENT_VERSION=	3.81
+IPS_PKG_NAME=		developer/build/gnu-make
+COMPONENT_DESCRIPTION=	"GNU make - A utility used to build software (gmake) 3.81"
+COMPONENT_CLASSIFICATION="Development/GNU"
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_PROJECT_URL=	http://http.gnu.org/software/make/
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	sha1:cd4fa5a3184176492bf0799593a8f250a728210c
+COMPONENT_ARCHIVE_URL=	http://ftp.gnu.org/gnu/make/$(COMPONENT_ARCHIVE)
+
+include ../../make-rules/prep.mk
+include ../../make-rules/configure.mk
+include ../../make-rules/ips.mk
+
+CONFIGURE_OPTIONS  +=		--program-prefix=g
+CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
+CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
+
+GNUPROGS =	make
+GNUMAN1 =	make.1
+SFWPROGS=	gmake
+SFWMAN1=	gmake.1
+
+PROTOGNULINKS = $(GNUPROGS:%=$(PROTOGNUBIN)/%)
+
+$(PROTOGNULINKS):	$(PROTOGNUBIN)
+	$(RM) [email protected] ; $(SYMLINK) ../../bin/g$(@F) [email protected]
+
+PROTOGNUMAN1LINKS = $(GNUMAN1:%=$(PROTOGNUSHAREMAN1)/%)
+
+$(PROTOGNUMAN1LINKS):	$(PROTOGNUSHAREMAN1)
+	$(RM) [email protected] ; $(SYMLINK) ../../../../share/man/man1/g$(@F) [email protected]
+
+include ../../make-rules/shared-targets.mk
+
+# common targets
+build:		$(BUILD_32)
+
+install:	$(INSTALL_32) \
+    $(PROTOGNULINKS) $(PROTOGNUMAN1LINKS) \
+    $(PROTOSFWLINKS) $(PROTOSFWMAN1LINKS)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include ../../make-rules/depend.mk

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/make/SUNWgmake.p5m	Wed Jan 26 13:22:43 2011 -0800
@@ -0,0 +1,36 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# Legacy package information for renamed SUNWgmake package
+#
+
+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)
+
+set name=variant.opensolaris.zone value=global value=nonglobal
+set name=variant.arch value=$(ARCH)
+
+depend fmri=developer/build/[email protected] type=require

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/make/make.license	Wed Jan 26 13:22:43 2011 -0800
@@ -0,0 +1,350 @@
+Oracle elects to use only the GNU Lesser General Public License version
+2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
+where a choice of LGPL/GPL license versions are made available with the
+language indicating that LGPLv2.1/GPLv2 or any later version may be
+used, or where a choice of which version of the LGPL/GPL is applied is
+unspecified.  Unless specifically stated otherwise, where a choice
+exists between another license and either the GPL or the LGPL, Oracle
+chooses the other license.
+-----------------------------------------------------------------------
+
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                          59 Temple Place - Suite 330, Boston, MA
+                          02111-1307, USA.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	Appendix: How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/make/make.p5m	Wed Jan 26 13:22:43 2011 -0800
@@ -0,0 +1,140 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+set name=pkg.fmri value=pkg:/developer/build/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="$(COMPONENT_SUMMARY) "
+set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
+set name=info.classification value="org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION) "
+set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+set variant.arch=$(ARCH)
+
+dir path=usr
+dir path=usr/bin
+dir path=usr/gnu
+dir path=usr/gnu/bin
+dir path=usr/gnu/share
+dir path=usr/gnu/share/man
+dir path=usr/gnu/share/man/man1
+dir path=usr/sfw
+dir path=usr/sfw/bin
+dir path=usr/sfw/share
+dir path=usr/sfw/share/man
+dir path=usr/sfw/share/man/man1
+dir path=usr/share
+dir path=usr/share/info
+dir path=usr/share/locale
+dir path=usr/share/locale/be
+dir path=usr/share/locale/be/LC_MESSAGES
+dir path=usr/share/locale/da
+dir path=usr/share/locale/da/LC_MESSAGES
+dir path=usr/share/locale/de
+dir path=usr/share/locale/de/LC_MESSAGES
+dir path=usr/share/locale/es
+dir path=usr/share/locale/es/LC_MESSAGES
+dir path=usr/share/locale/fi
+dir path=usr/share/locale/fi/LC_MESSAGES
+dir path=usr/share/locale/fr
+dir path=usr/share/locale/fr/LC_MESSAGES
+dir path=usr/share/locale/ga
+dir path=usr/share/locale/ga/LC_MESSAGES
+dir path=usr/share/locale/gl
+dir path=usr/share/locale/gl/LC_MESSAGES
+dir path=usr/share/locale/he
+dir path=usr/share/locale/he/LC_MESSAGES
+dir path=usr/share/locale/hr
+dir path=usr/share/locale/hr/LC_MESSAGES
+dir path=usr/share/locale/id
+dir path=usr/share/locale/id/LC_MESSAGES
+dir path=usr/share/locale/ja
+dir path=usr/share/locale/ja/LC_MESSAGES
+dir path=usr/share/locale/ko
+dir path=usr/share/locale/ko/LC_MESSAGES
+dir path=usr/share/locale/nl
+dir path=usr/share/locale/nl/LC_MESSAGES
+dir path=usr/share/locale/pl
+dir path=usr/share/locale/pl/LC_MESSAGES
+dir path=usr/share/locale/pt_BR
+dir path=usr/share/locale/pt_BR/LC_MESSAGES
+dir path=usr/share/locale/ru
+dir path=usr/share/locale/ru/LC_MESSAGES
+dir path=usr/share/locale/rw
+dir path=usr/share/locale/rw/LC_MESSAGES
+dir path=usr/share/locale/sv
+dir path=usr/share/locale/sv/LC_MESSAGES
+dir path=usr/share/locale/tr
+dir path=usr/share/locale/tr/LC_MESSAGES
+dir path=usr/share/locale/uk
+dir path=usr/share/locale/uk/LC_MESSAGES
+dir path=usr/share/locale/vi
+dir path=usr/share/locale/vi/LC_MESSAGES
+dir path=usr/share/locale/zh_CN
+dir path=usr/share/locale/zh_CN/LC_MESSAGES
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file path=usr/bin/gmake variant.arch=$(ARCH)
+file path=usr/share/info/make.info
+file path=usr/share/info/make.info-1
+file path=usr/share/info/make.info-2
+file path=usr/share/locale/be/LC_MESSAGES/make.mo
+file path=usr/share/locale/da/LC_MESSAGES/make.mo
+file path=usr/share/locale/de/LC_MESSAGES/make.mo
+file path=usr/share/locale/es/LC_MESSAGES/make.mo
+file path=usr/share/locale/fi/LC_MESSAGES/make.mo
+file path=usr/share/locale/fr/LC_MESSAGES/make.mo
+file path=usr/share/locale/ga/LC_MESSAGES/make.mo
+file path=usr/share/locale/gl/LC_MESSAGES/make.mo
+file path=usr/share/locale/he/LC_MESSAGES/make.mo
+file path=usr/share/locale/hr/LC_MESSAGES/make.mo
+file path=usr/share/locale/id/LC_MESSAGES/make.mo
+file path=usr/share/locale/ja/LC_MESSAGES/make.mo
+file path=usr/share/locale/ko/LC_MESSAGES/make.mo
+file path=usr/share/locale/nl/LC_MESSAGES/make.mo
+file path=usr/share/locale/pl/LC_MESSAGES/make.mo
+file path=usr/share/locale/pt_BR/LC_MESSAGES/make.mo
+file path=usr/share/locale/ru/LC_MESSAGES/make.mo
+file path=usr/share/locale/rw/LC_MESSAGES/make.mo
+file path=usr/share/locale/sv/LC_MESSAGES/make.mo
+file path=usr/share/locale/tr/LC_MESSAGES/make.mo
+file path=usr/share/locale/uk/LC_MESSAGES/make.mo
+file path=usr/share/locale/vi/LC_MESSAGES/make.mo
+file path=usr/share/locale/zh_CN/LC_MESSAGES/make.mo
+file path=usr/share/man/man1/gmake.1
+link path=usr/gnu/bin/make target=../../bin/gmake
+link path=usr/gnu/share/man/man1/make.1 \
+    target=../../../../share/man/man1/gmake.1
+link path=usr/sfw/bin/gmake target=../../bin/gmake
+link path=usr/sfw/share/man/man1/gmake.1 \
+    target=../../../../share/man/man1/gmake.1
+
+
+license make.license license="GPLv2"
+
+legacy arch=$(ARCH) category=system \
+	name="gmake - GNU make" \
+	desc="GNU make - A utility used to build software (gmake) 3.81" \
+	hotline="Please contact your local service provider" \
+	pkg=SUNWgmake variant.arch=$(ARCH) vendor="Oracle Corporation" \
+	version=11.11.0,REV=2010.10.26.16.59
+
+set name=variant.opensolaris.zone value=global value=nonglobal

--- a/make-rules/ips.mk	Mon Jan 24 16:29:04 2011 -0800
+++ b/make-rules/ips.mk	Wed Jan 26 13:22:43 2011 -0800
@@ -112,7 +112,8 @@
 $(GENERATED).p5m:	install
 	$(PKGSEND) generate $(PKG_HARDLINKS:%=--target %) $(PROTO_DIR) | \
 	$(PKGMOGRIFY) $(PKG_OPTIONS) /dev/fd/0 $(GENERATE_TRANSFORMS) | \
-		sed -e '/^$$/d' -e '/^#.*$$/d' | $(PKGFMT) >[email protected]
+		sed -e '/^$$/d' -e '/^#.*$$/d' | $(PKGFMT) | \
+		cat $(METADATA_TEMPLATE) - >[email protected]
 
 # copy the canonical manifest(s) to the build tree
 $(MANIFEST_BASE)-%.generate:	%.p5m canonical-manifests

--- a/make-rules/shared-macros.mk	Mon Jan 24 16:29:04 2011 -0800
+++ b/make-rules/shared-macros.mk	Wed Jan 26 13:22:43 2011 -0800
@@ -82,8 +82,23 @@
 
 SFWBIN =	/usr/sfw/bin
 SFWLIB =	/usr/sfw/lib
+SFWSHARE =	/usr/sfw/share
+SFWSHAREMAN =	/usr/sfw/share/man
+SFWSHAREMAN1 =	/usr/sfw/share/man/man1
 PROTOSFWBIN =	$(PROTO_DIR)/$(SFWBIN)
 PROTOSFWLIB =	$(PROTO_DIR)/$(SFWLIB)
+PROTOSFWSHARE =	$(PROTO_DIR)/$(SFWSHARE)
+PROTOSFWSHAREMAN =	$(PROTO_DIR)/$(SFWSHAREMAN)
+PROTOSFWSHAREMAN1 =	$(PROTO_DIR)/$(SFWSHAREMAN1)
+
+GNUBIN =	/usr/gnu/bin
+GNUSHARE =	/usr/gnu/share
+GNUSHAREMAN =	/usr/gnu/share/man
+GNUSHAREMAN1 =	/usr/gnu/share/man/man1
+PROTOGNUBIN =	$(PROTO_DIR)/$(GNUBIN)
+PROTOGNUSHARE =	$(PROTO_DIR)/$(GNUSHARE)
+PROTOGNUSHAREMAN =	$(PROTO_DIR)/$(GNUSHAREMAN)
+PROTOGNUSHAREMAN1 =	$(PROTO_DIR)/$(GNUSHAREMAN1)
 
 # work around _TIME, _DATE, embedded date chatter in component builds
 # to use, set TIME_CONSTANT in the component Makefile and add $(CONSTANT_TIME)
@@ -236,10 +251,19 @@
 	$(COPTFLAG64) $($(MACH64)_CFLAGS) $(CCMODE64) \
 	$(ILDOFF) $(C99MODE) $(IROPTFLAG64)
 
-#
+# build with a non-executable stack by default.
+# override this if necessary
+LD_MAP_NOEXSTK="-M /usr/lib/ld/map.noexstk"
+LD_OPTIONS+= $(LD_MAP_NOEXSTK)
+
 # Environment variables and arguments passed into the build and install
-# environment(s).  These specifically add the bit-specific data
-#
+# environment(s).  These are the initial settings.
+COMPONENT_BUILD_ENV= \
+    LD_OPTIONS=$(LD_OPTIONS)
+COMPONENT_INSTALL_ENV= \
+    LD_OPTIONS=$(LD_OPTIONS)
+
+# Add any bit-specific settings
 COMPONENT_BUILD_ENV += $(COMPONENT_BUILD_ENV.$(BITS))
 COMPONENT_BUILD_ARGS += $(COMPONENT_BUILD_ARGS.$(BITS))
 COMPONENT_INSTALL_ENV += $(COMPONENT_INSTALL_ENV.$(BITS))

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make-rules/shared-targets.mk	Wed Jan 26 13:22:43 2011 -0800
@@ -0,0 +1,42 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+#
+
+#
+# (hopefully) helpful common targets.
+#
+PROTOSFWLINKS= $(SFWPROGS:%=$(PROTOSFWBIN)/%)
+
+$(PROTOSFWLINKS):	$(PROTOSFWBIN)
+	$(RM) [email protected] ; $(SYMLINK) ../../bin/$(@F) [email protected]
+
+PROTOSFWMAN1LINKS= $(SFWMAN1:%=$(PROTOSFWSHAREMAN1)/%)
+
+$(PROTOSFWMAN1LINKS):	$(PROTOSFWSHAREMAN1)
+	$(RM) [email protected] ; $(SYMLINK) ../../../../share/man/man1/$(@F) [email protected]
+
+$(PROTOGNUBIN) \
+$(PROTOGNUSHAREMAN1) \
+$(PROTOSFWBIN) \
+$(PROTOSFWSHAREMAN1):
+	$(MKDIR) [email protected]
+

--- a/transforms/copyright-template	Mon Jan 24 16:29:04 2011 -0800
+++ b/transforms/copyright-template	Wed Jan 26 13:22:43 2011 -0800
@@ -18,5 +18,5 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #

--- a/transforms/manifest-metadata-template	Mon Jan 24 16:29:04 2011 -0800
+++ b/transforms/manifest-metadata-template	Wed Jan 26 13:22:43 2011 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, Oracle and/or it's affiliates.  All rights reserved.
+# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri value=pkg:/$(IPS_PKG_NAME)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -29,8 +29,7 @@
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 set variant.arch=$(ARCH)
-
-#license $(COPYRIGHT_FILE) license='$(COPYRIGHTS)'
+set name=variant.opensolaris.zone value=global value=nonglobal
 
-# set name=variant.opensolaris.zone value=global value=nonglobal
-# set name=variant.arch value=i386 value=sparc
+license $(COPYRIGHT_FILE) license='$(COPYRIGHTS)'
+