--- a/components/perl_modules/authen-pam/authen-pam.license	Fri Aug 15 15:07:33 2014 -0700
+++ b/components/perl_modules/authen-pam/authen-pam.license	Fri Aug 15 15:13:12 2014 -0700
@@ -1,8 +1,28 @@
-Copyright (c) 1986 - 2010, Larry Wall and others
+Portions of this program use Authen-PAM 0.16, the open source version is made
+available by Nikolay Pelov 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 Authen-PAM, and the
+terms contained in the following notices do not change those rights.
+      
+Extensions to Authen-PAM have been made by Oracle to support current versions
+of Solaris and provide additional tools.  These changes are detailed in the
+patches subdirectory.
+ 
+The current open source version of Authen-PAM can be downloaded at:
+http://search.cpan.org/CPAN/authors/id/N/NI/NIKIP/Authen-PAM-0.16.tar.gz
 
-			 The "Artistic License"
+Oracle elects to license this file available under the Artistic License as
+expressly permitted by the Perl licensing terms.
 
-				Preamble
+Copyright (c) 1998-2005 Nikolay Pelov. All rights reserved. This
+program is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+ 
+
+                         The "Artistic License"
+
+                                Preamble
 
 The intent of this document is to state the conditions under which a
 Package may be copied, such that the Copyright Holder maintains some
@@ -13,30 +33,30 @@
 
 Definitions:
 
-	"Package" refers to the collection of files distributed by the
-	Copyright Holder, and derivatives of that collection of files
-	created through textual modification.
+        "Package" refers to the collection of files distributed by the
+        Copyright Holder, and derivatives of that collection of files
+        created through textual modification.
 
-	"Standard Version" refers to such a Package if it has not been
-	modified, or has been modified in accordance with the wishes
-	of the Copyright Holder as specified below.
+        "Standard Version" refers to such a Package if it has not been
+        modified, or has been modified in accordance with the wishes
+        of the Copyright Holder as specified below.
 
-	"Copyright Holder" is whoever is named in the copyright or
-	copyrights for the package.
+        "Copyright Holder" is whoever is named in the copyright or
+        copyrights for the package.
 
-	"You" is you, if you're thinking about copying or distributing
-	this Package.
+        "You" is you, if you're thinking about copying or distributing
+        this Package.
 
-	"Reasonable copying fee" is whatever you can justify on the
-	basis of media cost, duplication charges, time of people involved,
-	and so on.  (You will not be required to justify it to the
-	Copyright Holder, but only to the computing community at large
-	as a market that must bear the fee.)
+        "Reasonable copying fee" is whatever you can justify on the
+        basis of media cost, duplication charges, time of people involved,
+        and so on.  (You will not be required to justify it to the
+        Copyright Holder, but only to the computing community at large
+        as a market that must bear the fee.)
 
-	"Freely Available" means that no fee is charged for the item
-	itself, though there may be fees involved in handling the item.
-	It also means that recipients of the item may redistribute it
-	under the same conditions they received it.
+        "Freely Available" means that no fee is charged for the item
+        itself, though there may be fees involved in handling the item.
+        It also means that recipients of the item may redistribute it
+        under the same conditions they received it.
 
 1. You may make and give away verbatim copies of the source form of the
 Standard Version of this Package without restriction, provided that you
@@ -126,4 +146,4 @@
 IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
 WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
-				The End
+                                The End

--- a/components/perl_modules/pmtools/pmtools.p5m	Fri Aug 15 15:07:33 2014 -0700
+++ b/components/perl_modules/pmtools/pmtools.p5m	Fri Aug 15 15:13:12 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.
 #
 
 set name=pkg.fmri \
@@ -34,7 +34,7 @@
 set name=org.opensolaris.arc-caseid \
     value=PSARC/2009/121
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-license pmtools.license license="GPLv2, Artistic"
+
 # perl 5.12
 depend fmri=library/perl-5/pmtools-512 predicate=runtime/perl-512 \
     type=conditional