--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/acpidump/Makefile	Fri Apr 22 12:12:20 2011 -0700
@@ -0,0 +1,68 @@
+#
+# 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=		pmtools
+COMPONENT_VERSION=	20071116
+IPS_COMPONENT_VERSION=	0.2007.11.16
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
+COMPONENT_ARCHIVE_HASH=	sha1:997612de90eee65c3974a07b9eee68cfeb077abd
+COMPONENT_ARCHIVE_URL=	http://www.lesswatts.org/patches/linux_acpi/$(COMPONENT_ARCHIVE)
+
+# we're i386-only
+ifeq ($(MACH), sparc)
+PUBLISH_STAMP= 
+endif
+
+include ../../make-rules/prep.mk
+include ../../make-rules/justmake.mk
+include ../../make-rules/ips.mk
+
+PKG_PROTO_DIRS += $(BUILD_DIR_32)
+
+COMPILER =	gcc
+
+COMPONENT_BUILD_ENV  +=		CC=$(CC)
+
+
+# common targets. we're i386-only so we have to
+# be slightly tricky.
+
+build_sparc:
+	@echo "Not available."
+
+build_i386:	$(BUILD_32)
+
+build:		build_$(MACH)
+
+install:	build
+
+test:		$(NO_TESTS)
+
+BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
+include ../../make-rules/depend.mk

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/acpidump/acpidump.1	Fri Apr 22 12:12:20 2011 -0700
@@ -0,0 +1,122 @@
+'\" te
+.\"
+.\" Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+.\"
+.TH acpidump 1 "24 Apr 2009" "SunOS 5.11" "User Commands"
+.SH NAME
+acpidump - dump the raw contents of ACPI tables
+.SH SYNOPSIS
+.LP
+.nf
+\fBacpidump\fB [\fB-a\fR \fIaddress\fR] [\fB-b\fR] [\fI-h\fR] 
+    [\fB-l\fR \fIlength\fR] [\fB-o\fR \fIfile\fR] [\fB-s\fR \fIcount\fR] 
+    [\fB-t\fR \fItable\fR]
+.fi
+
+.SH DESCRIPTION
+.sp
+.LP
+This utility will read the ACPI tables, if any, that were presented to the
+kernel from the BIOS at boot and display the information.  The tables will be
+printed out in hexidecimal format and can be parsed with the acpixtract(1) and
+madt(1) utilities.
+
+.SH OPTIONS
+.sp
+.LP
+The following options are supported:
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-a\fR [\fIaddress\fR]\fR
+.ad
+.sp .6
+.RS 4n
+Allows the user to specify the starting address from which to dump the tables.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-b\fR
+.ad
+.sp .6
+.RS 4n
+Dump the ACPI tables in binary mode.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-h\fR
+.ad
+.sp .6
+.RS 4n
+Display the help menu containing the options supported by the utility.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-l\fR [\fIlength\fR]\fR
+.ad
+.sp .6
+.RS 4n
+Requires a starting address, specified with -a, and will dump the range of
+physical address but makes no attempt to understand the contents of that memory.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-o\fR [\fIfile\fR]\fR
+.ad
+.sp .6
+.RS 4n
+Redirect the output provided by the utility to the specified file.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-s\fR [\fIcount\fR]\fR
+.ad
+.sp .6
+.RS 4n
+Skip \fIcount\fR tables of the given name
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-t\fR [\fItable\fR]\fR
+.ad
+.sp .6
+.RS 4n
+Dump only the table with the \fItable\fR signature.
+.RE
+
+
+.SH SEE ALSO
+.sp
+.LP
+\fBacpixtract\fR(1), \fBmadt\fR(1)
+.RE
+
+.SH RESOURCES
+.sp
+.LP
+http://www.lesswatts.org/projects/acpi/utilities.php
+.sp
+
+.SH NOTES
+.sp
+.LP
+The PRIV_FILE_DAC_READ privilege is necessary to use this utility.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/acpidump/acpidump.license	Fri Apr 22 12:12:20 2011 -0700
@@ -0,0 +1,353 @@
+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.
+--------------------------------------------------------------------
+
+Copyright (c) 1999 - 2006, Intel Corp.
+
+
+                    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
+
+            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) <year>  <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) year  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/acpidump/acpidump.p5m	Fri Apr 22 12:12:20 2011 -0700
@@ -0,0 +1,54 @@
+#
+# 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.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommited>
+set name=pkg.fmri \
+    value=pkg:/diagnostic/acpidump@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="acpidump - utilities used to display ACPI tables"
+set name=info.classification \
+    value="org.opensolaris.category.2008:System/Administration and Configuration"
+set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream_url value=http://www.lesswatts.org/projects/acpi/utilities.php
+set name=opensolaris.arc_url \
+    value=http://arc.opensolaris.org/caselog/PSARC/2009/458
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+dir path=usr
+dir path=usr/bin
+dir path=usr/share
+dir path=usr/share/man
+dir path=usr/share/man/man1
+file acpidump/acpidump path=usr/bin/acpidump
+file acpixtract/acpixtract path=usr/bin/acpixtract
+file madt/madt path=usr/bin/madt
+file acpidump.1 path=usr/share/man/man1/acpidump.1
+file acpixtract.1 path=usr/share/man/man1/acpixtract.1
+file madt.1 path=usr/share/man/man1/madt.1
+
+legacy pkg=SUNWacpidump \
+    desc="acpidump - utilities used to display ACPI tables (20071116)" \
+    name="acpidump - utilities used to display ACPI tables"
+
+license acpidump.license license=GPLv2

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/acpidump/acpixtract.1	Fri Apr 22 12:12:20 2011 -0700
@@ -0,0 +1,74 @@
+'\" te
+.\"
+.\" Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+.\"
+.TH acpixtract 1 "24 Apr 2009" "SunOS 5.11" "User Commands"
+.SH NAME
+acpixtract - extract the ACPI tables
+.SH SYNOPSIS
+.LP
+.nf
+\fBacpixtract\fB [\fB-a\fR \fIsource\fR] [\fB-l\fR \fIsource\fR] 
+    [\fB-s\fR \fIsource\fR \fIsignature\fR]
+.fi
+
+.SH DESCRIPTION
+.sp
+.LP
+This utility will extract the ACPI tables from a raw source and presents them in data file form.
+
+.SH OPTIONS
+.sp
+.LP
+The following options are supported:
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-a\fR [\fIsource\fR]\fR
+.ad
+.sp .6
+.RS 4n
+Extract all of the ACPI tables from the specified source.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-l\fR [\fIsource\fR]\fR
+.ad
+.sp .6
+.RS 4n
+List all of the tables present in the specified source and provide a short summary.  This will not extract the information in the source.
+.RE
+
+.sp
+.ne 2
+.mk
+.na
+\fB\fB-s\fR [\fIsignature\fR]\fR [\fIsource\fR]\fR
+.ad
+.sp .6
+.RS 4n
+Extract only the tables matching the specified signature from the specified source.
+.RE
+
+.SH SEE ALSO
+.sp
+.LP
+\fBacpidump\fR(1), \fBmadt\fR(1)
+.RE
+
+.SH RESOURCES
+.sp
+.LP
+http://www.lesswatts.org/projects/acpi/utilities.php
+
+.SH EXAMPLES
+.sp
+.LP
+1. Extract the binary ACPI tables from acpidump output
+
+    $ acpixtract -a acpidump.out
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/acpidump/madt.1	Fri Apr 22 12:12:20 2011 -0700
@@ -0,0 +1,35 @@
+'\" te
+.\"
+.\" Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+.\"
+.\" ident	"@(#)madt.1	1.2	10/03/16 SMI"
+.\"
+.TH madt 1 "24 Apr 2009" "SunOS 5.11" "User Commands"
+.SH NAME
+madt - parse ACPI tables
+.SH SYNOPSIS
+.LP
+.nf
+\fBmadt [ACPI data file]
+.fi
+
+.SH DESCRIPTION
+.sp
+.LP
+This utility parses the specified data file containing an extracted image of an ACPI table.  It displays the results to the user in human-readable text.
+
+.SH EXAMPLES
+.sp
+.LP
+# madt < SRAT2.dat
+
+
+.SH SEE ALSO
+acpidump(1), acpixtract(1)
+
+.SH RESOURCES
+.sp
+.LP
+http://www.lesswatts.org/projects/acpi/utilities.php
+.sp
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/acpidump/patches/pmtools-01.patch	Fri Apr 22 12:12:20 2011 -0700
@@ -0,0 +1,195 @@
+diff -Naupr pmtools-20071116/acpidump/acpidump.c acpidump-solaris/acpidump/acpidump.c
+--- pmtools-20071116/acpidump/acpidump.c	2007-11-17 02:27:17.000000000 +0800
++++ acpidump-solaris/acpidump/acpidump.c	2009-01-14 16:42:09.000000000 +0800
+@@ -81,13 +81,14 @@ static u8 *acpi_map_memory(unsigned long
+ {
+ 	unsigned long offset;
+ 	u8 *there;
+-	int fd = open("/dev/mem", O_RDONLY);
++	int fd = open(DEFAULT_MEM_DEV, O_RDONLY);
+ 	if (fd < 0) {
+-		fprintf(stderr, "acpi_os_map_memory: cannot open /dev/mem\n");
++		fprintf(stderr, "acpi_os_map_memory: cannot open %s\n",
++			DEFAULT_MEM_DEV);
+ 		exit(1);
+ 	}
+ 	offset = where % psz;
+-	there = mmap(NULL, length + offset, PROT_READ, MAP_PRIVATE,
++	there = mmap(NULL, length + offset, PROT_READ, MAP_FLAGS,
+ 			 fd, where - offset);
+ 	close(fd);
+ 	if (there == MAP_FAILED) return 0;
+diff -Naupr pmtools-20071116/acpidump/Makefile acpidump-solaris/acpidump/Makefile
+--- pmtools-20071116/acpidump/Makefile	2006-11-30 20:41:15.000000000 +0800
++++ acpidump-solaris/acpidump/Makefile	2009-01-18 14:02:17.850743693 +0800
+@@ -12,3 +12,6 @@ CLEANFILES= $(PROG)
+ clean : 
+ 	rm -f $(CLEANFILES) $(patsubst %.c,%.o, $(SRCS)) *~
+ 
++install:
++	cp $(PROG)	$(DESTDIR)
++
+diff -Naupr pmtools-20071116/acpixtract/Makefile acpidump-solaris/acpixtract/Makefile
+--- pmtools-20071116/acpixtract/Makefile	2006-11-30 20:45:06.000000000 +0800
++++ acpidump-solaris/acpixtract/Makefile	2009-01-18 14:02:38.805550620 +0800
+@@ -12,3 +12,6 @@ CLEANFILES= $(PROG)
+ 
+ clean : 
+ 	rm -f $(CLEANFILES) $(patsubst %.c,%.o, $(SRCS))
++
++install:
++	cp $(PROG)	$(DESTDIR)
+diff -Naupr pmtools-20071116/include/acpi/platform/acenv.h acpidump-solaris/include/acpi/platform/acenv.h
+--- pmtools-20071116/include/acpi/platform/acenv.h	2005-11-12 01:07:04.000000000 +0800
++++ acpidump-solaris/include/acpi/platform/acenv.h	2009-01-14 16:39:17.000000000 +0800
+@@ -146,6 +146,9 @@
+ #elif defined(NETWARE)
+ #include "acnetware.h"
+ 
++#elif defined(__sun)
++#include "acsolaris.h"
++
+ #else
+ 
+ /* All other environments */
+diff -Naupr pmtools-20071116/include/acpi/platform/aclinux.h acpidump-solaris/include/acpi/platform/aclinux.h
+--- pmtools-20071116/include/acpi/platform/aclinux.h	2005-11-12 01:07:04.000000000 +0800
++++ acpidump-solaris/include/acpi/platform/aclinux.h	2009-01-14 16:37:48.000000000 +0800
+@@ -47,6 +47,9 @@
+ #define ACPI_USE_SYSTEM_CLIBRARY
+ #define ACPI_USE_DO_WHILE_0
+ 
++#define	DEFAULT_MEM_DEV "/dev/mem"
++#define	MAP_FLAGS MAP_PRIVATE
++
+ #ifdef __KERNEL__
+ 
+ #include <linux/config.h>
+diff -Naupr pmtools-20071116/include/acpi/platform/acsolaris.h acpidump-solaris/include/acpi/platform/acsolaris.h
+--- pmtools-20071116/include/acpi/platform/acsolaris.h	1970-01-01 08:00:00.000000000 +0800
++++ acpidump-solaris/include/acpi/platform/acsolaris.h	2009-01-14 16:37:00.000000000 +0800
+@@ -0,0 +1,95 @@
++/******************************************************************************
++ *
++ * Name: acsolaris.h - OS specific defines, etc.
++ *
++ *****************************************************************************/
++
++/*
++ * Copyright (C) 2000 - 2005, R. Byron Moore
++ * All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ * 1. Redistributions of source code must retain the above copyright
++ *    notice, this list of conditions, and the following disclaimer,
++ *    without modification.
++ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
++ *    substantially similar to the "NO WARRANTY" disclaimer below
++ *    ("Disclaimer") and any redistribution must be conditioned upon
++ *    including a substantially similar Disclaimer requirement for further
++ *    binary redistribution.
++ * 3. Neither the names of the above-listed copyright holders nor the names
++ *    of any contributors may be used to endorse or promote products derived
++ *    from this software without specific prior written permission.
++ *
++ * Alternatively, this software may be distributed under the terms of the
++ * GNU General Public License ("GPL") version 2 as published by the Free
++ * Software Foundation.
++ *
++ * NO WARRANTY
++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
++ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
++ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
++ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
++ * POSSIBILITY OF SUCH DAMAGES.
++ */
++
++#ifndef __ACSOLARIS_H__
++#define __ACSOLARIS_H__
++
++#define ACPI_USE_SYSTEM_CLIBRARY
++#define ACPI_USE_DO_WHILE_0
++
++#define	DEFAULT_MEM_DEV "/dev/xsvc"
++#define	MAP_FLAGS MAP_SHARED | MAP_NORESERVE
++
++#ifdef __KERNEL__
++
++#include <linux/config.h>
++#include <linux/string.h>
++#include <linux/kernel.h>
++#include <linux/ctype.h>
++#include <asm/system.h>
++#include <asm/atomic.h>
++#include <asm/div64.h>
++#include <asm/acpi.h>
++
++#define strtoul simple_strtoul
++
++#define ACPI_MACHINE_WIDTH  BITS_PER_LONG
++
++#else /* !__KERNEL__ */
++
++#include <stdarg.h>
++#include <string.h>
++#include <stdlib.h>
++#include <ctype.h>
++#include <unistd.h>
++
++#if defined(__ia64__) || defined(__x86_64__)
++#define ACPI_MACHINE_WIDTH          64
++#define COMPILER_DEPENDENT_INT64    long
++#define COMPILER_DEPENDENT_UINT64   unsigned long
++#else
++#define ACPI_MACHINE_WIDTH          32
++#define COMPILER_DEPENDENT_INT64    long long
++#define COMPILER_DEPENDENT_UINT64   unsigned long long
++#define ACPI_USE_NATIVE_DIVIDE
++#endif
++
++#define __cdecl
++#define ACPI_FLUSH_CPU_CACHE()
++#endif /* __KERNEL__ */
++
++/* Solaris uses GCC */
++
++#include "acgcc.h"
++
++#endif /* __ACSOLARIS_H__ */
+diff -Naupr pmtools-20071116/madt/Makefile acpidump-solaris/madt/Makefile
+--- pmtools-20071116/madt/Makefile	2007-11-17 02:48:56.000000000 +0800
++++ acpidump-solaris/madt/Makefile	2009-01-18 14:02:58.243462763 +0800
+@@ -14,3 +14,6 @@ CLEANFILES= $(PROG)
+ clean : 
+ 	rm -f $(CLEANFILES) $(patsubst %.c,%.o, $(SRCS)) *~
+ 
++install:
++	cp $(PROG)	$(DESTDIR)
++
+diff -Naupr pmtools-20071116/Makefile acpidump-solaris/Makefile
+--- pmtools-20071116/Makefile	2007-11-17 02:46:10.000000000 +0800
++++ acpidump-solaris/Makefile	2009-01-18 14:07:53.943658824 +0800
+@@ -1,4 +1,6 @@
+ DIRS = acpidump acpixtract madt
++
++
+ 
+ all:
+ 	for i in $(DIRS); do $(MAKE) -C $$i $@; done
+@@ -6,4 +8,7 @@ all:
+ clean:
+ 	for i in $(DIRS); do $(MAKE) -C $$i $@; done
+ 
+-.PHONY: all clean
++install:
++	for i in $(DIRS); do $(MAKE) -C $$i $@; done
++
++.PHONY: all clean install

--- a/components/meta-packages/history/Makefile	Fri Apr 01 09:53:52 2011 -0700
+++ b/components/meta-packages/history/Makefile	Fri Apr 22 12:12:20 2011 -0700
@@ -33,6 +33,10 @@
 PKGMOGRIFY =	/usr/bin/pkgmogrify
 
 CANONICAL_MANIFESTS =	$(wildcard *.p5m)
+ARCH_MANIFESTS =	$(wildcard *.p5m.$(MACH))
+GENERATED_ARCH_MANIFESTS =	$(ARCH_MANIFESTS:%.p5m.$(MACH)=%.p5m)
+CANONICAL_MANIFESTS +=  $(GENERATED_ARCH_MANIFESTS)
+
 MANIFEST_BASE =		$(BUILD_DIR)/manifest-$(MACH)
 MOGRIFIED =		$(CANONICAL_MANIFESTS:%.p5m=$(MANIFEST_BASE)-%.mogrified)
 PUBLISHED =		$(CANONICAL_MANIFESTS:%.p5m=$(MANIFEST_BASE)-%.published)
@@ -61,5 +65,8 @@
 
 publish: $(BUILD_DIR)/.published-$(MACH)
 
+%.p5m: 	%.p5m.$(MACH)
+	$(CP) $< $@
+	
 clobber clean:
-	$(RM) -r $(BUILD_DIR)
+	$(RM) -r $(BUILD_DIR) $(GENERATED_ARCH_MANIFESTS)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/meta-packages/history/SUNWacpidump.p5m.i386	Fri Apr 22 12:12:20 2011 -0700
@@ -0,0 +1,29 @@
+#
+# 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:/[email protected],5.11-0.133
+set name=pkg.renamed value=true
+
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+
+depend fmri=diagnostic/[email protected] type=require

--- a/make-rules/ips.mk	Fri Apr 01 09:53:52 2011 -0700
+++ b/make-rules/ips.mk	Fri Apr 22 12:12:20 2011 -0700
@@ -100,7 +100,11 @@
 
 .SECONDARY:
 
-publish:		build install $(BUILD_DIR)/.published-$(MACH)
+# allow publishing to be overridden, such as when
+# a package is for one architecture only.
+PUBLISH_STAMP ?= $(BUILD_DIR)/.published-$(MACH)
+
+publish:		build install $(PUBLISH_STAMP)
 
 sample-manifest:	$(GENERATED).p5m