6733918 Teamware has retired, please welcome your new manager, Mercurial

4758439 some files use "current date" sccs keywords
6560843 asm sources should not rely on .file "%M%" for naming STT_FILE symbols
6560958 Solaris:: perl modules should not use SCCS keywords in version information
6729074 webrev doesn't deal well with remote ssh hg parents

18 files changed, 100 insertions, 128 deletions

diff --git a/usr/src/cmd/perl/5.8.4/utils/lib/ExtUtils/MM_Solaris_ON.pm b/usr/src/cmd/perl/5.8.4/utils/lib/ExtUtils/MM_Solaris_ON.pm
index 7c9de407ee..730e6c6f68 100644
--- a/usr/src/cmd/perl/5.8.4/utils/lib/ExtUtils/MM_Solaris_ON.pm
+++ b/usr/src/cmd/perl/5.8.4/utils/lib/ExtUtils/MM_Solaris_ON.pm
@@ -23,8 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # MM_Solaris_ON.pm overrides various parts of MakeMaker so that perl modules
@@ -45,7 +43,7 @@ package ExtUtils::MM_Solaris_ON;
 use strict;
 use warnings;
 our ($VERSION, @ISA);
-$VERSION = '%I%';
+$VERSION = '1.3';
 require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
 @ISA = qw(ExtUtils::MM_Any ExtUtils::MM_Unix);
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Catalog/Catalog.pm b/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Catalog/Catalog.pm
index 5ca57f6304..3892990b0f 100644
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Catalog/Catalog.pm
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Catalog/Catalog.pm
@@ -1,13 +1,9 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# 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.
@@ -22,7 +18,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # Catalog.pm contains perl code for exacct catalog tag manipulation.
 # 
@@ -33,7 +34,7 @@ use warnings;
 
 package Sun::Solaris::Exacct::Catalog;
 
-our $VERSION = '%I%';
+our $VERSION = '1.3';
 use Carp;
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Exacct.pm b/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Exacct.pm
index b424441d01..85a81d5def 100644
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Exacct.pm
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Exacct.pm
@@ -1,13 +1,8 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# 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.
@@ -22,7 +17,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # Exacct.pm contains wrappers for the exacct error functions and syscalls,
 # and some 'shorthand' convenience functions.
@@ -34,7 +34,7 @@ use warnings;
 
 package Sun::Solaris::Exacct;
 
-our $VERSION = '%I%';
+our $VERSION = '1.5';
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
 
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/File/File.pm b/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/File/File.pm
index 86a0fd5b8a..2d2de97d8a 100644
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/File/File.pm
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/File/File.pm
@@ -1,13 +1,9 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# 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.
@@ -22,7 +18,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # File.pm contains wrappers for the exacct file manipulation routines.
 # 
@@ -33,7 +34,7 @@ use warnings;
 
 package Sun::Solaris::Exacct::File;
 
-our $VERSION = '%I%';
+our $VERSION = '1.3';
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
 
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Object/Object.pm b/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Object/Object.pm
index b2f2790ee0..77c10c3fea 100644
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Object/Object.pm
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/Object/Object.pm
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# 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.
@@ -22,7 +21,7 @@
 # Copyright 2002-2003 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # Object.pm contains perl code for exacct object manipulation.
 #
@@ -33,7 +32,7 @@ use warnings;
 
 package Sun::Solaris::Exacct::Object;
 
