--- a/components/findutils/findutils.license	Wed Dec 04 18:16:46 2013 -0800
+++ b/components/findutils/findutils.license	Thu Dec 05 06:08:37 2013 -0800
@@ -295,8 +295,8 @@
 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>
+
+Copyright (C)
 
     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
@@ -335,7 +335,7 @@
   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
+, 1 April 1989
   Ty Coon, President of Vice
 
 This General Public License does not permit incorporating your program into

--- a/components/fping/fping.license	Wed Dec 04 18:16:46 2013 -0800
+++ b/components/fping/fping.license	Thu Dec 05 06:08:37 2013 -0800
@@ -1,19 +1,31 @@
- *-------------------------------------------------- 
- * Copyright (c) 1992, 1994, 1997 Board of Trustees 
- *            Leland Stanford Jr. University 
- *************************************************** 
+Copyright (c) 1992, 1994, 1997 Board of Trustees Leland Stanford Jr. University
+
+Redistribution and use in source and binary forms are permitted
+provided that the above copyright notice and this paragraph are
+duplicated in all such forms and that any documentation,
+advertising materials, and other materials related to such
+distribution and use acknowledge that the software was developed
+by Stanford University. The name of the University may not be used
+to endorse or promote products derived from this software without
+specific prior written permission.
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
-/* 
- * Redistribution and use in source and binary forms are permitted 
- * provided that the above copyright notice and this paragraph are 
- * duplicated in all such forms and that any documentation, 
- * advertising materials, and other materials related to such 
- * distribution and use acknowledge that the software was developed 
- * by Stanford University.  The name of the University may not be used 
- * to endorse or promote products derived from this software without 
- * specific prior written permission. 
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR 
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED 
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. 
- */
+--------------------------------------------------
+* Copyright (c) 1992, 1994, 1997 Board of Trustees
+* Leland Stanford Jr. University
+***************************************************
 
