17079880 GNU readline needs TPNO and license adjustments s11-update
authorRich Burridge <rich.burridge@oracle.com>
Fri, 12 Jul 2013 09:52:14 -0700
branchs11-update
changeset 2676 f89e91d41d2f
parent 2675 fd073a927804
child 2678 c64569a844ea
17079880 GNU readline needs TPNO and license adjustments
components/readline/readline.license
components/readline/readline.p5m
--- a/components/readline/readline.license	Fri Jul 12 09:49:41 2013 -0700
+++ b/components/readline/readline.license	Fri Jul 12 09:52:14 2013 -0700
@@ -1,18 +1,12 @@
-Copyright 1987-2006 Free Software Foundation, Inc.
-Copyright 1987 Oliver Laumann
-Copyright 2003-2004 Harold Levy
-Copyright 2004, 1999  Per Bothner
-
-
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+   GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          59 Temple Place, Suite 330, Boston, MA 02111 USA
+                       51 Franklin St, 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.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -61,8 +55,9 @@
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -116,7 +111,8 @@
     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
@@ -174,7 +170,8 @@
 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
@@ -231,7 +228,8 @@
 
 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
@@ -261,7 +259,7 @@
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            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
@@ -283,9 +281,10 @@
 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
+                     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
@@ -297,7 +296,7 @@
 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>
+    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
@@ -311,14 +310,15 @@
 
     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
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  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 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.
@@ -344,7 +344,7 @@
 library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
 
-====================================================================
+Copy of GNU Free Documentation License, Version 1.2
 
                 GNU Free Documentation License
                   Version 1.2, November 2002
--- a/components/readline/readline.p5m	Fri Jul 12 09:49:41 2013 -0700
+++ b/components/readline/readline.p5m	Fri Jul 12 09:52:14 2013 -0700
@@ -26,28 +26,18 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/library/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="GNU readline provides interactive line-editing and history"
 set name=pkg.description \
     value="The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in."
-set name=pkg.summary value="GNU readline provides interactive line-editing and history"
 set name=com.oracle.info.description value="GNU readline"
+set name=com.oracle.info.tpno value=9042
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2007/188
+set name=org.opensolaris.arc-caseid value=PSARC/2007/188
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/demo
-dir path=usr/demo/readline
-dir path=usr/include
-dir path=usr/include/readline
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/share
-dir path=usr/share/info
-dir path=usr/share/man
-dir path=usr/share/man/man3
 file examples/Inputrc path=usr/demo/readline/Inputrc
 file path=usr/include/readline/chardefs.h
 file path=usr/include/readline/history.h
@@ -57,10 +47,14 @@
 file path=usr/include/readline/rlstdc.h
 file path=usr/include/readline/rltypedefs.h
 file path=usr/include/readline/tilde.h
+link path=usr/lib/$(MACH64)/libhistory.so target=libhistory.so.5
 file path=usr/lib/$(MACH64)/libhistory.so.5
+link path=usr/lib/$(MACH64)/libreadline.so target=libreadline.so.5
 file path=usr/lib/$(MACH64)/libreadline.so.5
 file $(MACH64)/llib-lreadline.ln path=usr/lib/$(MACH64)/llib-lreadline.ln
+link path=usr/lib/libhistory.so target=libhistory.so.5
 file path=usr/lib/libhistory.so.5
+link path=usr/lib/libreadline.so target=libreadline.so.5
 file path=usr/lib/libreadline.so.5
 file llib-lreadline path=usr/lib/llib-lreadline
 file $(MACH32)/llib-lreadline.ln path=usr/lib/llib-lreadline.ln
@@ -70,7 +64,3 @@
 file path=usr/share/man/man3/history.3
 file path=usr/share/man/man3/readline.3
 license readline.license license="GPLv2, FDLv1.2"
-link path=usr/lib/$(MACH64)/libhistory.so target=libhistory.so.5
-link path=usr/lib/$(MACH64)/libreadline.so target=libreadline.so.5
-link path=usr/lib/libhistory.so target=libhistory.so.5
-link path=usr/lib/libreadline.so target=libreadline.so.5