-our $VERSION = '%I%';
+our $VERSION = '1.3';
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
 
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/README.ON b/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/README.ON
index 9f28916da2..e62d3b3c35 100644
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/README.ON
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Exacct/README.ON
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# 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.
@@ -20,22 +19,19 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 This module is released as Public Source via the Comprehensive Perl Archive
 Network (http://www.cpan.org).  If it is updated for any reason, a new
 release should be pushed to CPAN.
 
 The version number of this module is derived from the $VERSION variable in
-Exacct.pm.  This in turn contains the SID of the Exacct.pm file, so if anything
-under this directory is modified, a delta should be made to Exacct.pm to
-update the module version number correctly.  If this is not done, it will not
-be possible to upload the generated archive to CPAN, as CPAN requires that
-uploaded archives have unique names.
+Exacct.pm.  If anything under this directory is modified, $VERSION should be 
+changed in Exacct.pm to update the module version number correctly.  If this 
+is not done, it will not be possible to upload the generated archive to CPAN, 
+as CPAN requires that uploaded archives have unique names.
 
 To prepare the contents of the directory for release, they should be packaged
 up as a .tar.gz archive.  The procedure for this is:
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Kstat/Kstat.pm b/usr/src/cmd/perl/contrib/Sun/Solaris/Kstat/Kstat.pm
index bc19393c17..b1ae5db189 100644
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Kstat/Kstat.pm
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Kstat/Kstat.pm
@@ -23,8 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # Kstat.pm provides the bootstrap for the Sun::Solaris::Kstat module.
@@ -34,7 +32,7 @@ package Sun::Solaris::Kstat;
 use strict;
 use DynaLoader;
 use vars qw($VERSION @ISA);
-$VERSION = '%I%';
+$VERSION = '1.3';
 @ISA = qw(DynaLoader);
 bootstrap Sun::Solaris::Kstat $VERSION;
 1;
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/Changes b/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/Changes
index 6f50cb517b..e2f7427b60 100644
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/Changes
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/Changes
@@ -23,8 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
-Version %I%
+Version 1.1
 Initial Public Source release.
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/Lgrp.pm b/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/Lgrp.pm
index c2ae106a96..8668daa4b2 100644
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/Lgrp.pm
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/Lgrp.pm
@@ -23,16 +23,12 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # Lgrp.pm provides procedural and object-oriented interface to the Solaris
 # liblgrp(3LIB) library.
 #
 
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 require 5.6.1;
 use strict;
@@ -41,7 +37,7 @@ use Carp;
 
 package Sun::Solaris::Lgrp;
 
-our $VERSION = '%I%';
+our $VERSION = '1.1';
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
 
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/README.ON b/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/README.ON
index 4e195006ca..fd1ba0a8d9 100644
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/README.ON
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Lgrp/README.ON
@@ -20,22 +20,19 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 This module is released as Public Source via the Comprehensive Perl Archive
 Network (http://www.cpan.org).  If it is updated for any reason, a new
 release should be pushed to CPAN.
 
 The version number of this module is derived from the $VERSION variable in
-Lgrp.pm.  This in turn contains the SID of the Lgrp.pm file, so if
-anything under this directory is modified, a delta should be made to Lgrp.pm
-to update the module version number correctly.  If this is not done, it will
-not be possible to upload the generated archive to CPAN, as CPAN requires that
-uploaded archives have unique names.
+Lgrp.pm.  If anything under this directory is modified, $VERSION should be 
+changed in Lgrp.pm to update the module version number correctly.  If this 
+is not done, it will not be possible to upload the generated archive to CPAN, 
+as CPAN requires that uploaded archives have unique names.
 
 To prepare the contents of the directory for release, they should be packaged
 up as a .tar.gz archive.  The procedure for this is:
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/PerlGcc/perlgcc.PL b/usr/src/cmd/perl/contrib/Sun/Solaris/PerlGcc/perlgcc.PL
index 1dc73782e9..44f820dd77 100644
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/PerlGcc/perlgcc.PL
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/PerlGcc/perlgcc.PL
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# 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.
@@ -22,13 +21,11 @@
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 use strict;
 use warnings;
 use Config;
-our $VERSION = '%I%';
+our $VERSION = '1.2';
 
 my $fh;
 open($fh, ">$ARGV[0]") || die("Can't open perlgcc: $!\n");
@@ -44,13 +41,11 @@ $startperl
 # Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%$ARGV[0]	%I%	%E% SMI"
-#
 
 use $perlver;
 use strict;
 use warnings;
-our \$VERSION = '%I%';
+our \$VERSION = '$VERSION';
 
 \$ENV{PERL5_OVERRIDE_CONFIG} = '1';
 if (exists(\$ENV{PERL5LIB})) {
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Privilege/Privilege.pm b/usr/src/cmd/perl/contrib/Sun/Solaris/Privilege/Privilege.pm
index c3157a8a15..41d0200b13 100644
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Privilege/Privilege.pm
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Privilege/Privilege.pm
@@ -1,13 +1,8 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# 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.
@@ -22,7 +17,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # Privilege.pm provides the bootstrap for the Sun::Solaris::Privilege module.
 #
@@ -33,7 +33,7 @@ use warnings;
 
 package Sun::Solaris::Privilege;
 
-our $VERSION = '%I%';
+our $VERSION = '1.3';
 
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.pm b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.pm
index d409c9bea0..e6b1e889db 100644
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.pm
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/Project.pm
@@ -1,13 +1,8 @@
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# 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.
@@ -22,7 +17,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # Project.pm provides the bootstrap for the Sun::Solaris::Project module, and
 # also functions for reading, validating and writing out project(4) format
@@ -41,7 +41,7 @@ use POSIX qw(locale_h limits_h);
 
 package Sun::Solaris::Project;
 
-our $VERSION = '%I%';
+our $VERSION = '1.9';
 
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/README.ON b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/README.ON
index b2863eed4f..03fbe4aefb 100644
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Project/README.ON
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Project/README.ON
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# 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.
@@ -20,22 +19,19 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 This module is released as Public Source via the Comprehensive Perl Archive
 Network (http://www.cpan.org).  If it is updated for any reason, a new
 release should be pushed to CPAN.
 
 The version number of this module is derived from the $VERSION variable in
-Project.pm.  This in turn contains the SID of the Project.pm file, so if
-anything under this directory is modified, a delta should be made to Project.pm
-to update the module version number correctly.  If this is not done, it will
-not be possible to upload the generated archive to CPAN, as CPAN requires that
-uploaded archives have unique names.
+Project.pm.  If anything under this directory is modified, $VERSION should be 
+changed in Project.pm to update the module version number correctly.  If this 
+is not done, it will not be possible to upload the generated archive to CPAN, 
+as CPAN requires that uploaded archives have unique names.
 
 To prepare the contents of the directory for release, they should be packaged
 up as a .tar.gz archive.  The procedure for this is:
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Task/README.ON b/usr/src/cmd/perl/contrib/Sun/Solaris/Task/README.ON
index e0fd17629f..e6ddbdf0de 100644
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Task/README.ON
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Task/README.ON
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# 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.
@@ -20,22 +19,19 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 This module is released as Public Source via the Comprehensive Perl Archive
 Network (http://www.cpan.org).  If it is updated for any reason, a new
 release should be pushed to CPAN.
 
 The version number of this module is derived from the $VERSION variable in
-Task.pm.  This in turn contains the SID of the Task.pm file, so if anything
-under this directory is modified, a delta should be made to Task.pm to
-update the module version number correctly.  If this is not done, it will not
-be possible to upload the generated archive to CPAN, as CPAN requires that
-uploaded archives have unique names.
+Task.pm.  If anything under this directory is modified, $VERSION should be 
+changed in Task.pm to update the module version number correctly.  If this 
+is not done, it will not be possible to upload the generated archive to CPAN, 
+as CPAN requires that uploaded archives have unique names.
 
 To prepare the contents of the directory for release, they should be packaged
 up as a .tar.gz archive.  The procedure for this is:
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Task/Task.pm b/usr/src/cmd/perl/contrib/Sun/Solaris/Task/Task.pm
index 9dbdf26274..102b494755 100644
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Task/Task.pm
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Task/Task.pm
@@ -1,7 +1,4 @@
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
@@ -21,7 +18,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # Task.pm provides the bootstrap for the Sun::Solaris::Task module.
 #
@@ -32,7 +34,7 @@ use warnings;
 
 package Sun::Solaris::Task;
 
-our $VERSION = '%I%';
+our $VERSION = '1.4';
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
 
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Ucred/Ucred.pm b/usr/src/cmd/perl/contrib/Sun/Solaris/Ucred/Ucred.pm
index 52c7553cc6..59c4bee02d 100644
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Ucred/Ucred.pm
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Ucred/Ucred.pm
@@ -1,13 +1,9 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# 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.
@@ -22,7 +18,12 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+
 #
 # Ucred.pm provides the bootstrap for the Sun::Solaris::Ucred module.
 #
@@ -33,7 +34,7 @@ use warnings;
 
 package Sun::Solaris::Ucred;
 
-our $VERSION = '%I%';
+our $VERSION = '1.3';
 use XSLoader;
 XSLoader::load(__PACKAGE__, $VERSION);
 
diff --git a/usr/src/cmd/perl/contrib/Sun/Solaris/Utils/Utils.pm b/usr/src/cmd/perl/contrib/Sun/Solaris/Utils/Utils.pm
index a7bcf3004e..a66f8712a3 100644
--- a/usr/src/cmd/perl/contrib/Sun/Solaris/Utils/Utils.pm
+++ b/usr/src/cmd/perl/contrib/Sun/Solaris/Utils/Utils.pm
@@ -23,8 +23,6 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 
 #
 # Utils.pm provides the bootstrap for the Sun::Solaris::Utils module.
@@ -35,7 +33,7 @@ use strict;
 use Exporter;
 use DynaLoader;
 use vars qw($VERSION @ISA @EXPORT_OK);
-$VERSION = '%I%';
+$VERSION = '1.3';
 @ISA = qw(Exporter DynaLoader);
 @EXPORT_OK = qw(gmatch gettext textdomain bindtextdomain dcgettext dgettext);
 bootstrap Sun::Solaris::Utils $VERSION;