19078651 pv version 1.2.0 needs a TPNO in the fullness of time s11-update
authorRich Burridge <rich.burridge@oracle.com>
Wed, 08 Oct 2014 08:26:11 -0700
branchs11-update
changeset 3376 8e9db14cbe2d
parent 3373 9de01e7a073b
child 3377 479ff0452b26
19078651 pv version 1.2.0 needs a TPNO in the fullness of time 19079475 Update pv package attribution
components/pv/Makefile
components/pv/pv.license
components/pv/pv.p5m
--- a/components/pv/Makefile	Tue Oct 07 16:44:00 2014 -0700
+++ b/components/pv/Makefile	Wed Oct 08 08:26:11 2014 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -35,6 +35,8 @@
 COMPONENT_ARCHIVE_URL=	http://pipeviewer.googlecode.com/files/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/pv
 
+TPNO=			19386
+
 include ../../make-rules/prep.mk
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
--- a/components/pv/pv.license	Tue Oct 07 16:44:00 2014 -0700
+++ b/components/pv/pv.license	Wed Oct 08 08:26:11 2014 -0700
@@ -1,6 +1,18 @@
---------------------------------------------------------------------
-This package is free software, and is being distributed under the terms
-of the Artistic License 2.0.
+Portions of this program use pv version 1.2.0, the open source version is made
+available by Andrew Wood under the terms of the below version of the Artistic
+License.  As such, Oracle is required to provide the following notices.  Note,
+however, that the Oracle program license that accompanied this program
+determines your right to use the Oracle program, including pv, and the
+terms contained in the following notices do not change those rights.
+
+The current open source version of pv can be downloaded at:
+http://pipeviewer.googlecode.com/files/pv-1.2.0.tar.gz
+
+Oracle elects to license this file available under the Artistic License as
+expressly permitted by the Perl licensing terms.
+
+This package is copyright (C) 2008 Andrew Wood, and is being distributed
+under the terms of the Artistic License 2.0.
 
 ---------------------------------------------------------------------
 
@@ -168,5 +180,3 @@
 OR CONTRIBUTOR WILL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR
 CONSEQUENTIAL DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE,
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------------------------------------------------------
--- a/components/pv/pv.p5m	Tue Oct 07 16:44:00 2014 -0700
+++ b/components/pv/pv.p5m	Wed Oct 08 08:26:11 2014 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,6 +26,7 @@
 set name=pkg.fmri value=pkg:/shell/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="Pipe Viewer"
 set name=com.oracle.info.description value="the pv utility"
+set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification value="org.opensolaris.category.2008:Applications/System Utilities"
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)