+/*
+* Redistribution and use in source and binary forms are permitted
+* provided that the above copyright notice and this paragraph are
+* duplicated in all such forms and that any documentation,
+* advertising materials, and other materials related to such
+* distribution and use acknowledge that the software was developed
+* by Stanford University. The name of the University may not be used
+* to endorse or promote products derived from this software without
+* specific prior written permission.
+* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. 

--- a/components/fping/fping.p5m	Wed Dec 04 18:16:46 2013 -0800
+++ b/components/fping/fping.p5m	Thu Dec 05 06:08:37 2013 -0800
@@ -30,6 +30,7 @@
 set name=pkg.summary \
     value="fping - a program to ping hosts in parallel"
 set name=com.oracle.info.description value="the fping utility"
+set name=com.oracle.info.tpno value=5500
 set name=info.classification \
     value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)

--- a/components/groff/groff.license	Wed Dec 04 18:16:46 2013 -0800
+++ b/components/groff/groff.license	Thu Dec 05 06:08:37 2013 -0800
@@ -1,8 +1,8 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -15,7 +15,7 @@
 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
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -290,8 +290,8 @@
 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>
+
+Copyright (C)
 
     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
@@ -303,10 +303,9 @@
     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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
+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.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -330,11 +329,11 @@
   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
+, 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
+library. If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.

--- a/components/perl_modules/DBI/Makefile	Wed Dec 04 18:16:46 2013 -0800
+++ b/components/perl_modules/DBI/Makefile	Thu Dec 05 06:08:37 2013 -0800
@@ -36,9 +36,6 @@
 include $(WS_TOP)/make-rules/ips.mk
 include $(WS_TOP)/make-rules/makemaker.mk
 
-# Enable ASLR for this component
-ASLR_MODE = $(ASLR_ENABLE)
-
 COMPONENT_TEST_TARGETS = test
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)

--- a/components/pkg-config/pkg-config.license	Wed Dec 04 18:16:46 2013 -0800
+++ b/components/pkg-config/pkg-config.license	Thu Dec 05 06:08:37 2013 -0800
@@ -290,8 +290,8 @@
 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>
+
+Copyright (C)
 
     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
@@ -330,7 +330,7 @@
   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
+, 1 April 1989
   Ty Coon, President of Vice
 
 This General Public License does not permit incorporating your program into

--- a/components/python/imaging/imaging-PYVER.p5m	Wed Dec 04 18:16:46 2013 -0800
+++ b/components/python/imaging/imaging-PYVER.p5m	Thu Dec 05 06:08:37 2013 -0800
@@ -30,6 +30,7 @@
 set name=pkg.description \
     value="The Python Imaging Library (PIL) adds image processing capabilities to your Python interpreter. This library provides extensive file format support, an efficient internal representation, and powerful image processing capabilities."
 set name=com.oracle.info.description value="the Python imaging library"
+set name=com.oracle.info.tpno value=7909
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)

--- a/components/python/imaging/imaging.license	Wed Dec 04 18:16:46 2013 -0800
+++ b/components/python/imaging/imaging.license	Thu Dec 05 06:08:37 2013 -0800
@@ -1,25 +1,6 @@
-The Python Imaging Library is
-
-Copyright (c) 1997-2009 by Secret Labs AB
-Copyright (c) 1995-2009 by Fredrik Lundh
-
-By obtaining, using, and/or copying this software and/or its
-associated documentation, you agree that you have read, understood,
-and will comply with the following terms and conditions:
-
-Permission to use, copy, modify, and distribute this software and its
-associated documentation for any purpose and without fee is hereby
-granted, provided that the above copyright notice appears in all
-copies, and that both that copyright notice and this permission notice
-appear in supporting documentation, and that the name of Secret Labs
-AB or the author not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior
-permission.
-
-SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO
-THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+The Python Imaging Library (PIL) is
+Copyright © 1997-2006 by Secret Labs AB
+Copyright © 1995-2006 by Fredrik Lundh
+By obtaining, using, and/or copying this software and/or its associated documentation, you agree that you have read, understood, and will comply with the following terms and conditions:
+Permission to use, copy, modify, and distribute this software and its associated documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appears in all copies, and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of Secret Labs AB or the author not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission.
+SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

--- a/components/python/ipython/ipython-PYVER.p5m	Wed Dec 04 18:16:46 2013 -0800
+++ b/components/python/ipython/ipython-PYVER.p5m	Thu Dec 05 06:08:37 2013 -0800
@@ -27,6 +27,7 @@
     value=pkg:/library/python-2/ipython-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Enhanced interactive Python shell"
 set name=com.oracle.info.description value="the IPython interactive Python shell"
+set name=com.oracle.info.tpno value=9640
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)

--- a/components/python/ipython/ipython.license	Wed Dec 04 18:16:46 2013 -0800
+++ b/components/python/ipython/ipython.license	Thu Dec 05 06:08:37 2013 -0800
@@ -1,91 +1,30 @@
-=====================
-License and Copyright
-=====================
-
-License
-=======
-
-IPython is licensed under the terms of the new or revised BSD license, as follows::
+Copyright (c) 2008, IPython Development Team
 
-    Copyright (c) 2008, IPython Development Team
-
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:
-
-    Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
+All rights reserved.
 
-    Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-
-    Neither the name of the IPython Development Team nor the names of its
-    contributors may be used to endorse or promote products derived from this
-    software without specific prior written permission.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
 
-    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 MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-    PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 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 DAMAGE.
+Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
 
-Our Copyright Policy
-====================
+Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
 
-IPython uses a shared copyright model. Each contributor maintains copyright
-over their contributions to IPython. But, it is important to note that these
-contributions are typically only changes to the repositories. Thus, the
-IPython source code, in its entirety is not the copyright of any single person
-or institution. Instead, it is the collective copyright of the entire IPython
-Development Team. If individual contributors want to maintain a record of what
-changes/contributions they have specific copyright on, they should indicate
-their copyright in the commit message of the change, when they commit the
-change to one of the IPython repositories.
-
-Miscellaneous
-=============
-
-Some files (DPyGetOpt.py, for example) may be licensed under different
-conditions. Ultimately each file indicates clearly the conditions under which
-its author/authors have decided to publish the code.
-
-Versions of IPython up to and including 0.6.3 were released under the GNU
-Lesser General Public License (LGPL), available at
-http://www.gnu.org/copyleft/lesser.html.
-
---------------------------------------------------------------------
+Neither the name of the IPython Development Team nor the names of its
+contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
 
-IPython/DPyGetOpt.py:
-
-Copyright (c) 2001 Bill Bumgarner <[email protected]>
-
-
-Published under the terms of the MIT license, hereby reproduced:
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
-
+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 MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 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 DAMAGE.

--- a/components/python/twisted-web2/twisted-web2-PYVER.p5m	Wed Dec 04 18:16:46 2013 -0800
+++ b/components/python/twisted-web2/twisted-web2-PYVER.p5m	Thu Dec 05 06:08:37 2013 -0800
@@ -27,6 +27,7 @@
     value=pkg:/library/python-2/python-twisted-web2-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="A HTTP/1.1 Server Framework"
 set name=com.oracle.info.description value="the Twisted Web2 Python HTTP/1.1 Server Framework"
+set name=com.oracle.info.tpno value=9693
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)

--- a/components/python/twisted-web2/twisted-web2.license	Wed Dec 04 18:16:46 2013 -0800
+++ b/components/python/twisted-web2/twisted-web2.license	Thu Dec 05 06:08:37 2013 -0800
@@ -1,12 +1,8 @@
-----------------------
-- Twisted-Web2 8.1.0 -
-----------------------
-
---------------------------------------------------------------------
-
-Copyright (c) 2001-2008
+Copyright (c) 2001-2010
 Allen Short
+Andy Gayton
 Andrew Bennetts
+Antoine Pitrou
 Apple Computer, Inc.
 Benjamin Bruheim
 Bob Ippolito
@@ -15,13 +11,17 @@
 David Reid
 Donovan Preston
 Eric Mangold
+Eyal Lotem
 Itamar Shtull-Trauring
 James Knight
 Jason A. Mobarak
+Jean-Paul Calderone
+Jessica McKellar
+Jonathan Jacobs
 Jonathan Lange
 Jonathan D. Simms
-Jp Calderone
 Jürgen Hermann
+Kevin Horn
 Kevin Turner
 Mary Gardiner
 Matthew Lefkowitz
@@ -31,11 +31,11 @@
 Pavel Pergamenshchik
 Ralph Meijer
 Sean Riley
+Software Freedom Conservancy
 Travis B. Hartwell
+Thijs Triemstra
 Thomas Herve
-Eyal Lotem
-Antoine Pitrou
-Andy Gayton
+Timothy Allen
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

--- a/components/python/twisted/twisted-PYVER.p5m	Wed Dec 04 18:16:46 2013 -0800
+++ b/components/python/twisted/twisted-PYVER.p5m	Thu Dec 05 06:08:37 2013 -0800
@@ -27,6 +27,7 @@
     value=pkg:/library/python-2/python-twisted-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Event-based framework for internet applications"
 set name=com.oracle.info.description value="the Twisted event-based Python framework"
+set name=com.oracle.info.tpno value=9692
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)

--- a/components/python/twisted/twisted.license	Wed Dec 04 18:16:46 2013 -0800
+++ b/components/python/twisted/twisted.license	Thu Dec 05 06:08:37 2013 -0800
@@ -1,9 +1,3 @@
-------------------
-- Twisted 10.0.1 -
-------------------
-
---------------------------------------------------------------------
-
 Copyright (c) 2001-2010
 Allen Short
 Andy Gayton

--- a/components/python/zope-interface/zope-interface-PYVER.p5m	Wed Dec 04 18:16:46 2013 -0800
+++ b/components/python/zope-interface/zope-interface-PYVER.p5m	Thu Dec 05 06:08:37 2013 -0800
@@ -28,6 +28,7 @@
 set name=pkg.summary \
     value="Zope interfaces package for Python"
 set name=com.oracle.info.description value="the Zope interfaces package for Python"
+set name=com.oracle.info.tpno value=7911
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)

--- a/components/python/zope-interface/zope-interface.license	Wed Dec 04 18:16:46 2013 -0800
+++ b/components/python/zope-interface/zope-interface.license	Thu Dec 05 06:08:37 2013 -0800
@@ -1,47 +1,11 @@
-Zope Public License Version 2.1
-
-A copyright notice accompanies this license document that identifies the
-copyright holders. This license has been certified as open source. It has
-also been designated as GPL compatible by the Free Software Foundation (FSF).
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions in source code must retain the accompanying copyright
-   notice, this list of conditions, and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the accompanying copyright
-   notice, this list of conditions, and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-3. Names of the copyright holders must not be used to endorse or promote
-   products derived from this software without prior written permission
-   from the copyright holders.
-
-4. The right to distribute this software or to use it for any purpose does
-   not give You the right to use Servicemarks (sm) or Trademarks (tm) of
-   the copyright holders.
-
-5. If You make a patent infringement claim against any entity (including a
-   cross- claim or counterclaim in a lawsuit) alleging that the software
-   licensed hereunder constitutes direct or contributory patent infringement,
-   then any patent and any right-to-use licenses granted to You under this
-   License for that software shall terminate as of the date such claim is made.
-
-If any files are modified by You then you must cause the modified files to
-carry prominent notices stating that you changed the files and the date of
-any change.
-
+Zope Public License (ZPL) Version 2.1
+A copyright notice accompanies this license document that identifies the copyright holders.
+This license has been certified as open source. It has also been designated as GPL compatible by the Free Software Foundation (FSF).
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+1. Redistributions in source code must retain the accompanying copyright notice, this list of conditions, and the following disclaimer.
+2. Redistributions in binary form must reproduce the accompanying copyright notice, this list of conditions, and the following disclaimer in the documentation and/or other materials provided with the distribution.
+3. Names of the copyright holders must not be used to endorse or promote products derived from this software without prior written permission from the copyright holders.
+4. The right to distribute this software or to use it for any purpose does not give you the right to use Servicemarks (sm) or Trademarks (tm) of the copyright holders. Use of them is covered by separate agreement with the copyright holders.
+5. If any files are modified, you must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
 Disclaimer
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS “AS IS” AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, 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 DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 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 DAMAGE.

--- a/components/spawn-fcgi/spawn-fcgi.license	Wed Dec 04 18:16:46 2013 -0800
+++ b/components/spawn-fcgi/spawn-fcgi.license	Thu Dec 05 06:08:37 2013 -0800
@@ -1,4 +1,3 @@
-
 Copyright (c) 2004, Jan Kneschke, incremental
  All rights reserved.
 
@@ -27,4 +26,3 @@
 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 DAMAGE.
-

--- a/components/spawn-fcgi/spawn-fcgi.p5m	Wed Dec 04 18:16:46 2013 -0800
+++ b/components/spawn-fcgi/spawn-fcgi.p5m	Thu Dec 05 06:08:37 2013 -0800
@@ -28,6 +28,7 @@
     value="spawn-fcgi is a little helper program to spawn fastcgi processes."
 set name=pkg.summary value="Spawn-Fcgi utility"
 set name=com.oracle.info.description value="the spawn-fcgi utility"
+set name=com.oracle.info.tpno value=9041
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)