changeset 10258:ecf43a496539

1152232 remove /usr/bin/daps and /usr/lib/font/devaps/* from SUNWdoc 1201404 /usr/lib/term still delivered into system 1221321 SUNWdfb package has bugs 4754147 SUNWnfssr and SUNWnfssu have circular dependencies 4852540 SUNWstatl package is empty and should be removed 4948746 Remove empty /usr/lib/fp etc. directories 4954006 SUNWxcu4 and SUNWesu missing dependency on SUNWlibms packages 5018239 SUNWslpu recursive dependency 6319179 SUNWcnetr packaging issues in Nevada and S10u1 6326491 SUNWdfb.i needs to go 6353280 several files listed in SUNWhea's prototype_sparc and prototype_i386 6463717 SUNWrmodu cleanup
author Jason Beloro <Jason.Beloro@Sun.COM>
date Tue, 04 Aug 2009 18:20:38 -0700
parents d987765ad743
children 139695f850ed
files usr/src/Targetdirs usr/src/cmd/troff/troff.d/Makefile usr/src/cmd/troff/troff.d/devaps/B usr/src/cmd/troff/troff.d/devaps/BI usr/src/cmd/troff/troff.d/devaps/C usr/src/cmd/troff/troff.d/devaps/CE usr/src/cmd/troff/troff.d/devaps/CI usr/src/cmd/troff/troff.d/devaps/CT usr/src/cmd/troff/troff.d/devaps/CW usr/src/cmd/troff/troff.d/devaps/CX usr/src/cmd/troff/troff.d/devaps/DESC usr/src/cmd/troff/troff.d/devaps/G usr/src/cmd/troff/troff.d/devaps/GB usr/src/cmd/troff/troff.d/devaps/GI usr/src/cmd/troff/troff.d/devaps/GR usr/src/cmd/troff/troff.d/devaps/GS usr/src/cmd/troff/troff.d/devaps/H usr/src/cmd/troff/troff.d/devaps/HB usr/src/cmd/troff/troff.d/devaps/HI usr/src/cmd/troff/troff.d/devaps/HK usr/src/cmd/troff/troff.d/devaps/HL usr/src/cmd/troff/troff.d/devaps/HX usr/src/cmd/troff/troff.d/devaps/I usr/src/cmd/troff/troff.d/devaps/LINKFILE usr/src/cmd/troff/troff.d/devaps/MB usr/src/cmd/troff/troff.d/devaps/MI usr/src/cmd/troff/troff.d/devaps/MR usr/src/cmd/troff/troff.d/devaps/MX usr/src/cmd/troff/troff.d/devaps/Makefile usr/src/cmd/troff/troff.d/devaps/PA usr/src/cmd/troff/troff.d/devaps/PB usr/src/cmd/troff/troff.d/devaps/PI usr/src/cmd/troff/troff.d/devaps/PO usr/src/cmd/troff/troff.d/devaps/PX usr/src/cmd/troff/troff.d/devaps/R usr/src/cmd/troff/troff.d/devaps/README usr/src/cmd/troff/troff.d/devaps/S usr/src/cmd/troff/troff.d/devaps/S1 usr/src/cmd/troff/troff.d/devaps/SC usr/src/cmd/troff/troff.d/devaps/SM usr/src/cmd/troff/troff.d/devaps/TB usr/src/cmd/troff/troff.d/devaps/TX usr/src/cmd/troff/troff.d/devaps/aps.h usr/src/cmd/troff/troff.d/devaps/build.c usr/src/cmd/troff/troff.d/devaps/daps.c usr/src/cmd/troff/troff.d/devaps/daps.g usr/src/cmd/troff/troff.d/devaps/daps.h usr/src/cmd/troff/troff.d/devaps/makedev.c usr/src/cmd/troff/troff.d/devaps/version usr/src/pkgdefs/Makefile usr/src/pkgdefs/SUNWad810/depend usr/src/pkgdefs/SUNWadixp/depend usr/src/pkgdefs/SUNWadpu320/depend usr/src/pkgdefs/SUNWamr/depend usr/src/pkgdefs/SUNWamt-lms/depend usr/src/pkgdefs/SUNWamt/depend usr/src/pkgdefs/SUNWapct/depend usr/src/pkgdefs/SUNWarbel/depend usr/src/pkgdefs/SUNWarc/prototype_com usr/src/pkgdefs/SUNWatu/depend usr/src/pkgdefs/SUNWauda/depend usr/src/pkgdefs/SUNWaudiohd/depend usr/src/pkgdefs/SUNWaudit/depend usr/src/pkgdefs/SUNWav1394/depend usr/src/pkgdefs/SUNWbcp/depend usr/src/pkgdefs/SUNWbip/depend usr/src/pkgdefs/SUNWbipr/depend usr/src/pkgdefs/SUNWbnuu/depend usr/src/pkgdefs/SUNWbsu/depend usr/src/pkgdefs/SUNWbtool/depend usr/src/pkgdefs/SUNWcfclr/depend usr/src/pkgdefs/SUNWcfpl/depend usr/src/pkgdefs/SUNWcfplr/depend usr/src/pkgdefs/SUNWcnetr/Makefile usr/src/pkgdefs/SUNWcnetr/depend usr/src/pkgdefs/SUNWcnetr/prototype_com usr/src/pkgdefs/SUNWcpr.u/depend usr/src/pkgdefs/SUNWcsl/prototype_i386 usr/src/pkgdefs/SUNWcsl/prototype_sparc usr/src/pkgdefs/SUNWcslr/Makefile usr/src/pkgdefs/SUNWcslr/prototype_com usr/src/pkgdefs/SUNWcsu/prototype_com usr/src/pkgdefs/SUNWcti2.u/depend usr/src/pkgdefs/SUNWdcsu/depend usr/src/pkgdefs/SUNWdfb.i/Makefile usr/src/pkgdefs/SUNWdfb.i/pkginfo.tmpl usr/src/pkgdefs/SUNWdfb.i/prototype_com usr/src/pkgdefs/SUNWdfb.i/prototype_i386 usr/src/pkgdefs/SUNWdfbh/Makefile usr/src/pkgdefs/SUNWdfbh/pkginfo.tmpl usr/src/pkgdefs/SUNWdfbh/prototype_com usr/src/pkgdefs/SUNWdfbh/prototype_i386 usr/src/pkgdefs/SUNWdfbh/prototype_sparc usr/src/pkgdefs/SUNWdhcm/depend usr/src/pkgdefs/SUNWdhcsb/depend usr/src/pkgdefs/SUNWdhcsr/depend usr/src/pkgdefs/SUNWdhcsu/depend usr/src/pkgdefs/SUNWdmgtr/depend usr/src/pkgdefs/SUNWdmgtu/depend usr/src/pkgdefs/SUNWdoc/depend usr/src/pkgdefs/SUNWdoc/prototype_com usr/src/pkgdefs/SUNWdrcr.u/depend usr/src/pkgdefs/SUNWdscpr.u/depend usr/src/pkgdefs/SUNWdscpu.u/depend usr/src/pkgdefs/SUNWdsdr/depend usr/src/pkgdefs/SUNWdsdu/depend usr/src/pkgdefs/SUNWdtrt/depend usr/src/pkgdefs/SUNWefcu/depend usr/src/pkgdefs/SUNWemlxs/depend usr/src/pkgdefs/SUNWemlxu/depend usr/src/pkgdefs/SUNWesu/depend usr/src/pkgdefs/SUNWfchba/depend usr/src/pkgdefs/SUNWfchbar/depend usr/src/pkgdefs/SUNWfcip/depend usr/src/pkgdefs/SUNWfcoe/depend usr/src/pkgdefs/SUNWfcoet/depend usr/src/pkgdefs/SUNWfcoeu/depend usr/src/pkgdefs/SUNWfcp/depend usr/src/pkgdefs/SUNWfcprt/depend usr/src/pkgdefs/SUNWfcprtr/depend usr/src/pkgdefs/SUNWfcsm/depend usr/src/pkgdefs/SUNWfilebench/depend usr/src/pkgdefs/SUNWfmd/depend usr/src/pkgdefs/SUNWfruid/depend usr/src/pkgdefs/SUNWfruip.u/depend usr/src/pkgdefs/SUNWfsu/depend usr/src/pkgdefs/SUNWftdur/depend usr/src/pkgdefs/SUNWftduu/depend usr/src/pkgdefs/SUNWftpr/depend usr/src/pkgdefs/SUNWftpu/depend usr/src/pkgdefs/SUNWfwdc/depend usr/src/pkgdefs/SUNWfwdcu/depend usr/src/pkgdefs/SUNWgrub/depend usr/src/pkgdefs/SUNWgrubr/depend usr/src/pkgdefs/SUNWgssdh/depend usr/src/pkgdefs/SUNWhal/depend usr/src/pkgdefs/SUNWhalr/depend usr/src/pkgdefs/SUNWhea/prototype_com usr/src/pkgdefs/SUNWhea/prototype_i386 usr/src/pkgdefs/SUNWhea/prototype_sparc usr/src/pkgdefs/SUNWhermon/depend usr/src/pkgdefs/SUNWib/depend usr/src/pkgdefs/SUNWibdmar/depend usr/src/pkgdefs/SUNWibsdp/depend usr/src/pkgdefs/SUNWibsdpib/depend usr/src/pkgdefs/SUNWibsdpu/depend usr/src/pkgdefs/SUNWifp/depend usr/src/pkgdefs/SUNWiir/depend usr/src/pkgdefs/SUNWiiu/depend usr/src/pkgdefs/SUNWimar/depend usr/src/pkgdefs/SUNWintgige/depend usr/src/pkgdefs/SUNWiopc.u/depend usr/src/pkgdefs/SUNWiopc.v/depend usr/src/pkgdefs/SUNWipoib/depend usr/src/pkgdefs/SUNWiscsidmu/depend usr/src/pkgdefs/SUNWiscsir/depend usr/src/pkgdefs/SUNWiscsitgtr/depend usr/src/pkgdefs/SUNWiscsitgtu/depend usr/src/pkgdefs/SUNWiscsitr/depend usr/src/pkgdefs/SUNWiscsitu/depend usr/src/pkgdefs/SUNWisnsr/depend usr/src/pkgdefs/SUNWixgb/depend usr/src/pkgdefs/SUNWjcom/depend usr/src/pkgdefs/SUNWjib/depend usr/src/pkgdefs/SUNWkdcr/depend usr/src/pkgdefs/SUNWkdcu/depend usr/src/pkgdefs/SUNWkrbu/depend usr/src/pkgdefs/SUNWldomu.v/depend usr/src/pkgdefs/SUNWluxd.u/depend usr/src/pkgdefs/SUNWlxr/depend usr/src/pkgdefs/SUNWlxu/depend usr/src/pkgdefs/SUNWmdar/depend usr/src/pkgdefs/SUNWmdau/depend usr/src/pkgdefs/SUNWmdb/depend usr/src/pkgdefs/SUNWmddr/depend usr/src/pkgdefs/SUNWmdu/depend usr/src/pkgdefs/SUNWmmsr/depend usr/src/pkgdefs/SUNWmmsu/depend usr/src/pkgdefs/SUNWmpapi/depend usr/src/pkgdefs/SUNWncau/depend usr/src/pkgdefs/SUNWndmpu/depend usr/src/pkgdefs/SUNWnetcat/depend usr/src/pkgdefs/SUNWnfscu/depend usr/src/pkgdefs/SUNWnfssr/depend usr/src/pkgdefs/SUNWnfssu/depend usr/src/pkgdefs/SUNWnge/depend usr/src/pkgdefs/SUNWnisu/depend usr/src/pkgdefs/SUNWocf/depend usr/src/pkgdefs/SUNWos86r/depend usr/src/pkgdefs/SUNWpcelx/depend usr/src/pkgdefs/SUNWpcmcu/depend usr/src/pkgdefs/SUNWpcmem/depend usr/src/pkgdefs/SUNWpcser/depend usr/src/pkgdefs/SUNWperl584usr/depend usr/src/pkgdefs/SUNWpmr/depend usr/src/pkgdefs/SUNWpmu/depend usr/src/pkgdefs/SUNWpolkit/depend usr/src/pkgdefs/SUNWpool/depend usr/src/pkgdefs/SUNWpoold/depend usr/src/pkgdefs/SUNWpoolr/depend usr/src/pkgdefs/SUNWpowertop/depend usr/src/pkgdefs/SUNWpppdt/depend usr/src/pkgdefs/SUNWpppdu/depend usr/src/pkgdefs/SUNWpsdcr/depend usr/src/pkgdefs/SUNWpsdir/depend usr/src/pkgdefs/SUNWpsdpr/depend usr/src/pkgdefs/SUNWpsr/depend usr/src/pkgdefs/SUNWpsu/depend usr/src/pkgdefs/SUNWqfed/depend usr/src/pkgdefs/SUNWqlc/depend usr/src/pkgdefs/SUNWqlcu/depend usr/src/pkgdefs/SUNWqosu/depend usr/src/pkgdefs/SUNWrcapr/depend usr/src/pkgdefs/SUNWrcapu/depend usr/src/pkgdefs/SUNWrcmdc/depend usr/src/pkgdefs/SUNWrcmds/depend usr/src/pkgdefs/SUNWrdcr/depend usr/src/pkgdefs/SUNWrdcu/depend usr/src/pkgdefs/SUNWrds/depend usr/src/pkgdefs/SUNWrge/depend usr/src/pkgdefs/SUNWrmodr/depend usr/src/pkgdefs/SUNWrmodu/Makefile usr/src/pkgdefs/SUNWrmodu/depend usr/src/pkgdefs/SUNWrmodu/prototype_com usr/src/pkgdefs/SUNWrmodu/prototype_i386 usr/src/pkgdefs/SUNWrmodu/prototype_sparc_realmode usr/src/pkgdefs/SUNWrmvolmgr/depend usr/src/pkgdefs/SUNWrmvolmgrr/depend usr/src/pkgdefs/SUNWrmwbu/depend usr/src/pkgdefs/SUNWrpcib/depend usr/src/pkgdefs/SUNWrsm/depend usr/src/pkgdefs/SUNWrtls/depend usr/src/pkgdefs/SUNWrum/depend usr/src/pkgdefs/SUNWsckmu.u/depend usr/src/pkgdefs/SUNWscmhdlr/depend usr/src/pkgdefs/SUNWscmr/depend usr/src/pkgdefs/SUNWscmu/depend usr/src/pkgdefs/SUNWscplp/depend usr/src/pkgdefs/SUNWscpu/depend usr/src/pkgdefs/SUNWscsa1394/depend usr/src/pkgdefs/SUNWscsip/depend usr/src/pkgdefs/SUNWslpr/depend usr/src/pkgdefs/SUNWslpu/depend usr/src/pkgdefs/SUNWsmapi/depend usr/src/pkgdefs/SUNWsmbfskr/depend usr/src/pkgdefs/SUNWsmbfsr/depend usr/src/pkgdefs/SUNWsmbfsu/depend usr/src/pkgdefs/SUNWsmbsr/depend usr/src/pkgdefs/SUNWsmbsu/depend usr/src/pkgdefs/SUNWsmedia/depend usr/src/pkgdefs/SUNWsmhbar/depend usr/src/pkgdefs/SUNWsn1rint/depend usr/src/pkgdefs/SUNWsn1uint/depend usr/src/pkgdefs/SUNWsndmr/depend usr/src/pkgdefs/SUNWsndmu/depend usr/src/pkgdefs/SUNWspnego/depend usr/src/pkgdefs/SUNWspsvr/depend usr/src/pkgdefs/SUNWspsvu/depend usr/src/pkgdefs/SUNWsshcu/depend usr/src/pkgdefs/SUNWsshdr/depend usr/src/pkgdefs/SUNWsshdu/depend usr/src/pkgdefs/SUNWsshr/depend usr/src/pkgdefs/SUNWsshu/depend usr/src/pkgdefs/SUNWstatl/Makefile usr/src/pkgdefs/SUNWstatl/pkginfo.tmpl usr/src/pkgdefs/SUNWstatl/prototype_com usr/src/pkgdefs/SUNWstatl/prototype_i386 usr/src/pkgdefs/SUNWstatl/prototype_sparc usr/src/pkgdefs/SUNWstmf/depend usr/src/pkgdefs/SUNWtavor/depend usr/src/pkgdefs/SUNWtftp/depend usr/src/pkgdefs/SUNWtnetc/depend usr/src/pkgdefs/SUNWtnetd/depend usr/src/pkgdefs/SUNWtsg/depend usr/src/pkgdefs/SUNWtsr/depend usr/src/pkgdefs/SUNWtsu/depend usr/src/pkgdefs/SUNWuacm/depend usr/src/pkgdefs/SUNWudapltr/depend usr/src/pkgdefs/SUNWudapltu/depend usr/src/pkgdefs/SUNWudaplu/depend usr/src/pkgdefs/SUNWudf/depend usr/src/pkgdefs/SUNWuedg/depend usr/src/pkgdefs/SUNWuftdi/depend usr/src/pkgdefs/SUNWugen/depend usr/src/pkgdefs/SUNWugenu/depend usr/src/pkgdefs/SUNWuksp/depend usr/src/pkgdefs/SUNWukspfw/depend usr/src/pkgdefs/SUNWuprl/depend usr/src/pkgdefs/SUNWural/depend usr/src/pkgdefs/SUNWusb/depend usr/src/pkgdefs/SUNWusbs/depend usr/src/pkgdefs/SUNWusbu/depend usr/src/pkgdefs/SUNWusbvc/depend usr/src/pkgdefs/SUNWuwb/depend usr/src/pkgdefs/SUNWvia823x/depend usr/src/pkgdefs/SUNWvscanr/depend usr/src/pkgdefs/SUNWvscanu/depend usr/src/pkgdefs/SUNWwbint/depend usr/src/pkgdefs/SUNWwbsd/depend usr/src/pkgdefs/SUNWwbsup/depend usr/src/pkgdefs/SUNWwpar/depend usr/src/pkgdefs/SUNWwpau/depend usr/src/pkgdefs/SUNWxcu4/Makefile usr/src/pkgdefs/SUNWxcu4/depend usr/src/pkgdefs/SUNWxdt/depend usr/src/pkgdefs/SUNWxvmipar/depend usr/src/pkgdefs/SUNWxvmipau/depend usr/src/pkgdefs/SUNWzfskr/depend usr/src/pkgdefs/SUNWzfsr/depend usr/src/pkgdefs/SUNWzfsu/depend usr/src/pkgdefs/SUNWzoneu/depend usr/src/pkgdefs/SUNWzyd/depend usr/src/pkgdefs/common_files/depend
diffstat 313 files changed, 1055 insertions(+), 11646 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/Targetdirs	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/Targetdirs	Tue Aug 04 18:20:38 2009 -0700
@@ -273,8 +273,6 @@
 	/usr/lib/drv \
 	/usr/lib/elfedit \
 	/usr/lib/font \
-	/usr/lib/fp \
-	/usr/lib/fp/libp \
 	/usr/lib/inet \
 	/usr/lib/inet/dhcp \
 	/usr/lib/inet/dhcp/nsu \
@@ -304,7 +302,6 @@
 	/usr/lib/secure \
 	/usr/lib/security \
 	/usr/lib/smbsrv \
-	/usr/lib/term \
 	/usr/lib/vscan \
 	/usr/lib/zfs \
 	/usr/lib/zones \
@@ -376,7 +373,6 @@
 	/usr/lib/brand/sn1/$(MACH64) \
 	/usr/lib/elfedit/$(MACH64) \
 	/usr/lib/fm/$(MACH64) \
-	/usr/lib/fp/libp/$(MACH64) \
 	/usr/lib/inet/$(MACH64) \
 	/usr/lib/krb5/$(MACH64) \
 	/usr/lib/libp/$(MACH64) \
@@ -488,7 +484,6 @@
 	/etc/lib/nss_files.so.1 \
 	/usr/spool \
 	/usr/lib/tmac \
-	/usr/ccs/lib/fp \
 	/usr/ccs/lib/link_audit \
 	/usr/news \
 	/usr/preserve \
@@ -670,7 +665,6 @@
 $(ROOT)/usr/lib/lwp/32:=		LINKDEST=.
 $(ROOT)/usr/lib/link_audit/32:=		LINKDEST=.
 $(ROOT)/usr/lib/secure/32:=		LINKDEST=.
-$(ROOT)/usr/ccs/lib/fp:=		LINKDEST=../../lib/fp
 $(ROOT)/usr/ccs/lib/link_audit:=	LINKDEST=../../lib/link_audit
 $(ROOT)/var/ld/32:=			LINKDEST=.
 $(ROOT)/usr/ucblib/32:=			LINKDEST=.
--- a/usr/src/cmd/troff/troff.d/Makefile	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/cmd/troff/troff.d/Makefile	Tue Aug 04 18:20:38 2009 -0700
@@ -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,9 +19,8 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1989 by Sun Microsystems, Inc.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # cmd/troff/troff.d/Makefile
 #
@@ -31,7 +29,7 @@
 
 PROG =		troff ta makedev
 
-SUBDIRS =	tmac.d devaps
+SUBDIRS =	tmac.d
 
 TAOBJS =	draw.o ta.o
 MAKEDEVOBJS =	makedev.o
--- a/usr/src/cmd/troff/troff.d/devaps/B	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Times Roman Bold (with 15 characters from new disk)
-name B
-internalname 28921
-alternate_font
-ligatures fi ff fl ffi ffl 0
-charset
-A	70	2	1
-B	66	2	2
-C	68	2	3
-D	75	2	4
-E	66	2	5
-F	61	2	6
-G	70	2	7
-H	81	2	8
-I	38	2	9
-J	49	2	10
-K	70	2	11
-L	65	2	12
-M	98	2	13
-N	77	2	14
-O	73	2	15
-P	67	2	16
-Q	74	2	17
-R	70	2	18
-S	59	2	19
-T	66	2	20
-U	78	2	21
-V	71	2	22
-W	101	2	23
-X	71	2	24
-Y	70	2	25
-Z	70	2	26
-a	50	0	27
-b	50	2	28
-c	46	0	29
-d	50	2	30
-e	44	0	31
-f	35	2	32
-g	50	1	33
-h	51	2	34
-i	28	0	35
-j	31	1	36
-k	54	2	37
-l	27	2	38
-m	77	0	39
-n	50	0	40
-o	50	0	41
-p	50	1	42
-q	50	1	43
-r	39	0	44
-s	40	0	45
-t	34	2	46
-u	50	0	47
-v	40	0	48
-w	67	0	49
-x	55	0	50
-y	50	1	51
-z	47	0	52
-1	52	2	53
-2	52	2	54
-3	52	2	55
-4	52	2	56
-5	52	2	57
-6	52	2	58
-7	52	2	59
-8	52	2	60
-9	52	2	61
-0	52	2	62
-$	52	0	63
-ct	52	3	64
-&	104	0	65
-:	26	0	66
-;	26	0	67
-.	26	0	68
-,	26	0	69
-`	26	0	70
-'	26	0	71
-?	52	0	72
-!	26	0	73
-%	104	0	74
-*	52	0	75
-(	43	0	101	font 21
-)	43	0	102	font 21
-/	48	2	105	font 21
-hy	37	0	113	font 21
--	"
-em	96	0	112	font 21
-en	52	0	81
-ff	61	2	82
-fi	53	2	83
-fl	53	2	84
-Fi	82	2	85
-Fl	82	2	86
-14	78	2	91
-12	78	2	92
-34	78	2	93
-co	50	2	111
-rg	50	2	112
-tm	50	2	113
-#	72	0	13	font 21
-@	96	0	14	font 21
-bu	72	0	110	font 21
-de	52	2	123
-dg	52	3	124
-dd	46	2	49	font 21
-sc	46	3	42	font 21
-[	32	0	107	font 21
-]	32	0	108	font 21
-+	96	0	103	font 21
-\-	96	0	104	font 21
-=	96	0	106	font 21
-|	5	0	109	font 21
-sq	72	0	111	font 21
-ru	56	0	114	font 21
-fm	24	2	115	font 21
--- a/usr/src/cmd/troff/troff.d/devaps/BI	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Times Roman Bold Italic
-name BI
-internalname 28961
-ligatures fi ff fl ffi ffl 0
-charset
-A	65	2	1
-B	67	2	2
-C	73	2	3
-D	76	2	4
-E	68	2	5
-F	62	2	6
-G	70	2	7
-H	86	2	8
-I	45	2	9
-J	49	2	10
-K	75	2	11
-L	65	2	12
-M	101	2	13
-N	81	2	14
-O	75	2	15
-P	64	2	16
-Q	72	2	17
-R	69	2	18
-S	66	2	19
-T	62	2	20
-U	72	2	21
-V	64	2	22
-W	95	2	23
-X	73	2	24
-Y	65	2	25
-Z	76	2	26
-a	50	0	27
-b	50	2	28
-c	44	0	29
-d	54	2	30
-e	44	0	31
-f	36	2	32
-g	50	1	33
-h	52	2	34
-i	35	0	35
-j	35	1	36
-k	55	2	37
-l	35	2	38
-m	79	0	39
-n	53	0	40
-o	48	0	41
-p	51	1	42
-q	49	1	43
-r	39	0	44
-s	40	0	45
-t	34	2	46
-u	52	0	47
-v	39	0	48
-w	63	0	49
-x	52	0	50
-y	48	1	51
-z	44	0	52
-1	52	2	53
-2	52	2	54
-3	52	2	55
-4	52	2	56
-5	52	2	57
-6	52	2	58
-7	52	2	59
-8	52	2	60
-9	52	2	61
-0	52	2	62
-$	52	0	63
-ct	52	3	64
-&	73	0	65
-:	26	0	66
-;	26	0	67
-.	26	0	68
-,	26	0	69
-`	26	0	70
-'	26	0	71
-?	52	0	72
-!	26	0	73
-%	79	0	74
-*	52	0	75
-(	41	0	76
-)	41	0	77
-/	52	2	78
-hy	43	0	79
--	"
-em	104	0	80
-ff	66	2	82
-fi	57	2	83
-fl	66	2	84
-Fi	85	2	85
-Fl	92	2	86
-14	78	2	91
-12	76	2	92
-34	78	2	93
-co	50	2	111
-rg	50	2	112
-tm	50	2	113
-#	52	0	116
-@	78	0	120
-bu	28	0	121
-de	53	2	123
-dg	52	3	124
-dd	52	2	125
-sc	52	3	126
-[	41	0	127
-]	41	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/C	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# News Gothic Condensed
-name C
-internalname 19681
-ligatures fi ff fl ffi ffl 0
-charset
-A	45	2	1
-B	48	2	2
-C	46	2	3
-D	48	2	4
-E	43	2	5
-F	43	2	6
-G	50	2	7
-H	49	2	8
-I	19	2	9
-J	28	2	10
-K	47	2	11
-L	41	2	12
-M	61	2	13
-N	51	2	14
-O	49	2	15
-P	45	2	16
-Q	49	2	17
-R	46	2	18
-S	44	2	19
-T	41	2	20
-U	48	2	21
-V	43	2	22
-W	64	2	23
-X	44	2	24
-Y	44	2	25
-Z	41	2	26
-a	40	0	27
-b	42	2	28
-c	38	0	29
-d	41	2	30
-e	38	0	31
-f	26	2	32
-g	38	1	33
-h	41	2	34
-i	19	0	35
-j	20	1	36
-k	39	2	37
-l	19	2	38
-m	63	0	39
-n	42	0	40
-o	41	0	41
-p	41	1	42
-q	42	1	43
-r	30	0	44
-s	36	0	45
-t	28	2	46
-u	42	0	47
-v	39	0	48
-w	56	0	49
-x	36	0	50
-y	39	1	51
-z	34	0	52
-1	44	2	53
-2	44	2	54
-3	44	2	55
-4	44	2	56
-5	44	2	57
-6	44	2	58
-7	44	2	59
-8	44	2	60
-9	44	2	61
-0	44	2	62
-$	44	0	63
-ct	44	3	64
-&	54	0	65
-:	22	0	66
-;	22	0	67
-.	22	0	68
-,	22	0	69
-`	22	0	70
-'	22	0	71
-?	44	0	72
-!	22	0	73
-%	66	0	74
-*	44	0	75
-(	44	0	76
-)	44	0	77
-/	44	2	78
-hy	22	0	79
--	"
-em	88	0	80
-ff	48	2	82
-fi	43	2	83
-fl	43	2	84
-Fi	64	2	85
-Fl	64	2	86
-14	66	2	91
-12	66	2	92
-34	66	2	93
-co	50	2	111
-rg	50	2	112
-tm	50	2	113
-#	75	0	116
-@	85	0	120
-bu	28	0	121
-de	51	2	123
-dg	50	3	124
-dd	51	2	125
-sc	52	3	126
-[	25	0	127
-]	25	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/CE	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Century Expanded
-name CE
-internalname 6241
-ligatures fi ff fl ffi ffl 0
-charset
-A	78	2	1
-B	68	2	2
-C	67	2	3
-D	78	2	4
-E	70	2	5
-F	68	2	6
-G	79	2	7
-H	85	2	8
-I	39	2	9
-J	51	2	10
-K	79	2	11
-L	65	2	12
-M	90	2	13
-N	78	2	14
-O	68	2	15
-P	67	2	16
-Q	73	2	17
-R	73	2	18
-S	61	2	19
-T	65	2	20
-U	78	2	21
-V	73	2	22
-W	101	2	23
-X	73	2	24
-Y	73	2	25
-Z	61	2	26
-a	51	0	27
-b	56	2	28
-c	47	0	29
-d	56	2	30
-e	46	0	31
-f	39	2	32
-g	54	1	33
-h	60	2	34
-i	27	0	35
-j	37	1	36
-k	56	2	37
-l	32	2	38
-m	88	0	39
-n	59	0	40
-o	50	0	41
-p	56	1	42
-q	56	1	43
-r	46	0	44
-s	45	0	45
-t	40	2	46
-u	55	0	47
-v	52	0	48
-w	76	0	49
-x	54	0	50
-y	54	1	51
-z	45	0	52
-1	50	2	53
-2	50	2	54
-3	50	2	55
-4	50	2	56
-5	50	2	57
-6	50	2	58
-7	50	2	59
-8	50	2	60
-9	50	2	61
-0	50	2	62
-$	50	0	63
-ct	50	3	64
-&	75	0	65
-:	25	0	66
-;	25	0	67
-.	25	0	68
-,	25	0	69
-`	25	0	70
-'	25	0	71
-?	50	0	72
-!	25	0	73
-%	100	0	74
-*	50	0	75
-(	37	0	76
-)	37	0	77
-/	50	2	78
-hy	37	0	79
--	"
-em	100	0	80
-ff	67	2	82
-fi	57	2	83
-fl	57	2	84
-Fi	86	2	85
-Fl	86	2	86
-14	100	2	91
-12	100	2	92
-34	100	2	93
-co	64	2	111
-rg	64	2	112
-tm	64	2	113
-#	52	0	116
-@	78	0	120
-bu	28	0	121
-de	50	2	123
-dg	50	3	124
-dd	50	2	125
-sc	50	3	126
-[	30	0	127
-]	30	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/CI	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Century Bold Italic (also CK)
-name CI
-internalname 6041
-ligatures fi ff fl ffi ffl 0
-charset
-A	78	2	1
-B	81	2	2
-C	70	2	3
-D	87	2	4
-E	80	2	5
-F	76	2	6
-G	79	2	7
-H	90	2	8
-I	51	2	9
-J	65	2	10
-K	88	2	11
-L	72	2	12
-M	103	2	13
-N	87	2	14
-O	81	2	15
-P	79	2	16
-Q	81	2	17
-R	80	2	18
-S	66	2	19
-T	69	2	20
-U	83	2	21
-V	77	2	22
-W	98	2	23
-X	79	2	24
-Y	73	2	25
-Z	74	2	26
-a	60	0	27
-b	59	2	28
-c	51	0	29
-d	63	2	30
-e	50	0	31
-f	38	2	32
-g	63	1	33
-h	64	2	34
-i	38	0	35
-j	36	1	36
-k	64	2	37
-l	37	2	38
-m	91	0	39
-n	65	0	40
-o	52	0	41
-p	62	1	42
-q	59	1	43
-r	50	0	44
-s	50	0	45
-t	41	2	46
-u	64	0	47
-v	59	0	48
-w	86	0	49
-x	61	0	50
-y	60	1	51
-z	50	0	52
-1	52	2	53
-2	52	2	54
-3	52	2	55
-4	52	2	56
-5	52	2	57
-6	52	2	58
-7	52	2	59
-8	52	2	60
-9	52	2	61
-0	52	2	62
-$	52	0	63
-ct	52	3	64
-&	84	0	65
-:	26	0	66
-;	26	0	67
-.	26	0	68
-,	26	0	69
-`	26	0	70
-'	26	0	71
-?	52	0	72
-!	32	0	73
-%	104	0	74
-*	52	0	75
-(	52	0	76
-)	52	0	77
-/	52	2	78
-hy	40	0	79
--	"
-em	104	0	80
-ff	73	2	82
-fi	73	2	83
-fl	74	2	84
-Fi	102	2	85
-Fl	103	2	86
-14	104	2	91
-12	104	2	92
-34	104	2	93
-co	64	2	111
-rg	64	2	112
-tm	64	2	113
-#	52	0	116
-@	104	0	120
-bu	28	0	121
-de	52	2	123
-dg	52	3	124
-dd	52	2	125
-sc	52	3	126
-[	52	0	127
-]	52	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/CT	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Courier Typewriter
-name CT
-internalname 8301
-spacewidth 63
-max_range 1
-charset
-A	63	2	1
-B	63	2	2
-C	63	2	3
-D	63	2	4
-E	63	2	5
-F	63	2	6
-G	63	2	7
-H	63	2	8
-I	63	2	9
-J	63	2	10
-K	63	2	11
-L	63	2	12
-M	63	2	13
-N	63	2	14
-O	63	2	15
-P	63	2	16
-Q	63	2	17
-R	63	2	18
-S	63	2	19
-T	63	2	20
-U	63	2	21
-V	63	2	22
-W	63	2	23
-X	63	2	24
-Y	63	2	25
-Z	63	2	26
-a	63	0	27
-b	63	2	28
-c	63	0	29
-d	63	2	30
-e	63	0	31
-f	63	2	32
-g	63	1	33
-h	63	2	34
-i	63	0	35
-j	63	1	36
-k	63	2	37
-l	63	2	38
-m	63	0	39
-n	63	0	40
-o	63	0	41
-p	63	1	42
-q	63	1	43
-r	63	0	44
-s	63	0	45
-t	63	2	46
-u	63	0	47
-v	63	0	48
-w	63	0	49
-x	63	0	50
-y	63	1	51
-z	63	0	52
-1	63	2	53
-2	63	2	54
-3	63	2	55
-4	63	2	56
-5	63	2	57
-6	63	2	58
-7	63	2	59
-8	63	2	60
-9	63	2	61
-0	63	2	62
-$	63	0	63
-ct	63	3	64
-&	63	0	65
-:	63	0	66
-;	63	0	67
-.	63	0	68
-,	63	0	69
-"	63	0	70
-'	63	0	71
-?	63	0	72
-!	63	0	73
-%	63	0	74
-*	63	0	75
-(	63	0	76
-)	63	0	77
-/	63	2	78
-sl	"
-hy	63	0	79
--	"
-em	63	0	80
-_	63	0	109
-|	63	0	110
-#	63	0	116
-@	63	0	120
-bu	28	0	121
-de	63	2	123
-dg	63	3	124
-dd	63	2	125
-sc	63	3	126
-[	63	0	127
-]	63	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/CW	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,147 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Constant Width (also PO)
-name CW
-internalname 10941
-spacewidth 68
-max_range 2
-charset
-A	68	2	1
-B	68	2	2
-C	68	2	3
-D	68	2	4
-E	68	2	5
-F	68	2	6
-G	68	2	7
-H	68	2	8
-I	68	2	9
-J	68	2	10
-K	68	2	11
-L	68	2	12
-M	68	2	13
-N	68	2	14
-O	68	2	15
-P	68	2	16
-Q	68	2	17
-R	68	2	18
-S	68	2	19
-T	68	2	20
-U	68	2	21
-V	68	2	22
-W	68	2	23
-X	68	2	24
-Y	68	2	25
-Z	68	2	26
-a	68	0	27
-b	68	2	28
-c	68	0	29
-d	68	2	30
-e	68	0	31
-f	68	2	32
-g	68	1	33
-h	68	2	34
-i	68	0	35
-j	68	1	36
-k	68	2	37
-l	68	2	38
-m	68	0	39
-n	68	0	40
-o	68	0	41
-p	68	1	42
-q	68	1	43
-r	68	0	44
-s	68	0	45
-t	68	2	46
-u	68	0	47
-v	68	0	48
-w	68	0	49
-x	68	0	50
-y	68	1	51
-z	68	0	52
-1	68	2	53
-2	68	2	54
-3	68	2	55
-4	68	2	56
-5	68	2	57
-6	68	2	58
-7	68	2	59
-8	68	2	60
-9	68	2	61
-0	68	2	62
-$	68	0	63
-ct	68	3	64
-&	68	0	65
-:	68	0	66
-;	68	0	67
-.	68	0	68
-,	68	0	69
-`	68	0	70
-'	68	0	71
-?	68	0	72
-!	68	0	73
-%	68	0	74
-*	68	0	75
-(	68	0	76
-)	68	0	77
-/	68	2	78
-sl	"
-hy	68	0	79
--	"
-=	68	0	80
-+	68	0	81
-no	68	0	82
-<	68	0	83
->	68	0	84
-{	68	0	85
-}	68	0	86
-^	68	0	91
-~	68	0	92
-"	68	0	93
-fm	68	2	94
-_	68	0	109
-ul	"
-|	68	0	110
-or	"
-lh	68	2	111
-\	68	0	112
-#	68	0	116
-@	68	0	120
-sq	68	0	121
-->	68	0	122
-<-	68	0	123
-dg	68	3	124
-ua	68	3	125
-da	68	3	126
-[	68	0	127
-]	68	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/CX	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# News Gothic Condensed Italic
-name CX
-internalname 19681
-ligatures fi ff fl ffi ffl 0
-default_slant 14
-charset
-A	45	2	1
-B	48	2	2
-C	46	2	3
-D	48	2	4
-E	43	2	5
-F	43	2	6
-G	50	2	7
-H	49	2	8
-I	19	2	9
-J	28	2	10
-K	47	2	11
-L	41	2	12
-M	61	2	13
-N	51	2	14
-O	49	2	15
-P	45	2	16
-Q	49	2	17
-R	46	2	18
-S	44	2	19
-T	41	2	20
-U	48	2	21
-V	43	2	22
-W	64	2	23
-X	44	2	24
-Y	44	2	25
-Z	41	2	26
-a	40	0	27
-b	42	2	28
-c	38	0	29
-d	41	2	30
-e	38	0	31
-f	26	2	32
-g	38	1	33
-h	41	2	34
-i	19	0	35
-j	20	1	36
-k	39	2	37
-l	19	2	38
-m	63	0	39
-n	42	0	40
-o	41	0	41
-p	41	1	42
-q	42	1	43
-r	30	0	44
-s	36	0	45
-t	28	2	46
-u	42	0	47
-v	39	0	48
-w	56	0	49
-x	36	0	50
-y	39	1	51
-z	34	0	52
-1	44	2	53
-2	44	2	54
-3	44	2	55
-4	44	2	56
-5	44	2	57
-6	44	2	58
-7	44	2	59
-8	44	2	60
-9	44	2	61
-0	44	2	62
-$	44	0	63
-ct	44	3	64
-&	54	0	65
-:	22	0	66
-;	22	0	67
-.	22	0	68
-,	22	0	69
-`	22	0	70
-'	22	0	71
-?	44	0	72
-!	22	0	73
-%	66	0	74
-*	44	0	75
-(	44	0	76
-)	44	0	77
-/	44	2	78
-hy	22	0	79
--	"
-em	88	0	80
-ff	48	2	82
-fi	43	2	83
-fl	43	2	84
-Fi	64	2	85
-Fl	64	2	86
-14	66	2	91
-12	66	2	92
-34	66	2	93
-co	50	2	111	slant 0
-rg	50	2	112	slant 0
-tm	50	2	113	slant 0
-#	75	0	116
-@	85	0	120
-bu	28	0	121	slant 0
-de	51	2	123	slant 0
-dg	50	3	124
-dd	51	2	125
-sc	52	3	126
-[	25	0	127
-]	25	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/DESC	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-fonts 8 R I B H CW S S1 GR
-sizes 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 22 24 26 28 30 32 34 36 40 44 48 0
-res 723
-hor 1
-vert 1
-unitwidth 10
-paperwidth 6120
-biggestfont 109
-charset
-\-  \_
-** *A *B *C *D *E *F *G *H *I *K *L *M *N *O *P *Q *R *S
-*T *U *V *W *X *Y *Z *a *b *c *d *e *f *g *h *i
-*k *l *m *n *o *p *q *r *s *t *u
-*w *x *y *z +- -> <- <=
-== >=  aa
-LH LV
-ap br bu bv ca
-ci co ct cu dd de dg di em
-eq es fm ga gr hy
-ib if ip is lh mi mo
-mu no or pd pl pt rg rh ru
-sb sc sl sp sq sr tm ts
-~= ul rn en
-lf rf lc rc lt rt lb rb
-lk rk !=
-ua da 12 
-bx 14 34
-ff fi fl Fi Fl
-ps !< !> as os tf bc ld rd pp ra an =. 4d =:
--+ gp =p cy
-le ge el eg LE GE EL EG <> ><
-RC TR RB CB Sl
-\' \`
-xe xh xk cs vs ob
--- a/usr/src/cmd/troff/troff.d/devaps/G	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Geneva Regular (also Helvetica Regular)
-name G
-internalname 12641
-ligatures fi ff fl ffi ffl 0
-charset
-A	64	2	1
-B	64	2	2
-C	68	2	3
-D	66	2	4
-E	60	2	5
-F	60	2	6
-G	70	2	7
-H	63	2	8
-I	24	2	9
-J	51	2	10
-K	64	2	11
-L	56	2	12
-M	80	2	13
-N	66	2	14
-O	74	2	15
-P	62	2	16
-Q	76	2	17
-R	66	2	18
-S	64	2	19
-T	56	2	20
-U	66	2	21
-V	64	2	22
-W	90	2	23
-X	64	2	24
-Y	66	2	25
-Z	60	2	26
-a	56	0	27
-b	56	2	28
-c	54	0	29
-d	56	2	30
-e	56	0	31
-f	30	2	32
-g	56	1	33
-h	54	2	34
-i	24	0	35
-j	24	1	36
-k	52	2	37
-l	24	2	38
-m	76	0	39
-n	50	0	40
-o	56	0	41
-p	56	1	42
-q	56	1	43
-r	34	0	44
-s	52	0	45
-t	32	2	46
-u	50	0	47
-v	48	0	48
-w	70	0	49
-x	52	0	50
-y	50	1	51
-z	48	0	52
-1	56	2	53
-2	56	2	54
-3	56	2	55
-4	56	2	56
-5	56	2	57
-6	56	2	58
-7	56	2	59
-8	56	2	60
-9	56	2	61
-0	56	2	62
-$	56	0	63
-ct	56	3	64
-&	64	0	65
-:	28	0	66
-;	28	0	67
-.	28	0	68
-,	28	0	69
-`	28	0	70
-'	28	0	71
-?	52	0	72
-!	28	0	73
-%	84	0	74
-*	56	0	75
-(	36	0	76
-)	36	0	77
-/	56	2	78
-hy	32	0	79
--	"
-em	112	0	80
-ff	53	2	82
-fi	48	2	83
-fl	48	2	84
-Fi	71	2	85
-Fl	71	2	86
-14	84	2	91
-12	84	2	92
-34	84	2	93
-co	50	2	111
-rg	50	2	112
-tm	50	2	113
-#	75	0	116
-@	84	0	120
-bu	28	0	121
-de	56	2	123
-dg	56	3	124
-dd	56	2	125
-sc	56	3	126
-[	32	0	127
-]	32	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/GB	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Greek Bold
-name GB
-internalname 14121
-alternate_font
-special
-max_range 2
-charset
-*A	78	2	1
-*B	78	2	2
-*G	64	2	3
-*D	74	2	4
-*E	77	2	5
-*Z	68	2	6
-*Y	88	2	7
-*H	66	2	8
-*I	46	2	9
-*K	87	2	10
-*L	72	2	11
-*M	102	2	12
-*N	90	2	13
-*C	70	2	14
-*O	76	2	15
-*P	82	2	16
-*R	72	2	17
-*S	66	2	18
-*T	78	2	19
-*F	72	2	21
-*X	90	2	22
-*a	60	0	27
-*b	60	3	28
-*g	61	3	29
-*d	42	2	30
-*e	34	0	31
-*z	46	3	32
-*y	50	1	33
-*h	44	2	34
-*i	30	0	35
-*k	44	0	36
-*l	54	2	37
-*m	56	1	38
-*n	42	0	39
-*c	44	3	40
-*o	42	0	41
-*p	62	0	42
-*r	46	1	43
-*s	54	0	44
-*t	50	0	45
-*u	46	0	46
-*f	60	3	47
-*x	61	3	48
-*q	62	3	49
-*w	64	0	50
-pd	40	2	52
-gr	80	2	53
-xe	38	0	98	font 13961
-xh	61	2	101
-xk	48	0	103	font 13961
--- a/usr/src/cmd/troff/troff.d/devaps/GI	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Geneva Italic (also Helvetica Italic)
-name GI
-internalname 12641
-ligatures fi ff fl ffi ffl 0
-default_slant 14
-alternate_font
-charset
-A	64	2	1
-B	64	2	2
-C	68	2	3
-D	66	2	4
-E	60	2	5
-F	60	2	6
-G	70	2	7
-H	63	2	8
-I	24	2	9
-J	51	2	10
-K	64	2	11
-L	56	2	12
-M	80	2	13
-N	66	2	14
-O	74	2	15
-P	62	2	16
-Q	76	2	17
-R	66	2	18
-S	64	2	19
-T	56	2	20
-U	66	2	21
-V	64	2	22
-W	90	2	23
-X	64	2	24
-Y	66	2	25
-Z	60	2	26
-a	56	0	27
-b	56	2	28
-c	54	0	29
-d	56	2	30
-e	56	0	31
-f	30	2	32
-g	56	1	33
-h	54	2	34
-i	24	0	35
-j	24	1	36
-k	52	2	37
-l	24	2	38
-m	76	0	39
-n	50	0	40
-o	56	0	41
-p	56	1	42
-q	56	1	43
-r	34	0	44
-s	52	0	45
-t	32	2	46
-u	50	0	47
-v	48	0	48
-w	70	0	49
-x	52	0	50
-y	50	1	51
-z	48	0	52
-1	56	2	53
-2	56	2	54
-3	56	2	55
-4	56	2	56
-5	56	2	57
-6	56	2	58
-7	56	2	59
-8	56	2	60
-9	56	2	61
-0	56	2	62
-$	56	0	63
-ct	56	3	64
-&	64	0	65
-:	28	0	66
-;	28	0	67
-.	28	0	68
-,	28	0	69
-`	28	0	70
-'	28	0	71
-?	52	0	72
-!	28	0	73
-%	84	0	74
-*	56	0	75
-(	36	0	76
-)	36	0	77
-/	56	2	78
-hy	32	0	79
--	"
-em	112	0	80
-ff	53	2	82
-fi	48	2	83
-fl	48	2	84
-Fi	71	2	85
-Fl	71	2	86
-14	84	2	91
-12	84	2	92
-34	84	2	93
-co	50	2	111	slant 0
-rg	50	2	112	slant 0
-tm	50	2	113	slant 0
-#	75	0	116
-@	84	0	120
-bu	28	0	121	slant 0
-de	56	2	123	slant 0
-dg	56	3	124
-dd	56	2	125
-sc	56	3	126
-[	32	0	127
-]	32	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/GR	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Greek
-name GR
-internalname 13961
-special
-max_range 2
-charset
-*A	68	2	1
-*B	62	2	2
-*G	58	2	3	max_range 3
-*D	66	2	4
-*E	61	2	5
-*Z	55	2	6
-*Y	75	2	7
-*H	63	2	8
-*I	37	2	9
-*K	75	2	10
-*L	67	2	11
-*M	84	2	12
-*N	74	2	13
-*C	66	2	14
-*O	62	2	15
-*P	76	2	16	max_range 3
-*R	57	2	17
-*S	62	2	18	max_range 3
-*T	62	2	19
-*F	65	2	21
-*X	72	2	22
-*a	58	0	27
-*b	55	3	28
-*g	58	3	29
-*d	41	2	30
-*e	33	0	31
-*z	39	3	32
-*y	47	1	33
-*h	43	2	34
-*i	26	0	35
-*k	41	0	36
-*l	51	2	37
-*m	54	1	38
-*n	40	0	39
-*c	43	3	40
-*o	41	0	41
-*p	59	0	42
-*r	49	1	43
-*s	50	0	44
-*t	46	0	45
-*u	42	0	46
-*f	58	3	47
-*x	58	3	48
-*q	59	3	49
-*w	61	0	50
-pd	50	2	52
-gr	68	2	53
-xe	38	0	98
-xh	58	2	101
-xk	48	0	103
--- a/usr/src/cmd/troff/troff.d/devaps/GS	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# German Script
-name GS
-internalname 41
-alternate_font
-max_range 2
-charset
-A	71	2	1
-B	75	2	2
-C	63	2	3
-D	79	2	4
-E	66	2	5
-F	69	2	6
-G	74	2	7
-H	69	2	8
-I	67	2	9
-J	66	2	10
-K	68	2	11
-L	59	2	12
-M	99	2	13
-N	77	2	14
-O	78	2	15
-P	74	2	16
-Q	82	2	17
-R	72	2	18
-S	77	2	19
-T	67	2	20
-U	65	2	21
-V	73	2	22
-W	92	2	23
-X	66	2	24
-Y	67	2	25
-Z	65	2	26
-a	48	0	27
-b	47	2	28
-c	34	0	29
-d	46	2	30
-e	38	0	31
-f	29	2	32
-g	44	1	33
-h	47	2	34
-i	30	0	35
-j	28	1	36
-k	36	2	37
-l	29	2	38
-m	78	0	39
-n	55	0	40
-o	46	0	41
-p	50	1	42
-q	46	1	43
-r	42	0	44
-s	48	0	45
-t	31	2	46
-u	55	0	47
-v	45	0	48
-w	69	0	49
-x	42	0	50
-y	47	1	51
-z	38	0	52
-1	52	2	53	font 18001
-2	52	2	54	font 18001
-3	52	2	55	font 18001
-4	52	2	56	font 18001
-5	52	2	57	font 18001
-6	52	2	58	font 18001
-7	52	2	59	font 18001
-8	52	2	60	font 18001
-9	52	2	61	font 18001
-0	52	2	62	font 18001
-$	52	0	63	font 18001
-ct	52	3	64	font 18001
-&	75	0	65	font 18081
-:	26	0	66	font 18001
-;	26	0	67	font 18001
-.	26	0	68	font 18001
-,	26	0	69	font 18001
-`	26	0	70	font 18001
-'	26	0	71	font 18001
-?	43	0	72	font 18001
-!	26	0	73	font 18001
-%	75	0	74	font 18001
-*	52	0	75	font 18001
-(	34	0	76	font 18001
-)	34	0	77	font 18001
-/	52	2	78	font 18001
-hy	34	0	79	font 18001
--	"
-em	104	0	80	font 18001
-14	78	2	91	font 18001
-12	78	2	92	font 18001
-34	78	2	93	font 18001
-co	50	2	111	font 18001
-rg	50	2	112	font 18001
-tm	50	2	113	font 18001
-#	78	0	116	font 18001
-@	104	0	120	font 18001
-bu	28	0	121	font 18001
-de	52	2	123	font 18001
-dg	52	3	124	font 18001
-dd	52	2	125	font 18001
-sc	52	3	126	font 18001
-[	29	0	127	font 18001
-]	30	0	128	font 18001
--- a/usr/src/cmd/troff/troff.d/devaps/H	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Helvetica Regular (also Geneva Regular)
-name H
-internalname 12641
-ligatures fi ff fl ffi ffl 0
-charset
-A	64	2	1
-B	64	2	2
-C	68	2	3
-D	66	2	4
-E	60	2	5
-F	60	2	6
-G	70	2	7
-H	63	2	8
-I	24	2	9
-J	51	2	10
-K	64	2	11
-L	56	2	12
-M	80	2	13
-N	66	2	14
-O	74	2	15
-P	62	2	16
-Q	76	2	17
-R	66	2	18
-S	64	2	19
-T	56	2	20
-U	66	2	21
-V	64	2	22
-W	90	2	23
-X	64	2	24
-Y	66	2	25
-Z	60	2	26
-a	56	0	27
-b	56	2	28
-c	54	0	29
-d	56	2	30
-e	56	0	31
-f	30	2	32
-g	56	1	33
-h	54	2	34
-i	24	0	35
-j	24	1	36
-k	52	2	37
-l	24	2	38
-m	76	0	39
-n	50	0	40
-o	56	0	41
-p	56	1	42
-q	56	1	43
-r	34	0	44
-s	52	0	45
-t	32	2	46
-u	50	0	47
-v	48	0	48
-w	70	0	49
-x	52	0	50
-y	50	1	51
-z	48	0	52
-1	56	2	53
-2	56	2	54
-3	56	2	55
-4	56	2	56
-5	56	2	57
-6	56	2	58
-7	56	2	59
-8	56	2	60
-9	56	2	61
-0	56	2	62
-$	56	0	63
-ct	56	3	64
-&	64	0	65
-:	28	0	66
-;	28	0	67
-.	28	0	68
-,	28	0	69
-`	28	0	70
-'	28	0	71
-?	52	0	72
-!	28	0	73
-%	84	0	74
-*	56	0	75
-(	36	0	76
-)	36	0	77
-/	56	2	78
-hy	32	0	79
--	"
-em	112	0	80
-ff	53	2	82
-fi	48	2	83
-fl	48	2	84
-Fi	71	2	85
-Fl	71	2	86
-14	84	2	91
-12	84	2	92
-34	84	2	93
-co	50	2	111
-rg	50	2	112
-tm	50	2	113
-#	75	0	116
-@	84	0	120
-bu	28	0	121
-de	56	2	123
-dg	56	3	124
-dd	56	2	125
-sc	56	3	126
-[	32	0	127
-]	32	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/HB	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Helvetica Black (also Helvetica Medium, Geneva Medium)
-name HB
-internalname 12561
-ligatures fi ff fl ffi ffl 0
-charset
-A	66	2	1
-B	66	2	2
-C	70	2	3
-D	70	2	4
-E	64	2	5
-F	62	2	6
-G	74	2	7
-H	66	2	8
-I	28	2	9
-J	54	2	10
-K	68	2	11
-L	56	2	12
-M	80	2	13
-N	68	2	14
-O	74	2	15
-P	62	2	16
-Q	76	2	17
-R	64	2	18
-S	64	2	19
-T	62	2	20
-U	68	2	21
-V	64	2	22
-W	90	2	23
-X	62	2	24
-Y	62	2	25
-Z	62	2	26
-a	56	0	27
-b	60	2	28
-c	56	0	29
-d	60	2	30
-e	58	0	31
-f	36	2	32
-g	60	1	33
-h	56	2	34
-i	26	0	35
-j	26	1	36
-k	58	2	37
-l	26	2	38
-m	84	0	39
-n	58	0	40
-o	60	0	41
-p	60	1	42
-q	60	1	43
-r	38	0	44
-s	52	0	45
-t	36	2	46
-u	56	0	47
-v	52	0	48
-w	78	0	49
-x	56	0	50
-y	54	1	51
-z	50	0	52
-1	60	2	53
-2	60	2	54
-3	60	2	55
-4	60	2	56
-5	60	2	57
-6	60	2	58
-7	60	2	59
-8	60	2	60
-9	60	2	61
-0	60	2	62
-$	60	0	63
-ct	60	3	64
-&	70	0	65
-:	30	0	66
-;	30	0	67
-.	30	0	68
-,	30	0	69
-`	30	0	70
-'	30	0	71
-?	30	0	72
-!	30	0	73
-%	90	0	74
-*	30	0	75
-(	32	0	76
-)	32	0	77
-/	60	2	78
-hy	30	0	79
--	"
-em	120	0	80
-ff	61	2	82
-fi	54	2	83
-fl	54	2	84
-Fi	83	2	85
-Fl	83	2	86
-14	90	2	91
-12	90	2	92
-34	90	2	93
-co	64	2	111
-rg	64	2	112
-tm	64	2	113
-#	90	0	116
-@	90	0	120
-bu	28	0	121
-de	30	2	123
-dg	60	3	124
-dd	60	2	125
-sc	60	3	126
-[	30	0	127
-]	30	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/HI	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Helvetica Italic (also Geneva Italic)
-name HI
-internalname 12641
-ligatures fi ff fl ffi ffl 0
-default_slant 14
-alternate_font
-charset
-A	64	2	1
-B	64	2	2
-C	68	2	3
-D	66	2	4
-E	60	2	5
-F	60	2	6
-G	70	2	7
-H	63	2	8
-I	24	2	9
-J	51	2	10
-K	64	2	11
-L	56	2	12
-M	80	2	13
-N	66	2	14
-O	74	2	15
-P	62	2	16
-Q	76	2	17
-R	66	2	18
-S	64	2	19
-T	56	2	20
-U	66	2	21
-V	64	2	22
-W	90	2	23
-X	64	2	24
-Y	66	2	25
-Z	60	2	26
-a	56	0	27
-b	56	2	28
-c	54	0	29
-d	56	2	30
-e	56	0	31
-f	30	2	32
-g	56	1	33
-h	54	2	34
-i	24	0	35
-j	24	1	36
-k	52	2	37
-l	24	2	38
-m	76	0	39
-n	50	0	40
-o	56	0	41
-p	56	1	42
-q	56	1	43
-r	34	0	44
-s	52	0	45
-t	32	2	46
-u	50	0	47
-v	48	0	48
-w	70	0	49
-x	52	0	50
-y	50	1	51
-z	48	0	52
-1	56	2	53
-2	56	2	54
-3	56	2	55
-4	56	2	56
-5	56	2	57
-6	56	2	58
-7	56	2	59
-8	56	2	60
-9	56	2	61
-0	56	2	62
-$	56	0	63
-ct	56	3	64
-&	64	0	65
-:	28	0	66
-;	28	0	67
-.	28	0	68
-,	28	0	69
-`	28	0	70
-'	28	0	71
-?	52	0	72
-!	28	0	73
-%	84	0	74
-*	56	0	75
-(	36	0	76
-)	36	0	77
-/	56	2	78
-hy	32	0	79
--	"
-em	112	0	80
-ff	53	2	82
-fi	48	2	83
-fl	48	2	84
-Fi	71	2	85
-Fl	71	2	86
-14	84	2	91
-12	84	2	92
-34	84	2	93
-co	50	2	111	slant 0
-rg	50	2	112	slant 0
-tm	50	2	113	slant 0
-#	75	0	116
-@	84	0	120
-bu	28	0	121	slant 0
-de	56	2	123	slant 0
-dg	56	3	124
-dd	56	2	125
-sc	56	3	126
-[	32	0	127
-]	32	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/HK	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Helvetica Light Italic 2
-name HK
-internalname 12491
-ligatures fi ff fl ffi ffl 0
-default_slant 14
-charset
-A	65	2	1
-B	64	2	2
-C	70	2	3
-D	69	2	4
-E	60	2	5
-F	56	2	6
-G	75	2	7
-H	69	2	8
-I	21	2	9
-J	48	2	10
-K	65	2	11
-L	54	2	12
-M	79	2	13
-N	67	2	14
-O	75	2	15
-P	60	2	16
-Q	75	2	17
-R	65	2	18
-S	61	2	19
-T	56	2	20
-U	69	2	21
-V	63	2	22
-W	89	2	23
-X	61	2	24
-Y	62	2	25
-Z	62	2	26
-a	52	0	27
-b	58	2	28
-c	52	0	29
-d	58	2	30
-e	53	0	31
-f	29	2	32
-g	58	1	33
-h	54	2	34
-i	21	0	35
-j	22	1	36
-k	50	2	37
-l	21	2	38
-m	81	0	39
-n	54	0	40
-o	53	0	41
-p	58	1	42
-q	58	1	43
-r	32	0	44
-s	49	0	45
-t	32	2	46
-u	54	0	47
-v	49	0	48
-w	73	0	49
-x	49	0	50
-y	49	1	51
-z	49	0	52
-1	52	2	53
-2	52	2	54
-3	52	2	55
-4	52	2	56
-5	52	2	57
-6	52	2	58
-7	52	2	59
-8	52	2	60
-9	52	2	61
-0	52	2	62
-$	52	0	63
-ct	52	3	64
-&	63	0	65
-:	26	0	66
-;	26	0	67
-.	26	0	68
-,	26	0	69
-`	26	0	70
-'	26	0	71
-?	50	0	72
-!	21	0	73
-%	85	0	74
-*	38	0	75
-(	30	0	76
-)	30	0	77
-/	38	2	78
-hy	27	0	79
--	"
-em	104	0	80
-ff	52	2	82
-fi	47	2	83
-fl	47	2	84
-Fi	70	2	85
-Fl	70	2	86
-14	88	2	91
-12	88	2	92
-34	88	2	93
-co	81	2	111	slant 0
-rg	81	2	112	slant 0
-tm	60	2	113	slant 0
-#	78	0	116
-@	100	0	120
-bu	28	0	121	slant 0
-de	41	2	123	slant 0
-dg	52	3	124
-dd	52	2	125
-sc	52	3	126
-[	34	0	127
-]	34	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/HL	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Helvetica Light 2
-name HL
-internalname 12491
-ligatures fi ff fl ffi ffl 0
-charset
-A	65	2	1
-B	64	2	2
-C	70	2	3
-D	69	2	4
-E	60	2	5
-F	56	2	6
-G	75	2	7
-H	69	2	8
-I	21	2	9
-J	48	2	10
-K	65	2	11
-L	54	2	12
-M	79	2	13
-N	67	2	14
-O	75	2	15
-P	60	2	16
-Q	75	2	17
-R	65	2	18
-S	61	2	19
-T	56	2	20
-U	69	2	21
-V	63	2	22
-W	89	2	23
-X	61	2	24
-Y	62	2	25
-Z	62	2	26
-a	52	0	27
-b	58	2	28
-c	52	0	29
-d	58	2	30
-e	53	0	31
-f	29	2	32
-g	58	1	33
-h	54	2	34
-i	21	0	35
-j	22	1	36
-k	50	2	37
-l	21	2	38
-m	81	0	39
-n	54	0	40
-o	53	0	41
-p	58	1	42
-q	58	1	43
-r	32	0	44
-s	49	0	45
-t	32	2	46
-u	54	0	47
-v	49	0	48
-w	73	0	49
-x	49	0	50
-y	49	1	51
-z	49	0	52
-1	52	2	53
-2	52	2	54
-3	52	2	55
-4	52	2	56
-5	52	2	57
-6	52	2	58
-7	52	2	59
-8	52	2	60
-9	52	2	61
-0	52	2	62
-$	52	0	63
-ct	52	3	64
-&	63	0	65
-:	26	0	66
-;	26	0	67
-.	26	0	68
-,	26	0	69
-`	26	0	70
-'	26	0	71
-?	50	0	72
-!	21	0	73
-%	85	0	74
-*	38	0	75
-(	30	0	76
-)	30	0	77
-/	38	2	78
-hy	27	0	79
--	"
-em	104	0	80
-ff	52	2	82
-fi	47	2	83
-fl	47	2	84
-Fi	70	2	85
-Fl	70	2	86
-14	88	2	91
-12	88	2	92
-34	88	2	93
-co	81	2	111
-rg	81	2	112
-tm	60	2	113
-#	78	0	116
-@	100	0	120
-bu	28	0	121
-de	41	2	123
-dg	52	3	124
-dd	52	2	125
-sc	52	3	126
-[	34	0	127
-]	34	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/HX	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Helvetica Black Italic
-name HX
-internalname 12561
-ligatures fi ff fl ffi ffl 0
-default_slant 14
-charset
-A	66	2	1
-B	66	2	2
-C	70	2	3
-D	70	2	4
-E	64	2	5
-F	62	2	6
-G	74	2	7
-H	66	2	8
-I	28	2	9
-J	54	2	10
-K	68	2	11
-L	56	2	12
-M	80	2	13
-N	68	2	14
-O	74	2	15
-P	62	2	16
-Q	76	2	17
-R	64	2	18
-S	64	2	19
-T	62	2	20
-U	68	2	21
-V	64	2	22
-W	90	2	23
-X	62	2	24
-Y	62	2	25
-Z	62	2	26
-a	56	0	27
-b	60	2	28
-c	56	0	29
-d	60	2	30
-e	58	0	31
-f	36	2	32
-g	60	1	33
-h	56	2	34
-i	26	0	35
-j	26	1	36
-k	58	2	37
-l	26	2	38
-m	84	0	39
-n	58	0	40
-o	60	0	41
-p	60	1	42
-q	60	1	43
-r	38	0	44
-s	52	0	45
-t	36	2	46
-u	56	0	47
-v	52	0	48
-w	78	0	49
-x	56	0	50
-y	54	1	51
-z	50	0	52
-1	60	2	53
-2	60	2	54
-3	60	2	55
-4	60	2	56
-5	60	2	57
-6	60	2	58
-7	60	2	59
-8	60	2	60
-9	60	2	61
-0	60	2	62
-$	60	0	63
-ct	60	3	64
-&	70	0	65
-:	30	0	66
-;	30	0	67
-.	30	0	68
-,	30	0	69
-`	30	0	70
-'	30	0	71
-?	30	0	72
-!	30	0	73
-%	90	0	74
-*	30	0	75
-(	32	0	76
-)	32	0	77
-/	60	2	78
-hy	30	0	79
--	"
-em	120	0	80
-ff	61	2	82
-fi	54	2	83
-fl	54	2	84
-Fi	83	2	85
-Fl	83	2	86
-14	90	2	91
-12	90	2	92
-34	90	2	93
-co	64	2	111	slant 0
-rg	64	2	112	slant 0
-tm	64	2	113	slant 0
-#	90	0	116
-@	90	0	120
-bu	28	0	121	slant 0
-de	30	2	123	slant 0
-dg	60	3	124
-dd	60	2	125
-sc	60	3	126
-[	30	0	127
-]	30	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/I	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Times Roman Italic (with 15 characters from new disk)
-name I
-internalname 29241
-alternate_font
-ligatures fi ff fl ffi ffl 0
-charset
-A	73	2	1
-B	65	2	2
-C	69	2	3
-D	73	2	4
-E	70	2	5
-F	63	2	6
-G	72	2	7
-H	82	2	8
-I	40	2	9
-J	52	2	10
-K	72	2	11
-L	62	2	12
-M	97	2	13
-N	79	2	14
-O	72	2	15
-P	63	2	16
-Q	74	2	17
-R	75	2	18
-S	63	2	19
-T	69	2	20
-U	72	2	21
-V	68	2	22
-W	94	2	23
-X	71	2	24
-Y	69	2	25
-Z	72	2	26
-a	52	0	27
-b	51	2	28
-c	43	0	29
-d	55	2	30
-e	44	0	31
-f	36	2	32
-g	50	1	33
-h	55	2	34
-i	30	0	35
-j	34	1	36
-k	57	2	37
-l	32	2	38
-m	82	0	39
-n	51	0	40
-o	51	0	41
-p	53	1	42
-q	52	1	43
-r	40	0	44
-s	41	0	45
-t	34	2	46
-u	56	0	47
-v	45	0	48
-w	67	0	49
-x	56	0	50
-y	50	1	51
-z	46	0	52
-1	52	2	53
-2	52	2	54
-3	52	2	55
-4	52	2	56
-5	52	2	57
-6	52	2	58
-7	52	2	59
-8	52	2	60
-9	52	2	61
-0	52	2	62
-$	52	0	63
-ct	52	3	64
-&	84	0	65
-:	26	0	66
-;	26	0	67
-.	26	0	68
-,	26	0	69
-`	26	0	70
-'	26	0	71
-?	44	0	72
-!	36	0	73
-%	104	0	74
-*	52	0	75
-(	40	0	86	font 21
-)	40	0	87	font 21
-/	24	2	90	font 21
-hy	45	0	98	font 21
--	"
-em	96	0	97	font 21
-en	52	0	81
-ff	62	2	82
-fi	58	2	83
-fl	60	2	84
-Fi	84	2	85
-Fl	88	2	86
-14	78	2	91
-12	78	2	92
-34	78	2	93
-co	50	2	111
-rg	50	2	112
-tm	50	2	113
-#	72	0	13	font 21
-@	96	0	14	font 21
-bu	72	0	95	font 21
-de	54	2	123
-dg	52	3	124
-dd	46	2	49	font 21
-sc	46	3	42	font 21
-[	34	0	92	font 21
-]	34	0	93	font 21
-+	96	0	88	font 21
-\-	96	0	89	font 21
-=	96	0	91	font 21
-|	29	0	94	font 21
-sq	72	0	96	font 21
-ru	46	0	99	font 21
-fm	19	2	100	font 21
--- a/usr/src/cmd/troff/troff.d/devaps/LINKFILE	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-
-#
-# This file is read and executed by maketables, or it can be run on its
-# own to link any missing .out files to appropriate existing .out files.
-#
-
-
-rm -f HM.out
-ln HB.out HM.out
-
-if [ -f HB.add ]; then
-    rm -f HM.add
-    ln HB.add HM.add
-fi
-
--- a/usr/src/cmd/troff/troff.d/devaps/MB	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Malibu 2 Bold Roman
-name MB
-internalname 18031
-ligatures fi ff fl ffi ffl 0
-charset
-A	81	2	1
-B	65	2	2
-C	74	2	3
-D	83	2	4
-E	63	2	5
-F	58	2	6
-G	80	2	7
-H	80	2	8
-I	38	2	9
-J	37	2	10
-K	74	2	11
-L	60	2	12
-M	98	2	13
-N	83	2	14
-O	85	2	15
-P	62	2	16
-Q	82	2	17
-R	73	2	18
-S	60	2	19
-T	70	2	20
-U	77	2	21
-V	79	2	22
-W	101	2	23
-X	66	2	24
-Y	70	2	25
-Z	64	2	26
-a	51	0	27
-b	60	2	28
-c	45	0	29
-d	60	2	30
-e	51	0	31
-f	37	2	32
-g	54	1	33
-h	64	2	34
-i	35	0	35
-j	33	1	36
-k	60	2	37
-l	35	2	38
-m	91	0	39
-n	62	0	40
-o	55	0	41
-p	60	1	42
-q	61	1	43
-r	41	0	44
-s	44	0	45
-t	35	2	46
-u	62	0	47
-v	59	0	48
-w	85	0	49
-x	53	0	50
-y	59	1	51
-z	52	0	52
-1	50	2	53
-2	50	2	54
-3	50	2	55
-4	50	2	56
-5	50	2	57
-6	50	2	58
-7	50	2	59
-8	50	2	60
-9	50	2	61
-0	50	2	62
-$	50	0	63
-ct	50	3	64
-&	79	0	65
-:	25	0	66
-;	25	0	67
-.	25	0	68
-,	25	0	69
-`	25	0	70
-'	25	0	71
-?	44	0	72
-!	25	0	73
-%	84	0	74
-*	50	0	75
-(	29	0	76
-)	30	0	77
-/	55	2	78
-hy	39	0	79
--	"
-em	100	0	80
-ff	72	2	82
-fi	61	2	83
-fl	62	2	84
-Fi	96	2	85
-Fl	96	2	86
-14	88	2	91
-12	88	2	92
-34	88	2	93
-co	82	2	111
-rg	82	2	112
-tm	105	2	113
-#	75	0	116
-@	103	0	120
-bu	28	0	121
-de	50	2	123
-dg	50	3	124
-dd	49	2	125
-sc	50	3	126
-[	33	0	127
-]	33	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/MI	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Malibu 2 Italic
-name MI
-internalname 18021
-ligatures fi ff fl ffi ffl 0
-charset
-A	68	2	1
-B	57	2	2
-C	65	2	3
-D	73	2	4
-E	56	2	5
-F	53	2	6
-G	71	2	7
-H	78	2	8
-I	36	2	9
-J	34	2	10
-K	61	2	11
-L	53	2	12
-M	90	2	13
-N	77	2	14
-O	76	2	15
-P	60	2	16
-Q	78	2	17
-R	64	2	18
-S	49	2	19
-T	60	2	20
-U	75	2	21
-V	68	2	22
-W	86	2	23
-X	66	2	24
-Y	61	2	25
-Z	59	2	26
-a	48	0	27
-b	49	2	28
-c	43	0	29
-d	52	2	30
-e	44	0	31
-f	29	2	32
-g	48	1	33
-h	54	2	34
-i	30	0	35
-j	29	1	36
-k	46	2	37
-l	30	2	38
-m	78	0	39
-n	55	0	40
-o	47	0	41
-p	53	1	42
-q	48	1	43
-r	38	0	44
-s	39	0	45
-t	33	2	46
-u	55	0	47
-v	53	0	48
-w	74	0	49
-x	47	0	50
-y	49	1	51
-z	41	0	52
-1	50	2	53
-2	50	2	54
-3	50	2	55
-4	50	2	56
-5	50	2	57
-6	50	2	58
-7	50	2	59
-8	50	2	60
-9	50	2	61
-0	50	2	62
-$	50	0	63
-ct	50	3	64
-&	77	0	65
-:	25	0	66
-;	25	0	67
-.	25	0	68
-,	25	0	69
-`	25	0	70
-'	25	0	71
-?	35	0	72
-!	25	0	73
-%	86	0	74
-*	39	0	75
-(	24	0	76
-)	24	0	77
-/	57	2	78
-hy	39	0	79
--	"
-em	100	0	80
-ff	55	2	82
-fi	54	2	83
-fl	55	2	84
-Fi	78	2	85
-Fl	79	2	86
-14	72	2	91
-12	72	2	92
-34	72	2	93
-co	91	2	111
-rg	91	2	112
-tm	101	2	113
-#	61	0	116
-@	96	0	120
-bu	28	0	121
-de	41	2	123
-dg	48	3	124
-dd	48	2	125
-sc	48	3	126
-[	35	0	127
-]	37	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/MR	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Malibu 2 Roman
-name MR
-internalname 18011
-ligatures fi ff fl ffi ffl 0
-charset
-A	75	2	1
-B	59	2	2
-C	72	2	3
-D	77	2	4
-E	60	2	5
-F	54	2	6
-G	79	2	7
-H	81	2	8
-I	33	2	9
-J	31	2	10
-K	67	2	11
-L	59	2	12
-M	93	2	13
-N	83	2	14
-O	81	2	15
-P	63	2	16
-Q	79	2	17
-R	66	2	18
-S	58	2	19
-T	62	2	20
-U	77	2	21
-V	71	2	22
-W	97	2	23
-X	63	2	24
-Y	66	2	25
-Z	63	2	26
-a	50	0	27
-b	56	2	28
-c	44	0	29
-d	58	2	30
-e	49	0	31
-f	33	2	32
-g	53	1	33
-h	60	2	34
-i	28	0	35
-j	28	1	36
-k	55	2	37
-l	29	2	38
-m	87	0	39
-n	59	0	40
-o	55	0	41
-p	58	1	42
-q	54	1	43
-r	37	0	44
-s	42	0	45
-t	32	2	46
-u	58	0	47
-v	55	0	48
-w	81	0	49
-x	49	0	50
-y	55	1	51
-z	49	0	52
-1	54	2	53
-2	54	2	54
-3	54	2	55
-4	54	2	56
-5	54	2	57
-6	54	2	58
-7	54	2	59
-8	54	2	60
-9	54	2	61
-0	54	2	62
-$	54	0	63
-ct	54	3	64
-&	76	0	65
-:	27	0	66
-;	27	0	67
-.	27	0	68
-,	27	0	69
-`	27	0	70
-'	27	0	71
-?	41	0	72
-!	25	0	73
-%	94	0	74
-*	45	0	75
-(	33	0	76
-)	32	0	77
-/	59	2	78
-hy	37	0	79
--	"		
-em	108	0	80
-ff	65	2	82
-fi	58	2	83
-fl	59	2	84
-Fi	91	2	85
-Fl	89	2	86
-14	88	2	91
-12	88	2	92
-34	88	2	93
-co	91	2	111
-rg	91	2	112
-tm	95	2	113
-#	65	0	116
-@	99	0	120
-bu	28	0	121
-de	50	2	123
-dg	50	3	124
-dd	51	2	125
-sc	51	3	126
-[	27	0	127
-]	28	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/MX	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Malibu 2 Bold Italic
-name MX
-internalname 18051
-ligatures fi ff fl ffi ffl 0
-charset
-A	75	2	1
-B	66	2	2
-C	68	2	3
-D	79	2	4
-E	64	2	5
-F	61	2	6
-G	77	2	7
-H	78	2	8
-I	38	2	9
-J	37	2	10
-K	74	2	11
-L	59	2	12
-M	96	2	13
-N	81	2	14
-O	78	2	15
-P	66	2	16
-Q	81	2	17
-R	70	2	18
-S	52	2	19
-T	68	2	20
-U	77	2	21
-V	70	2	22
-W	102	2	23
-X	73	2	24
-Y	62	2	25
-Z	68	2	26
-a	55	0	27
-b	56	2	28
-c	44	0	29
-d	60	2	30
-e	45	0	31
-f	39	2	32
-g	53	1	33
-h	56	2	34
-i	34	0	35
-j	35	1	36
-k	54	2	37
-l	35	2	38
-m	82	0	39
-n	57	0	40
-o	53	0	41
-p	58	1	42
-q	55	1	43
-r	45	0	44
-s	43	0	45
-t	41	2	46
-u	58	0	47
-v	54	0	48
-w	81	0	49
-x	55	0	50
-y	57	1	51
-z	48	0	52
-1	56	2	53
-2	56	2	54
-3	56	2	55
-4	56	2	56
-5	56	2	57
-6	56	2	58
-7	56	2	59
-8	56	2	60
-9	56	2	61
-0	56	2	62
-$	56	0	63
-ct	56	3	64
-&	83	0	65
-:	28	0	66
-;	28	0	67
-.	28	0	68
-,	28	0	69
-`	28	0	70
-'	28	0	71
-?	45	0	72
-!	25	0	73
-%	86	0	74
-*	56	0	75
-(	28	0	76
-)	28	0	77
-/	67	2	78
-hy	44	0	79
--	"
-em	112	0	80
-ff	69	2	82
-fi	63	2	83
-fl	64	2	84
-Fi	92	2	85
-Fl	94	2	86
-14	87	2	91
-12	87	2	92
-34	87	2	93
-co	85	2	111
-rg	84	2	112
-tm	105	2	113
-#	84	0	116
-@	112	0	120
-bu	28	0	121
-de	55	2	123
-dg	56	3	124
-dd	56	2	125
-sc	56	3	126
-[	39	0	127
-]	39	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/Makefile	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1989 by Sun Microsystems, Inc.
-#
-# cmd/troff/troff.d/devaps/Makefile
-#
-
-include 	../../../Makefile.cmd
-
-PROG =		daps
-
-MAKEDEV =	./makedev
-
-DAPSSRCS =	daps.c build.c
-SRCS=		$(DAPSSRCS)
-
-OBJS =		$(SRCS:%.c=%.o)
-
-COMMONOBJS =	../draw.o
-
-F1 =		B I R S CT CW CX GB GI GR GS	\
-		HI HK HX PO PX S1 SC SM TX
-F2 =		DESC C G H BI CE CI HB HL MB MI MR MX PA PB PI TB
-F3 =		HM
-OTHERFILES =	version
-TXTS =		README LINKFILE
-
-OUTF1 =		$(F1:%=%.out)
-OUTF2 =		$(F2:%=%.out)
-OUTF3 =		$(F3:%=%.out)
-OUTFILES =	$(OUTF1) $(OUTF2) $(OUTF3)
-
-ADDFILES =	$(F1:%=%.add)
-
-ROOTFONT =	$(ROOTLIB)/font
-ROOTDEVAPS =	$(ROOTFONT)/devaps
-
-# Don"t re-install /usr/lib/font, Targetdirs installs it
-#ROOTDIRS =	$(ROOTFONT) $(ROOTDEVAPS)
-ROOTDIRS =	$(ROOTDEVAPS)
-
-ROOTFILES =	$(OUTFILES:%=$(ROOTDEVAPS)/%) 	\
-		$(ADDFILES:%=$(ROOTDEVAPS)/%)	\
-		$(OTHERFILES:%=$(ROOTDEVAPS)/%)
-
-FILEMODE =	644
-
-CPPFLAGS =	-I. -I.. $(CPPFLAGS.master)
-LDLIBS +=	-lm
-
-$(MAKEDEV) :=	CPPFLAGS = -I. -I..
-$(MAKEDEV) :=	LDLIBS   =
-
-$(PROG) :=		POBJS = $(COMMONOBJS) $(DAPSSRCS:%.c=%.o)
-
-$(ROOTPROG) := FILEMODE = 555
-
-.KEEP_STATE:
-
-.PARALLEL: $(OBJS)
-
-all :		$(TXTS) $(OTHERFILES) $(PROG) $(MAKEDEV) $(OUTFILES) $(ADDFILES)
-
-$(PROG) :	$$(POBJS)
-		$(LINK.c) -o $@ $(POBJS) $(LDLIBS)
-		$(POST_PROCESS)
-
-$(MAKEDEV):	$$@.c
-		$(NATIVECC) -O $(CPPFLAGS) -o $@ $@.c
-
-$(COMMONOBJS) :	$$(@:%.o=%.c)
-		cd $(@D); $(MAKE) $(@F)
-
-$(OUTF1) \
-$(OUTF2) :	$$(@:%.out=%) $(MAKEDEV)
-		$(MAKEDEV) $(@:%.out=%)
-
-# ADDFILES are built indirectly from building OUTF1, but they must
-# appear as a target to the NSE
-#
-$(ADDFILES) :	$(OUTF1)
-		@:
-
-$(OUTF3) :	HB.out
-		$(RM) $@; $(LN) HB.out $@
-
-install:	all $(ROOTDIRS) $(ROOTPROG) $(ROOTFILES)
-
-$(ROOTDIRS):
-		$(INS.dir)
-
-$(ROOTDEVAPS)/%:	% $(ROOTDIRS)
-		$(INS.file)
-
-clean:
-		$(RM) $(OBJS)
-
-clobber:	clean
-		$(RM) $(ADDFILES) $(OUTFILES) $(PROG) $(MAKEDEV)
-
-strip:
-		$(STRIP) $(PROG)
-
-lint:
-		$(LINT.c) $(PROG).c
--- a/usr/src/cmd/troff/troff.d/devaps/PA	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Palatino (also Malibu)
-name PA
-internalname 18001
-ligatures fi ff fl ffi ffl 0
-charset
-A	76	2	1
-B	60	2	2
-C	70	2	3
-D	78	2	4
-E	58	2	5
-F	56	2	6
-G	74	2	7
-H	85	2	8
-I	36	2	9
-J	37	2	10
-K	73	2	11
-L	61	2	12
-M	96	2	13
-N	85	2	14
-O	80	2	15
-P	62	2	16
-Q	78	2	17
-R	67	2	18
-S	55	2	19
-T	62	2	20
-U	79	2	21
-V	73	2	22
-W	98	2	23
-X	68	2	24
-Y	68	2	25
-Z	66	2	26
-a	48	0	27
-b	57	2	28
-c	45	0	29
-d	60	2	30
-e	50	0	31
-f	37	2	32
-g	57	1	33
-h	63	2	34
-i	32	0	35
-j	24	1	36
-k	57	2	37
-l	33	2	38
-m	88	0	39
-n	63	0	40
-o	55	0	41
-p	60	1	42
-q	57	1	43
-r	41	0	44
-s	41	0	45
-t	34	2	46
-u	60	0	47
-v	57	0	48
-w	83	0	49
-x	51	0	50
-y	56	1	51
-z	50	0	52
-1	52	2	53
-2	52	2	54
-3	52	2	55
-4	52	2	56
-5	52	2	57
-6	52	2	58
-7	52	2	59
-8	52	2	60
-9	52	2	61
-0	52	2	62
-$	52	0	63
-ct	52	3	64
-&	75	0	65
-:	26	0	66
-;	26	0	67
-.	26	0	68
-,	26	0	69
-`	26	0	70
-'	26	0	71
-?	43	0	72
-!	26	0	73
-%	75	0	74
-*	52	0	75
-(	34	0	76
-)	34	0	77
-/	52	2	78
-hy	34	0	79
--	"
-em	104	0	80
-ff	66	2	82
-fi	63	2	83
-fl	63	2	84
-Fi	92	2	85
-Fl	92	2	86
-14	78	2	91
-12	78	2	92
-34	78	2	93
-co	50	2	111
-rg	50	2	112
-tm	50	2	113
-#	78	0	116
-@	104	0	120
-bu	28	0	121
-de	52	2	123
-dg	52	3	124
-dd	52	2	125
-sc	52	3	126
-[	29	0	127
-]	30	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/PB	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Palatino Bold (also Malibu Bold)
-name PB
-internalname 18041
-ligatures fi ff fl ffi ffl 0
-charset
-A	78	2	1
-B	63	2	2
-C	72	2	3
-D	84	2	4
-E	61	2	5
-F	57	2	6
-G	79	2	7
-H	86	2	8
-I	41	2	9
-J	43	2	10
-K	78	2	11
-L	63	2	12
-M	102	2	13
-N	85	2	14
-O	84	2	15
-P	63	2	16
-Q	84	2	17
-R	74	2	18
-S	58	2	19
-T	67	2	20
-U	79	2	21
-V	79	2	22
-W	101	2	23
-X	68	2	24
-Y	69	2	25
-Z	65	2	26
-a	50	0	27
-b	61	2	28
-c	46	0	29
-d	61	2	30
-e	50	0	31
-f	41	2	32
-g	56	1	33
-h	63	2	34
-i	35	0	35
-j	32	1	36
-k	63	2	37
-l	35	2	38
-m	91	0	39
-n	63	0	40
-o	57	0	41
-p	61	1	42
-q	61	1	43
-r	42	0	44
-s	43	0	45
-t	37	2	46
-u	61	0	47
-v	59	0	48
-w	85	0	49
-x	52	0	50
-y	59	1	51
-z	50	0	52
-1	52	2	53
-2	52	2	54
-3	52	2	55
-4	52	2	56
-5	52	2	57
-6	52	2	58
-7	52	2	59
-8	52	2	60
-9	52	2	61
-0	52	2	62
-$	52	0	63
-ct	52	3	64
-&	80	0	65
-:	26	0	66
-;	26	0	67
-.	26	0	68
-,	26	0	69
-`	26	0	70
-'	26	0	71
-?	49	0	72
-!	26	0	73
-%	78	0	74
-*	52	0	75
-(	34	0	76
-)	34	0	77
-/	52	2	78
-hy	40	0	79
--	"
-em	104	0	80
-ff	77	2	82
-fi	71	2	83
-fl	71	2	84
-Fi	105	2	85
-Fl	105	2	86
-14	78	2	91
-12	78	2	92
-34	78	2	93
-co	50	2	111
-rg	50	2	112
-tm	50	2	113
-#	75	0	116
-@	101	0	120
-bu	28	0	121
-de	39	2	123
-dg	50	3	124
-dd	50	2	125
-sc	50	3	126
-[	25	0	127
-]	25	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/PI	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Palatino Italic (also Malibu Italic)
-name PI
-internalname 18081
-ligatures fi ff fl ffi ffl 0
-charset
-A	72	2	1
-B	58	2	2
-C	63	2	3
-D	74	2	4
-E	55	2	5
-F	56	2	6
-G	68	2	7
-H	79	2	8
-I	35	2	9
-J	37	2	10
-K	68	2	11
-L	54	2	12
-M	99	2	13
-N	80	2	14
-O	75	2	15
-P	59	2	16
-Q	74	2	17
-R	65	2	18
-S	50	2	19
-T	60	2	20
-U	77	2	21
-V	71	2	22
-W	93	2	23
-X	72	2	24
-Y	69	2	25
-Z	63	2	26
-a	47	0	27
-b	43	2	28
-c	42	0	29
-d	52	2	30
-e	42	0	31
-f	34	2	32
-g	49	1	33
-h	52	2	34
-i	25	0	35
-j	30	1	36
-k	49	2	37
-l	29	2	38
-m	77	0	39
-n	54	0	40
-o	46	0	41
-p	51	1	42
-q	46	1	43
-r	38	0	44
-s	37	0	45
-t	34	2	46
-u	52	0	47
-v	51	0	48
-w	72	0	49
-x	49	0	50
-y	52	1	51
-z	45	0	52
-1	50	2	53
-2	50	2	54
-3	50	2	55
-4	50	2	56
-5	50	2	57
-6	50	2	58
-7	50	2	59
-8	50	2	60
-9	50	2	61
-0	50	2	62
-$	50	0	63
-ct	50	3	64
-&	75	0	65
-:	25	0	66
-;	25	0	67
-.	25	0	68
-,	25	0	69
-`	25	0	70
-'	25	0	71
-?	40	0	72
-!	25	0	73
-%	75	0	74
-*	55	0	75
-(	34	0	76
-)	34	0	77
-/	50	2	78
-hy	38	0	79
--	"
-em	100	0	80
-ff	57	2	82
-fi	54	2	83
-fl	57	2	84
-Fi	78	2	85
-Fl	80	2	86
-14	75	2	91
-12	75	2	92
-34	75	2	93
-co	50	2	111
-rg	50	2	112
-tm	50	2	113
-#	75	0	116
-@	100	0	120
-bu	28	0	121
-de	50	2	123
-dg	50	3	124
-dd	50	2	125
-sc	50	3	126
-[	34	0	127
-]	34	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/PO	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,147 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Constant Width (also CW)
-name PO
-internalname 10941
-spacewidth 68
-max_range 2
-charset
-A	68	2	1
-B	68	2	2
-C	68	2	3
-D	68	2	4
-E	68	2	5
-F	68	2	6
-G	68	2	7
-H	68	2	8
-I	68	2	9
-J	68	2	10
-K	68	2	11
-L	68	2	12
-M	68	2	13
-N	68	2	14
-O	68	2	15
-P	68	2	16
-Q	68	2	17
-R	68	2	18
-S	68	2	19
-T	68	2	20
-U	68	2	21
-V	68	2	22
-W	68	2	23
-X	68	2	24
-Y	68	2	25
-Z	68	2	26
-a	68	0	27
-b	68	2	28
-c	68	0	29
-d	68	2	30
-e	68	0	31
-f	68	2	32
-g	68	1	33
-h	68	2	34
-i	68	0	35
-j	68	1	36
-k	68	2	37
-l	68	2	38
-m	68	0	39
-n	68	0	40
-o	68	0	41
-p	68	1	42
-q	68	1	43
-r	68	0	44
-s	68	0	45
-t	68	2	46
-u	68	0	47
-v	68	0	48
-w	68	0	49
-x	68	0	50
-y	68	1	51
-z	68	0	52
-1	68	2	53
-2	68	2	54
-3	68	2	55
-4	68	2	56
-5	68	2	57
-6	68	2	58
-7	68	2	59
-8	68	2	60
-9	68	2	61
-0	68	2	62
-$	68	0	63
-ct	68	3	64
-&	68	0	65
-:	68	0	66
-;	68	0	67
-.	68	0	68
-,	68	0	69
-`	68	0	70
-'	68	0	71
-?	68	0	72
-!	68	0	73
-%	68	0	74
-*	68	0	75
-(	68	0	76
-)	68	0	77
-/	68	2	78
-sl	"
-hy	68	0	79
--	"
-=	68	0	80
-+	68	0	81
-no	68	0	82
-<	68	0	83
->	68	0	84
-{	68	0	85
-}	68	0	86
-^	68	0	91
-~	68	0	92
-"	68	0	93
-fm	68	2	94
-_	68	0	109
-ul	"
-|	68	0	110
-or	"
-lh	68	2	111
-\	68	0	112
-#	68	0	116
-@	68	0	120
-sq	68	0	121
-->	68	0	122
-<-	68	0	123
-dg	68	3	124
-ua	68	3	125
-da	68	3	126
-[	68	0	127
-]	68	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/PX	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Palatino Bold Italic
-name PX
-internalname 18041
-ligatures fi ff fl ffi ffl 0
-default_slant 14
-charset
-A	78	2	1
-B	63	2	2
-C	72	2	3
-D	84	2	4
-E	61	2	5
-F	57	2	6
-G	79	2	7
-H	86	2	8
-I	41	2	9
-J	43	2	10
-K	78	2	11
-L	63	2	12
-M	102	2	13
-N	85	2	14
-O	84	2	15
-P	63	2	16
-Q	84	2	17
-R	74	2	18
-S	58	2	19
-T	67	2	20
-U	79	2	21
-V	79	2	22
-W	101	2	23
-X	68	2	24
-Y	69	2	25
-Z	65	2	26
-a	50	0	27
-b	61	2	28
-c	46	0	29
-d	61	2	30
-e	50	0	31
-f	41	2	32
-g	56	1	33
-h	63	2	34
-i	35	0	35
-j	32	1	36
-k	63	2	37
-l	35	2	38
-m	91	0	39
-n	63	0	40
-o	57	0	41
-p	61	1	42
-q	61	1	43
-r	42	0	44
-s	43	0	45
-t	37	2	46
-u	61	0	47
-v	59	0	48
-w	85	0	49
-x	52	0	50
-y	59	1	51
-z	50	0	52
-1	52	2	53
-2	52	2	54
-3	52	2	55
-4	52	2	56
-5	52	2	57
-6	52	2	58
-7	52	2	59
-8	52	2	60
-9	52	2	61
-0	52	2	62
-$	52	0	63
-ct	52	3	64
-&	80	0	65
-:	26	0	66
-;	26	0	67
-.	26	0	68
-,	26	0	69
-`	26	0	70
-'	26	0	71
-?	49	0	72
-!	26	0	73
-%	78	0	74
-*	52	0	75
-(	34	0	76
-)	34	0	77
-/	52	2	78
-hy	40	0	79
--	"
-em	104	0	80
-ff	77	2	82
-fi	71	2	83
-fl	71	2	84
-Fi	105	2	85
-Fl	105	2	86
-14	78	2	91
-12	78	2	92
-34	78	2	93
-co	50	2	111	slant 0
-rg	50	2	112	slant 0
-tm	50	2	113	slant 0
-#	75	0	116
-@	101	0	120
-bu	28	0	121	slant 0
-de	39	2	123	slant 0
-dg	50	3	124
-dd	50	2	125
-sc	50	3	126
-[	25	0	127
-]	25	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/R	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Times Roman (with 15 characters from new disk)
-name R
-internalname 29201
-alternate_font
-ligatures fi ff fl ffi ffl 0
-charset
-A	77	2	1
-B	67	2	2
-C	73	2	3
-D	77	2	4
-E	67	2	5
-F	63	2	6
-G	78	2	7
-H	83	2	8
-I	40	2	9
-J	48	2	10
-K	77	2	11
-L	67	2	12
-M	99	2	13
-N	85	2	14
-O	77	2	15
-P	61	2	16
-Q	77	2	17
-R	76	2	18
-S	60	2	19
-T	67	2	20
-U	80	2	21
-V	73	2	22
-W	103	2	23
-X	78	2	24
-Y	78	2	25
-Z	71	2	26
-a	50	0	27
-b	53	2	28
-c	45	0	29
-d	53	2	30
-e	45	0	31
-f	35	2	32
-g	51	1	33
-h	54	2	34
-i	28	0	35
-j	30	1	36
-k	52	2	37
-l	28	2	38
-m	82	0	39
-n	53	0	40
-o	48	0	41
-p	52	1	42
-q	52	1	43
-r	39	0	44
-s	38	0	45
-t	34	2	46
-u	54	0	47
-v	46	0	48
-w	70	0	49
-x	50	0	50
-y	50	1	51
-z	46	0	52
-1	52	2	53
-2	52	2	54
-3	52	2	55
-4	52	2	56
-5	52	2	57
-6	52	2	58
-7	52	2	59
-8	52	2	60
-9	52	2	61
-0	52	2	62
-$	52	0	63
-ct	52	3	64
-&	90	0	65
-:	26	0	66
-;	26	0	67
-.	26	0	68
-,	26	0	69
-`	26	0	70
-'	26	0	71
-?	52	0	72
-!	26	0	73
-%	78	0	74
-*	52	0	75
-(	43	0	71	font 21
-)	43	0	72	font 21
-/	46	2	75	font 21
-hy	35	0	83	font 21
--	"
-em	96	0	82	font 21
-en	52	0	81
-ff	63	2	82
-fi	55	2	83
-fl	55	2	84
-Fi	82	2	85
-Fl	82	2	86
-14	78	2	91
-12	78	2	92
-34	78	2	93
-co	50	2	111
-rg	50	2	112
-tm	50	2	113
-#	72	0	13	font 21
-@	96	0	14	font 21
-bu	72	0	80	font 21
-de	54	2	123
-dg	52	3	124
-dd	46	2	49	font 21
-sc	46	3	42	font 21
-[	37	0	77	font 21
-]	37	0	78	font 21
-+	77	0	73	font 21
-\-	77	0	74	font 21
-=	77	0	76	font 21
-|	10	0	79	font 21
-sq	72	0	81	font 21
-ru	42	0	84	font 21
-fm	21	2	85	font 21
--- a/usr/src/cmd/troff/troff.d/devaps/README	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 1989 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-
-This directory contains the ASCII font and device tables and a
-postprocessor for an APS-5 phototypesetter. The device independent troff uses
-the information contained in these files, but instead of looking at the
-ASCII files, troff reads an equivalent set of binary tables that are
-produced by a program called 'makedev'.
-
-    Since you need to be a little careful when you run makedev, we
-have written a small shell program called 'maketables' that takes one
-or more of the ASCII files as input, and then properly updates all the
-required binary files. For example, to make a complete new set of
-binary tables just type in the command,
-
-                            maketables *
-
-On the other hand if just a few font files have been changed, eg. R,
-I, and PA, the command line,
-
-                            maketables R I PA
-
-will remake all the required binary files. In neither of the above
-examples could you simply substitute makedev for maketables and have
-things work properly. After you've run either maketables or makedev
-the binary files are easy to find - their names all end in the suffix
-'.out' or '.add'.  maketables uses the makedev defined by its shell
-variable MAKEDEV.
-
-The shell program 'maketables' is located in the parent of this directory.
-
-N.B.  The contents of this directory (the ASCII font description
-tables, the postprocessor daps, and the description table compiler
-makedev) are all tailored for the particular font disk used in the
-Murray Hill Computing Center.  Any installation with a different
-APS font set will almost certainly have to hand-tune some of the
-font description files and will possibly want to use the more general
-makedev located in the parent of this directory.
-
-
--------------------------------------------------------------------------------
-
-Changes since the original release:
-
-
- 1: The width of ru on the R, I, B, and S fonts is 12 units less than
-    Autologic's specifications. This eliminates the dashed line problems
-    we were having, provided only troff reads these tables.
-
- 2: Added the en character to the I and B fonts so that font positions
-    1, 2, and 3 would all be the same size. Told users on other systems
-    to remove en from R since it's only used in our banners and that
-    seemed to be a less error prone process.
-
- 3: Added xe, xt, and xk to DESC, GB, and GR files.
-
- 4: Set the character code for bs in the S font to 0 so that the old
-    Bell System logo will be replaced by white space on the APS-5.
-
- 5: Added the new ATT logo characters to DESC and the S font file.
-    LH and LV are logos in horizontal and vertical configurations,
-    respectively.
-
- 6: Fixed (probably overdid) the ascender/descender stuff.
-
- 7: Added the old Bell Logo to the DESC file and the S font as character
-    LB.  Still have \(bs replaced by white space.
-
-
--------------------------------------------------------------------------------
--- a/usr/src/cmd/troff/troff.d/devaps/S	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-name S
-internalname 21
-special
-alternate_font
-max_range 3
-charset
-"	35	0	1
-\'	27	2	2
-aa	"
-\	37	0	3
-^	40	0	4
-ul	45	1	5	max_range 2
-_	"
-\`	27	2	6
-ga	"
-~	40	0	7
-/	37	2	8
-sl	"
-<	96	0	9
->	96	0	10
-{	37	0	11
-}	37	0	12
-#	72	0	13
-@	96	0	14
-pl	72	0	15
-+	"
-mi	72	0	16
-\-	"
-eq	72	0	17
-=	"
-**	43	0	18
-sr	81	3	19
-rn	48	2	20
-<=	96	2	21
->=	96	2	22
-==	96	0	23
-ap	96	0	24
-~=	96	0	25
-!=	96	2	26
-->	96	0	27
-<-	96	0	28
-ua	48	3	29
-da	48	3	30
-mu	72	0	31
-di	72	0	32
-+-	96	0	33
-cu	96	2	34
-ca	96	2	35
-sb	96	2	36
-sp	96	2	37
-ib	96	3	38
-ip	96	3	39
-if	91	0	40
-pd	56	2	41
-sc	46	3	42
-gr	96	2	43
-no	59	0	44
-is	64	3	45
-pt	72	0	46
-es	74	2	47
-mo	72	2	48
-dd	46	2	49
-rh	126	2	50
-lh	128	2	51
-or	24	2	53
-ci	85	2	54
-|	0	0	66
-br	"
-ts	48	0	67
-*U	75	2	68
-*Q	85	2	69
-*W	96	2	70
-bu	72	0	80
-sq	72	0	81
-bx	72	0	111
-em	96	0	82
-ru	42	0	84
-fm	21	2	85
-Sl	55	2	116	max_range 2
-bv	50	3	21	font 11
-lt	50	3	15	font 11
-lb	50	3	16	font 11
-rt	50	3	17	font 11
-rb	50	3	18	font 11
-lk	50	3	19	font 11
-rk	50	3	20	font 11
-lf	50	3	22	font 11
-rf	50	3	23	font 11
-lc	50	3	24	font 11
-rc	50	3	25	font 11
-LH	212	3	0	font 441
-LV	112	3	0	font 441
--- a/usr/src/cmd/troff/troff.d/devaps/S1	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-name S1
-internalname 32051
-special
-max_range 2
-charset
--+	100	0	7
-!<	100	2	12
-!>	100	2	13
-le	100	2	14
-ge	100	2	15
-el	100	2	16
-eg	100	2	17
-LE	100	2	18
-GE	100	2	19
-EL	100	2	20
-EG	100	2	21
-<>	100	3	28
-><	100	3	29
-as	100	2	30
-os	100	2	31
-RC	100	2	43
-TR	100	2	45
-RB	100	0	47
-CB	100	2	48
-=.	100	0	50
-=:	100	0	52
-gp	100	0	53
-=p	100	0	54
-4d	75	0	55
-tf	100	2	57
-bc	100	2	59
-an	50	2	65
-ra	50	2	66
-pp	100	2	67
-cy	100	0	68
-de	50	2	71
-ps	50	2	76
-rd	50	0	81
-ld	50	0	83
-vs	68	0	121	font 10941
-cs	68	2	124	font 10941
--- a/usr/src/cmd/troff/troff.d/devaps/SC	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Script
-name SC
-internalname 31
-alternate_font
-max_range 2
-charset
-A	81	2	1
-B	91	2	2
-C	82	2	3
-D	88	2	4
-E	62	2	5
-F	75	2	6
-G	84	2	7
-H	87	2	8
-I	66	2	9
-J	55	2	10
-K	86	2	11
-L	78	2	12
-M	100	2	13
-N	87	2	14
-O	60	2	15
-P	74	2	16
-Q	67	2	17
-R	87	2	18
-S	78	2	19
-T	69	2	20
-U	91	2	21
-V	65	2	22
-W	90	2	23
-X	78	2	24
-Y	81	2	25
-Z	84	2	26
-a	36	0	27
-b	30	2	28
-c	24	0	29
-d	36	2	30
-e	26	0	31
-f	28	2	32
-g	34	1	33
-h	39	2	34
-i	22	0	35
-j	23	1	36
-k	35	2	37
-l	22	2	38
-m	62	0	39
-n	44	0	40
-o	26	0	41
-p	40	1	42
-q	36	1	43
-r	30	0	44
-s	23	0	45
-t	23	2	46
-u	36	0	47
-v	38	0	48
-w	46	0	49
-x	33	0	50
-y	44	1	51
-z	36	0	52
-1	52	2	53	font 6041
-2	52	2	54	font 6041
-3	52	2	55	font 6041
-4	52	2	56	font 6041
-5	52	2	57	font 6041
-6	52	2	58	font 6041
-7	52	2	59	font 6041
-8	52	2	60	font 6041
-9	52	2	61	font 6041
-0	52	2	62	font 6041
-$	52	0	63	font 6041
-ct	52	3	64	font 6041
-&	75	0	65	font 18081
-:	26	0	66	font 6041
-;	26	0	67	font 6041
-.	26	0	68	font 6041
-,	26	0	69	font 6041
-`	26	0	70	font 6041
-'	26	0	71	font 6041
-?	52	0	72	font 6041
-!	32	0	73	font 6041
-%	104	0	74	font 6041
-*	52	0	75	font 6041
-(	52	0	76	font 6041
-)	52	0	77	font 6041
-/	52	2	78	font 6041
-hy	40	0	79	font 6041
--	"
-em	104	0	80	font 6041
-14	104	2	91	font 6041
-12	104	2	92	font 6041
-34	104	2	93	font 6041
-co	64	2	111	font 6041
-rg	64	2	112	font 6041
-tm	64	2	113	font 6041
-#	52	0	116	font 6041
-@	104	0	120	font 6041
-bu	28	0	121	font 6041
-de	52	2	123	font 6041
-dg	52	3	124	font 6041
-dd	52	2	125	font 6041
-sc	52	3	126	font 6041
-[	52	0	127	font 6041
-]	52	0	128	font 6041
--- a/usr/src/cmd/troff/troff.d/devaps/SM	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Stymie Medium
-name SM
-internalname 25681
-max_range 2
-charset
-A	77	2	1
-B	64	2	2
-C	77	2	3
-D	74	2	4
-E	60	2	5
-F	56	2	6
-G	82	2	7
-H	78	2	8
-I	36	2	9
-J	37	2	10
-K	73	2	11
-L	59	2	12
-M	89	2	13
-N	73	2	14
-O	85	2	15
-P	61	2	16
-Q	86	2	17
-R	64	2	18
-S	57	2	19
-T	60	2	20
-U	79	2	21
-V	71	2	22
-W	104	2	23
-X	67	2	24
-Y	66	2	25
-Z	56	2	26
-a	52	0	27
-b	60	2	28
-c	51	0	29
-d	60	2	30
-e	52	0	31
-f	32	2	32
-g	58	1	33
-h	59	2	34
-i	31	0	35
-j	30	1	36
-k	55	2	37
-l	31	2	38
-m	82	0	39
-n	58	0	40
-o	52	0	41
-p	60	1	42
-q	60	1	43
-r	39	0	44
-s	42	0	45
-t	28	2	46
-u	58	0	47
-v	51	0	48
-w	74	0	49
-x	53	0	50
-y	52	1	51
-z	42	0	52
-1	56	2	53
-2	56	2	54
-3	56	2	55
-4	56	2	56
-5	56	2	57
-6	56	2	58
-7	56	2	59
-8	56	2	60
-9	56	2	61
-0	56	2	62
-$	56	0	63
-ct	56	3	64
-&	68	0	65
-:	28	0	66
-;	28	0	67
-.	28	0	68
-,	28	0	69
-`	28	0	70
-'	28	0	71
-?	56	0	72
-!	28	0	73
-%	112	0	74
-*	52	0	75
-(	29	0	76
-)	29	0	77
-/	52	2	78
-hy	35	0	79
--	"
-em	112	0	80
-14	112	2	91
-12	112	2	92
-34	112	2	93
-co	50	2	111
-rg	50	2	112
-tm	50	2	113
-#	75	0	116
-@	113	0	120
-bu	28	0	121
-de	57	2	123
-dg	57	3	124
-dd	58	2	125
-sc	57	3	126
-[	23	0	127
-]	23	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/TB	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Techno Bold (also Futura Demi-Bold, Utica Demi-Bold)
-name TB
-internalname 27201
-ligatures fi ff fl ffi ffl 0
-charset
-A	66	2	1
-B	55	2	2
-C	61	2	3
-D	61	2	4
-E	48	2	5
-F	45	2	6
-G	72	2	7
-H	67	2	8
-I	26	2	9
-J	44	2	10
-K	60	2	11
-L	38	2	12
-M	83	2	13
-N	71	2	14
-O	72	2	15
-P	52	2	16
-Q	72	2	17
-R	55	2	18
-S	50	2	19
-T	50	2	20
-U	66	2	21
-V	65	2	22
-W	88	2	23
-X	66	2	24
-Y	60	2	25
-Z	57	2	26
-a	55	0	27
-b	55	2	28
-c	39	0	29
-d	57	2	30
-e	50	0	31
-f	33	2	32
-g	56	1	33
-h	56	2	34
-i	24	0	35
-j	24	1	36
-k	49	2	37
-l	24	2	38
-m	83	0	39
-n	56	0	40
-o	49	0	41
-p	55	1	42
-q	55	1	43
-r	32	0	44
-s	38	0	45
-t	33	2	46
-u	57	0	47
-v	48	0	48
-w	83	0	49
-x	50	0	50
-y	48	1	51
-z	44	0	52
-1	55	2	53
-2	55	2	54
-3	55	2	55
-4	55	2	56
-5	55	2	57
-6	55	2	58
-7	55	2	59
-8	55	2	60
-9	55	2	61
-0	55	2	62
-$	55	0	63
-ct	55	3	64
-&	82	0	65
-:	28	0	66
-;	28	0	67
-.	28	0	68
-,	28	0	69
-`	28	0	70
-'	28	0	71
-?	55	0	72
-!	28	0	73
-%	90	0	74
-*	55	0	75
-(	25	0	76
-)	25	0	77
-/	55	2	78
-hy	32	0	79
--	"
-em	110	0	80
-ff	61	2	82
-fi	56	2	83
-fl	56	2	84
-Fi	84	2	85
-Fl	84	2	86
-14	83	2	91
-12	83	2	92
-34	83	2	93
-co	50	2	111
-rg	50	2	112
-tm	50	2	113
-#	82	0	116
-@	110	0	120
-bu	28	0	121
-de	55	2	123
-dg	55	3	124
-dd	55	2	125
-sc	55	3	126
-[	24	0	127
-]	24	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/TX	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-# Techno Bold Italic
-name TX
-internalname 27201
-ligatures fi ff fl ffi ffl 0
-default_slant 14
-charset
-A	66	2	1
-B	55	2	2
-C	61	2	3
-D	61	2	4
-E	48	2	5
-F	45	2	6
-G	72	2	7
-H	67	2	8
-I	26	2	9
-J	44	2	10
-K	60	2	11
-L	38	2	12
-M	83	2	13
-N	71	2	14
-O	72	2	15
-P	52	2	16
-Q	72	2	17
-R	55	2	18
-S	50	2	19
-T	50	2	20
-U	66	2	21
-V	65	2	22
-W	88	2	23
-X	66	2	24
-Y	60	2	25
-Z	57	2	26
-a	55	0	27
-b	55	2	28
-c	39	0	29
-d	57	2	30
-e	50	0	31
-f	33	2	32
-g	56	1	33
-h	56	2	34
-i	24	0	35
-j	24	1	36
-k	49	2	37
-l	24	2	38
-m	83	0	39
-n	56	0	40
-o	49	0	41
-p	55	1	42
-q	55	1	43
-r	32	0	44
-s	38	0	45
-t	33	2	46
-u	57	0	47
-v	48	0	48
-w	83	0	49
-x	50	0	50
-y	48	1	51
-z	44	0	52
-1	55	2	53
-2	55	2	54
-3	55	2	55
-4	55	2	56
-5	55	2	57
-6	55	2	58
-7	55	2	59
-8	55	2	60
-9	55	2	61
-0	55	2	62
-$	55	0	63
-ct	55	3	64
-&	82	0	65
-:	28	0	66
-;	28	0	67
-.	28	0	68
-,	28	0	69
-`	28	0	70
-'	28	0	71
-?	55	0	72
-!	28	0	73
-%	90	0	74
-*	55	0	75
-(	25	0	76
-)	25	0	77
-/	55	2	78
-hy	32	0	79
--	"
-em	110	0	80
-ff	61	2	82
-fi	56	2	83
-fl	56	2	84
-Fi	84	2	85
-Fl	84	2	86
-14	83	2	91
-12	83	2	92
-34	83	2	93
-co	50	2	111	slant 0
-rg	50	2	112	slant 0
-tm	50	2	113	slant 0
-#	82	0	116
-@	110	0	120
-bu	28	0	121	slant 0
-de	55	2	123	slant 0
-dg	55	3	124
-dd	55	2	125
-sc	55	3	126
-[	24	0	127
-]	24	0	128
--- a/usr/src/cmd/troff/troff.d/devaps/aps.h	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-/*
- * 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.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2001 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/*
- * University Copyright- Copyright (c) 1982, 1986, 1988
- * The Regents of the University of California
- * All Rights Reserved
- *
- * University Acknowledgment- Portions of this document are derived from
- * software developed by the University of California, Berkeley, and its
- * contributors.
- */
-
-#define APSNOOP		00
-#define HSP25U		0201
-#define HSP400U		0202
-#define HSP200U		0203
-#define HSP100U		0204
-#define HSP50U		0205
-#define HSP72P		0206
-#define HSP36P		0207
-#define HSP18P		0210
-#define HSP9P		0211
-#define HSP45P		0212
-#define MARKLOC		0217
-#define RTNMARK		0220
-#define DRAW		0221
-#define RTNMARKX	0222
-#define RTNMARKY	0223
-#define SPEED		0240
-#define DCLMSZ		0241
-#define SETOBLIQUE	0242
-#define WRREAD		0243
-#define LFTMGN		0244
-#define RETRACE		0245
-#define UPDOWN		0246
-#define DISPFONT	0257
-#define FONT		0260
-#define HSIZE		0261
-#define VSIZE		0262
-#define HVSIZE		0263
-#define REPEAT		0264
-#define SAVSTR		0265
-#define EXSTR		0266
-#define SETCTR		0267
-#define SETPTR		0270
-#define STRTJOB		0272
-#define STRTPG		0273
-#define SELFSCAN	0274
-#define VSSPOTS		0276
-#define HSSPOTS		0277
-#define VSPABS		0300
-#define VSPREL		0301
-#define HSPABS		0302
-#define HSPREL		0303
-#define LTRSP		0304
-#define LTRSPREL	0305
-#define PGLEAD		0313
-#define HPSNABS		0315
-#define VPSNABS		0316
-#define SKIP		0317
-#define STORVERT	0320
-#define STORVTSPOT	0321
-#define SETTAB		0323
-#define STRVRA		0325
-#define STRHRA		0326
-#define STRVRB		0327
-#define STRHRB		0330
-#define STORHSPA	0332
-#define STORHSPB	0333
-#define STORHSPC	0334
-#define STORHSPD	0335
-#define MKH		0336
-#define RTNHMK		0337
-#define EXVSP		0340
-#define RTN		0341
-#define CRTN		0342
-#define XTAB		0343
-#define XTABCR		0344
-#define XRULA		0345
-#define XRULATAB	0346
-#define XRULB		0347
-#define XNORMAL		0350
-#define XOBLIQUE	0351
-#define XHSPA		0352
-#define XHSPB		0353
-#define XHSPC		0354
-#define XHSPD		0355
-#define RESET		0356
-#define DISPFNTS	0357
-#define ENDSTR		0360
-#define DECCTR		0361
-#define MKV		0362
-#define RTNVMK		0363
-#define ESCGRAPHICS	0366
-#define CUT		0374
-#define HALT		0375
-#define ENDJOB		0376
-
-#define MAXESCAPE 8400
-#define MAXLEAD 32367
--- a/usr/src/cmd/troff/troff.d/devaps/build.c	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,313 +0,0 @@
-/*
- * 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.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 1989 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
-/*
- * University Copyright- Copyright (c) 1982, 1986, 1988
- * The Regents of the University of California
- * All Rights Reserved
- *
- * University Acknowledgment- Portions of this document are derived from
- * software developed by the University of California, Berkeley, and its
- * contributors.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#include <stdio.h>
-
-
-#define	LIBDIR	"charlib"				/* files found in *fontdir/LIBDIR */
-
-
-/*
- *
- * These variables are used to save and later restore the post-processor's
- * environment.
- *
- */
-
-
-int		ohpos;
-int		ovpos;
-int		ofont;
-int		osize;
-
-int		env = 0;						/* nonzero if environment is saved */
-
-
-extern int		hpos;
-extern int		vpos;
-extern int		font;
-extern int		size;
-
-extern char		*fontdir;
-extern char		devname[];
-extern FILE		*tf;
-
-#define oput(n)	putc(n, tf)
-
-
-/*****************************************************************************/
-
-int
-newfile(name, size)
-
-
-	char	*name;						/* start reading from this file */
-	int		size;						/* may use it to get the file */
-
-
-{
-
-
-	FILE	*fp;
-	FILE	*charfile();
-
-
-	/********************************************************************
-	 *																	*
-	 *		Used when we want to take the post-processor's input from	*
-	 *	a different file for a while. Added to handle problems with the	*
-	 *	new logos, but it could easily be used to define other special	*
-	 *	characters.														*
-	 *																	*
-	 ********************************************************************/
-
-
-	if ( env || (fp = charfile(name, size)) == NULL )
-		return(1);
-
-	save_env();
-	nconv(fp);
-	restore_env();
-	fclose(fp);
-
-	return(0);
-
-}	/* End of newfile */
-
-
-/*****************************************************************************/
-
-
-FILE *charfile(name, size)
-
-
-	char	*name;						/* start reading from this file */
-	int		size;						/* size of the character to print */
-
-
-{
-
-
-	char	path[100];					/* file pathname put here */
-	FILE	*fp;						/* file pointer for *path */
-
-
-	/********************************************************************
-	 *																	*
-	 *		First tries to open file *name.size in the right directory,	*
-	 *	and if it can't then it tries *name. Returns the file pointer	*
-	 *	or NULL if either file can't be opened.							*
-	 *																	*
-	 ********************************************************************/
-
-
-	sprintf(path, "%s/dev%s/%s/%s.%d", fontdir, devname, LIBDIR, name, size);
-
-	if ( (fp = fopen(path, "r")) == NULL )  {
-		sprintf(path, "%s/dev%s/%s/%s", fontdir, devname, LIBDIR, name);
-		fp = fopen(path, "r");
-	}	/* End if */
-
-	return(fp);
-
-}	/* End of charfile */
-
-
-/*****************************************************************************/
-
-int
-save_env()
-
-
-{
-
-
-	/********************************************************************
-	 *																	*
-	 *		Before we start reading from a different file we'll want	*
-	 *	to save the values of the variables that will be needed to get	*
-	 *	back to where we were.											*
-	 *																	*
-	 ********************************************************************/
-
-
-	hflush();
-
-	ohpos = hpos;
-	ovpos = vpos;
-	ofont = font;
-	osize = size;
-
-	env = 1;
-
-	return (0);
-}	/* End of save_env */
-
-
-/*****************************************************************************/
-
-int
-restore_env()
-
-
-{
-
-
-	/********************************************************************
-	 *																	*
-	 *		Hopefully does everything needed to get the post-processor	*
-	 *	back to where it was before the input was diverted.				*
-	 *																	*
-	 ********************************************************************/
-
-
-	hgoto(ohpos);
-	vgoto(ovpos);
-
-	setfont(ofont);
-	setsize(osize);
-
-	env = 0;
-
-	return (0);
-}	/* End of restore_env */
-
-
-/*****************************************************************************/
-
-int
-nconv(fp)
-
-
-	FILE	*fp;						/* new file we're reading from */
-
-
-{
-
-
-	int		ch;							/* first character of the command */
-	int		c, n;						/* used in reading chars from *fp */
-	char	str[100];					/* don't really need this much room */
-
-
-	/********************************************************************
-	 *																	*
-	 *		A restricted and slightly modified version of the conv()	*
-	 *	routine found in all of troff's post-processors. It should only	*
-	 *	be used to interpret the special character building files found	*
-	 *	in directory *fontdir/LIBDIR.									*
-	 *																	*
-	 ********************************************************************/
-
-
-	while ( (ch = getc(fp)) != EOF )  {
-
-		switch ( ch )  {
-
-			case 'w':					/* just ignore these guys */
-			case ' ':
-			case '\n':
-			case 0:
-					break;
-
-			case 'c':					/* single ASCII character */
-					put1(getc(fp));
-					break;
-
-			case 'C':					/* special character */
-					fscanf(fp, "%s", str);
-					put1s(str);
-					break;
-
-			case 'h':					/* relative horizontal motion */
-					fscanf(fp, "%d", &n);
-					hmot(n);
-					break;
-
-			case 'v':
-					fscanf(fp, "%d", &n);
-					vmot(n);
-					break;
-
-			case 'x':					/* device control - font change only */
-					fscanf(fp, "%s", str);
-					if ( str[0] == 'f' )  {
-						fscanf(fp, "%d %s", &n, str);
-						loadfont(n, str, "");
-					}	/* End if */
-					break;
-
-			case 's':					/* set point size */
-					fscanf(fp, "%d", &n);
-					setsize(t_size(n));
-					break;
-
-			case 'f':					/* use this font */
-					fscanf(fp, "%s", str);
-					setfont(t_font(str));
-					break;
-
-			case 'b':
-					fscanf(fp, "%d", &n);
-					oput(n);
-					break;
-
-			case 'W':
-					fscanf(fp, "%d", &n);
-					putint(n);
-					break;
-
-
-			case '#':					/* comment */
-					while ( (c = getc(fp)) != '\n'  &&  c != EOF ) ;
-					break;
-
-		}	/* End switch */
-
-	}	/* End while */
-
-	return (0);
-}	/* End of nconv */
-
-
-/*****************************************************************************/
-
-
--- a/usr/src/cmd/troff/troff.d/devaps/daps.c	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2978 +0,0 @@
-/*
- * 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.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 1989 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
-/*
- * University Copyright- Copyright (c) 1982, 1986, 1988
- * The Regents of the University of California
- * All Rights Reserved
- *
- * University Acknowledgment- Portions of this document are derived from
- * software developed by the University of California, Berkeley, and its
- * contributors.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-char *xxxvers = "troff.d/devaps/daps.c	1.2";
-
-
-
-/****************************************************************************
- *																			*
- *		This is the post-processor for the APS-5 phototypesetter. The 		*
- *	language that is accepted by this program is produced by the new device	*
- *	independent troff, and consists of the following statements,			*
- *																			*
- *																			*
- *		sn			set the point size to n									*
- *		fn			set the typesetter font to the one in position n		*
- *		cx			output the ASCII character x 							*
- *		Cxyz		output the code for the special character xyz. This		*
- *					command is terminated by white space.					*
- *		Hn			go to absolute horizontal position n					*
- *		Vn			go to absolute vertical position n ( down is positive )	*
- *		hn			go n units horizontally from current position			*
- *		vn			go n units vertically from current position				*
- *		nnc			move right nn units, then print the character c. This	*
- *					command expects exactly two digits followed by the		*
- *					character c.											*
- *		w			paddable word space - no action needed					*
- *		nb a		end of line ( information only - no action needed )		*
- *		pn			begin page n											*
- *		Dt ...\n	draw operation 't':										*
- *																			*
- *						Dl x y		line from here to x,y					*
- *						Dc d		circle of diameter d, left side here	*
- *						De x y		ellipse of axes x,y, left side here		*
- *						Da u v x y	arc 									*
- *						D~ x y x y	wiggly line by x,y then x,y				*
- *																			*
- *		x ... \n	device control functions:								*
- *																			*
- *						x i			initialize the typesetter				*
- *						x T s		name of device is s						*
- *						x r n h v	resolution is n units per inch. h is	*
- *									min horizontal motion, v is min vert.	*
- *									motion in machine units.				*
- *						x p			pause - can restart the typesetter		*
- *						x s			stop - done forever						*
- *						x t			generate trailer - no-op for the APS	*
- *						x f n s		load font position n with tables for 	*
- *									font s. Referring to font n now means	*
- *									font s.									*
- *						x H n		set character height to n				*
- *						x S n		set character slant to n				*
- *																			*
- *						Subcommands like i are often spelled out as "init"	*
- *																			*
- *		To get the post-processor running properly on your system, you may	*
- *	have to make one or more of changes:									*
- *																			*
- *			Choose the appropriate description of your typesetter. These	*
- *			values include the type of lens and the maximum master range	*
- *			for your fonts. The values that you will need to adjust are		*
- *			macros and defined constants located at the start of the		*
- *			daps.h file.													*
- *																			*
- *			Make sure the variable 'typesetter' is properly initialized		*
- *			to the APS-5 typesetter file on your system. If you are not		*
- *			going to have daps directly drive the typesetter, you may 		*
- *			want to set it to the null file, and/or initialize 'tf' to		*
- *			be stdout. (file daps.g)										*
- *																			*
- *			Make sure that the accounting file pathname 'tracct' is the		*
- *			the accounting file that you want. If no accounting is to be	*
- *			done then initialize it to the null string. (file daps.g)		*
- *																			*
- *			Check to make sure that 'fontdir' is the directory that			*
- *			contains the devaps directory where your font tables are		*
- *			located. (file daps.g)											*
- *																			*
- *			If there are no characters on your font disk that need any		*
- *			adjustment in their vertical placement, then make sure that		*
- *			the conditional compilation flag ADJUST is undefined. I would	*
- *			recommend that you start this way to see what your font disk	*
- *			really looks like. (file daps.h)								*
- *																			*
- *																			*
- ****************************************************************************/
-
-
-
-
-
-
-#include	<stdio.h>
-#include	<ctype.h>
-#include	<signal.h>
-
-#include	"aps.h"					/* APS-5 opcode definitions */
-#include	"dev.h"					/* font and dev structure declarations */
-
-#include	"daps.h"				/* constant and macro definitions */
-#include	"daps.g"				/* global variable definitions */
-
-
-
-
-
-/*****************************************************************************/
-
-int
-main(int argc, char **argv)
-{
-
-
-	/********************************************************************
-	 *																	*
-	 *		This is the main program for the APS-5 post-processor. It 	*
-	 *	is responsible for calling the sequence of routines that are	*
-	 *	needed to translate troff's new typesetter independent output	*
-	 *	language into a form that will be understood by the APS-5		*
-	 *	phototypesetter.												*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	get_options(argc, argv);		/* process the option list */
-	if ( tf != stdout )				/* need to open the file */
-		out_file();
-	init_signals();					/* set up signal handling */
-	acct_file();					/* open the accounting file */
-	process_input(argc, argv);		/* translate the input files */
-	account();						/* make sure we charge this guy */
-	done();							/* finish up this job and reset the APS */
-
-	return (0);
-}	/* End of main */
-
-
-/****************************************************************************/
-
-int
-get_options(int argc, char **argv)
-{
-
-
-	int		save;					/* used to adjust arg_index */
-	int		v_step;					/* vertical step in -V option */
-
-	double	atof();					/* used in getting beam cutoff postion */
-
-	int ch;
-	int i, sharpsign;
-	extern char *optarg;
-	extern int optind;
-
-
-	/********************************************************************
-	 *																	*
-	 *		This is the routine that processes the command line option	*
-	 *	list. The macro SET_ARGS uses the global variable arg_index to	*
-	 *	properly initialize the local argc and argv values, while the	*
-	 *	macro COUNT_ARGS adjusts the value of arg_index to account for	*
-	 *	the number of arguments that were just processed.				*
-	 *																	*
-	 *		The options that are currently available in this driver 	*
-	 *	are,															*
-	 *																	*
-	 *				-f dir	- 	use dir as the font directory			*
-	 *				-F dir	-	same									*
-	 *																	*
-	 *				-t		-	use standard output						*
-	 *																	*
-	 *				-r		-	report the number of pages				*
-	 *																	*
-	 *				-A		-	do accounting even if there is no real	*
-	 *							accounting file. If tracct is NULL then	*
-	 *							the accounting information is written	*
-	 *							to stderr. This is the way things are	*
-	 *							done on our APS.						*
-	 *																	*
-	 *				-b		-	report whether typesetter is busy or	*
-	 *							not. Nothing is printed.				*
-	 *																	*
-	 *				-w		-	wait until typesetter is available,		*
-	 *							then procees the job.					*
-	 *																	*
-	 *				-o[str]	-	process only this list of pages. The	*
-	 *							list may contain single pages or page	*
-	 *							ranges, where the latter consists of 	*
-	 *							a pair of pages separated by -.			*
-	 *																	*
-	 *				-s[num]	-	stop processing every num pages, and	*
-	 *							HALT the typesetter.					*
-	 *																	*
-	 *				-v[num] -	use num as the maximum vertical step	*
-	 *							size up or down the page. The argument	*
-	 *							num is interpreted as 10ths of a point.	*
-	 *																	*
-	 *				-h[str]	-	use str as the string to be printed		*
-	 *							in the header.							*
-	 *																	*
-	 *				-H[str]	-	use str as the pathname of the file		*
-	 *							whose first line contains the string	*
-	 *							to be printed in the header.			*
-	 *																	*
-	 *				-d[str] -	toggle the debug flags for each number	*
-	 *							contained in the string str. If str		*
-	 *							contains the character '*' then all of	*
-	 *							the debug flags will be toggled.		*
-	 *																	*
-	 *				-D[str] -	dump all of the debug information into	*
-	 *							file str. If this option is not used	*
-	 *							then the debugging stuff is written to	*
-	 *							stderr.									*
-	 *																	*
-	 *				-L[str] -	use the file str as the log file for	*
-	 *							all error messages. If this option is	*
-	 *							not used then all error messages will	*
-	 *							be written to stderr.					*
-	 *																	*
-	 *				-I		-	ignore all FATAL errors. This option is	*
-	 *							only to be used for debugging - it may	*
-	 *							cause a core file to be written.		*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	SET_ARGS(save);					/* MACRO - adjust internal argc and argv */
-
-	while ((ch = getopt(argc, argv, "f:F:trAbwo:s:h:H:d:D:L:Iv:c:#"))
-		!= EOF) {				/*read options list*/
-
-		switch ( ch )  {					/* check option */
-
-			case 'f':								/* font directory */
-			case 'F':
-						fontdir = optarg;
-						break;
-
-			case 't':								/* use standard output */
-						tf = stdout;
-						break;
-
-			case 'r':								/* print page report */
-						report = YES;
-						break;
-
-			case 'A':								/* do accounting! */
-						if ( privelege == ON )
-							x_stat |= DO_ACCT;
-						break;
-
-			case 'b':								/* check if busy or not */
-						busyflag = ON;
-						break;
-
-			case 'w':								/* wait til APS is free */
-						waitflag = ON;
-						break;
-
-			case 'o':								/* process page list */
-						outlist(optarg);
-						break;
-
-			case 's':								/* stop every spage(s) */
-						spage = atoi(optarg);
-						if ( spage <= 0 )			/* illegal page number */
-							spage = 9999;
-						break;
-
-			case 'h':								/* banner is in argument */
-						banner = optarg;
-						print_banner = YES;
-						break;
-
-			case 'H':								/* banner is in file */
-						ban_file(optarg);
-						print_banner = YES;
-						break;
-
-			case 'd':								/* selective debug */
-						debug_select(optarg);
-						break;
-
-			case 'D':								/* set up debug file */
-						debug_file(optarg);
-						break;
-
-			case 'L':								/* set up log file */
-						log_file(optarg);
-						break;
-
-			case 'I':								/* ignore fatal errors */
-						if ( privelege == ON )
-							ignore = YES;
-						break;
-
-			case 'v':								/* set max vertical step */
-						v_step = atoi(optarg);
-						if ( v_step != 0 )
-							vert_step = ( v_step > 0 ) ? v_step
-													   : -v_step;
-						if ( vert_step > MAX_INT )	/* its too big */
-							vert_step = MAX_INT;
-						break;
-
-			case 'c':								/* set beam cutoff */
-						if ( (cutoff = atof(optarg)) <= 0 )
-							cutoff = CUTOFF;
-						break;
-
-		case '#':
-			sharpsign = 1;
-			break;
-			default:								/* didn't find it */
-						error(NON_FATAL, "illegal option %c", argv[1][1]);
-						break;
-
-		}	/* End of switch */
-
-	}	/* End while */
-
-	argc -= optind - 1;
-	COUNT_ARGS(save);				/* MACRO - adjust arg_index */
-	if (sharpsign == 1) {
-		fprintf(stderr, "report = %d, x_stat = %o\n",
-			report, x_stat);
-		fprintf(stderr, "busyflag = %d, waitflag = %d, ignore = %d\n",
-			busyflag, waitflag, ignore);
-		fprintf(stderr, "fontdir = %s, spage = %d, banner = %s\n",
-			fontdir, spage, banner);
-		fprintf(stderr, "v_step = %d, cutoff = %g\n",
-			v_step, cutoff);
-		for (i=0; i<nolist; i+=2)
-			fprintf (stderr, "olist[%d] is %d; olist[%d] is %d.\n",
-				i, olist[i], i+1, olist[i+1]);
-		for (i=0; i<MAX_DEBUG; i+=4)
-			fprintf(stderr, "debug[%d] = %d, %d, %d, %d\n",
-				i,debug[i],debug[i+1],debug[i+2],debug[i+3]);
-		if (fp_debug != stderr)
-			fprintf(stderr, "fp_debug is %x\n", fp_debug);
-		if (fp_error != stderr)
-			fprintf(stderr, "fp_error is %x\n", fp_error);
-		if (tf != stdout)
-			fprintf(stderr, "tf is %x\n", tf);
-	}
-
-	return (0);
-}	/* End of get_options */
-
-
-/*****************************************************************************/
-
-int
-process_input(int argc, char **argv)
-{
-
-
-	FILE	*fp_in;					/* input file descriptor */
-	int 	save;					/* used to adjust arg_index before exit */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called by main to handle the processing		*
-	 *	of the input files from the command line. If there were no		*
-	 *	files specified in the call then the post-processor will read	*
-	 *	from the standard input. Otherwise it will process all of the	*
-	 *	input files in the list, concatenating the output from each		*
-	 *	one onto the output file. The only convention that is used for	*
-	 *	input file names is that the character '-' as a file name will	*
-	 *	cause the driver to read from the standard input, provided it	*
-	 *	isn't the first 'file' in the list of input files. It would		*
-	 *	probably be better if we chose some other character or sequence	*
-	 *	of characters for this purpose.									*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	SET_ARGS(save);						/* MACRO - adjust argc and argv */
-
-	if ( argc <= 1 ) conv(stdin);		/* no more args - use stdin */
-	else  {								/* read input file list */
-		while ( --argc > 0 )  {			/* rest of the args are input files */
-
-			if ( strcmp(*++argv, "-") == 0 )	/* use standard input */
-				fp_in == stdin;
-			else if ( (fp_in = fopen(*argv, "r")) == NULL )  {		
-					error(FATAL, "can't open input file %s", *argv);
-					continue;			/* in case we ignore this error */
-			}	/* End else */
-
-			conv(fp_in);				/* translate the file */
-			if ( fp_in != stdin )		/* probably don't need it anymore */
-				fclose(fp_in);
-
-		}	/* End of while */
-	}	/* End else */
-
-	COUNT_ARGS(save);					/* MACRO - adjust arg_index */
-
-	return (0);
-}	/* End of process_input */
-
-
-/****************************************************************************/
-
-int
-init_signals()
-
-
-{
-
-
-	void	wrap_up();					/* signal handling routine */
-	void	float_err();				/* handles floating point errors */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called by main to set up the appropriate	*
-	 *	handling of external signals for the post-processor. As 		*
-	 *	currently written interrupts, quits and hangups are all either	*
-	 *	ignored or processed by the routine wrap_up().					*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	signal(SIGFPE, float_err);			/* catch floating point errors */
-
-	if ( signal(SIGINT, wrap_up) == SIG_IGN )  {	/* ignoring interrupts */
-		signal(SIGINT, SIG_IGN);					/* so reset SIGINT */
-		signal(SIGQUIT, SIG_IGN);					/* and ignore the rest */
-		signal(SIGHUP, SIG_IGN);
-	} else {										/* wrap_up() handles them */
-		signal(SIGQUIT, wrap_up);
-		signal(SIGHUP, wrap_up);
-	}	/* End if */
-
-	return (0);
-}	/* End of init_signals */
-
-
-/*****************************************************************************/
-
-int
-debug_select(str)
-
-
-	char	*str;						/* string of debug flags */
-
-
-{
-
-
-	int		index;						/* single debug flag to toggle */
-	int		i;							/* for loop index */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called by main() when it finds the -d		*
-	 *	option.	The parameter str is a pointer to a string of comma		*
-	 *	separated tokens from the command line that specify which of 	*
-	 *	the debug flags is to be toggled. As currently implemented the	*
-	 *	tokens in str may consist of numbers, which specify the actual	*
-	 *	flag to be toggled, or the character '*', which stands for all	*
-	 *	of the available debug flags.									*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	while ( *str )  {
-
-		if ( isdigit(*str) )  {			/* have a single debug flag */
-			STR_CONVERT(str, index);	/* MACRO - get the debug flag */
-			if ( index >= 0  &&  index < MAX_DEBUG )
-				TOGGLE(debug[index]);	/* MACRO - toggle it */
-		} else if ( *str == '*' )		/* toggle all the debug flags */
-			for ( i = 0; i < MAX_DEBUG; i++ )
-				TOGGLE(debug[i]);		/* MACRO */
-
-		if ( *str != '\0' ) str++;		/* skip the comma */
-
-	}	/* End while */
-
-	return (0);
-}	/* End of debug_select */
-
-
-/*****************************************************************************/
-
-int
-debug_file(str)
-
-
-	char	*str;						/* debug file pathname */
-
-
-{
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called by get_options() when it finds the	*
-	 *	-D option in the command line. The parameter str is a pointer	*
-	 *	to the pathname of the file to be used for all of the debugging	*
-	 *	output. If the -D option is not specified then by default all	*
-	 *	the debug output is written to stderr.							*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	if ( (fp_debug = fopen(str, "w")) == NULL )  {
-		fp_debug = stderr;
-		error(NON_FATAL, "can't open debug file %s", str);
-	}	/* End if */
-
-	return (0);
-}	/* End of debug_file */
-
-
-/*****************************************************************************/
-
-int
-log_file(str)
-
-
-	char	*str;						/* log file pathname */
-
-
-{
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called to open the log file for the APS-5	*
-	 *	post-processor. The pathname of the file is passed in the		*
-	 *	parameter str when this routine is called from get_options().	*
-	 *	If the log file isn't specified then the post-processor will	*
-	 *	write all of it's error messages to stderr.						*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	if ( (fp_error = fopen(str, "a")) == NULL )  {
-		fp_error = stderr;
-		error(FATAL, "can't open log file %s", str);
-	}	/* End if */
-
-	return (0);
-}	/* End of log_file */
-
-
-/*****************************************************************************/
-
-int
-acct_file()
-
-
-{
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called to open the accounting file whose	*
-	 *	pathname is pointed to by the variable tracct. If there is no	*
-	 *	pathname in tracct then nothing is done in this routine, while	*
-	 *	if we are unable to open the accounting file then an error		*
-	 *	message is printed out and we quit.								*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	if ( *tracct )  {					/* we have an accnt file pathname */
-
-		if ( (fp_acct = fopen(tracct, "a")) == NULL )  {	/* so open it */
-			fp_acct = stderr;			/* couldn't open accounting file */
-			x_stat |= NO_ACCTFILE;		/* indicate this in the exit status */
-			error(FATAL, "unable to open accounting file");
-			exit(x_stat);				/* in case we ignore this error */
-		}	/* End if */
-		x_stat |= DO_ACCT;				/* accounting needs to be done */
-
-	}	/* End if */
-
-	return (0);
-}	/* End of acct_file */
-
-
-/*****************************************************************************/
-
-int
-ban_file(str)
-
-
-	char	*str;						/* banner file pathname */
-
-
-{
-
-
-	FILE	*fp_ban;					/* banner file descriptor */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called from get_options() to read the 		*
-	 *	banner string from the first line of the file whose pathname is	*
-	 *	contained in the string str.									*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	if ( (fp_ban = fopen(str, "r")) == NULL )  {
-		error(NON_FATAL, "can't open the banner file %s", str);
-		return (0);
-	}	/* End if */
-
-	GET_LINE(fp_ban, ban_buf);			/* MACRO - banner is first line only */
-	banner = ban_buf;					/* t_banner() prints string *banner */
-
-	fclose(fp_ban);						/* shouldn't need this file again */
-
-	return (0);
-}	/* End of ban_file */
-
-
-/*****************************************************************************/
-
-int
-out_file()
-
-
-{
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called from the main program to open the	*
-	 *	file pointed to by typesetter.									*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	do  {
-		tf = fopen(typesetter, "w");	/* typesetter output file */
-		if ( busyflag == ON )  {		/* report status and then exit */
-			printf(tf == NULL ? "Busy.\n" : "Available.\n");
-			exit(0);
-		}	/* End if */
-
-		if ( tf == NULL )  {			/* didn't open on last try */
-			if ( waitflag == OFF )  {	/* he doesn't want to wait */
-				error(NON_FATAL, "can't open typesetter");
-				exit(NO_OUTFILE);
-			}	/* End if */
-			else sleep(60);				/* try again later */
-		}	/* End if */
-	}  while ( tf == NULL );
-
-	return (0);
-}	/* End of out_file */
-
-
-/*****************************************************************************/
-
-int
-outlist(str)
-
-
-	char	*str;						/* string of pages to process */
-
-
-{
-
-
-	int		start, stop;				/* page range end points */
-	int		i;							/* loop index - debug only */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called when the -o option is read in		*
-	 *	the command line. The parameter str points to a list of page	*
-	 *	numbers to be processed. This list consists single pages or 	*
-	 *	page ranges, separated by commas. A page range is specified by	*
-	 *	separating two page numbers by the character '-'. In this case	*
-	 *	all pages in this closed interval will be processed by daps.	*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	while ( *str  &&  nolist < MAX_OUTLIST - 2 )  {
-
-		start = 0;
-
-		if ( isdigit(*str) )				/* page number should begin here */
-			STR_CONVERT(str,start);			/* MACRO - get left end point */
-		else start = -9999;					/* use lowest possible page */
-
-		stop = start;						/* in case it is a single page */
-
-		if ( *str == '-' )  {				/* have a page range */
-			str++;							/* so skip the minus sign */
-			if ( isdigit(*str) )			/* page number begins here */
-				STR_CONVERT(str,stop);		/* MACRO - get right end point */
-			else stop = 9999;				/* use largest possible page */
-		}	/* End if */
-
-		if ( start > stop )
-			error(FATAL,"illegal range %d-%d",start,stop);
-
-		olist[nolist++] = start;			/* save the page range */
-		olist[nolist++] = stop;
-
-		if ( *str != '\0' ) str++;			/* skip the comma */
-
-	}	/* End while */
-
-	olist[nolist] = 0;						/* terminate the page list */
-
-	if ( *str )							/* too many pages for olist array */
-		error(NON_FATAL, "skipped pages %s", str);
-
-	if ( debug[1] )							/* dump the olist[] array */
-		for ( i = 0; i < nolist; i += 2 )
-			fprintf(fp_debug,"%3d  %3d\n", olist[i], olist[i+1]);
-
-	return (0);
-}	/* End of outlist */
-
-
-/*****************************************************************************/
-
-int
-error(kind, str, a1, a2, a3, a4, a5, a6, a7)
-
-
-	int		kind;					/* kind of error ie. FATAL or NON_FATAL */
-	char	*str;					/* pointer to message to be printed */
-
-
-{
-	void	wrap_up();					/* signal handling routine */
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called when the post-processor has found	*
-	 *	an internal error. The parameter kind has the value FATAL or	*
-	 *	NON_FATAL, and accordingly determines whether processing will	*
-	 *	continue or not. The parameter str is a pointer to the error	*
-	 *	message that is to be printed. All the remaining parameters		*
-	 *	are the arguments that may be referenced in the control string	*
-	 *	str.															*
-	 *																	*
-	 *		The global variable ignore is initialized to NO in the		*
-	 *	file daps.globals, and can be set to YES by using the -I option	*
-	 *	in the command line. This will allow the post-processor to		*
-	 *	continue after a normally FATAL error has been encountered. 	*
-	 *	This is only a debugging feature and should not generally be	*
-	 *	used.															*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	fprintf(fp_error, "daps: ");
-	if ( (kind == NON_FATAL) && (line_number > 0) )
-		fprintf(fp_error, "warning - ");
-	fprintf(fp_error, str, a1, a2, a3, a4, a5, a6, a7);
-
-	if ( line_number > 0 )
-		fprintf(fp_error, " ( line = %ld )", line_number);
-	fprintf(fp_error, "\n");
-
-	if ( ignore == YES  &&  privelege == ON )
-		return (0);
-
-	if ( kind == FATAL )			/* can't ignore this error */
-		wrap_up();					/* so quit */
-
-	return (0);
-}	/* End of error */
-
-
-/*****************************************************************************/
-
-int
-done()
-
-
-{
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called to do the final processing for the	*
-	 *	current job. If there is to be any accounting for this job we	*
-	 *	need to be sure that the account function is called first		*
-	 *	because there is nothing more we can do when we get here.		*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	if ( tf == NULL ) 					/* Nowhere to write */
-		exit(x_stat | NO_OUTFILE);		/* so set the bit in x_stat and quit */
-
-	t_reset('s');						/* get APS ready for the next job */
-	exit(x_stat);						/* quit with status x_stat */
-
-	return (0);
-}	/* End of done */
-
-
-/*****************************************************************************/
-
-
-void float_err(sig)
-
-
-	int		sig;						/* signal number - not used */
-
-
-{
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		Called when a floating point error has been detected.		*
-	 *	Needed because we want to make sure we exit gracefully if a		*
-	 *	users job would normally dump a core file.						*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	error(FATAL, "floating point exception");
-
-}	/* End of float_err */
-
-
-/*****************************************************************************/
-
-
-void wrap_up(sig)
-
-
-	int		sig;						/* signal number - not used */
-
-
-{
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called to make sure that all the necessary	*
-	 *	stuff is done when the driver finishes its job because of some	*
-	 *	external signal or because it encountered a FATAL syntax error.	*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	account();							/* keep some kind of record for this job */
-	done();								/* get the APS ready for next job */
-
-}	/* End of wrap_up */
-
-
-/*****************************************************************************/
-
-int
-conv(fp)
-
-
-	FILE	*fp;				/* input file descriptor */
-
-
-{
-
-
-	int	ch;					/* first character of the command */
-	int		c;							/* used only as a character */
-	int		n;							/* general purpose integer variable */
-	char	str[100], buf[300];			/* buffers for fscanf and fgets */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This is the main interpreter for the post-processor. It is	*
-	 *	called from routine process_input with the single parameter		*
-	 *	fp, which is the file descriptor for the current input file.	*
-	 *																	*
-	 *		The global variable line_number is used to keep track of	*
-	 *	the current line in the input file fp. Its value is adjusted	*
-	 *	in both conv() and devcntrl() and it is used in the routine		*
-	 *	error() when error messages are written to the file fp_error.	*
-	 *																	*
-	 *		The bits in the global variable x_stat are used to keep 	*
-	 *	track of the progress of the post-processor, and when the 		*
-	 *	program exits it will return x_stat as its termination status.	*
-	 *																	*
-	 *																	*
-	 *		NOTE - In order to improve the speed of this routine we may	*
-	 *	want to declare more register variables. When we do this we 	*
-	 *	need to be sure that the macros that are being used will accept	*
-	 *	register variables as arguments. For example if a macro takes	*
-	 *	the address of one of its arguments, then we can't assign this	*
-	 *	variable to a register.											*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	x_stat |= FILE_STARTED;					/* indicate this in x_stat */
-	line_number = 1;						/* line in current input file */
-
-	while ( (ch = getc(fp) ) != EOF )  {
-
-		switch ( ch )  {					/* ch determines the command */
-
-			case 'w':						/* don't do anything for these */
-			case ' ':
-			case  0:
-						break;
-
-			case '\n':						/* just increment line_number */
-						line_number++;
-						break;
-
-			case '0':						/* two motion digits and a char */
-			case '1':
-			case '2':
-			case '3':
-			case '4':
-			case '5':
-			case '6':
-			case '7':
-			case '8':
-			case '9':
-						GET_DIG(fp, c);		/* MACRO - get the second digit */
-						hmot((ch - '0') * 10 + c - '0');
-
-				/* Be careful - we need to fall through here */
-
-			case 'c':						/* single ASCII character */
-						GET_CHAR(fp, c);	/* MACRO - read the character */
-						put1(c);			/* output c's APS-5 code */
-						break;
-
-			case 'h':						/* relative horizontal motion */
-			case 'H':						/* absolute horizontal motion */
-			case 'v':						/* relative vertical motion */
-			case 'V':						/* absolute vertical motion */
-			case 's':						/* set point size */
-			case 'p':						/* start a new page */
-						GET_INT(fp, n);		/* MACRO - first get an integer */
-						switch( ch )  {		/* and then process the command */
-
-							case 'h':	hmot(n);
-										break;
-
-							case 'H':	hgoto(n);
-										break;
-
-							case 'v':	vmot(n);
-										break;
-
-							case 'V':	vgoto(n);
-										break;
-
-							case 's':	setsize(t_size(n));
-										break;
-
-							case 'p':	t_page(n);
-										break;
-
-						}	/* End switch */
-						break;
-
-			case 'C':						/* process special char string */
-			case 'f':						/* set font */
-						GET_STR(fp, str);	/* MACRO - first get a string */
-						if ( ch == 'C' )
-							 put1s(str);
-						else setfont(t_font(str));
-						break;
-
-			case 'x':						/* device control function */
-						devcntrl(fp);
-						break;
-
-			case 'D':						/* drawing operation */
-			case 't':						/* text string upto newline */
-						GET_LINE(fp, buf);	/* MACRO - get rest of the line */
-						if ( ch == 'D' )
-							 drawfunct(buf, fp);
-						else t_text(buf);
-						line_number++;		/* finished with this line */
-						break;
-
-			case 'n':						/* end of line */
-			case '#':						/* comment */
-						SKIP_LINE(fp,c);	/* MACRO - skip rest of this line */
-						if ( ch == 'n' )
-							t_newline();
-						line_number++;		
-						break;
-
-			default:						/* illegal command - quit */
-						error(FATAL,"unknown input character 0%o %c", ch, ch);
-						break;				/* in case we ignore this error */
-
-		}	/* End switch */
-
-	}	/* End while */
-
-	x_stat &= ~FILE_STARTED;				/* turn off FILE_STARTED bit in x_stat */
-
-	return (0);
-}	/* End of conv */
-
-
-/*****************************************************************************/
-
-int
-drawfunct(buf, fp)
-
-
-	char	buf[];						/* drawing command */
-	FILE	*fp;
-
-
-{
-
-
-	int		n1, n2, n3, n4;				/* values are set in the MACROS */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine interprets the drawing functions that are 		*
-	 *	provided by troff. The array buf[] has been filled in by the	*
-	 *	function conv(), and it contains the drawing command line from	*
-	 *	the input file. 												*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	switch ( buf[0] )  {					/* process the command */
-
-		case 'l':							/* draw a line */
-					SCAN2(buf+1, n1, n2);	/* MACRO - get two integers */
-					drawline(n1, n2, ".");
-					break;
-
-		case 'c':							/* draw a circle */
-					SCAN1(buf+1, n1);		/* MACRO - get one integer */
-					drawcirc(n1);
-					break;
-
-		case 'e':							/* draw an ellipse */
-					SCAN2(buf+1, n1, n2);	/* MACRO - get two integers */
-					drawellip(n1, n2);
-					break;
-
-		case 'a':							/* draw an arc */
-					SCAN4(buf+1,n1,n2,n3,n4);	/* MACRO - get four integers */
-					drawarc(n1, n2, n3, n4);
-					break;
-
-		case '~':							/* draw spline curve */
-					drawwig(buf+1);
-					break;
-
-#ifdef PLOT
-		case 'p':							/* plot these points */
-					plot_points(buf+1, fp);
-					break;
-#endif
-		default:							/* don't understand the command */
-					error(FATAL, "unknown drawing function %s", buf);
-					break;					/* in case we ignore this error */
-
-	}	/* End switch */
-
-	return (0);
-}	/* End of drawfunct */
-
-
-/*****************************************************************************/
-
-int
-devcntrl(fp)
-
-
-	FILE	*fp;						/* input file descriptor */
-
-
-{
-
-
-	int		c;							/* character used in SKIP_LINE */
-	int		n;							/* integer used in GET_INT */
-	char	str[20];					/* used to hold different strings */
-	char	file[50];					/* load from this font file - maybe */
-	char	buf[50];					/* buffer used in GET_LINE etc. */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This is the interpreter for the device control language		*
-	 *	that is produced by the new troff. The parameter fp is the file	*
-	 *	descriptor for the current input file.							*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	GET_STR(fp, str);						/* read command from input file */
-
-	switch ( str[0] )  {					/* str[0] determines the command */
-
-		case 'i':							/* initialize the device */
-					fileinit();				/* read data from DESC.out */
-					t_init();				/* initialize the typesetter */
-					if ( print_banner == YES )	 /* print the job's banner */
-						t_banner();
-					break;
-
-		case 'T':							/* set device name */
-					GET_STR(fp, devname);	/* MACRO - get device string */
-					if ( strcmp(devname, "aps") != SAME_STR )
-						error(FATAL, "illegal typesetter %s", devname);
-					break;
-
-		case 't':							/* trailer - do nothing on APS-5 */
-					break;
-
-		case 'p':							/* pause - we can restart */
-		case 's':							/* stop - done with this job */
-					t_reset(str[0]);		/* reset the typesetter */
-					break;
-
-		case 'r':							/* set resolution */
-					GET_INT(fp, res);		/* MACRO - get one integer */
-					hcutoff = cutoff * res;	/* beam cutoff in device units */
-					break;
-
-		case 'f':							/* load a font */
-					GET_INT(fp, n);			/* MACRO - put font number in n */
-					GET_STR(fp, str);		/* MACRO - put font name in str */
-					GET_LINE(fp, buf);		/* MACRO - use this filename */
-					ungetc('\n', fp);		/* put '\n' back for SKIP_LINE */
-					file[0] = 0;			/* in case there is no file name */
-					SCAN_STR(buf, file);	/* MACRO - may have a file name */
-					loadfont(n, str, file);	
-					break;
-
-		case 'H':							/* set character height */
-					GET_INT(fp, n);			/* MACRO - read vertical point size */
-					t_charht(t_size(n));
-					break;
-
-		case 'S':							/* set character slant */
-					GET_INT(fp, n);			/* MACRO - read APS slant angle */
-					t_slant(n);				/* set the APS slant to n */
-					last_req_slant = n;		/* and remember this angle */
-					break;
-
-		default:							/* don't understand the command */
-					error(FATAL, "unknown device command %c", str[0]);
-					break;					/* in case we ignore this error */
-
-	}	/* End switch */
-
-	SKIP_LINE(fp, c);						/* finished with this line */
-	line_number++;
-
-	return (0);
-}	/* End of devcntrl */
-
-
-/*****************************************************************************/
-
-int
-t_init()
-
-
-{
-
-
-	int		i;							/* for loop variable */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called from devcntrl() when the command		*
-	 *	x init is read. It produces the instructions that initialize	*
-	 *	the APS, and then it sets up the picture drawing variables		*
-	 *	drawdot and drawsize.											*
-	 *																	*
-	 *																	*
-	 *		NOTE - the opcode STRTJOB is defined to be octal 272 in the	*
-	 *	file aps.h, although on our APS-5 typesetter it is one of the	*
-	 *	reserved but not implemented opcodes. 							*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	PUTC(STRTJOB, tf);					/* MACRO - output STRTJOB opcode */
-	putint(1);							/* dummy argument for STRTJOB? */
-	PUTC(STRTPG, tf);					/* MACRO - start page 0 */
-	putint(0);
-
-	hpos = vpos = 0;					/* initialize page coordinates */
-
-	for ( i = 0; i < nchtab; i++ )		/* find drawing character index */
-		if ( strcmp(&chname[chtab[i]], "l.") == SAME_STR )
-			break;
-
-	if ( i < nchtab )  {				/* found it in the table */
-		drawdot = i + 128;				/* so use these values for drawing */
-		drawsize = 1;
-	} else  {							/* didn't find it - use default */
-		drawdot = '.';
-		drawsize = 3;
-	}	/* End if */
-
-	return (0);
-}	/* End of t_init */
-
-
-/*****************************************************************************/
-
-int
-t_banner()
-
-
-{
-
-
-	int		i;							/* while loop counter */
-	char 	*bp;						/* temp pointer to banner string */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called from devcntrl() when the device		*
-	 *	initialization command is read. It is responsible for printing	*
-	 *	the job's header. This includes checking and then writing out	*
-	 *	the string pointed to by banner. The user may set this string	*
-	 *	by using either the -h or the -H options on the command line.	*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	output = ON;						/* ON for routine put1() etc. */
-	bp = banner;						/* point to start of banner string */
-	i = 0;								/* characters looked at so far */
-
-	while ( *bp )						/* check at most BAN_LENGTH chars */
-		if ( *bp++ < ' '  ||  ++i > BAN_LENGTH )	/* unprintable or too long */
-			*(--bp) = '\0';				/* so last char is as far as we go */
-
-	setsize(t_size(BAN_SIZE));			/* use font 1 and point size BAN_SIZE */
-
-	vmot(VSPACE0);						/* space down for banner cut marks */
-	t_text(cut_marks);					/* print first set of cut marks */
-	hmot(HSPACE0);						/* space right for more cut marks */
-	t_text(cut_marks);					/* print second set of cut marks */
-
-	vmot(VSPACE1);						/* skip this far before banner */
-	hgoto(HSPACE1);						/* indent */
-	t_text(ban_sep);					/* start of banner */
-
-	vmot(VSPACE2);						/* space down for banner string */
-	hgoto(HSPACE2);						/* indent */
-	t_text(banner);						/* print the user's banner */
-
-	vmot(VSPACE3);						/* skip down for next separator */
-	hgoto(HSPACE3);						/* indent */
-	t_text(ban_sep);					/* print the second separator */
-
-	vmot(VSPACE4);						/* skip down for banner cut marks */
-	hgoto(HSPACE4);						/* position for first cut marks */
-	t_text(cut_marks);					/* print first set of cut marks */
-	hmot(HSPACE0);						/* skip right for second cut marks */
-	t_text(cut_marks);					/* print second set */
-	
-	hpos = vpos = 0;					/* reset these guys again */
-	cur_vpos = max_vpos = 0;			/* user doesn't own the banner */
-	print_banner = NO;					/* don't print it again */
-	output = OFF;						/* output is controlled in t_page() */
-
-	return (0);
-}	/* End of t_banner */
-
-
-/*****************************************************************************/
-
-int
-t_page(n)
-
-
-{
-
-
-	int		i;							/* for loop index */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called from conv() to do the work that is	*
-	 *	necessary when we begin a new page. The STRTPG command to the	*
-	 *	APS-5 invokes the RESET command which sets the font to 0000,	*
-	 *	the master range to 1, and sets the oblique mode to normal and	*
-	 *	the oblique angle to 14 degrees. To reset the font and range	*
-	 *	properly we call setsize(), while if we were in oblique mode	*
-	 *	the variable aps_slant will be non-zero and so in this case		*
-	 *	we call routine t_slant() with aps_slant as the parameter.		*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	if ( output == ON  &&  ++scount >= spage )  {	/* reached stop page */
-		t_reset('p');					/* so reset the APS and then HALT */
-		scount = 0;						/* and start counting over again */
-	}	/* End if */
-
-	vpos = 0;							/* we are at the top of new page */
-	output = ON;						/* enable output in put1() etc. */
-	last_slant = POS_SLANT;				/* this will be the stored angle */
-
-	PUTC(STRTPG, tf);					/* MACRO - start page n */
-	putint(n);
-	++pageno;							/* update user's page number */
-
-	setsize(size);						/* reset both the font and size */
-	if ( aps_slant )					/* then the APS was in oblique mode */
-		t_slant(aps_slant);				/* so go back to previous slant */
-
-	if ( nolist == 0 ) return (0);			/* no -o option, so print every page */
-	output = OFF;						/* otherwise -o option was specified */
-	for ( i = 0; i < nolist; i += 2 )	/* so check page pairs in olist[] */
-		if ( n >= olist[i]  &&  n <= olist[i+1] )  {
-			output = ON;				/* enable output for this page */
-			break;
-		}	/* End if */
-
-	return (0);
-}	/* End of t_page */
-
-
-/*****************************************************************************/
-
-int
-t_newline()
-
-
-{
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called from conv() when it has read the		*
-	 *	start new line command. This command has the form "n a b" where	*
-	 *	a and b are integers that we can safely ignore for the APS-5.	*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	hpos = 0;							/* return to left margin */
-
-	return (0);
-}	/* End of t_newline */
-
-
-/*****************************************************************************/
-
-int
-t_size(n)
-
-
-	int		n;							/* convert this point size */
-
-
-{
-
-	int		i;							/* for loop index */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called to convert the point size n to an	*
-	 *	internal size, which is defined as one plus the index of the	*
-	 *	least upper bound for n in the array pstab[]. If n is larger	*
-	 *	than all the entries in pstab[] then nsizes is returned.		*
-	 *																	*
-	 *																	*
-	 *		NOTE - this routine expects the entries in pstab[] to be in	*
-	 *	increasing numerical order, but it doesn't require this list to	*
-	 *	be terminated by a 0 point size entry.							*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	if ( n >= pstab[nsizes-1] )			/* greater than all entries */
-		return(nsizes);					/* so use largest internal size */
-
-	for ( i = 0; n > pstab[i]; i++ )	/* otherwise find the LUB for n */
-		;
-	return(i+1);						/* internal size is i+1 */
-
-}	/* End of t_size */
-
-
-/*****************************************************************************/
-
-int
-t_charht(n)
-
-
-	int		n;							/* set height to this internal size */
-
-
-{
-
-
-	int		max;						/* max internal size for current range */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called by devcntrl() to set the height of	*
-	 *	the characters that are being printed to the internal size		*
-	 *	specified by the parameter n. If the requested size is too 		*
-	 *	large for the current range then an error message is written	*
-	 *	and the requested size is set to the maximum allowed in the		*
-	 *	current range. Since the APS-5 apparently allows us to decrease	*
-	 *	the height as far as we want, no lower limit checks are made on	*
-	 *	the requested size. The global variable range is set by the		*
-	 *	routine setfont() to the current master range that is being		*
-	 *	used.															*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	if ( range < 1  ||  range > MAX_RANGE )  {	/* something is wrong here */
-		error(FATAL, "illegal master range %d", range);
-		return (0);							/* in case this error is ignored */
-	}	/* End if */
-
-	max = upper_limit(range);			/* internal upper limit for range */
-
-	if ( n > max )  {					/* requested size is too big */
-		error(NON_FATAL, "size %d too large for range %d", pstab[n-1], range);
-		n = max;						/* reset n to largest allowed size */
-	}	/* End if */
-
-	PUTC(VSIZE, tf);					/* MACRO - set character height */
-	putint(10 * pstab[n-1]);			/* vertical size - in decipoints */
-
-	return (0);
-}	/* End of t_charht */
-
-
-/*****************************************************************************/
-
-int
-upper_limit(n)
-
-
-	int		n;							/* find upper limit for this range */
-
-
-{
-
-
-	int		bsize;						/* master range base size */
-	int		max;						/* maximum point size for range n */
-	int		max_internal;				/* maximum internal size for range n */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called by t_charht() and possibly others to	*
-	 *	find the maximum internal size that is allowed for master range	*
-	 *	n. The value returned to the caller is the largest internal		*
-	 *	size that is allowed in this range.								*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	bsize = BASE_SIZE(n);				/* base size for master range n */
-	max = bsize;						/* max point size if n > 3 */
-	if ( n <= 3 )						/* can scale these ranges up */
-		max = SCALE_UP(bsize);			/* to this limit on our APS-5 */
-
-	max_internal = t_size(max);			/* first try at max internal size */
-	if ( pstab[max_internal -1] > max )	/* take next lower internal size */
-		max_internal--;
-
-	return(max_internal);
-
-}	/* End of upper_limit */
-
-
-/*****************************************************************************/
-
-int
-t_slant(n)
-
-
-	int		n;							/* set the APS slant to this value */
-
-
-{
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		Called to set the slant angle to the value of the parameter	*
-	 *	n. On the APS-5 we can only set positive or negative 14 degree	*
-	 *	slants, even though in TROFF any slant angle can be requested.	*
-	 *	The global variable last_slant is the value of the last angle	*
-	 *	that was stored in the APS-5 using either the SETOBLIQUE or		*
-	 *	STRTPG commands, while aps_slant is the last angle we set in	*
-	 *	this routine.													*
-	 *																	*
-	 *		Originally we only set the oblique angle if last_slant		*
-	 *	was not equal to n. This really didn't work too well, because	*
-	 *	appaerntly the APS-5 resets the oblique angle to +14 degrees	*
-	 *	when it returns to normal mode.									*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	if ( n != 0 )  {					/* need to slant type being set */
-
-		n = ( n > 0 ) ? POS_SLANT		/* use +14 degree slant */
-					  : NEG_SLANT;		/* otherwise slant at -14 degrees */
-
-		PUTC(SETOBLIQUE, tf);			/* MACRO - store new angle n */
-		putint(10 * n);					/* APS expects 10 times the angle */
-		last_slant = n;					/* remember this stored angle */
-
-		PUTC(XOBLIQUE, tf);				/* MACRO - execute oblique mode */
-
-	}	/* End if */
-	else PUTC(XNORMAL, tf);				/* MACRO - otherwise use normal mode */
-
-	aps_slant = n;						/* angle that type is being set at */
-
-	return (0);
-}	/* End of t_slant */
-
-
-/*****************************************************************************/
-
-int
-t_font(str)
-
-
-	char	*str;						/* convert this string to font number */
-
-
-{
-
-
-	int		n;							/* integer value for number in str */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called from conv() to convert the ASCII		*
-	 *	string *str to an integer that represents a legal font number.	*
-	 *	If the resulting number is outside the allowed range for fonts	*
-	 *	on this typesetter then an error message is printed out and		*
-	 *	the program is aborted.											*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	n = atoi(str);						/* font number */
-	if ( n < 0  ||  n > nfonts )  {		/* illegal font - abort */
-		error(FATAL, "illegal font number %d", n);
-		n = font;						/* in case we don't quit on an error */
-	}	/* End if */
-
-	return(n);							/* legal value so return it */
-
-}	/* End of t_font */
-
-
-/*****************************************************************************/
-
-int
-t_text(str)
-
-
-	char	*str;						/* typeset this string of characters */
-
-
-{
-
-
-	int		ch;							/* internal character variable */
-	char	buf[4];						/* buffer used for special chars */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called by conv() to process the text string	*
-	 *	that is in the array str. Characters are read from str and		*
-	 *	written to the output file until the end of the string is		*
-	 *	reached.														*
-	 *																	*
-	 *		After the character has been put in the output file the		*
-	 *	current horizontal position is adjusted by a call to hmot()		*
-	 *	using the global variable lastw as the parameter. lastw is set	*
-	 *	in put1() and represents the width of the last character that	*
-	 *	was printed.													*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	if ( debug[2] )
-		fprintf(fp_debug,"input string = %s\n", str);
-
-	if ( output == OFF ) return (0);		/* not doing output on this page */
-
-	while ( (ch = *str++) != '\n'  &&  ch != '\0' )  {
-
-		if ( ch == '\\' )  {			/* this is a special char sequence */
-			switch ( ch = *str++ )  {	/* so check the next character */
-
-				case '(':				/* special troff character sequence */
-							buf[0] = *str++;
-							buf[1] = *str++;
-							buf[2] = '\0';
-							put1s(buf);	
-							break;
-
-				case '\\':				/* backslash character */
-				case 'e':
-							put1('\\');
-							break;
-
-				default:				/* illegal character sequence */
-							error(FATAL,"illegal character sequence \\%c", ch);
-							break;
-
-			}	/* End switch */
-		} else put1(ch);				/* otherwise it is a simple character */
-		hmot(lastw);					/* beam has moved right lastw units */
-
-		if ( debug[3] )
-			fprintf(fp_debug,"char = %c  width = %d\n", ch, lastw);
-
-	}	/* End while */
-
-	return (0);
-}	/* End of t_text */
-
-
-/*****************************************************************************/
-
-int
-t_reset(ch)
-
-
-	int		ch;							/* pause or stop */
-
-
-{
-
-
-	int		n;							/* for loop variable */
-	long	dist;						/* distance to end of job */
-	int		opcode;						/* ENDJOB or HALT */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called to produce the typesetter commands	*
-	 *	that are required at the end of a job. If the parameter ch has	*
-	 *	the value 's' then we have reached the end of the current job	*
-	 *	and so we output the ENDJOB opcode, otherwise ch should be		*
-	 *	equal to 'p', and so we produce the HALT command. This enables	*
-	 *	the operator to restart the current job by pressing the PROCEED	*
-	 *	button on the front panel, while if he hits the INITIAL button	*
-	 *	the current job will be terminated.								*
-	 *																	*
-	 *		If we have finished this job, but we are not currently at	*
-	 *	position max_vpos, we step the job forward to this position so	*
-	 *	that the next job begins on unexposed paper.					*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	output = ON;						/* probably not needed here? */
-
-	if ( ((dist = max_vpos - cur_vpos) > 0) && (ch == 's') )  {
-		dist += (pstab[nsizes-1] / 2) * 10;		/* try to get whole last line */
-		while ( dist > 0 )  {			/* go to the end of the job */
-			vmot(dist > MAX_INT ? MAX_INT : dist);
-			dist -= (dist > MAX_INT) ? MAX_INT : dist;
-		}	/* End while */
-	}	/* End if */
-
-	PUTC(STRTPG, tf);					/* MACRO - output STRTPG opcode */
-	putint(9000+pageno);				/* can't possibly be a page number */
-	
-	for ( n = 0; n < 10; n++ )			/* flush out APS internal buffer */
-		PUTC(APSNOOP, tf);				/* MACRO - put out a few no-op's */
-
-	opcode = ( ch == 'p' ) ? HALT		/* may want to restart this job */
-						   : ENDJOB;	/* done with this guy */
-
-	PUTC(opcode, tf);					/* MACRO - stop */
-
-	fflush(tf);							/* flush any buffered output */
-
-	return (0);
-}	/* End of t_reset */
-
-
-/*****************************************************************************/
-
-int
-hflush()
-
-
-{
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called in put1() and t_push() to make sure 	*
-	 *	that the two variables hpos and htrue aren't too different. If	*
-	 *	they differ by more than the constant SLOP then a tab is set 	*
-	 *	and then executed to position the beam properly.				*
-	 *																	*
-	 *		The variable hpos is the current horizontal position as 	*
-	 *	determined by troff, while htrue is the horizontal position as	*
-	 *	calculated by the post-processor.								*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	if ( output == OFF ) return (0);		/* not doing output for this page */
-
-	if ( abs(hpos - htrue) > SLOP )  {	/* positions are too different */
-		PUTC(SETTAB, tf);				/* MACRO - so set a tab */
-		putint(hpos);					/* to the current value of hpos */
-		PUTC(XTAB, tf);					/* MACRO - then execute the tab */
-		htrue = hpos;					/* the positions are the same now */
-	}	/* End if */
-
-	return (0);
-}	/* End of hflush */
-
-
-/*****************************************************************************/
-
-int
-hmot(n)
-
-
-	int		n;							/* move this far from here */
-
-
-{
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called from conv() to handle a relative		*
-	 *	horizontal motion of n units. If n is positive then we move to	*
-	 *	the right on the current line. If the final horizontal position	*
-	 *	hpos is negative then something has gone wrong and so we print	*
-	 *	out an error message and if we return from error() we set hpos	*
-	 *	to 0.															*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	if ( (hpos += n ) < 0 || hpos > hcutoff )  {		/* bad beam position */
-		error(FATAL, "illegal horizontal position %d", hpos);
-		hpos = 0;						/* in case we ignore this error */
-	}	/* End if */
-
-	return (0);
-}	/* End of hmot */
-
-
-/*****************************************************************************/
-
-int
-hgoto(n)
-
-
-	int		n;							/* move to this horizontal position */
-
-
-{
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called by conv() to set the absolute		*
-	 *	horizontal position of the beam to the position n, where n		*
-	 *	must be a positive integer.										*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	if ( (hpos = n) < 0 || hpos > hcutoff )  {		/* bad beam position */
-		error(FATAL, "illegal horizontal position %d", hpos);
-		hpos = 0;						/* in case we ignore this error */
-	}	/* End if */
-
-	return (0);
-}	/* End of hgoto */
-
-
-/*****************************************************************************/
-
-int
-vgoto(n)
-
-
-	int		n;							/* final absolute vert position */
-
-
-{
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called from conv() to position the beam at	*
-	 *	the absolute vertical position n. The unit used in all of the	*
-	 *	APS absolute spacing commands is 1/10 of a point.				*
-	 *																	*
-	 *																	*
-	 *		NOTE - it is important to check that a job doesn't try to	*
-	 *	write on a previous job by using the vertical spacing commands.	*
-	 *	Currently this check is made in the routine vmot().				*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	vmot(n - vpos);						/* move n-vpos units from here */
-
-	return (0);
-}	/* End of vgoto */
-
-
-/*****************************************************************************/
-
-int
-vmot(n)
-
-
-	int		n;							/* move n units vertically from here */
-
-
-{
-
-
-	int		i;							/* for loop variable */
-	int		sign;						/* sign of the requested motion */
-	int		dist;						/* distance left to move */
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called to move the vertical position of the	*
-	 *	beam n units from the current position. The global variable 	*
-	 *	cur_vpos is the typesetter's current vertical position as 		*
-	 *	measured from the start of the job. If the user has requested	*
-	 *	a relative vertical motion that would make cur_vpos negative	*
-	 *	we print an error message and then abort. The variable max_vpos	*
-	 *	is the maximum vertical position that this job has reached. It 	*
-	 *	is used to calculate the amount of paper that has been used.	*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	if ( output == OFF ) return (0);		/* not doing output on this page */
-
-	if ( cur_vpos + n < 0 )  {			/* trying to write on last job! */
-		error(FATAL, "can't backup past start of job");
-		return (0);							/* in case we ignore this error */
-	}	/* End if */
-
-	sign = ( n > 0 ) ? 1 : -1;			/* up or down the page */
-	dist = sign * n;					/* total distance to move */
-
-	while ( dist > 0 )  {				/* not done yet */
-		PUTC(VSPABS, tf);				/* MACRO - absolute vert motion */
-		putint(sign * ((dist > vert_step) ? vert_step : dist));
-		dist -= ( dist > vert_step ) ? vert_step : dist ;
-	}	/* End while */
-
-	vpos += n;							/* record our new vertical position */
-	cur_vpos += n;
-	if ( cur_vpos > max_vpos )			/* this is the farthest we have gone */
-		max_vpos = cur_vpos;
-
-	return (0);
-}	/* End of vmot */
-
-
-/*****************************************************************************/
-
-int
-put1s(s)
-
-
-	char	*s;							/* print this special character */
-
-
-{
-
-
-	int		i;							/* for loop index */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called to produce the typesetter output		*
-	 *	for the special character string pointed to by s. All of the	*
-	 *	special characters are listed in the charset portion of the 	*
-	 *	typsetter's DESC file, and the program makedev reads this part	*
-	 *	of the DESC file and produces two tables called chtab[] and		*
-	 *	chname[]. The character array chname[] contains the special		*
-	 *	character strings separated by '\0', while chtab[i] gives us 	*
-	 *	the starting position in chname[] for the special character i.	*
-	 *																	*
-	 *																	*
-	 *		NOTE - Since we just do a sequential search of the strings	*
-	 *	in chname[] when looking for a special character, the speed of	*
-	 *	the post-processor could be improved if we had the most common	*
-	 *	special characters at the start of the list in the DESC file.	*
-	 *	However before doing this we should find out how troff does 	*
-	 *	the lookup.														*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	if ( output == OFF ) return (0);		/* not doing output for this page */
-
-	for ( i = 0; i < nchtab; i++ )		/* lookup the special character */
-		if ( strcmp(&chname[chtab[i]], s) == SAME_STR )
-			break;
-	
-	if ( i < nchtab )  {				/* found it */
-#ifdef ADJUST
-		t_adjust(s);					/* adjust vertical positions */
-#endif
-		put1(i + 128);					/* special characters start at 128 */
-	}	/* End if */
-	else								/* didn't find it - abort */
-		if ( newfile(s, pstab[size-1]) )
-			error(FATAL, "special character %s not found", s);
-
-	if ( debug[4] )  {
-		fprintf(fp_debug,"string = %s  ", s);
-		fprintf(fp_debug,"index = %d\n", i);
-	}	/* End if */
-
-	return (0);
-}	/* End of put1s */
-
-
-/*****************************************************************************/
-
-
-#ifdef ADJUST
-
-int
-t_adjust(s)
-
-
-	char	*s;							/* look for this string */
-
-
-{
-
-
-	int		i;							/* for loop index */
-	int		incr;						/* incrment v_adjust by this much */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		Called from put1s() to look for the string *s in adj_tbl[]	*
-	 *	and if found it is used to set the appropriate vertical for the	*
-	 *	character.														*
-	 *																	*
-	 ********************************************************************/
-
-
-	v_adjust = 0;
-
-	for ( i = 0; adj_tbl[i] != '\0'; i++ )
-		if ( strcmp(s, adj_tbl[i]) == 0 )  {
-			incr = (vadjustment[i] < 0) ? -1 : 1;
-			v_adjust = (vadjustment[i] * pstab[size-1]) /dev.unitwidth + incr;
-			break;
-		}	/* End if */
-
-	return (0);
-}	/* End of t_adjust */
-
-#endif
-
-
-/*****************************************************************************/
-
-int
-put1(c)
-
-
-	int		c;							/* print this character */
-
-
-{
-
-
-	int	i;					/* c's index in font data structures */
-	int	k;					/* look for c on this font */
-	int		j;							/* lookup failed on this many fonts */
-	int		k1;							/* if not found check this font next */
-	int		code;						/* APS-5 code for this character */
-	int		old_font;					/* original font number (1..nfonts) */
-	int		old_range;					/* original master range setting */
-	int		last_range;					/* last master range setting */
-	int		old_slant;					/* original device slant angle */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is responsible for producing the output codes	*
-	 *	for the characters to be printed by the APS. The integer c		*
-	 *	is the ASCII code for the character if c < 128. Otherwise it 	*
-	 *	refers to one of troff's special character sequences. Since we	*
-	 *	are not concerned with unprintable ASCII characters we subtract	*
-	 *	32 from c to get the right index to use when we do the lookup	*
-	 *	in array fitab[][]. If the character isn't found on the current	*
-	 *	font then we search all the remaining fonts, starting with the	*
-	 *	first special font. If we haven't found the character after we	*
-	 *	search the last font then an error message is written out and	*
-	 *	we quit. Since we can't be guarenteed that font position 0 has	*
-	 *	been loaded with a valid font, we need to make sure that the	*
-	 *	circular search skips this position.							*
-	 *																	*
-	 *		If we find the character c, but it has an APS code that is	*
-	 *	larger than 128, then the makedev program has encoded some		*
-	 *	extra information in this field. Therefore we call the routine	*
-	 *	special_case() to decode this info, and return the correct APS	*
-	 *	code for c.														*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	if ( output == OFF ) return (0);		/* not doing output on this page */
-
-	old_font = font;					/* may find c on a different font */
-	old_range = last_range = range;		/* and in a different master range */
-	old_slant = aps_slant;				/* and may change the slant for c */
-
-	k = font;							/* while loop looks for c on font k */
-	k1 = smnt - 1;						/* get the next font from this guy */
-	j = 0;								/* c not found on this many fonts */
-
-	c -= 32;							/* tables don't include unprintable chars */
-
-	if ( c <= 0 )  {					/* c is a space or unprintable */
-		if ( c < 0 )   					/* can't be in any of our font tables */
-			error(FATAL, "non-printable character 0%o\n", c+32);
-
-		lastw = (widthtab[font][0] & BMASK) * pstab[size-1] / dev.unitwidth;
-		return (0);							/* lastw = space width (see t_text()) */
-	}	/* End if */
-
-
-	/* Look for character c in current font and then on the special fonts */
-
-
-	while ( (j < nfonts + 1) && ((i = fitab[k][c] & BMASK) == 0) )  {
-		k = (k1++) % nfonts + 1;		/* now check all other fonts */
-		j++;
-	}	/* End while */
-
-
-	/* If j > nfonts or i == 0 then char c not found. no-op if code = 0 */
-
-
-	if ( j > nfonts || i == 0 || (code = codetab[k][i] & BMASK) == 0 )  {
-		if ( i == 0  ||  j > nfonts )	
-			if ( c+32 < 128 || newfile(&chname[chtab[c+32-128]], pstab[size-1]) )
-				error(FATAL, "character 0%o not found", c+32);
-		return (0);
-	}	/* End if */
-
-	if ( aps_font != fontname[k].number )	/* probably need a new font */
-		if ( (code < 129) || (fontbase[font]->spare1 != fontbase[k]->spare1) )
-			CHANGE_FONT(k, last_range);
-
-	if ( code > 128  &&  fontbase[k]->spare1 )  {	/* got some more stuff to do */
-		code = special_case(i, k);		/* this is the real APS code for c */
-		last_range = range;				/* in case the range was changed */
-	}	/* End if */
-
-#ifdef ADJUST
-
-	if ( v_adjust != 0 )
-		vmot(v_adjust);
-
-#endif
-
-	hflush();							/* get to right horizontal position */
-	PUTC(code, tf);						/* MACRO - then print the character */
-
-#ifdef ADJUST
-
-	if ( v_adjust != 0 )  {
-		vmot(-v_adjust);
-		v_adjust = 0;
-	}	/* End if */
-
-#endif
-
-	if ( (last_range != old_range) || (aps_slant != old_slant) )
-		CHANGE_FONT(old_font, last_range);	/* MACRO - back to the old font */
-
-	lastw = ((widthtab[k][i] & BMASK) * pstab[size-1] + dev.unitwidth/2) / dev.unitwidth;
-	htrue += lastw;						/* approximate right side of char */
-
-	return (0);
-}	/* End of put1 */
-
-
-/*****************************************************************************/
-
-int
-putint(n)
-
-
-	int		n;							/* write out this integer */
-
-
-{
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called to write the integer n out in the	*
-	 *	last two bytes of a type two command on the APS-5 typesetter.	*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	PUTC(n >> 8, tf);					
-	PUTC(n, tf);						
-
-	return (0);
-}	/* End of putint */
-
-
-/*****************************************************************************/
-
-int
-setsize(n)
-
-
-	int		n;							/* new internal size */
-
-
-{
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called to set the current internal size to	*
-	 *	the value n, and then output the commands needed to change the	*
-	 *	APS-5 point size. The internal size n is an index into the		*
-	 *	array pstab[], which contains the actual point size that is to	*
-	 *	be used.														*
-	 *																	*
-	 *																	*
-	 *		NOTE - This routine always calls setfont in case the range	*
-	 *	has changed, but it may be the case that the range doesn't		*
-	 *	really change even though the point size has changed. Always 	*
-	 *	making this call definitely produces some unnecessary APS-5		*
-	 *	code. Probably fix it in setfont routine.						*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	if ( output == OFF ) return (0);		/* not doing output on this page */
-
-	if ( n <= 0  ||  n > nsizes )  {	/* internal size out of range */
-		error(FATAL, "illegal internal size %d", n);
-		n = size;						/* in case we return from this error */
-	}	/* End if */
-
-	size = n;							/* must preceed call to setfont() */
-	change_font(font);					/* in case the range has changed */
-	PUTC(HVSIZE, tf);					/* MACRO - set the new point size */
-	putint(10 * pstab[n-1]);			/* APS expects 10 times the size */
-
-	return (0);
-}	/* End of setsize */
-
-
-/*****************************************************************************/
-
-int
-setfont(n)
-
-
-	int		n;							/* new font's internal number */
-
-
-{
-
-
-	int		oldrange;					/* current master range */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called to set the current typesetter font	*
-	 *	to the one that corresponds to the parameter n. These internal	*
-	 *	font numbers are determined by the way the font tables are set	*
-	 *	up for the typesetter in the DESC file.							*
-	 *																	*
-	 *		Our APS-5 typesetter typically has only master ranges 1, 2,	*
-	 *	and 3. The actual font that we want to set is determined by the	*
-	 *	current value of the global variable size. Remember that this	*
-	 *	value is an internal size, which is an index into the array		*
-	 *	pstab[]. The following table gives the point sizes that can be	*
-	 *	used in the different master ranges,							*
-	 *																	*
-	 *																	*
-	 *					MASTER RANGE 1:   0 to 12						*
-	 *					MASTER RANGE 2:  12 to 24						*
-	 *					MASTER RANGE 3:  24 to 48						*
-	 *					MASTER RANGE 4:  48 to 96						*
-	 *																	*
-	 *																	*
-	 *	although any range can actually print characters up to size,	*
-	 *																	*
-	 *																	*
-	 *						1.5 * limit - 1								*
-	 *																	*
-	 *																	*
-	 *	where the value of limit is obtained from the above table.		*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	if ( output == OFF ) return (0);		/* not doing output for this page */
-
-	if ( n < 0  ||  n > nfonts )  {
-		error(FATAL, "requested font number %d out of range", n);
-		n = font;						/* in case we ignore this error */
-	}	/* End if */
-
-	oldrange = range;					/* new range may be different */
-	CHANGE_FONT(n, oldrange);			/* change the APS font */
-	font = n;							/* current internal font number */
-
-	return (0);
-}	/* End of setfont */
-
-
-/*****************************************************************************/
-
-int
-change_font(n)
-
-
-	int		n;							/* new font's internal number */
-
-
-{
-
-
-
-	int		angle;						/* slant angle - used in SETSLANT */
-	int		max_range;					/* largest range allowed on font n */
-	int		max_size;					/* largest size allowed in max_range */
-	char	f_spare1;					/* value of font flags */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called to change the font that the APS is	*
-	 *	currently setting type in. Some extra stuff is done if the font	*
-	 *	has any of its special flags set.								*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	range = get_range(pstab[size-1]);	/* probably the new range */
-
-	f_spare1 = fontbase[n]->spare1;		/* get special case font flags */
-	if ( f_spare1 & RANGE_BIT )  {		/* have a maximum range for font n */
-
-		max_range = DECODE(f_spare1, RANGE_VAL, TWO_BITS);	/* decode this range */
-		if ( range > max_range )  {		/* current range is too big */
-			max_size = upper_limit(max_range);
-			if ( size > max_size )		/* can't blow max_range up to size */
-				error(FATAL, "size %d too big for range %d", pstab[size-1], max_range);
-			range = max_range;			/* use the biggest possible range */
-		}	/* End if */
-
-	}	/* End if */
-
-	if ( f_spare1 & SLANT_BIT )			/* this font has a default slant */
-		SETSLANT(f_spare1, angle);		/* MACRO - so use it */
-	else if ( aps_slant != last_req_slant )		/* back to the last requested slant */
-		t_slant(last_req_slant);
-
-
-	PUTC(FONT, tf);						/* MACRO - set the new font and range */
-	if ( range < 3 )					/* APS expects a positive number */
-		 putint(fontname[n].number + range-1);
-	else putint(-(fontname[n].number + range-1));
-
-	aps_font = fontname[n].number;		/* font that the APS is using */
-
-	return (0);
-}	/* End of change_font */
-
-
-/*****************************************************************************/
-
-int
-t_fp(n, s, si)
-
-
-	int		n;							/* update this font position */
-	char	*s;							/* font's external name (eg. R) */
-	char	*si;						/* font number used by the APS */
-
-
-{
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called to update the data structures that	*
-	 *	are maintained by the post-processor to keep track of fonts.	*
-	 *	The parameter n is the font position that we are going to		*
-	 *	update, while s and si are the font's external and internal		*
-	 *	names.															*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	fontname[n].name = s;
-	fontname[n].number = atoi(si);
-	fontname[n].nwfont = fontbase[n]->nwfont;
-
-	return (0);
-}	/* End of t_fp */
-
-
-/*****************************************************************************/
-
-int
-account()
-
-
-{
-
-
-	char	user[L_cuserid];			/* user's login name */
-	float	pages;						/* will charge for this many pages */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This is the accounting routine for the post-processor. It	*
-	 *	may have to be changed for your particular system.				*
-	 *																	*
-	 *		NOTE - since the variable res can be changed we better use	*
-	 *	the constant RES to determine how many pages were printed.		*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	paper = max_vpos;						/* used this much paper */
-	pages = paper / (RES * PAGE_LENGTH);	/* pages that we think were used */
-
-	if ( x_stat & DO_ACCT )  {				/* got accounting to do */
-		cuserid(user);
-		fprintf(fp_acct, " user = %-10s", user);
-		fprintf(fp_acct, " paper = %-10.1f", pages);
-		x_stat &= ~DO_ACCT;					/* done the important accounting */
-		fprintf(fp_acct, "exit status = 0%-6o", x_stat);
-		if ( tf == stdout )
-			fprintf(fp_acct, "  ??");
-		fprintf(fp_acct, "\n");
-	}	/* End if */
-
-	if ( report == YES )
-		fprintf(stderr, " %-3.1f pages\n", pages);
-
-	return (0);
-}	/* End of account */
-
-
-/*****************************************************************************/
-
-int
-special_case(index, font)
-
-
-	int		index;						/* char position in tables */
-	int		font;						/* char info is on this font */
-
-
-{
-
-
-	int		old_range;					/* saved value of current range */
-	int		old_font;					/* present APS-5 font number */
-	int		req_font;					/* requested APS-5 font number */
-	int		max_range;					/* max allowed range for character */
-	int		max_size;					/* max size allowed for max_range */
-	int		angle;						/* special char angle to set */
-	int		code;						/* old code - with bits set */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called by put1() to handle the special any	*
-	 *	special case characters for the APS-5. 							*
-	 *																	*
-	 *		Taken on its own, this is a very confusing routine, but one	*
-	 *	which I found from my experience with the APS-5 at Murray Hill	*
-	 *	was definitely needed. I'll try to give a brief, but hopefully	*
-	 *	complete explination here.										*
-	 *																	*
-	 *		The additions that I made here needed to be completely		*
-	 *	transparent to troff, and so the only field in the font tables	*
-	 *	that could be changed was the actual charater code, since troff	*
-	 *	can't possibly need this stuff (it's device independent!). On	*
-	 *	the APS-5, character codes lie between 1 and 128 (inclusive) -	*
-	 *	anything else is an actual function code. Therefore when we are	*
-	 *	ready to print a character in put1(), and we find that its code	*
-	 *	is larger than 128 we know something more has to be done. This	*
-	 *	routine is then called to try to make sense out of the code,	*
-	 *	do any of the special stuff required for this character, and	*
-	 *	finially return its real code. This extra stuff can include		*
-	 *	changing the character's slant, ensuring that the current		*
-	 *	master range is not larger than a given value (max_range), and	*
-	 *	finially getting the actual character from a completely			*
-	 *	different font (alternate_font). What we actually do for each	*
-	 *	special character is determined by its code in the current		*
-	 *	set of font tables. This code is produced by a special version	*
-	 *	of the makedev program, which I changed to interpret some 		*
-	 *	extra fields in the ASCII font tables.					 		*
-	 *																	*
-	 *																	*
-	 *		NOTE - This extra stuff is costly, and should only be used	*
-	 *	when absolutely necessary. The alternate font stuff can			*
-	 *	cause many extra font changes, which in turn will force extra	*
-	 *	disk accesses. We found this to be one of the main reasons for	*
-	 *	slow jobs on our APS, not to mention the extra wear on the disk	*
-	 *	drive.															*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	if ( fontname[font].number != alt_tables )	/* don't have font's table */
-		load_alt(font);							/* load font's '.add' tables */
-
-	code = codetab[font][index] & BMASK;	/* encoded character information */
-	old_range = range;						/* current typesetter range */
-	old_font = aps_font;					/* quick change - fix it later */
-	req_font = old_font;
-
-	if ( code & SLANT_BIT )				/* special slant for this character */
-		SETSLANT(code, angle);			/* MACRO - set slant to encoded value */
-
-	if ( code & RANGE_BIT )  {			/* maximum range specified */
-
-		max_range = DECODE(code, RANGE_VAL, TWO_BITS);
-		range = get_range(pstab[size-1]);	/* get range for current size */
-		if ( range > max_range )  {		/* check current size first */
-			max_size = upper_limit(max_range);
-			if ( size > max_size )		/* too big for max_range - abort */
-				error(FATAL, "size %d too large for range %d", pstab[size-1], max_range);
-			else range = max_range;		/* set the range */
-		}	/* End if */
-
-	}	/* End if */
-
-	if ( code & FONT_BIT )				/* alternate font specified */
-		req_font = alt_font[index];		/* APS-5 alternate font number */
-
-	if ( (old_range != range) || (req_font != old_font) )  {	
-
-		aps_font = req_font;
-		PUTC(FONT, tf);					/* set new font */
-		if ( range < 3 )				/* output positive number */
-			putint(req_font + range - 1);
-		else putint(-(req_font + range - 1));
-		if ( range != old_range )  {	/* Need to set the size */
-			PUTC(HVSIZE, tf);			/* MACRO - set the point size */
-			putint(10 * pstab[size-1]);
-		}	/* End if */
-
-	}	/* End if */
-
-	return(alt_code[index] & BMASK);
-
-}	/* End of special_case */
-
-
-/*****************************************************************************/
-
-int
-get_range(n)
-
-
-	int		n;							/* find the range for this point size */
-
-
-{
-
-
-	int		val;						/* return this as the range */
-	int		msize;						/* size for master range val */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called to return the range corresponding to	*
-	 *	the point size n. Note that n is not an internal size for this	*
-	 *	routine.														*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	val = 0;
-
-	while ( ++val <= MAX_RANGE )  {
-		msize = BASE_SIZE(val);			/* base size for master range val */
-		if ( (val == MAX_RANGE) && (val <= 3) )		/* scale it up */
-			msize = SCALE_UP(msize);
-		if ( n <= msize ) return(val);	/* found the correct master range */
-	}	/* End while */
-
-	error(FATAL, "size %d too large", n);
-	return(1);							/* in case we ignore this error */
-
-}	/* End of get_range */
-
-
-/*****************************************************************************/
-
-int
-fileinit()
-
-
-{
-
-
-	int		fin;						/* input file descriptor */
-	int		nw;							/* number of font table entries */
-	int		i;							/* for loop index */
-	char	*malloc();					/* memory allocation routine */
-	char	*filebase;					/* pointer to memory block */
-	char	*p;							/* pointer used to set up tables */
-	char	temp[60];					/* pathname of the DESC.out file */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is responsible for reading the DESC.out file	*
-	 *	for the APS-5 typesetter, and then initializing the appropriate	*
-	 *	data structures for the device and all of the default fonts		*
-	 *	that were mentioned in the typesetter description file DESC.	*
-	 *																	*
-	 *		First the DESC.out file is opened and the structure dev is	*
-	 *	initialized from the first part of the file. This structure 	*
-	 *	then contains all the information needed to enable us to finish	*
-	 *	the initialization process. Next the rest of the file is read	*
-	 *	in and the device tables pstab[], chtab[], and chname[] are set	*
-	 *	up. After this has been done we enter a loop which handles the	*
-	 *	initialization for all of the fonts that were mentioned in the	*
-	 *	DESC file. Finially we allocate enough memory so that font		*
-	 *	position 0 can be loaded with the tables from any valid font 	*
-	 *	in the library.													*
-	 *																	*
-	 *																	*
-	 *		NOTE - the program 'makedev' creates all of the '.out' 		*
-	 *	files in the troff font library. This routine quite obviously	*
-	 *	depends on how 'makedev' has written these files. In addition	*
-	 *	the troff program also reads the '.out' files and it too 		*
-	 *	expects the same format as we do here! To really understand		*
-	 *	this routine you need to look at 'makedev.c' and the ASCII		*
-	 *	tables in the troff font library.								*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	sprintf(temp, "%s/dev%s/DESC.out", fontdir, devname);
-	if ( (fin = open(temp, 0)) < 0 )	/* file didn't open - abort */
-		error(FATAL, "can't open tables for %s", temp);
-
-	READ(fin, &dev, sizeof(struct dev));	/* init dev structure */
-
-	nsizes = dev.nsizes;				/* number of point sizes specified */
-	nchtab = dev.nchtab;				/* number of char table entries */
-	nfonts = dev.nfonts;				/* number of default fonts */
-
-	if ( nfonts > NFONT )				/* need to redefine NFONT */
-		error(FATAL, "internal error - constant NFONT too small");
-
-	filebase = malloc(dev.filesize);	/* space for rest of the file */
-	READ(fin, filebase, dev.filesize);	/* read in the rest of the file */
-
-	pstab = (short *) filebase;			/* point size list is first */
-	chtab = pstab + nsizes + 1;			/* next comes chtab list */
-	chname = (char *) (chtab + dev.nchtab);	/* then the char table list */
-
-	p = chname + dev.lchname;			/* start of font table info */
-
-	for (i = 1; i <= nfonts; i++)  {	/* set up default font tables */
-
-		fontbase[i] = (struct Font *) p;
-		nw = *p & BMASK;				/* width count comes first */
-
-		if (smnt == 0  &&  fontbase[i]->specfont == 1)
-			smnt = i;					/* this is first special font */
-
-		p += sizeof(struct Font);		/* font structure was written first */
-		widthtab[i] = p;				/* next is this font's width table */
-		codetab[i] = p + 2 * nw;		/* skip kern to get the code table */
-		fitab[i] = p + 3 * nw;			/* last is the font index table */
-
-		p += 3 * nw + dev.nchtab + 128 - 32;	/* point to next font */
-
-		t_fp(i, fontbase[i]->namefont, fontbase[i]->intname);
-
-		if ( debug[5] ) fontprint(i);	/* dump font tables */
-
-	}	/* End for */
-
-	if ( smnt == 0 ) 					/* no special fonts specified */
-		smnt = nfonts + 1;				/* used in routine put1() */
-
-	fontbase[0] = (struct Font *) malloc(3*255 + dev.nchtab + (128-32) + sizeof(struct Font));
-	widthtab[0] = (char *) fontbase[0] + sizeof(struct Font);
-	fontbase[0]->nwfont = 255;
-	close(fin);
-
-	return (0);
-}	/* End of fileinit */
-
-
-/*****************************************************************************/
-
-int
-fontprint(i)
-
-
-	int		i;							/* index of font to print out */
-
-
-{
-
-
-	int		j;							/* for loop variable */
-	int		n;							/* number of width entries */
-	int		pos;						/* position of char from fitab array */
-	int		count;						/* count of characters in this font */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This is a debugging routine that is used to dump all of the	*
-	 *	information about font i that was loaded from the '.out' file.	*
-	 *	It is called from fileinit() when the debug flag 5 is turned 	*
-	 *	on, and from loadfont when flag 6 is set.						*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	n = fontbase[i]->nwfont & BMASK;	/* number of width entries */
-
-	fprintf(fp_debug, "\nDUMP FOR FONT %s ", fontbase[i]->namefont);
-	fprintf(fp_debug, "   FONT POSITION = %d\n\n", i);
-	fprintf(fp_debug, "  font structure data:\n");
-	fprintf(fp_debug, "\t\tfont.nwfont = %d\n", fontbase[i]->nwfont & BMASK);
-	fprintf(fp_debug, "\t\tfont.specfont = %d\n", fontbase[i]->specfont & BMASK);
-	fprintf(fp_debug, "\t\tfont.ligfont = %d\n", fontbase[i]->ligfont & BMASK);
-	fprintf(fp_debug, "\t\tfont.spare1 = %d\n", fontbase[i]->spare1 & BMASK);
-	fprintf(fp_debug, "\t\tfont.intname = %s\n\n", fontbase[i]->intname);
-
-	fprintf(fp_debug, "  CHAR     WIDTH      CODE     INDEX\n");
-	count = 0;
-
-	for (j = 0; j < dev.nchtab + 128 - 32; j++)  {	 
-
-		if ( (pos = fitab[i][j] & BMASK) != 0 )  {
-			count++;
-			if ( j >= 96 )					/* special chars start at 128-32 */
-				 fprintf(fp_debug, "%5s", &chname[chtab[j-96]]);
-			else fprintf(fp_debug, "%5c", (j + 32) & BMASK);
-			fprintf(fp_debug, "%10d", widthtab[i][pos] & BMASK);
-			fprintf(fp_debug, "%10d", codetab[i][pos] & BMASK);
-			fprintf(fp_debug, "%10d", j);
-			if ( alt_tables == fontname[i].number )		/* print extra info */
-				fprintf(fp_debug, "%10d%10d", alt_code[pos] & BMASK, alt_font[pos]);
-			fprintf(fp_debug,"\n");
-		}	/* End if */
-
-	}	/* End for */
-
-	fprintf(fp_debug, "\n CHARACTER COUNT FOR THIS FONT = %d\n", count);
-	fprintf(fp_debug, "\n\n");
-
-	return (0);
-}	/* End of fontprint */
-
-
-/*****************************************************************************/
-
-int
-loadfont(num, name, fdir)
-
-
-	int		num;						/* font position to load */
-	char	*name;						/* name of the font to load */
-	char	*fdir;						/* name of directory to load from? */
-
-
-{
-
-
-	int		fin;						/* font file descriptor */
-	int		nw;							/* width entries in new font file */
-	int		norig;						/* width entries in old font file */
-	char	temp[60];					/* path name of font file */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called to load the font position num with	*
-	 *	the data for the font name. If the string fdir is not null then	*
-	 *	it is taken as the pathname of the directory that contains the	*
-	 *	'.out' file for the font that we are to load, otherwise we load	*
-	 *	this data from the standard font library.						*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	if ( num < 0  ||  num > NFONT )		/* illegal font number - abort */
-		error(FATAL, "illegal fp command %d %s", num, name);
-
-	if ( strcmp(name, fontbase[num]->namefont) == SAME_STR )	/* in already */
-		return (0);
-
-	if ( fdir == NULL  ||  fdir[0] == '\0' )	/* no alternate directory */
-		 sprintf(temp, "%s/dev%s/%s.out", fontdir, devname, name);
-	else sprintf(temp, "%s/%s.out", fdir, name);
-
-	if ( (fin = open(temp, 0)) < 0 )			/* open the font file */
-		error(FATAL, "can't open font table %s", temp);
-
-	norig = fontbase[num]->nwfont & BMASK;	/* 'space' available in pos num */
-	READ(fin, fontbase[num], 3*norig + nchtab+128-32 + sizeof(struct Font));
-	nw = fontbase[num]->nwfont & BMASK;		/* 'space' needed for new font */
-	if ( nw > norig )						/* new font is too big - abort */
-		error(FATAL, "font %s too big for position %d", name, num);
-
-	close(fin);
-	widthtab[num] = (char *) fontbase[num] + sizeof(struct Font);
-	codetab[num] = (char *) widthtab[num] + 2 * nw;
-	fitab[num] = (char *) widthtab[num] + 3 * nw;
-	t_fp(num, fontbase[num]->namefont, fontbase[num]->intname);
-
-	fontbase[num]->nwfont = norig;			/* save size of position num */
-
-	if ( debug[6] ) fontprint(num);			/* dump font position num */
-
-	return (0);
-}	/* End of loadfont */
-
-
-/*****************************************************************************/
-
-int
-load_alt(font)
-
-
-	int		font;						/* load '.add' tables for this font */
-
-
-{
-
-
-	int		nw;							/* number of width entries for font */
-	int		fin;						/* font file descriptor */
-	char	cmd[60];					/* room for font's .add file */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		This routine is called to read in the '.add' file for the	*
-	 *	font that is loaded in the position specified by the parameter	*
-	 *	font. These '.add' files are created by the special version of	*
-	 *	the makedev program, which reads and interprets several extra	*
-	 *	fields in the APS font tables. Included in the '.add' files are	*
-	 *	the alternate font table and the APS-5 character code table.	*
-	 *																	*
-	 ********************************************************************/
-
-
-
-	sprintf(cmd, "%s/dev%s/%s.add", fontdir, devname, fontname[font].name);
-
-	if ( (fin = open(cmd, 0)) < 0 )		/* couldn't open the file */
-		error(FATAL, "can't open file %s", cmd);
-
-	nw = fontname[font].nwfont & BMASK;			/* number of width entries */
-
-	READ(fin, alt_font, nw * sizeof(alt_font[0]));
-	READ(fin, alt_code, nw);			/* read alternate code table */
-
-	close(fin);
-	alt_tables = fontname[font].number;	/* read in tables for this font */
-
-	if ( debug[7] )						/* print all the font information */
-		fontprint(font);
-
-	return (0);
-}	/* End of load_alt */
-
-
-/*****************************************************************************/
--- a/usr/src/cmd/troff/troff.d/devaps/daps.g	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,212 +0,0 @@
-/*
- * 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.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/*
- * Copyright 1989 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-/*
- * University Copyright- Copyright (c) 1982, 1986, 1988
- * The Regents of the University of California
- * All Rights Reserved
- *
- * University Acknowledgment- Portions of this document are derived from
- * software developed by the University of California, Berkeley, and its
- * contributors.
- */
-
-
-	/********************************************************************
-	 *																	*
-	 *				POST-PROCESSOR GLOBAL VARIABLES						*
-	 *																	*
-	 ********************************************************************/
-
-
-
-short 	debug[MAX_DEBUG];				/* array of debug flags */
-
-short 	privelege = ON;					/* is user priveleged */
-
-short	x_stat = 0;						/* program exits with this status */
-
-short	ignore = NO;					/* don't ignore fatal errors */
-short	report = NO;					/* just report results */
-short	busyflag = OFF;					/* report typesetter availability */
-short	waitflag = OFF;					/* wait for typesetter */
-
-short	output = OFF;					/* ON if we do output for this page */
-
-int		nolist = 0;						/* number of page pairs in olist[] */
-
-int		olist[MAX_OUTLIST];				/* list of pages to process */
-
-int		spage = 9999;					/* stop every spage pages */
-
-int		scount = 0;						/* spage counter */
-
-int		arg_index = 0;					/* offset from argv for next argument */
-
-long	line_number = -1;				/* current line in input file */
-
-int		lastw;							/* width of last printed character */
-
-int		pageno = 0;						/* current page number */
-long	paper = 0;						/* amount of paper used */
-
-char	*banner = "\0";					/* pointer to banner string */
-char	ban_buf[BAN_LENGTH];			/* buffer for banner read from file */
-short	print_banner = NO;				/* print the job's banner? */
-char	*cut_marks = "--";				/* string used for cut marks */
-char	*ban_sep = "\\(en \\(en \\(en \\(en \\(en \\(en \\(en \\(en \\(en \\(en";
-
-short	last_slant = 0;					/* last slant stored in the APS-5 */
-short	last_req_slant = 0;				/* last requested slant from troff */
-short	aps_slant = 0;					/* current slant angle for type */
-int		aps_font = 0;					/* font that the APS is using */
-
-short	range = 1;						/* current master range */
-
-
-char	devname[NAME_LENGTH] = "aps";	/* name of phototypesetter */
-
-char	*typesetter = "/dev/null";		/* should be /dev/aps */
-char	*tracct = "";					/* accounting file pathname */
-char	*fontdir = "/usr/lib/font";			/* font directory */
-
-int		alt_tables = 0;					/* which font has alt tables loaded */
-int		alt_font[FSIZE];				/* alternate font table */
-char	alt_code[FSIZE];				/* alternate code table */
-
-short	*pstab;							/* point size list */
-short	*chtab;							/* char's index in chname array */
-char	*chname;						/* special character strings */
-char	*fitab[NFONT+1];				/* chars position on a font */
-char	*widthtab[NFONT+1];				/* character's width on a font */
-char	*codetab[NFONT+1];				/* APS-5 code for character */
-
-int		nsizes;							/* number of sizes from DESC.out */
-int		nfonts;							/* number of default fonts */
-int		nchtab;							/* number of special chars in chtab */
-int		smnt = 0;						/* index of first special font */
-int		res = 723;						/* DESC.out res should equal this */
-
-int		size = 1;						/* current internal point size */
-int		font = 1;						/* current font number */
-
-int		hpos;							/* troff calculated horiz position */
-int		htrue = 0;						/* our calculated horiz position */
-int		vpos;							/* current vertical position (down positive) */
-int		hcutoff = HCUTOFF;				/* horizontal cutoff in device units */
-double	cutoff = CUTOFF;				/* horizontal beam cutoff in inches */
-long	cur_vpos = 0;					/* current distance from start of job */
-long	max_vpos = 0;					/* maximum distance from start of job */
-
-
-int		DX = 3;							/* step size in x for drawing */
-int		DY = 3;							/* step size in y for drawing */
-int		drawdot = '.';					/* draw with this character */
-int		drawsize = 1;					/* shrink by this factor when drawing */
-
-
-struct	{								/* font position information */
-			char	*name;				/* external font name */
-			int		number;				/* internal font name */
-			int		nwfont;				/* width entries - load_alt uses it */
-}	fontname[NFONT+1];
-
-struct dev	dev;						/* store APS data here from DESC.out */
-
-struct Font	*fontbase[NFONT+1];			/* point to font data from DESC.out */
-
-
-FILE	*fp_debug = stderr;				/* debug file descriptor */
-FILE	*fp_error = stderr;				/* error message file descriptor */
-FILE	*fp_acct = stderr;				/* accounting file descriptor */
-FILE	*tf = stdout;					/* typesetter output file */
-
-int		horig;							/* not really used */
-int		vorig;
-
-int		vert_step = MAX_INT;			/* break up vert steps larger than this */
-
-
-
-/*****************************************************************************/
-
-
-
-#ifdef ADJUST							/* do the vertical adjustments */
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		Some of the characters on the current APS disk at Murray	*
-	 *	Hill are quite bad. In particular lf, rf, lb, and rb are all	*
-	 *	too low, so that braces built up from them don't join properly.	*
-	 *	The data structures that follow are used to make the proper		*
-	 *	vertical adjustment for problem characters such as these. They	*
-	 *	are only used in routines put1s() and put1(). The code in these	*
-	 *	two routines that was added to handle these special cases		*
-	 *	should be removed or commented out when the characters are		*
-	 *	finially fixed! In addition routine t_adjust() was written		*
-	 *	to do the lookup in these tables and set the appropriate value	*
-	 *	for v_adjust - it can be removed whenever you no longer need	*
-	 *	these vertical adjustments.										*
-	 *																	*
-	 *		All of this vertical adjustment stuff is included in the	*
-	 *	object code when the conditional compilation flag ADJUST is		*
-	 *	defined. To eliminate the overhead of these adjustments just	*
-	 *	remove the definition of ADJUST from daps.h.					*
-	 *																	*
-	 ********************************************************************/
-
-
-
-int		v_adjust = 0;					/* vert adjustment - done in put1() */
-
-char	*adj_tbl[] = {					/* adjust these characters */
-			"lf",
-			"rf",
-			"lb",
-			"rb",
-			"lt",
-			"rt",
-			0,
-};
-
-int		vadjustment[] = {				/* corresponding vert adjustment */
-			-1,
-			-1,
-			-3,
-			-3,
-			1,
-			1,
-			0,
-};
-
-
-#endif
-
--- a/usr/src/cmd/troff/troff.d/devaps/daps.h	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,390 +0,0 @@
-/*
- * 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.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 1989 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/*
- * University Copyright- Copyright (c) 1982, 1986, 1988
- * The Regents of the University of California
- * All Rights Reserved
- *
- * University Acknowledgment- Portions of this document are derived from
- * software developed by the University of California, Berkeley, and its
- * contributors.
- */
-
-
-
-
-	/********************************************************************
-	 *																	*
-	 *		The following defined constants and macros must be properly	*
-	 *	set up for your APS-5 photo-typesetter.							*
-	 *																	*
-	 ********************************************************************/
-
-
-
-#define	ADJUST			1			/* conditional compilation flag */
-
-#define	LENS3			1			/* used for conditional compilation */
-#define	MAX_RANGE		3			/* largest master range on this APS-5 */
-
-
-
-#ifdef LENS1						/* standard 2.22X lens */
-
-#define	RANGE1_SIZE		10			/* used in macro BASE_SIZE */
-#define	SCALEFACTOR		1.25		/* can scale lower ranges up this far */
-
-
-#define	BASE_SIZE(Range)			/* base size for master range Range */	\
-																			\
-		(RANGE1_SIZE * (1 << (Range - 1)))
-
-
-#define	SCALE_UP(Bsize)				/* max size for lower ranges */			\
-																			\
-		(Bsize * SCALEFACTOR)
-
-#endif
-
-
-
-#ifdef LENS2						/* standard 2.667X lens */
-
-#define	RANGE1_SIZE		12			/* master range 1 base size */
-#define	SCALEFACTOR		1.25		/* can scale lower ranges up this far */
-
-
-#define	BASE_SIZE(Range)			/* base size for master range Range */	\
-																			\
-		(RANGE1_SIZE * (1 << (Range - 1)))
-
-
-#define	SCALE_UP(Bsize)				/* max size for lower ranges */			\
-																			\
-		(Bsize * SCALEFACTOR)
-
-#endif
-
-
-#ifdef LENS3						/* 2.667X lens - special case */
-
-#define	RANGE1_SIZE		12			/* master range 1 base size */
-#define	SCALEFACTOR		1.50		/* can scale lower ranges up this far */
-
-
-#define	BASE_SIZE(Range)			/* base size for master range Range */	\
-																			\
-		(RANGE1_SIZE * (1 << (Range - 1)))
-
-
-#define	SCALE_UP(Bsize)				/* max size for lower ranges */			\
-																			\
-		(Bsize * SCALEFACTOR - 1)
-
-#endif
-
-
-
-
-	/********************************************************************
-	 *																	*
-	 *				POST-PROCESSOR DEFINED CONSTANTS					*
-	 *																	*
-	 ********************************************************************/
-
-
-
-#define	NON_FATAL		0				/* don't abort the job */
-#define	FATAL			1				/* fatal error - abort the job */
-#define	OFF				0				/* debug mode is off */
-#define ON				1				/* debug mode is on */
-#define	NO				0				/* don't ignore fatal errors - debug */
-#define	YES				1				/* ignore fatal errors - debug only! */
-#define	SAME_STR		0				/* strings are the same */
-
-#define	RES				723.0			/* use this constant for accounting! */
-#define	PAGE_LENGTH		11.0			/* inches per page for accounting */
-
-#define	CUTOFF			10.0			/* beam cutoff position (inches) */
-#define	HCUTOFF			7230			/* beam cutoff in device units */
-
-
-#define	BMASK			0377			/* used for character mask */
-
-#define MAX_INT			30000			/* used in t_reset() */
-#define	MAX_DEBUG		20				/* number of debug states */
-
-#define	MAX_OUTLIST		30				/* number of page pairs olist array */
-
-#define	NAME_LENGTH		10				/* max length of typesetter name */
-
-#define	FSIZE			200				/* size of a physical font */
-
-#define	SLOP			2				/* error factor used in hflush() */
-
-#define	NFONT			10				/* number of font positions available */
-
-#define	POS_SLANT		14				/* angle used for positive slants */
-#define	NEG_SLANT		-14				/* angle used for negative slants */
-
-#define	TWO_BITS		3				/* mask for two rightmost bits */
-
-#define	BIT0			1				/* mask for bit 0 */
-#define	BIT1			2				/* mask for bit 1 */
-#define	BIT2			4				/* mask for bit 2 */
-#define	BIT3			8				/* mask for bit 3 */
-
-#define	SLANT_BIT		BIT0			/* slant bit is bit 0 */
-#define	FONT_BIT		BIT1			/* alternate font is bit 1 */
-#define	RANGE_BIT		BIT2			/* max range is bit 2 */
-
-#define	SLANT_VAL		3				/* slant angle starts in bit 3 */
-#define	RANGE_VAL		5				/* range value starts in bit 5 */
-
-#define	DO_ACCT			BIT0			/* still have to do accounting if on */
-#define	FILE_STARTED	BIT1			/* file started but not completed */
-#define	NO_OUTFILE		BIT2			/* no output file if on */
-#define	NO_ACCTFILE		BIT3			/* no accounting file if on */
-
-#define	BAN_LENGTH		130				/* max length of banner string */
-#define	BAN_SIZE		10				/* point size to use in banner */
-
-#define	VSPACE0			6				/* space down for first cut marks */
-#define	VSPACE1			180				/* space at start of banner */
-#define	VSPACE2			180				/* space before printing user string */
-#define	VSPACE3			180				/* space before printing separator */
-#define	VSPACE4			180				/* space before starting user job */
-
-#define	HSPACE0			5346			/* space right for second cut marks */
-#define	HSPACE1			50				/* indent before first separator */
-#define	HSPACE2			100				/* indent before user string */
-#define	HSPACE3			50				/* indent before second separator */
-#define	HSPACE4			0				/* start cut marks at this position */
-
-
-
-
-	/********************************************************************
-	 *																	*
-	 *						POST-PROCESSOR MACROS						*
-	 *																	*
-	 ********************************************************************/
-
-
-
-
-#define	SET_ARGS(save)			/* set up internal argc and argv */			\
-																			\
-		save = argc;			/* save current value of argc */			\
-		argc -= arg_index;		/* count arguments read already */			\
-		argv += arg_index
-
-
-
-
-#define	COUNT_ARGS(save)		/* count the arguments processed */			\
-																			\
-		arg_index = save - argc		/* arg_index counts the arguments */
-
-
-
-
-#define	STR_CONVERT(s,i)		/* convert string s to integer i */			\
-																			\
-		do  {																\
-			i = 0;															\
-			do																\
-				i = 10 * i + *s++ - '0';									\
-			while ( isdigit(*s) );											\
-		}	while ( 0 )	
-
-
-
-
-#define	TOGGLE(a)				/* toggle the value in argument a */		\
-																			\
-		a = (a + 1) % 2
-
-
-
-
-#define GET_DIG(fp,c)			/* get a single ASCII digit */				\
-																			\
-		c = getc(fp);														\
-		if ( !isdigit(c)  ||  c == EOF )	/* illegal character */			\
-			error(FATAL, "internal error - digit not found in GET_DIG")
-
-
-
-
-#define GET_CHAR(fp,c)			/* get a single ASCII character */			\
-																			\
-		if ( (c = getc(fp)) == EOF )		/* end of file - abort */		\
-			error(FATAL, "internal error - char not found in GET_CHAR")
-
-
-
-
-#define GET_INT(fp,n)			/* get an integer from file fp */			\
-																			\
-		if ( fscanf(fp, "%d", &n) != 1 )	/* end of file - abort */		\
-			error(FATAL,"internal error - integer not found in GET_INT")
-
-
-
-
-#define GET_STR(fp,str)			/* get a string from file fp */				\
-																			\
-		if ( fscanf(fp, "%s", str) != 1 )		/* end of file - abort */	\
-			error(FATAL, "internal error - string not found in GET_STR")
-
-
-
-
-#define GET_LINE(fp,buf)		/* read a line from file fp into buf */		\
-																			\
-		if ( fgets(buf, sizeof(buf), fp) == NULL )							\
-			error(FATAL, "internal error - line not found in GET_LINE")
-
-
-
-
-#define SKIP_LINE(fp,c)			/* skip to the next line of the file fp */	\
-																			\
-		while ( ((c = getc(fp)) != '\n')  &&  c != EOF )					\
-			;
-
-
-
-
-#define SCAN1(buf,n1)			/* read one number from buf */				\
-																			\
-		if ( sscanf(buf, "%d", &n1) != 1 )									\
-			error(FATAL, "internal error - integer not found in SCAN1")
-
-
-
-
-#define SCAN2(buf,n1,n2)		/* read two numbers from buf */				\
-																			\
-		if ( sscanf(buf, "%d %d", &n1, &n2) != 2 )							\
-			error(FATAL, "internal error - integers not found in SCAN2")
-
-
-
-
-#define SCAN3(buf,n1,n2,n3)		/* read three numbers from buf */			\
-																			\
-		if ( sscanf(buf, "%d %d %d", &n1, &n2, &n3) != 3 )					\
-			error(FATAL, "internal error - integers not found in SCAN3")
-
-
-
-
-#define SCAN4(buf,n1,n2,n3,n4)	/* read four numbers from buf */			\
-																			\
-		if ( sscanf(buf, "%d %d %d %d", &n1, &n2, &n3, &n4) != 4 )			\
-			error(FATAL, "internal error - integers not found in SCAN4")
-
-
-
-
-#define	SCAN_STR(buf,str)		/* read a string from buf */				\
-																			\
-		sscanf(buf, "%s", str)
-
-
-
-
-#ifdef pdp11					/* sign extension problems on pdp11s */
-
-#define	PUTC(ch, fp)			/* don't check for error if ch = 0377 */	\
-																			\
-		if ( (putc(ch, fp) == EOF) && ((ch & BMASK) != 0377) )				\
-			error(FATAL, "internal error - PUTC can't output character")
-
-#else							/* don't worry about char 0377 */
-
-#define	PUTC(ch, fp)			/* write character ch to file fp */			\
-																			\
-        if ( putc(ch, fp) == EOF )      /* error in writing to fp */        \
-            error(FATAL, "internal error - PUTC can't output character")
-
-#endif
-
-
-
-
-#define	READ(fd, buf, n)		/* read n chars from file fd into buf */	\
-																			\
-		if ( read(fd, buf, n) < 0 )		/* error in reading from fd */		\
-			error(FATAL, "internal error - READ can't read input file")
-
-
-
-
-#define	DECODE(value, start, bitmask)										\
-																			\
-		(value >> start) & bitmask							
-
-
-
-
-#define	CHANGE_FONT(newfont, oldrange)		/* set font to newfont */		\
-																			\
-		do {																\
-			change_font(newfont);											\
-			if ( oldrange != range )  {		/* range has changed */			\
-				PUTC(HVSIZE, tf);			/* so set the point size */		\
-				putint(10*pstab[size-1]);	/* to current size */			\
-				oldrange = range;											\
-			}	/* End if */												\
-		}	while ( 0 )
-
-
-
-
-#define	SETSLANT(code, angle)	/* set slant to value encoded in code */	\
-																			\
-		do {																\
-			angle = DECODE(code, SLANT_VAL, TWO_BITS);						\
-			if ( angle & BIT0 )			/* have positive APS-5 slant */		\
-				angle = POS_SLANT;											\
-			else if ( angle & BIT1 )	/* have negative slant */			\
-				angle = NEG_SLANT;											\
-			t_slant(angle + last_req_slant);	/* set the correct slant */	\
-		} while ( 0 )
-
-
-
-
--- a/usr/src/cmd/troff/troff.d/devaps/makedev.c	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,637 +0,0 @@
-/*
- * 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.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-/*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/*
- * University Copyright- Copyright (c) 1982, 1986, 1988
- * The Regents of the University of California
- * All Rights Reserved
- *
- * University Acknowledgment- Portions of this document are derived from
- * software developed by the University of California, Berkeley, and its
- * contributors.
- */
-
-/*
- *  This is a special version of makedev, tailored for the font disk
- *	of the APS-5 in the MH Computing Center.  It is not to be used
- *	to set up font description files for other devices.
- *
- * makedev:
- *	read text info about a particular device
- *	(e.g., cat, 202, aps5) from file, convert
- *	it into internal (binary) form suitable for
- *	fast reading by troff initialization (ptinit()).
- *
- *	Usage:
- *
- *	makedev DESC [ F ... ]
- *		uses DESC to create a description file
- *		using the information therein.
- *		It creates the file DESC.out.
- *
- *	makedev F ...
- *		makes the font tables for fonts F only,
- *		creates files F.out.
- *
- *	DESC.out contains:
- *	dev structure with fundamental sizes
- *	list of sizes (nsizes+1) terminated by 0, as short's
- *	indices of char names (nchtab * sizeof (short))
- *	char names as hy\0em\0... (lchname)
- *	nfonts occurrences of
- *		widths (nwidth)
- *		kerning (nwidth) [ascender+descender only so far]
- *		codes (nwidth) to drive actual typesetter
- *		fitab (nchtab+128-32)
- *	each of these is an array of char.
- *
- *	dev.filesize contains the number of bytes
- *	in the file, excluding the dev part itself.
- *
- *	F.out contains the font header, width, kern, codes, and fitab.
- *	Width, kern and codes are parallel arrays.
- *	(Which suggests that they ought to be together?)
- *	Later, we might allow for codes which are actually
- *	sequences of formatting info so characters can be drawn.
- */
-
-#include	<stdio.h>
-#include	<stdlib.h>
-#include	<unistd.h>
-#include	<string.h>
-#include	<fcntl.h>
-#include	"dev.h"
-
-#define	BYTEMASK	0377
-
-#define	SLANT_BIT	1		/* slant flag is bit 0 */
-#define	FONT_BIT	2		/* font flag is bit 1 */
-#define	RANGE_BIT	4		/* range flag is bit 2 */
-
-#define	SLANT_VAL	3		/* slant angle starts in bit 3 */
-#define	RANGE_VAL	5		/* max range starts in bit 5 */
-
-#define	skipline(f)	while (getc(f) != '\n')
-
-struct	dev	dev;
-struct	Font	font;
-
-#define	NSIZE	100	/* maximum number of sizes */
-short	size[NSIZE];
-#define	NCH	256	/* max number of characters with funny names */
-char	chname[5*NCH];	/* character names, including \0 for each */
-short	chtab[NCH];	/* index of character in chname */
-
-#define	NFITAB	(NCH + 128-32)	/* includes ascii chars, but not non-graphics */
-char	fitab[NFITAB];	/* font index table: position of char i on this font. */
-			/* zero if not there */
-
-#define	FSIZE	256	/* size of a physical font (e.g., 102 for cat) */
-char	width[FSIZE];	/* width table for a physical font */
-char	kern[FSIZE];	/* ascender+descender info */
-char	code[FSIZE];	/* actual device codes for a physical font */
-char	alt_code[FSIZE];	/* code for alternate font */
-int	alt_font[FSIZE];	/* alternate font to use */
-
-int	dbg = 0;		/* debug flag */
-
-
-#define	NFONT	60	/* max number of default fonts */
-char	fname[NFONT][10];	/* temp space to hold default font names */
-
-int	fflag	= 0;	/* on if font table to be written */
-int	fdout;	/* output file descriptor */
-char	*fout	= "DESC.out";
-
-int dofont(char *name);
-int getlig(FILE *fin);
-void dump_font(void);
-void finish_line(char *buf, int nw);
-void add_font(char *name);
-
-int
-main(int argc, char *argv[])
-{
-	FILE *fin;
-	char cmd[100], *p;
-	int i, totfont, v;
-
-	if (argc < 2) {
-		fprintf(stderr, "Usage:  makedev [DESC] [fonts]\n");
-		exit(1);
-	}
-
-	if ((fin = fopen("DESC", "r")) == NULL) {
-		fprintf(stderr, "makedev: can't open %s\n", argv[1]);
-		exit(1);
-	}
-	while (fscanf(fin, "%s", cmd) != EOF) {
-		if (cmd[0] == '#')	/* comment */
-			skipline(fin);
-		else if (strcmp(cmd, "debug") == 0)
-			dbg++;
-		else if (strcmp(cmd, "res") == 0) {
-			fscanf(fin, "%hd", &dev.res);
-		} else if (strcmp(cmd, "hor") == 0) {
-			fscanf(fin, "%hd", &dev.hor);
-		} else if (strcmp(cmd, "vert") == 0) {
-			fscanf(fin, "%hd", &dev.vert);
-		} else if (strcmp(cmd, "unitwidth") == 0) {
-			fscanf(fin, "%hd", &dev.unitwidth);
-		} else if (strcmp(cmd, "sizescale") == 0) {
-			fscanf(fin, "%hd", &dev.sizescale);
-		} else if (strcmp(cmd, "paperwidth") == 0) {
-			fscanf(fin, "%hd", &dev.paperwidth);
-		} else if (strcmp(cmd, "paperlength") == 0) {
-			fscanf(fin, "%hd", &dev.paperlength);
-		} else if (strcmp(cmd, "biggestfont") == 0) {
-			fscanf(fin, "%hd", &dev.biggestfont);
-		} else if (strcmp(cmd, "spare2") == 0) {
-			fscanf(fin, "%hd", &dev.spare2);
-		} else if (strcmp(cmd, "sizes") == 0) {
-			dev.nsizes = 0;
-			while (fscanf(fin, "%d", &v) != EOF && v != 0)
-				size[dev.nsizes++] = v;
-			size[dev.nsizes] = 0;	/* need an extra 0 at the end */
-		} else if (strcmp(cmd, "fonts") == 0) {
-			fscanf(fin, "%hd", &dev.nfonts);
-			for (i = 0; i < dev.nfonts; i++)
-				fscanf(fin, "%s", fname[i]);
-		} else if (strcmp(cmd, "charset") == 0) {
-			p = chname;
-			dev.nchtab = 0;
-			while (fscanf(fin, "%s", p) != EOF) {
-				chtab[dev.nchtab++] = p - chname;
-				while (*p++)	/* skip to end of name */
-					;
-			}
-			dev.lchname = p - chname;
-			chtab[dev.nchtab++] = 0;	/* terminate properly */
-		} else
-			fprintf(stderr, "makedev: unknown command %s\n", cmd);
-	}
-	if (argc > 0 && strcmp(argv[1], "DESC") == 0) {
-		fdout = creat(fout, 0666);
-		if (fdout < 0) {
-			fprintf(stderr, "makedev: can't open %s\n", fout);
-			exit(1);
-		}
-		write(fdout, &dev, sizeof (struct dev));
-		/* we need a 0 on the end */
-		write(fdout, size, (dev.nsizes+1) * sizeof (size[0]));
-		write(fdout, chtab, dev.nchtab * sizeof (chtab[0]));
-		write(fdout, chname, dev.lchname);
-		totfont = 0;
-		for (i = 0; i < dev.nfonts; i++) {
-			totfont += dofont(fname[i]);
-			write(fdout, &font, sizeof (struct Font));
-			write(fdout, width, font.nwfont & BYTEMASK);
-			write(fdout, kern, font.nwfont & BYTEMASK);
-			write(fdout, code, font.nwfont & BYTEMASK);
-			write(fdout, fitab, dev.nchtab+128-32);
-		}
-		/* back to beginning to install proper size */
-		lseek(fdout, 0L, 0);
-		dev.filesize =		/* excluding dev struct itself */
-			(dev.nsizes+1) * sizeof (size[0])
-			+ dev.nchtab * sizeof (chtab[0])
-			+ dev.lchname * sizeof (char)
-			+ totfont * sizeof (char);
-		write(fdout, &dev, sizeof (struct dev));
-		close(fdout);
-		argc--;
-		argv++;
-	}
-	for (i = 1; i < argc; i++)
-		dofont(argv[i]);
-	exit(0);
-}
-
-
-int
-dofont(char *name)
-	/* string containing name of font */
-{
-
-
-	FILE	*fin;			/* input file descriptor */
-	int	fdout;			/* output file descriptor */
-	int	i, nw, spacewidth, n, v;
-	char 	buf[100], ch[10], s1[10], s2[10], s3[10], cmd[30];
-	char	s4[10];			/* used to check for extra info */
-	int	count;			/* value returned from sscanf() */
-	int	dflt_range;		/* default maximum range for font */
-	int	dflt_slant;		/* default slant for this font */
-
-	/*
-	 * This routine is responsible for making the '.out' file for
-	 * the font specified by the parameter name. It also sets up some
-	 * of the data structures needed to make the DESC.out file in the
-	 * main routine. In addition I have changed this routine so that
-	 * we can add some typesetter dependent parameters to the font
-	 * files and have this information dumped out to a 'add' file
-	 * for this font, which can be read as needed by the aps driver.
-	 */
-	if ((fin = fopen(name, "r")) == NULL) {
-		fprintf(stderr, "makedev: can't open font %s\n", name);
-		exit(2);
-	}	/* End if */
-
-	sprintf(cmd, "%s.out", name);	/* output file is name.out */
-	fdout = creat(cmd, 0666);
-
-	font.specfont = 0;		/* by default it isn't special font */
-	font.ligfont = 0;		/* and has no ligatures */
-	font.spare1 = 0;		/* all the flags are initially off */
-	spacewidth = 0;			/* really useful for CW font */
-	dflt_range = 3;			/* max range available on our APS-5 */
-	dflt_slant = 0;			/* no slant for this font yet */
-
-	for (i = 0; i < NFITAB; i++)	/* initialize font index table */
-		fitab[i] = 0;
-
-	for (i = 0; i < FSIZE; i++)  {	/* initialize font index table */
-		width[i] = kern[i] = code[i] = 0;
-		alt_font[i] = 0;
-		alt_code[i] = 0;
-	}	/* End for */
-
-	while (fscanf(fin, "%s", cmd) != EOF)  {	/* read the font file */
-
-		if (cmd[0] == '#')
-			skipline(fin);
-		else if (strcmp(cmd, "name") == 0)
-			fscanf(fin, "%s", font.namefont);
-		else if (strcmp(cmd, "internalname") == 0)
-			fscanf(fin, "%s", font.intname);
-		else if (strcmp(cmd, "special") == 0)
-			font.specfont = 1;
-		else if (strcmp(cmd, "ligatures") == 0) {
-			font.ligfont = getlig(fin);
-		} else if (strcmp(cmd, "spacewidth") == 0) {
-			fscanf(fin, "%d", &spacewidth);
-			/* width of space on this font */
-			width[0] = spacewidth;
-		} else if (strcmp(cmd, "charset") == 0) {
-			skipline(fin);
-			nw = 0;
-
-			/* widths are origin 1 so fitab==0 can mean */
-			/* "not there" */
-
-			while (fgets(buf, 100, fin) != NULL)  {
-
-				count = sscanf(buf, "%s %s %s %s %s", ch, s1,
-				    s2, s3, s4);
-
-				if (s1[0] != '"') {
-					/* it's a genuine new character */
-
-					nw++;
-					width[nw] = atoi(s1);
-					kern[nw] = atoi(s2);
-
-					/* temporarily, pick up one byte as */
-					/* code */
-
-					if (s3[0] == '0')
-						sscanf(s3, "%o", &i);
-					else
-						sscanf(s3, "%d", &i);
-					code[nw] = i;
-
-					if (count > 4 && font.spare1)
-						finish_line(buf, nw);
-
-				}	/* End if */
-
-				/* otherwise it's a synonym for previous */
-				/* character, so leave previous values intact */
-
-				if (strlen(ch) == 1)	/* it's ascii */
-					fitab[ch[0] - 32] = nw;
-					/* fitab origin omits non-graphics */
-				else {		/* it has a funny name */
-					for (i = 0; i < dev.nchtab; i++)
-						if (strcmp(&chname[chtab[i]],
-						    ch) == 0) {
-							/* starts after the */
-							/* ascii */
-							fitab[i + 128-32] = nw;
-							break;
-						}	/* End if */
-
-					if (i >= dev.nchtab)
-						fprintf(stderr,
-						    "makedev: font %s: %s not "
-						    "in charset\n", name, ch);
-				}	/* End else */
-
-			}	/* End while */
-			nw++;
-			if (dev.biggestfont >= nw)
-				n = dev.biggestfont;
-			else {
-				if (dev.biggestfont > 0)
-					fprintf(stderr, "font %s too big\n",
-					    name);
-				n = nw;
-			}
-			font.nwfont = n;
-		} else if (strcmp(cmd, "alternate_font") == 0)
-			font.spare1 |= FONT_BIT; /* set alternate font bit */
-		else if (strcmp(cmd, "default_slant") == 0)  {
-			/* clear two slant val bits */
-			font.spare1 &= ~(3 << SLANT_VAL);
-			/* set font slant bit */
-			font.spare1 |= SLANT_BIT;
-			/* read the default slant value */
-			fscanf(fin, "%d", &dflt_slant);
-			if (dflt_slant > 0)		/* encode it as 01 */
-				font.spare1 |= (1 << SLANT_VAL);
-			else if (dflt_slant < 0)	/* encode it as 10 */
-				font.spare1 |= (1 << (SLANT_VAL + 1));
-		} else if (strcmp(cmd, "max_range") == 0)  {
-			/* set range bit in spare1 */
-			font.spare1 |= RANGE_BIT;
-			/* read default font slant */
-			fscanf(fin, "%d", &dflt_range);
-			if (dflt_range < 1 || dflt_range > 4)  {
-				fprintf(stderr,
-				    "makedev: illegal default range %d\n",
-				    dflt_range);
-				exit(1);
-			}	/* End if */
-			font.spare1 |= (dflt_range << RANGE_VAL);
-		} else if (strcmp(cmd, "debug") == 0)
-			dbg++;
-
-	}	/* End while */
-
-	if (spacewidth == 0)
-		width[0] = dev.res * dev.unitwidth / 72 / 3;
-	fclose(fin);
-
-	write(fdout, &font, sizeof (struct Font));
-	write(fdout, width, font.nwfont & BYTEMASK);
-	write(fdout, kern, font.nwfont & BYTEMASK);
-	write(fdout, code, font.nwfont & BYTEMASK);
-	write(fdout, fitab, dev.nchtab+128-32);
-	close(fdout);
-
-	if (font.spare1)
-		add_font(name);
-
-	if (dbg)
-		dump_font();
-
-	v = sizeof (struct Font) + 3 * n + dev.nchtab + 128-32;
-	fprintf(stderr, "%3s: %3d chars, width %3d, size %3d\n",
-		font.namefont, nw, width[0], v);
-	return (v);
-
-}	/* End of dofont */
-
-
-/* pick up ligature list */
-int
-getlig(FILE *fin)
-{
-
-
-	int	lig;
-	char	temp[100];
-
-
-	lig = 0;
-	while (fscanf(fin, "%s", temp) != EOF && strcmp(temp, "0") != 0) {
-		if (strcmp(temp, "fi") == 0)
-			lig |= LFI;
-		else if (strcmp(temp, "fl") == 0)
-			lig |= LFL;
-		else if (strcmp(temp, "ff") == 0)
-			lig |= LFF;
-		else if (strcmp(temp, "ffi") == 0)
-			lig |= LFFI;
-		else if (strcmp(temp, "ffl") == 0)
-			lig |= LFFL;
-		else
-			fprintf(stderr, "illegal ligature %s\n", temp);
-	}
-
-	skipline(fin);
-	return (lig);
-
-}	/* End of getlg */
-
-
-void
-finish_line(
-	char	*buf,			/* last input line */
-	int	nw)			/* data for next char goes here */
-{
-
-
-	char	s[3][20];		/* used for special char commands */
-	char	v[3][20];		/* and their values */
-	int	count;			/* number of extra commands */
-	int	range;			/* largest allowed master range */
-	int	angle;			/* slant the character by this much */
-	int	i;			/* loop index */
-
-
-/*
- *
- * Called from dofont() to interpret any extra fields in the current input
- * line. The additional stuff can include one or more of the following
- *
- *          slant n
- *          max_range n
- *          font n
- *
- * separated by white space and in any order. In all the above n is an
- * integer. Comments will really screw things up so leave them out of the
- * charset part in the APS-5 font files.
- *
- */
-
-
-	count = sscanf(buf, "%*s %*s %*s %*s %s %s %s %s %s %s",
-	    s[0], v[0], s[1], v[1], s[2], v[2]);
-
-	if ((count % 2 != 0) || (count == 0))  {
-		fprintf(stderr, "makedev: format error in charset table\n");
-		exit(1);
-	}	/* End if */
-
-	alt_code[nw] = code[nw];	/* real code will go in .add file */
-	code[nw] = 128;			/* tells daps it's not a real code */
-
-	for (i = 0; i < count/2; i++)  {
-
-		if (strcmp(s[i], "font") == 0)  {
-			/* get char from another font */
-			/* daps checks this bit */
-			code[nw] |= FONT_BIT;
-			alt_font[nw] = atoi(v[i]);	/* APS-5 font number */
-		} else if (strcmp(s[i], "max_range") == 0)  {
-			code[nw] &= ~(3 << RANGE_VAL);
-			code[nw] |= RANGE_BIT;
-			range = atoi(v[i]);
-			if (range < 1 || range > 4)  {
-				fprintf(stderr, "makedev: illegal range\n");
-				exit(1);
-			}	/* End if */
-			code[nw] |= (range << RANGE_VAL);
-		} else if (strcmp(s[i], "slant") == 0)  {
-			code[nw] &= ~(3 << SLANT_VAL);
-			code[nw] |= SLANT_BIT;
-			angle = atoi(v[i]);
-			if (angle > 0)	/* again daps understands these */
-				code[nw] |= (1 << SLANT_VAL);
-			else if (angle < 0)
-				code[nw] |= (1 << (SLANT_VAL + 1));
-		} else {
-			fprintf(stderr, "makedev: illegal command\n");
-			exit(1);
-		}	/* End else */
-
-	}	/* End for */
-	if (code[nw] & BYTEMASK == 128)  {
-		fprintf(stderr, "makedev: char code %d less than 129\n",
-		    code[nw]);
-		exit(1);
-	}	/* End if */
-
-}	/* End of finish_line */
-
-
-void
-add_font(char *name)
-{
-
-
-	int	fdout;			/* output file descriptor */
-	int	k;			/* number of width entries */
-	char	cmd[30];		/* used to create output file */
-
-
-
-/*
- *
- * If there were any special requests made in the current font file we'll
- * want to save the real data (for daps) in a binary file that ends with
- * the suffix ".add". When daps tries to print a character and finds that
- * it's character code bigger than 129 it knows it will need to get more
- * real data from the appropriate .add file.
- *
- */
-
-
-
-	sprintf(cmd, "%s.add", name);		/* file will be 'name'.add */
-	fdout = creat(cmd, 0666);
-
-	k = font.nwfont & BYTEMASK;
-
-	write(fdout, alt_font, k * sizeof (alt_font[0]));
-	write(fdout, alt_code, k);
-
-	close(fdout);
-
-}	/* End of add_font */
-
-
-void
-dump_font(void)
-{
-
-
-	int	pos;			/* position in character tables */
-	int	j;			/* for loop index */
-	int	code_val;		/* number in code table */
-
-
-
-/*
- *
- * Just a debugging routine that's really not important anymore. It's
- * called from dofont() after everything's been built for the current
- * font file. Need to include the string "debug" in the font file that
- * we want to check.
- *
- */
-
-
-	printf("DATA FOR FONT %s:\n\n", font.namefont);
-
-	printf("  font structure data:\n");
-	printf("\t\tfont.nwfont = %d\n", font.nwfont & BYTEMASK);
-	printf("\t\tfont.specfont = %d\n", font.specfont & BYTEMASK);
-	printf("\t\tfont.ligfont = %d\n", font.ligfont & BYTEMASK);
-	printf("\t\tfont.spare1 = 0%o\n", font.spare1 & BYTEMASK);
-	printf("\t\tfont.intname = %s\n\n", font.intname);
-
-	printf("  CHAR     WIDTH      KERN      CODE     INDEX\n");
-
-	for (j = 0; j < dev.nchtab + 128 - 32; j++)  {
-
-		if ((pos = fitab[j] & BYTEMASK) != 0)  {
-			if (j >= 96)
-				printf("%5s", &chname[chtab[j-96]]);
-			else printf("%5c", (j + 32) & BYTEMASK);
-			printf("%10d", width[pos] & BYTEMASK);
-			printf("%10d", kern[pos] & BYTEMASK);
-			code_val = code[pos] & BYTEMASK;
-			printf("%10d", code_val & BYTEMASK);
-			printf("%10d", j);
-
-			if (code_val > 128)  {
-				printf("%5d", alt_code[pos] & BYTEMASK);
-				if (code_val & SLANT_BIT)
-					printf("  slant %d",
-					    (code_val >> SLANT_VAL) & 03);
-				if (code_val & FONT_BIT)
-					printf("  font %d", alt_font[pos]);
-				if (code_val & RANGE_BIT)
-					printf("  range %d",
-					    (code_val >> RANGE_VAL) & 03);
-			}	/* End if */
-
-			printf("\n");
-		}	/* End if */
-
-	}	/* End for */
-
-	printf("\n\n");
-
-}	/* End of dump_font */
--- a/usr/src/cmd/troff/troff.d/devaps/version	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# University Copyright- Copyright (c) 1982, 1986, 1988
-# The Regents of the University of California
-# All Rights Reserved
-#
-# University Acknowledgment- Portions of this document are derived from
-# software developed by the University of California, Berkeley, and its
-# contributors.
-#
-063285
--- a/usr/src/pkgdefs/Makefile	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/Makefile	Tue Aug 04 18:20:38 2009 -0700
@@ -126,7 +126,6 @@
 	SUNWcarx.i  \
 	SUNWcpc.i \
 	SUNWcpr.i \
-	SUNWdfb.i  \
 	SUNWdrmr \
 	SUNWgrub \
 	SUNWgrubS \
@@ -227,7 +226,6 @@
 	SUNWcstl \
 	SUNWdcaf \
 	SUNWdcar \
-	SUNWdfbh  \
 	SUNWdhcm  \
 	SUNWdhcsb  \
 	SUNWdhcsr  \
@@ -542,7 +540,6 @@
 	SUNWibsdpib \
 	SUNWkdcr \
 	SUNWkdcu \
-	SUNWstatl \
 	SUNWsvvs \
 	SUNWwbint \
 	SUNWwbsup
--- a/usr/src/pkgdefs/SUNWad810/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWad810/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWaudd	Audio Drivers
--- a/usr/src/pkgdefs/SUNWadixp/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWadixp/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -18,12 +18,10 @@
 #
 # CDDL HEADER END
 #
-
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -51,4 +49,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWaudd	Audio Drivers
--- a/usr/src/pkgdefs/SUNWadpu320/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWadpu320/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,8 +1,7 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -29,3 +28,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWamr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWamr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,8 +1,7 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -29,4 +28,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWrmodr	Realmode Modules, (Root)
--- a/usr/src/pkgdefs/SUNWamt-lms/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWamt-lms/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -48,4 +48,5 @@
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
 P SUNWlibC	Sun Workshop Compilers Bundled libC
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWamt	Solaris support for Intel AMT
--- a/usr/src/pkgdefs/SUNWamt/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWamt/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -47,3 +47,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWapct/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWapct/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -40,6 +38,14 @@
 # <type> <pkg.abbr> <name>
 # ...
 
+P SUNWcar		Core Architecture, (Root)
+P SUNWcakr		Core Solaris Kernel Architecture (Root)
+P SUNWkvm		Core Architecture, (Kvm)
+P SUNWcsr		Core Solaris, (Root)
+P SUNWckr		Core Solaris Kernel (Root)
+P SUNWcnetr		Core Solaris Network Infrastructure (Root)
+P SUNWcsd		Core Solaris Devices
+P SUNWcslr		Core Solaris Libraries (Root)
 P SUNWbtool		CCS tools bundled with SunOS
 P SUNWcsu		Core Solaris, (Usr)
 P SUNWcsl		Core Solaris, (Shared Libs)
--- a/usr/src/pkgdefs/SUNWarbel/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWarbel/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWib	Sun InfiniBand Framework
--- a/usr/src/pkgdefs/SUNWarc/prototype_com	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWarc/prototype_com	Tue Aug 04 18:20:38 2009 -0700
@@ -48,9 +48,6 @@
 d none usr 755 root sys
 d none usr/ccs 755 root bin
 d none usr/ccs/lib 755 root bin
-d none usr/lib/fp 755 root bin
-d none usr/lib/fp/libp 755 root bin
-s none usr/ccs/lib/fp=../../lib/fp
 f none usr/lib/crti.o 644 root bin
 f none usr/lib/crtn.o 644 root bin
 f none usr/lib/values-xpg4.o 644 root bin
--- a/usr/src/pkgdefs/SUNWatu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWatu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -47,4 +47,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWusb	USB Device Drivers
--- a/usr/src/pkgdefs/SUNWauda/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWauda/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,5 +48,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWlibC	Sun Workshop Compilers Bundled libC
 P SUNWlibms	Math & Microtasking Libraries (Usr)
--- a/usr/src/pkgdefs/SUNWaudiohd/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWaudiohd/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +49,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWaudd	Audio Drivers
--- a/usr/src/pkgdefs/SUNWaudit/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWaudit/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -41,15 +39,13 @@
 # ...
 #
 
-P SUNWcar       Core Architecture, (Root)
+P SUNWcar	Core Architecture, (Root)
 P SUNWcakr	Core Solaris Kernel Architecture (Root)
-P SUNWkvm       Core Architecture, (Kvm)
-P SUNWcsr       Core Solaris, (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
 P SUNWckr	Core Solaris Kernel (Root)
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsd	Core Solaris Devices
-P SUNWcsu       Core Solaris, (Usr)
-P SUNWcsl       Core Solaris Libraries
-
-
-
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWav1394/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWav1394/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNW1394	Sun IEEE1394 Framework
--- a/usr/src/pkgdefs/SUNWbcp/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWbcp/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWscpu	Source Compatibility, (Usr)
--- a/usr/src/pkgdefs/SUNWbip/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWbip/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,8 +48,8 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 R SUNWbipr	Basic IP commands, (Root)
 P SUNWgss	GSSAPI V2
 P SUNWkrbu	Kerberos version 5 support (Usr)
-P SUNWlibmsr	Math Libraries (Root)
-
+P SUNWlibmsr	Math & Microtasking Libraries (Root)
--- a/usr/src/pkgdefs/SUNWbipr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWbipr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -41,12 +39,13 @@
 # ...
 #
 
-P SUNWcar       Core Architecture, (Root)
+P SUNWcar	Core Architecture, (Root)
 P SUNWcakr	Core Solaris Kernel Architecture (Root)
-P SUNWkvm       Core Architecture, (Kvm)
-P SUNWcsr       Core Solaris, (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
 P SUNWckr	Core Solaris Kernel (Root)
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
-P SUNWcsu       Core Solaris, (Usr)
-P SUNWcsd       Core Solaris Devices
-P SUNWcsl       Core Solaris Libraries
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWbnuu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWbnuu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
-R SUNWbnur      Networking UUCP Utilities (Root)
+P SUNWcslr	Core Solaris Libraries (Root)
+R SUNWbnur	Networking UUCP Utilities (Root)
--- a/usr/src/pkgdefs/SUNWbsu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWbsu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWbsr	Boot Server daemons (Root)
--- a/usr/src/pkgdefs/SUNWbtool/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWbtool/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,5 +48,6 @@
 P SUNWcsu		Core Solaris, (Usr)
 P SUNWcsd		Core Solaris Devices
 P SUNWcsl		Core Solaris Libraries
+P SUNWcslr		Core Solaris Libraries (Root)
 P SUNWtecla		Tecla command-line editing library
 P SUNWperl584core	Perl 5.8.4 (core)
--- a/usr/src/pkgdefs/SUNWcfclr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWcfclr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #
@@ -39,12 +39,13 @@
 # ...
 
 P SUNWcar	Core Architecture, (Root)
-P SUNWcakr      Core Solaris Kernel Architecture (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
 P SUNWkvm	Core Architecture, (Kvm)
 P SUNWcsr	Core Solaris, (Root)
-P SUNWckr       Core Solaris Kernel (Root)
-P SUNWcnetr     Core Solaris Network Infrastructure (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWcfcl	Common Fibre Channel HBA API Library (Usr)
--- a/usr/src/pkgdefs/SUNWcfpl/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWcfpl/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -47,5 +47,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWluxop	Sun Enterprise Network Array firmware and utilities
 P SUNWcfcl	Common Fibre Channel HBA API Library (Usr)
--- a/usr/src/pkgdefs/SUNWcfplr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWcfplr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #
@@ -40,12 +40,13 @@
 # ...
 
 P SUNWcar	Core Architecture, (Root)
-P SUNWcakr      Core Solaris Kernel Architecture (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
 P SUNWkvm	Core Architecture, (Kvm)
 P SUNWcsr	Core Solaris, (Root)
-P SUNWckr       Core Solaris Kernel (Root)
-P SUNWcnetr     Core Solaris Network Infrastructure (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWcfpl	fp cfgadm plug-in library
--- a/usr/src/pkgdefs/SUNWcnetr/Makefile	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWcnetr/Makefile	Tue Aug 04 18:20:38 2009 -0700
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.com
@@ -31,7 +30,7 @@
 
 .KEEP_STATE:
 
-all: $(FILES) postinstall depend
+all: $(FILES) postinstall
 
 install: all pkg
 
--- a/usr/src/pkgdefs/SUNWcnetr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# Copyright 2008 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 (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.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# This package information file defines software dependencies associated
-# with the pkg.  You can define three types of pkg dependencies with this file:
-#	 P indicates a prerequisite for installation
-#	 I indicates an incompatible package
-#	 R indicates a reverse dependency
-# <pkg.abbr> see pkginfo(4), PKG parameter
-# <name> see pkginfo(4), NAME parameter
-# <version> see pkginfo(4), VERSION parameter
-# <arch> see pkginfo(4), ARCH parameter
-# <type> <pkg.abbr> <name>
-# 	(<arch>)<version>
-# 	(<arch>)<version>
-# 	...
-# <type> <pkg.abbr> <name>
-# ...
-#
-
-P SUNWcsr	Core Solaris, (Root)
--- a/usr/src/pkgdefs/SUNWcnetr/prototype_com	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWcnetr/prototype_com	Tue Aug 04 18:20:38 2009 -0700
@@ -35,7 +35,6 @@
 #!<param>=<value>			# puts parameter in pkg environment
 
 # packaging files
-i depend
 i pkginfo
 i copyright
 i postinstall
--- a/usr/src/pkgdefs/SUNWcpr.u/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWcpr.u/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,3 +48,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWcsl/prototype_i386	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWcsl/prototype_i386	Tue Aug 04 18:20:38 2009 -0700
@@ -81,7 +81,6 @@
 f none usr/lib/dns/amd64/dnssafe.so.1 755 root bin
 # EXPORT DELETE END
 f none usr/lib/dns/amd64/irs.so.1 755 root bin
-d none usr/lib/fp/libp/amd64 755 root bin
 d none usr/lib/iconv/amd64 755 root bin
 d none usr/lib/lwp/amd64 755 root bin
 s none usr/lib/lwp/64=amd64
--- a/usr/src/pkgdefs/SUNWcsl/prototype_sparc	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWcsl/prototype_sparc	Tue Aug 04 18:20:38 2009 -0700
@@ -74,7 +74,6 @@
 f none usr/lib/dns/sparcv9/dnssafe.so.1 755 root bin
 # EXPORT DELETE END
 f none usr/lib/dns/sparcv9/irs.so.1 755 root bin
-d none usr/lib/fp/libp/sparcv9 755 root bin
 d none usr/lib/iconv/sparcv9 755 root bin
 d none usr/lib/lwp/sparcv9 755 root bin
 s none usr/lib/lwp/64=sparcv9
--- a/usr/src/pkgdefs/SUNWcslr/Makefile	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWcslr/Makefile	Tue Aug 04 18:20:38 2009 -0700
@@ -25,8 +25,6 @@
 
 include ../Makefile.com
 
-DATAFILES += depend
-
 LICENSEFILES_i386 = \
 	../../common/crypto/aes/amd64/THIRDPARTYLICENSE.gladman \
 	../../common/crypto/aes/amd64/THIRDPARTYLICENSE.openssl \
--- a/usr/src/pkgdefs/SUNWcslr/prototype_com	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWcslr/prototype_com	Tue Aug 04 18:20:38 2009 -0700
@@ -34,7 +34,6 @@
 # packaging files
 i pkginfo
 i copyright
-i depend
 #
 # source locations relative to the prototype file
 #
--- a/usr/src/pkgdefs/SUNWcsu/prototype_com	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWcsu/prototype_com	Tue Aug 04 18:20:38 2009 -0700
@@ -717,7 +717,6 @@
 f none usr/lib/t300s 555 root bin
 f none usr/lib/t4014 555 root bin
 f none usr/lib/t450 555 root bin
-d none usr/lib/term 755 root bin
 f none usr/lib/utmp_update 4555 root bin
 f none usr/lib/utmpd 555 root bin
 f none usr/lib/vplot 555 root bin
--- a/usr/src/pkgdefs/SUNWcti2.u/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWcti2.u/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,3 +48,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWdcsu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWdcsu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWdcsr	Domain Configuration Server, (Root)
--- a/usr/src/pkgdefs/SUNWdfb.i/Makefile	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-include ../Makefile.com
-
-CDDL=
-
-.KEEP_STATE:
-
-DATAFILES += depend
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWdfb.i/pkginfo.tmpl	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWdfb"
-NAME="Dumb Frame Buffer Device Drivers (deprecated)"
-ARCH="i386.i86pc"
-VERSION="ONVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="root"
-MAXINST="1000"
-CATEGORY="system"
-DESC="deprecated: empty package to be removed in a future release"
-VENDOR="Sun Microsystems, Inc."
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="true"
-SUNW_PKG_HOLLOW="true"
-SUNW_PKG_THISZONE="false"
-#VSTOCK="<reserved by Release Engineering for package part #>"
-#ISTATES="<developer defined>"
-#RSTATES='<developer defined>'
-#ULIMIT="<developer defined>"
-#ORDER="<developer defined>"
-#PSTAMP="<developer defined>"
-#INTONLY="<developer defined>"
--- a/usr/src/pkgdefs/SUNWdfb.i/prototype_com	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#	Copyright (c) 1990-95 Sun Microsystems, Inc.
-#		All Rights Reserved
-#
-#	ident	"%Z%%M%	%I%	%E% SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-# packaging files
-i pkginfo
-i copyright
-i depend
-#
-# source locations relative to the prototype file
-#
-# SUNWdfb.i
-#
--- a/usr/src/pkgdefs/SUNWdfb.i/prototype_i386	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#	Copyright (c) 1990-93 Sun Microsystems, Inc.
-#		All Rights Reserved
-#
-#	ident	"%Z%%M%	%I%	%E% SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-#
-#
-# List files which are SPARC specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWdfb.i
-#
--- a/usr/src/pkgdefs/SUNWdfbh/Makefile	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1993 by Sun Microsystems, Inc.
-#
-
-include ../Makefile.com
-
-DATAFILES += depend
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWdfbh/pkginfo.tmpl	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# 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.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWdfbh"
-NAME="Dumb Frame Buffer Header Files"
-ARCH="ISA"
-VERSION="ONVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="SunOS C/C++ header files for development of software for dumb frame buffers"
-VENDOR="Sun Microsystems, Inc."
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-SUNW_PKG_ALLZONES="true"
-SUNW_PKG_HOLLOW="false"
-SUNW_PKG_THISZONE="false"
-#VSTOCK="<reserved by Release Engineering for package part #>"
-#ISTATES="<developer defined>"
-#RSTATES='<developer defined>'
-#ULIMIT="<developer defined>"
-#ORDER="<developer defined>"
-#PSTAMP="<developer defined>"
-#INTONLY="<developer defined>"
--- a/usr/src/pkgdefs/SUNWdfbh/prototype_com	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-# packaging files
-i pkginfo
-i copyright
-i depend
-#
-# source locations relative to the prototype file
-#
-# SUNWdfbh
-#
-d none usr 755 root sys
-d none usr/include 755 root bin
-d none usr/include/sys 755 root bin
-f none usr/include/sys/visual_io.h 644 root bin
-f none usr/include/sys/fbio.h 0644 root bin
--- a/usr/src/pkgdefs/SUNWdfbh/prototype_i386	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#	Copyright (c) 1990-93 Sun Microsystems, Inc.
-#		All Rights Reserved
-#
-#	ident	"%Z%%M%	%I%	%E% SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-#
-#
-# List files which are I386 specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWdfbh
-#
--- a/usr/src/pkgdefs/SUNWdfbh/prototype_sparc	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 1990-1993,1998, 2002 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-#
-#
-# List files which are SPARC specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWdfbh
-#
--- a/usr/src/pkgdefs/SUNWdhcm/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWdhcm/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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.
@@ -24,7 +23,6 @@
 #
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -42,6 +40,16 @@
 # <type> <pkg.abbr> <name>
 # ...
 
-P SUNWdhcsr	DHCP Server Services, (Root)
-P SUNWdhcsu	DHCP Server Services, (User)
-P SUNWj5rt	JDK 1.5 runtime environment
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
+P SUNWdhcsr     DHCP Server Services, (Root)
+P SUNWdhcsu     DHCP Server Services, (User)
+P SUNWj5rt      JDK 1.5 runtime environment
--- a/usr/src/pkgdefs/SUNWdhcsb/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWdhcsb/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,5 +48,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsl	Core Solaris Libraries
 P SUNWcsd	Core Solaris Devices
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWdhcsr	DHCP Server Services, (Root)
 P SUNWdhcsu	DHCP Server Services, (Usr)
--- a/usr/src/pkgdefs/SUNWdhcsr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWdhcsr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsl	Core Solaris Libraries
 P SUNWcsd	Core Solaris Devices
+P SUNWcslr	Core Solaris Libraries (Root)
 R SUNWdhcsu	DHCP Server Services, (Usr)
--- a/usr/src/pkgdefs/SUNWdhcsu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWdhcsu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,6 +48,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsl	Core Solaris Libraries
 P SUNWcsd	Core Solaris Devices
+P SUNWcslr      Core Solaris Libraries (Root)
 R SUNWdhcsr	DHCP Server Services, (Root)
 P SUNWbip	Basic IP commands
 P SUNWj5rt 	JDK 1.5 runtime environment
--- a/usr/src/pkgdefs/SUNWdmgtr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWdmgtr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -41,14 +39,15 @@
 # ...
 #
 
-P SUNWcar       Core Architecture, (Root)
+P SUNWcar	Core Architecture, (Root)
 P SUNWcakr	Core Solaris Kernel Architecture (Root)
-P SUNWkvm       Core Architecture, (Kvm)
-P SUNWcsr       Core Solaris, (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
 P SUNWckr	Core Solaris Kernel (Root)
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
-P SUNWcsu       Core Solaris, (Usr)
-P SUNWcsd       Core Solaris Devices
-P SUNWcsl       Core Solaris Libraries
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWfsmgtu	Solaris Local File System Management APIs (usr)
 P SUNWfsmgtr	Solaris Local File System Management APIs (root)
--- a/usr/src/pkgdefs/SUNWdmgtu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWdmgtu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -41,17 +39,18 @@
 # ...
 #
 
-P SUNWcar       Core Architecture, (Root)
+P SUNWcar	Core Architecture, (Root)
 P SUNWcakr	Core Solaris Kernel Architecture (Root)
-P SUNWkvm       Core Architecture, (Kvm)
-P SUNWcsr       Core Solaris, (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
 P SUNWckr	Core Solaris Kernel (Root)
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
-P SUNWcsu       Core Solaris, (Usr)
-P SUNWcsd       Core Solaris Devices
-P SUNWcsl       Core Solaris Libraries
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWwbcor	Solaris WBEM Services (root)
 P SUNWwbcou	Solaris WBEM Services (usr)
-P SUNWwbpro     WBEM Providers (usr)
+P SUNWwbpro	WBEM Providers (usr)
 P SUNWfsmgtu	Solaris Local File System Management APIs (usr)
 P SUNWfsmgtr	Solaris Local File System Management APIs (root)
--- a/usr/src/pkgdefs/SUNWdoc/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWdoc/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,5 +48,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWlibC	Sun Workshop Compilers Bundled libC
 P SUNWesu	Extended System Utilities
--- a/usr/src/pkgdefs/SUNWdoc/prototype_com	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWdoc/prototype_com	Tue Aug 04 18:20:38 2009 -0700
@@ -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.
@@ -19,11 +18,9 @@
 #
 # CDDL HEADER END
 #
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1990-93,1998 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -54,7 +51,6 @@
 l none usr/bin/catman=../../usr/bin/apropos
 f none usr/bin/checkeq 555 root bin
 f none usr/bin/checknr 555 root bin
-f none usr/bin/daps 555 root bin
 f none usr/bin/deroff 555 root bin
 f none usr/bin/diffmk 555 root bin
 f none usr/bin/eqn 555 root bin
@@ -75,66 +71,6 @@
 l none usr/bin/whatis=../../usr/bin/apropos
 d none usr/lib 755 root bin
 d none usr/lib/font 755 root bin
-d none usr/lib/font/devaps 755 root bin
-f none usr/lib/font/devaps/B.add 644 root bin
-f none usr/lib/font/devaps/B.out 644 root bin
-f none usr/lib/font/devaps/BI.out 644 root bin
-f none usr/lib/font/devaps/C.out 644 root bin
-f none usr/lib/font/devaps/CE.out 644 root bin
-f none usr/lib/font/devaps/CI.out 644 root bin
-f none usr/lib/font/devaps/CT.add 644 root bin
-f none usr/lib/font/devaps/CT.out 644 root bin
-f none usr/lib/font/devaps/CW.add 644 root bin
-f none usr/lib/font/devaps/CW.out 644 root bin
-f none usr/lib/font/devaps/CX.add 644 root bin
-f none usr/lib/font/devaps/CX.out 644 root bin
-f none usr/lib/font/devaps/DESC.out 644 root bin
-f none usr/lib/font/devaps/G.out 644 root bin
-f none usr/lib/font/devaps/GB.add 644 root bin
-f none usr/lib/font/devaps/GB.out 644 root bin
-f none usr/lib/font/devaps/GI.add 644 root bin
-f none usr/lib/font/devaps/GI.out 644 root bin
-f none usr/lib/font/devaps/GR.add 644 root bin
-f none usr/lib/font/devaps/GR.out 644 root bin
-f none usr/lib/font/devaps/GS.add 644 root bin
-f none usr/lib/font/devaps/GS.out 644 root bin
-f none usr/lib/font/devaps/H.out 644 root bin
-f none usr/lib/font/devaps/HB.out 644 root bin
-f none usr/lib/font/devaps/HI.add 644 root bin
-f none usr/lib/font/devaps/HI.out 644 root bin
-f none usr/lib/font/devaps/HK.add 644 root bin
-f none usr/lib/font/devaps/HK.out 644 root bin
-f none usr/lib/font/devaps/HL.out 644 root bin
-f none usr/lib/font/devaps/HM.out 644 root bin
-f none usr/lib/font/devaps/HX.add 644 root bin
-f none usr/lib/font/devaps/HX.out 644 root bin
-f none usr/lib/font/devaps/I.add 644 root bin
-f none usr/lib/font/devaps/I.out 644 root bin
-f none usr/lib/font/devaps/MB.out 644 root bin
-f none usr/lib/font/devaps/MI.out 644 root bin
-f none usr/lib/font/devaps/MR.out 644 root bin
-f none usr/lib/font/devaps/MX.out 644 root bin
-f none usr/lib/font/devaps/PA.out 644 root bin
-f none usr/lib/font/devaps/PB.out 644 root bin
-f none usr/lib/font/devaps/PI.out 644 root bin
-f none usr/lib/font/devaps/PO.add 644 root bin
-f none usr/lib/font/devaps/PO.out 644 root bin
-f none usr/lib/font/devaps/PX.add 644 root bin
-f none usr/lib/font/devaps/PX.out 644 root bin
-f none usr/lib/font/devaps/R.add 644 root bin
-f none usr/lib/font/devaps/R.out 644 root bin
-f none usr/lib/font/devaps/S.add 644 root bin
-f none usr/lib/font/devaps/S.out 644 root bin
-f none usr/lib/font/devaps/S1.add 644 root bin
-f none usr/lib/font/devaps/S1.out 644 root bin
-f none usr/lib/font/devaps/SC.add 644 root bin
-f none usr/lib/font/devaps/SC.out 644 root bin
-f none usr/lib/font/devaps/SM.add 644 root bin
-f none usr/lib/font/devaps/SM.out 644 root bin
-f none usr/lib/font/devaps/TB.out 644 root bin
-f none usr/lib/font/devaps/TX.add 644 root bin
-f none usr/lib/font/devaps/TX.out 644 root bin
-f none usr/lib/font/devaps/version 644 root bin
 d none usr/lib/font/devpost 755 root lp
 f none usr/lib/font/devpost/AB 444 root lp
 f none usr/lib/font/devpost/AB.name 444 root lp
--- a/usr/src/pkgdefs/SUNWdrcr.u/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWdrcr.u/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWefc	FCode Interpreter Drivers, (Root)
--- a/usr/src/pkgdefs/SUNWdscpr.u/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWdscpr.u/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,5 +48,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 R SUNWdcsr	Domain Configuration Server, (Root)
 R SUNWdcsu	Domain Configuration Server
--- a/usr/src/pkgdefs/SUNWdscpu.u/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWdscpu.u/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,6 +48,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWpppdu	Solaris PPP daemon and utilities
 R SUNWdcsr	Domain Configuration Server, (Root)
 R SUNWdcsu	Domain Configuration Server
--- a/usr/src/pkgdefs/SUNWdsdr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWdsdr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-
+#
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -42,13 +40,14 @@
 # ...
 #
 
-P SUNWcar       Core Architecture, (Root)
-P SUNWcakr      Core Solaris Kernel Architecture (Root)
-P SUNWkvm       Core Architecture, (Kvm)
-P SUNWcsr       Core Solaris, (Root)
-P SUNWckr       Core Solaris Kernel (Root)
-P SUNWcnetr     Core Solaris Network Infrastructure (Root)
-P SUNWcsu       Core Solaris, (Usr)
-P SUNWcslr      Core Solaris Libraries (Root)
-P SUNWcsd       Core Solaris Devices
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
+P SUNWcsd	Core Solaris Devices
 P SUNWdsdu	Multicast DNS and Service Discovery (Usr)
--- a/usr/src/pkgdefs/SUNWdsdu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWdsdu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,11 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-
+#
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -42,12 +40,13 @@
 # ...
 #
 
-P SUNWcar       Core Architecture, (Root)
-P SUNWcakr      Core Solaris Kernel Architecture (Root)
-P SUNWkvm       Core Architecture, (Kvm)
-P SUNWcsr       Core Solaris, (Root)
-P SUNWckr       Core Solaris Kernel (Root)
-P SUNWcnetr     Core Solaris Network Infrastructure (Root)
-P SUNWcsu       Core Solaris, (Usr)
-P SUNWcslr      Core Solaris Libraries (Root)
-P SUNWcsd       Core Solaris Devices
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
+P SUNWcsd	Core Solaris Devices
--- a/usr/src/pkgdefs/SUNWdtrt/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWdtrt/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -18,13 +18,20 @@
 #
 # CDDL HEADER END
 #
-
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 
 P SUNWcsu	Core Solaris, (Usr)
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWdtrc	Dynamic Tracing (DTrace) Clients 
 P SUNWdtrp	Dynamic Tracing (DTrace) Providers
--- a/usr/src/pkgdefs/SUNWefcu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWefcu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,5 +48,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWefcl	Embedded FCode Libraries
 P SUNWefc 	FCode Interpreter Drivers, (Root)
--- a/usr/src/pkgdefs/SUNWemlxs/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWemlxs/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # This package information file defines software dependencies associated
@@ -47,4 +47,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWfctl	Sun Fibre Channel Transport layer
--- a/usr/src/pkgdefs/SUNWemlxu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWemlxu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # This package information file defines software dependencies associated
@@ -38,12 +38,13 @@
 # ...
 
 P SUNWcar	Core Architecture, (Root)
-P SUNWcakr      Core Solaris Kernel Architecture (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
 P SUNWkvm	Core Architecture, (Kvm)
 P SUNWcsr	Core Solaris, (Root)
-P SUNWckr       Core Solaris Kernel (Root)
-P SUNWcnetr     Core Solaris Network Infrastructure (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWfctl	Sun Fibre Channel Transport layer
--- a/usr/src/pkgdefs/SUNWesu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWesu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,5 +48,7 @@
 P SUNWcsu		Core Solaris, (Usr)
 P SUNWcsd		Core Solaris Devices
 P SUNWcsl		Core Solaris Libraries
+P SUNWcslr		Core Solaris Libraries (Root)
 P SUNWperl584core	Perl 5.8.4 (core)
 P SUNWperl584usr	Perl 5.8.4 (non-core)
+P SUNWlibms		Math & Microtasking Libraries (Usr)
--- a/usr/src/pkgdefs/SUNWfchba/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWfchba/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #
@@ -39,12 +39,13 @@
 # ...
 
 P SUNWcar	Core Architecture, (Root)
-P SUNWcakr      Core Solaris Kernel Architecture (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
 P SUNWkvm	Core Architecture, (Kvm)
 P SUNWcsr	Core Solaris, (Root)
-P SUNWckr       Core Solaris Kernel (Root)
-P SUNWcnetr     Core Solaris Network Infrastructure (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
-P SUNWfchbar    Sun Fibre Channel Host Bus Adapter Library (root)
+P SUNWcslr	Core Solaris Libraries (Root)
+P SUNWfchbar	Sun Fibre Channel Host Bus Adapter Library (root)
--- a/usr/src/pkgdefs/SUNWfchbar/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWfchbar/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #
@@ -49,4 +49,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
-P SUNWcfclr     Common Fibre Channel HBA API Library (Root)
+P SUNWcslr	Core Solaris Libraries (Root)
+P SUNWcfclr	Common Fibre Channel HBA API Library (Root)
--- a/usr/src/pkgdefs/SUNWfcip/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWfcip/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #
@@ -40,12 +40,13 @@
 # ...
 
 P SUNWcar	Core Architecture, (Root)
-P SUNWcakr      Core Solaris Kernel Architecture (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
 P SUNWkvm	Core Architecture, (Kvm)
 P SUNWcsr	Core Solaris, (Root)
-P SUNWckr       Core Solaris Kernel (Root)
-P SUNWcnetr     Core Solaris Network Infrastructure (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWfctl	Sun Fibre Channel Transport layer
--- a/usr/src/pkgdefs/SUNWfcoe/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWfcoe/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -48,3 +48,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWfcoet/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWfcoet/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -40,13 +40,14 @@
 # ...
 
 P SUNWcar	Core Architecture, (Root)
-P SUNWcakr      Core Solaris Kernel Architecture (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
 P SUNWkvm	Core Architecture, (Kvm)
 P SUNWcsr	Core Solaris, (Root)
-P SUNWckr       Core Solaris Kernel (Root)
-P SUNWcnetr     Core Solaris Network Infrastructure (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWfcoe	SUN FCoE Transport Driver
 P SUNWstmf	Sun Common Multiprotocol SCSI Target
--- a/usr/src/pkgdefs/SUNWfcoeu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWfcoeu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -40,11 +40,12 @@
 # ...
 
 P SUNWcar	Core Architecture, (Root)
-P SUNWcakr      Core Solaris Kernel Architecture (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
 P SUNWkvm	Core Architecture, (Kvm)
 P SUNWcsr	Core Solaris, (Root)
-P SUNWckr       Core Solaris Kernel (Root)
-P SUNWcnetr     Core Solaris Network Infrastructure (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWfcp/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWfcp/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #
@@ -40,12 +40,13 @@
 # ...
 
 P SUNWcar	Core Architecture, (Root)
-P SUNWcakr      Core Solaris Kernel Architecture (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
 P SUNWkvm	Core Architecture, (Kvm)
 P SUNWcsr	Core Solaris, (Root)
-P SUNWckr       Core Solaris Kernel (Root)
-P SUNWcnetr     Core Solaris Network Infrastructure (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWfctl	Sun Fibre Channel Transport layer
--- a/usr/src/pkgdefs/SUNWfcprt/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWfcprt/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -49,6 +49,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWcfcl	Common Fibre Channel HBA API Library (Usr)
 P SUNWfcoeu	SUN FCoE Port Management Library
-
--- a/usr/src/pkgdefs/SUNWfcprtr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWfcprtr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #
@@ -48,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr      Core Solaris Libraries (Root)
 P SUNWfcprt	Fibre Channel HBA Port utility
--- a/usr/src/pkgdefs/SUNWfcsm/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWfcsm/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # This package information file defines software dependencies associated
@@ -39,12 +39,13 @@
 # ...
 
 P SUNWcar	Core Architecture, (Root)
-P SUNWcakr      Core Solaris Kernel Architecture (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
 P SUNWkvm	Core Architecture, (Kvm)
 P SUNWcsr	Core Solaris, (Root)
-P SUNWckr       Core Solaris Kernel (Root)
-P SUNWcnetr     Core Solaris Network Infrastructure (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWfctl	Sun Fibre Channel Transport layer
--- a/usr/src/pkgdefs/SUNWfilebench/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWfilebench/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # This package information file defines software dependencies associated
@@ -40,12 +40,16 @@
 # ...
 #
 
-P SUNWcar	Core Architecture, (Root)
-P SUNWcakr	Core Solaris Kernel Architecture (Root)
-P SUNWkvm	Core Architecture, (Kvm)
-P SUNWcsr	Core Solaris, (Root)
-P SUNWcsu	Core Solaris, (Usr)
-P SUNWcsl	Core Solaris Libraries
+P SUNWcar		Core Architecture, (Root)
+P SUNWcakr		Core Solaris Kernel Architecture (Root)
+P SUNWkvm		Core Architecture, (Kvm)
+P SUNWcsr		Core Solaris, (Root)
+P SUNWcsu		Core Solaris, (Usr)
+P SUNWcsl		Core Solaris Libraries
+P SUNWckr		Core Solaris Kernel (Root)
+P SUNWcslr		Core Solaris Libraries (Root)
+P SUNWcnetr		Core Solaris Network Infrastructure (Root)
+P SUNWcsd		Core Solaris Devices
 P SUNWperl584core	Perl 5.8.4 (core)
-P SUNWlibmsr	
-P SUNWtecla	Tecla command-line editing library
+P SUNWlibmsr		Math & Microtasking Libraries (Root)	
+P SUNWtecla		Tecla command-line editing library
--- a/usr/src/pkgdefs/SUNWfmd/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWfmd/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -33,7 +33,8 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWfmdr	Fault Management Daemon and Utilities (Root)
 P SUNWnet-snmp-core     Net-SNMP Agent files and libraries
-P SUNWlxmlr     The XML library (Root)
-P SUNWzfsr      ZFS (Root)
+P SUNWlxmlr	The XML library (Root)
+P SUNWzfsr	ZFS (Root)
--- a/usr/src/pkgdefs/SUNWfruid/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWfruid/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,5 +48,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWlibC	Sun Workshop Compilers Bundled libC
 P SUNWpiclu	PICL Libraries, and Plugin Modules (Usr)
--- a/usr/src/pkgdefs/SUNWfruip.u/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWfruip.u/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,5 +48,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWpiclu	PICL Libraries, and Plugin Modules (Usr)
 P SUNWfruid	FRU ID Utility and Library (Usr)
--- a/usr/src/pkgdefs/SUNWfsu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWfsu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -20,12 +20,10 @@
 #
 
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
-
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
 #        P indicates a prerequisite for installation
@@ -44,6 +42,13 @@
 P SUNWcsr	Core Solaris, (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsl	Core Solaris Libraries
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsd	Core Solaris Devices
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWlibmsr	Math & Microtasking Libraries (Root)
 P SUNWfmd	Fault Management Daemon and Utilities
 P SUNWfsr	FP Scrubber configuration files (ROOT)
--- a/usr/src/pkgdefs/SUNWftdur/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWftdur/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,3 +47,5 @@
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWftduu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWftduu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWftdur	ftSafe developer utilities package (Root)
--- a/usr/src/pkgdefs/SUNWftpr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWftpr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,8 +1,7 @@
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -30,3 +29,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWftpu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWftpu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,8 +1,7 @@
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -30,6 +29,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWgss	GSSAPI V2
 P SUNWkrbu	Kerberos version 5 support (Usr)
 R SUNWftpr	FTP Server, (Root)
--- a/usr/src/pkgdefs/SUNWfwdc/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWfwdc/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNW1394	Sun IEEE1394 Framework
--- a/usr/src/pkgdefs/SUNWfwdcu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWfwdcu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,5 +48,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNW1394	Sun IEEE1394 Framework
 P SUNWfwdc	Sun IEEE1394 Video Conferencing Class Driver
--- a/usr/src/pkgdefs/SUNWgrub/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWgrub/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,11 @@
-# ident	"%Z%%M%	%I%	%E% SMI"
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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.
@@ -50,3 +48,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWgrubr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWgrubr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -45,6 +45,7 @@
 P SUNWkvm	Core Architecture, (Kvm)
 P SUNWcsr	Core Solaris, (Root)
 P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
--- a/usr/src/pkgdefs/SUNWgssdh/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWgssdh/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,4 @@
-#	ident	"%Z%%M%	%I%	%E% SMI"
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -38,6 +37,16 @@
 # <type> <pkg.abbr> <name>
 # ...
 
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWgss	GSSAPI V2
 P SUNWrsg	RPCSEC_GSS
 P SUNWgssc	GSSAPI CONFIG V2
--- a/usr/src/pkgdefs/SUNWhal/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWhal/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,6 +48,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 
 # Other packages this package has dependencies
 # upon at install-time or run-time.
--- a/usr/src/pkgdefs/SUNWhalr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWhalr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,6 +48,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 
 # Other packages this package has dependencies
 # upon at install-time or run-time.
--- a/usr/src/pkgdefs/SUNWhea/prototype_com	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWhea/prototype_com	Tue Aug 04 18:20:38 2009 -0700
@@ -770,6 +770,9 @@
 f none usr/include/sys/dkbad.h 644 root bin
 f none usr/include/sys/dkio.h 644 root bin
 f none usr/include/sys/dklabel.h 644 root bin
+d none usr/include/sys/dktp 755 root bin
+f none usr/include/sys/dktp/dadkio.h 644 root bin
+f none usr/include/sys/dktp/fdisk.h 644 root bin
 f none usr/include/sys/dl.h 644 root bin
 f none usr/include/sys/dlpi.h 644 root bin
 f none usr/include/sys/dma_i8237A.h 644 root bin
@@ -803,6 +806,7 @@
 f none usr/include/sys/exec.h 644 root bin
 f none usr/include/sys/exechdr.h 644 root bin
 f none usr/include/sys/fault.h 644 root bin
+f none usr/include/sys/fbio.h 0644 root bin
 f none usr/include/sys/fbuf.h 644 root bin
 d none usr/include/sys/fc4 755 root bin
 f none usr/include/sys/fc4/fc.h 644 root bin
@@ -1073,6 +1077,7 @@
 f none usr/include/sys/nvpair_impl.h 644 root bin
 f none usr/include/sys/objfs.h 644 root bin
 f none usr/include/sys/objfs_impl.h 644 root bin
+f none usr/include/sys/obpdefs.h 644 root bin
 f none usr/include/sys/old_procfs.h 644 root bin
 f none usr/include/sys/open.h 644 root bin
 f none usr/include/sys/openpromio.h 644 root bin
@@ -1212,6 +1217,7 @@
 f none usr/include/sys/scsi/targets/sgendef.h 644 root bin
 f none usr/include/sys/scsi/targets/sddef.h 644 root bin
 f none usr/include/sys/scsi/targets/smp.h 644 root bin
+f none usr/include/sys/scsi/targets/stdef.h 644 root bin
 f none usr/include/sys/select.h 644 root bin
 f none usr/include/sys/sem.h 644 root bin
 f none usr/include/sys/sem_impl.h 644 root bin
@@ -1238,6 +1244,7 @@
 f none usr/include/sys/socketvar.h 644 root bin
 f none usr/include/sys/sockio.h 644 root bin
 f none usr/include/sys/socket_proto.h 644 root bin
+f none usr/include/sys/spl.h 644 root bin
 f none usr/include/sys/sservice.h 644 root bin
 f none usr/include/sys/squeue.h 644 root bin
 f none usr/include/sys/squeue_impl.h 644 root bin
@@ -1361,6 +1368,7 @@
 f none usr/include/sys/vfs_opreg.h 644 root bin
 f none usr/include/sys/vfstab.h 644 root bin
 f none usr/include/sys/videodev2.h 644 root bin
+f none usr/include/sys/visual_io.h 644 root bin
 f none usr/include/sys/vm.h 644 root bin
 f none usr/include/sys/vm_usage.h 644 root bin
 f none usr/include/sys/vmem.h 644 root bin
@@ -1451,6 +1459,7 @@
 f none usr/include/xti.h 644 root bin
 f none usr/include/xti_inet.h 644 root bin
 f none usr/include/zone.h 644 root bin
+d none usr/platform 755 root sys
 d none usr/share 755 root sys
 d none usr/share/src 755 root sys
 d none usr/share/src/uts 755 root bin
--- a/usr/src/pkgdefs/SUNWhea/prototype_i386	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWhea/prototype_i386	Tue Aug 04 18:20:38 2009 -0700
@@ -80,11 +80,8 @@
 f none usr/include/sys/bootsvcs.h 644 root bin
 f none usr/include/sys/controlregs.h 644 root bin
 f none usr/include/sys/debugreg.h 644 root bin
-d none usr/include/sys/dktp 755 root bin
 f none usr/include/sys/dktp/altsctr.h 644 root bin
 f none usr/include/sys/dktp/cmpkt.h 644 root bin
-f none usr/include/sys/dktp/dadkio.h 644 root bin
-f none usr/include/sys/dktp/fdisk.h 644 root bin
 f none usr/include/sys/dma_engine.h 644 root bin
 f none usr/include/sys/fp.h 644 root bin
 f none usr/include/sys/hypervisor.h 644 root bin
@@ -96,7 +93,6 @@
 f none usr/include/sys/mca_x86.h 644 root bin
 f none usr/include/sys/mc_intel.h 644 root bin
 f none usr/include/sys/mutex_impl.h 644 root bin
-f none usr/include/sys/obpdefs.h 644 root bin
 f none usr/include/sys/pcic_reg.h 644 root bin
 f none usr/include/sys/pcic_var.h 644 root bin
 f none usr/include/sys/pic.h 644 root bin
@@ -112,17 +108,14 @@
 d none usr/include/sys/sata 755 root sys
 f none usr/include/sys/sata/sata_hba.h 644 root bin
 f none usr/include/sys/sata/sata_defs.h 644 root bin
-f none usr/include/sys/scsi/targets/stdef.h 644 root bin
 f none usr/include/sys/segment.h 644 root bin
 f none usr/include/sys/segments.h 644 root bin
 f none usr/include/sys/sysi86.h 644 root bin
-f none usr/include/sys/spl.h 644 root bin
 f none usr/include/sys/traptrace.h 644 root bin
 f none usr/include/sys/tss.h 644 root bin
 f none usr/include/sys/x86_archext.h 644 root bin
 f none usr/include/sys/ucode.h 644 root bin
 f none usr/include/sys/xen_errno.h 644 root bin
-d none usr/platform 755 root sys
 d none usr/platform/i86pc 755 root sys
 d none usr/platform/i86pc/include 755 root bin
 d none usr/platform/i86pc/include/sys 755 root bin
--- a/usr/src/pkgdefs/SUNWhea/prototype_sparc	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWhea/prototype_sparc	Tue Aug 04 18:20:38 2009 -0700
@@ -57,9 +57,6 @@
 f none usr/include/sys/cg6thc.h 644 root bin
 f none usr/include/sys/cmpregs.h 644 root bin
 f none usr/include/sys/dkmpio.h 644 root bin
-d none usr/include/sys/dktp 755 root bin
-f none usr/include/sys/dktp/dadkio.h 644 root bin
-f none usr/include/sys/dktp/fdisk.h 644 root bin
 f none usr/include/sys/dmaga.h 644 root bin
 f none usr/include/sys/fdreg.h 644 root bin
 f none usr/include/sys/fdvar.h 644 root bin
@@ -73,7 +70,6 @@
 f none usr/include/sys/fpu/globals.h 644 root bin
 f none usr/include/sys/fpu/ieee.h 644 root bin
 f none usr/include/sys/fsr.h 644 root bin
-f none usr/include/sys/obpdefs.h 644 root bin
 f none usr/include/sys/ramdac.h 644 root bin
 f none usr/include/sys/scsi/adapters/espcmd.h 644 root bin
 f none usr/include/sys/scsi/adapters/espreg.h 644 root bin
@@ -83,14 +79,11 @@
 f none usr/include/sys/scsi/adapters/ispreg.h 644 root bin
 f none usr/include/sys/scsi/adapters/ispvar.h 644 root bin
 f none usr/include/sys/scsi/targets/ssddef.h 644 root bin
-f none usr/include/sys/scsi/targets/stdef.h 644 root bin
 f none usr/include/sys/ser_async.h 644 root bin
 f none usr/include/sys/ser_zscc.h 644 root bin
-f none usr/include/sys/spl.h 644 root bin
 f none usr/include/sys/stp4020_reg.h 644 root bin
 f none usr/include/sys/stp4020_var.h 644 root bin
 f none usr/include/sys/zsdev.h 644 root bin
-d none usr/platform 755 root sys
 d none usr/platform/sun4u 755 root sys
 d none usr/platform/sun4u/include 755 root bin
 d none usr/platform/SUNW,SPARC-Enterprise 755 root sys
--- a/usr/src/pkgdefs/SUNWhermon/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWhermon/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # This package information file defines software dependencies associated
@@ -47,4 +47,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWib	Sun InfiniBand Framework
--- a/usr/src/pkgdefs/SUNWib/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWib/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,3 +47,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWibdmar/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWibdmar/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -47,4 +47,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWib	Sun InfiniBand Framework
--- a/usr/src/pkgdefs/SUNWibsdp/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWibsdp/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -39,15 +39,16 @@
 # <type> <pkg.abbr> <name>
 # ...
 
-P SUNWcar       Core Architecture, (Root)
-P SUNWcakr      Core Solaris Kernel Architecture (Root)
-P SUNWkvm       Core Architecture, (Kvm)
-P SUNWcsr       Core Solaris, (Root)
-P SUNWckr       Core Solaris Kernel (Root)
-P SUNWcnetr     Core Solaris Network Infrastructure (Root)
-P SUNWcsu       Core Solaris, (Usr)
-P SUNWcsd       Core Solaris Devices
-P SUNWcsl       Core Solaris Libraries
-P SUNWib        Sun Infiniband Framework
-P SUNWipoib     Sun IP over Infiniband
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
+P SUNWib	Sun Infiniband Framework
+P SUNWipoib	Sun IP over Infiniband
 P SUNWibsdpib	Sun InfiniBand Sockets Direct Protocol
--- a/usr/src/pkgdefs/SUNWibsdpib/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWibsdpib/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -18,14 +18,15 @@
 # <type> <pkg.abbr> <name>
 # ...
 
-P SUNWcar       Core Architecture, (Root)
-P SUNWcakr      Core Solaris Kernel Architecture (Root)
-P SUNWkvm       Core Architecture, (Kvm)
-P SUNWcsr       Core Solaris, (Root)
-P SUNWckr       Core Solaris Kernel (Root)
-P SUNWcnetr     Core Solaris Network Infrastructure (Root)
-P SUNWcsu       Core Solaris, (Usr)
-P SUNWcsd       Core Solaris Devices
-P SUNWcsl       Core Solaris Libraries
-P SUNWib        Sun Infiniband Framework
-P SUNWipoib     Sun IP over Infiniband
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
+P SUNWib	Sun Infiniband Framework
+P SUNWipoib	Sun IP over Infiniband
--- a/usr/src/pkgdefs/SUNWibsdpu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWibsdpu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -40,13 +39,14 @@
 # <type> <pkg.abbr> <name>
 # ...
 
-P SUNWcar       Core Architecture, (Root)
-P SUNWcakr      Core Solaris Kernel Architecture (Root)
-P SUNWkvm       Core Architecture, (Kvm)
-P SUNWcsr       Core Solaris, (Root)
-P SUNWckr       Core Solaris Kernel (Root)
-P SUNWcnetr     Core Solaris Network Infrastructure (Root)
-P SUNWcsu       Core Solaris, (Usr)
-P SUNWcsd       Core Solaris Devices
-P SUNWcsl       Core Solaris Libraries
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWibsdp	Sun Infiniband Layered Sockets Direct Protocol
--- a/usr/src/pkgdefs/SUNWifp/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWifp/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,8 +1,7 @@
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -29,6 +28,8 @@
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWses	SCSI Enclosure Services Device Driver
 P SUNWssad	SPARCstorage Array Drivers
 P SUNWluxop	Sun Enterprise Network Array firmware and utilities
--- a/usr/src/pkgdefs/SUNWiir/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWiir/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # This package information file defines software dependencies associated
@@ -46,5 +46,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWscmu	Sun StorageTek Availability Suite Storage Cache Management (usr)
 P SUNWspsvu	Sun StorageTek Availability Suite Storage Volume Driver (usr)
--- a/usr/src/pkgdefs/SUNWiiu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWiiu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -38,6 +38,16 @@
 # ...
 #
 
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWlibms	Math & Microtasking Libraries (Usr)
 P SUNWlibmsr	Math & Microtasking Libraries (Root)
 P SUNWscmu	Sun StorageTek Availability Suite Storage Cache Management (usr)
--- a/usr/src/pkgdefs/SUNWimar/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWimar/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # This package information file defines software dependencies associated
@@ -48,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWimacr	Solaris IMA Common Library (Root)
--- a/usr/src/pkgdefs/SUNWintgige/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWintgige/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,11 @@
-# ident	"%Z%%M%	%I%	%E% SMI"
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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.
@@ -48,3 +46,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWiopc.u/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWiopc.u/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -20,10 +20,9 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -51,3 +50,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWiopc.v/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWiopc.v/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -20,10 +20,9 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -51,3 +50,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWipoib/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWipoib/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,4 +47,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWib	Sun InfiniBand Framework
--- a/usr/src/pkgdefs/SUNWiscsidmu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWiscsidmu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -47,4 +47,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWiscsidmr	Sun iSCSI Data Mover (Root)
--- a/usr/src/pkgdefs/SUNWiscsir/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWiscsir/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -46,4 +46,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWiscsidmr	Sun iSCSI Data Mover (Root)
--- a/usr/src/pkgdefs/SUNWiscsitgtr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWiscsitgtr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,5 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWlxml	The XML library
-
--- a/usr/src/pkgdefs/SUNWiscsitgtu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWiscsitgtu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,7 +48,8 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWlxml	The XML library
-P SUNWiscsitgtr Sun iSCSI Target
+P SUNWiscsitgtr	Sun iSCSI Target
 P SUNWzfsr	SUNWzfsr ZFS (Root)
 P SUNWlibsasl	SASL v2
--- a/usr/src/pkgdefs/SUNWiscsitr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWiscsitr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -46,6 +46,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWiscsidmr	Sun iSCSI Data Mover (Root)
 P SUNWiscsidmu	Sun iSCSI Data Mover (Usr)
 P SUNWstmf	Sun Common Multipotocol SCSI Target
--- a/usr/src/pkgdefs/SUNWiscsitu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWiscsitu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -46,5 +46,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWiscsitr	Sun iSCSI COMSTAR port provider (Root)
 P SUNWstmfu	Sun Common Multipotocol SCSI Target Libraries and Tools
--- a/usr/src/pkgdefs/SUNWisnsr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWisnsr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # This package information file defines software dependencies associated
@@ -47,4 +47,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWisns	Solaris iSNS Server
--- a/usr/src/pkgdefs/SUNWixgb/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWixgb/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,7 +1,6 @@
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -28,3 +27,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWjcom/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWjcom/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,7 @@
 #
 # CDDL HEADER END
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
 #	 P indicates a prerequisite for installation
@@ -39,4 +38,14 @@
 # <type> <pkg.abbr> <name>
 # ...
 
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWocf	Opencard Card Framework
--- a/usr/src/pkgdefs/SUNWjib/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWjib/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
-#ident	"%Z%%M%	%I%	%E% SMI"
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+#
+# Copyright 2009 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.
@@ -39,4 +38,14 @@
 # <type> <pkg.abbr> <name>
 # ...
 
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWjcom	javax.comm package
--- a/usr/src/pkgdefs/SUNWkdcr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWkdcr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -51,3 +49,4 @@
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
 P SUNWkrbr	Kerberos version 5 support (Root)
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWkdcu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWkdcu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -47,7 +47,8 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
-P SUNWrsg	RPCSEC_GSS
+P SUNWcslr      Core Solaris Libraries (Root)
+P SUNWrsg       RPCSEC_GSS
 P SUNWgss	Generic Security Service App Program Int, Ver 2 - user
 P SUNWlldap	LDAP Libraries
 P SUNWsmbsu	SMB Server (Usr)
--- a/usr/src/pkgdefs/SUNWkrbu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWkrbu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -47,6 +47,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWkrbr	Kerberos version 5 support (Root)
 P SUNWgss	GSSAPI V2
 P SUNWgssc	GSSAPI CONFIG V2
--- a/usr/src/pkgdefs/SUNWldomu.v/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWldomu.v/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -18,14 +18,10 @@
 #
 # CDDL HEADER END
 #
-
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -44,14 +40,15 @@
 # ...
 #
 
-P SUNWcar	Core Architecture, (Root)
-P SUNWcakr	Core Solaris Kernel Architecture (Root)
-P SUNWkvm	Core Architecture, (Kvm)
-P SUNWcsr	Core Solaris, (Root)
-P SUNWckr	Core Solaris Kernel (Root)
-P SUNWcnetr	Core Solaris Network Infrastructure (Root)
-P SUNWcsu	Core Solaris, (Usr)
-P SUNWcsd	Core Solaris Devices
-P SUNWcsl	Core Solaris Libraries
-P SUNWldomr	Solaris Logical Domains (Root)
+P SUNWcar		Core Architecture, (Root)
+P SUNWcakr		Core Solaris Kernel Architecture (Root)
+P SUNWkvm		Core Architecture, (Kvm)
+P SUNWcsr		Core Solaris, (Root)
+P SUNWckr		Core Solaris Kernel (Root)
+P SUNWcnetr		Core Solaris Network Infrastructure (Root)
+P SUNWcsu		Core Solaris, (Usr)
+P SUNWcsd		Core Solaris Devices
+P SUNWcsl		Core Solaris Libraries
+P SUNWcslr		Core Solaris Libraries (Root)
+P SUNWldomr		Solaris Logical Domains (Root)
 P SUNWperl584core	Perl 5.8.4 (core)
--- a/usr/src/pkgdefs/SUNWluxd.u/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWluxd.u/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,5 +48,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWses	SCSI Enclosure Services Device Driver
 P SUNWssad	SPARCstorage Array Drivers
--- a/usr/src/pkgdefs/SUNWlxr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWlxr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 P SUNWcar	Core Architecture, (Root)
@@ -34,5 +33,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWzoneu	Solaris Zones (Usr)
 P SUNWzoner	Solaris Zones (Root)
--- a/usr/src/pkgdefs/SUNWlxu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWlxu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 P SUNWcar	Core Architecture, (Root)
@@ -34,6 +33,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWzoneu	Solaris Zones (Usr)
 P SUNWzoner	Solaris Zones (Root)
 P SUNWlxr	lx Brand (Root)
--- a/usr/src/pkgdefs/SUNWmdar/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWmdar/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -48,6 +46,8 @@
 P SUNWcar	Core Archictecture, (Root)
 P SUNWcakr	Core Solaris Kernel Architecture (Root)
 P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 
 # Other packages this package has dependencies
 # upon at install-time or run-time.
--- a/usr/src/pkgdefs/SUNWmdau/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWmdau/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -48,6 +46,8 @@
 P SUNWcar	Core Archictecture, (Root)
 P SUNWcakr	Core Solaris Kernel Architecture (Root)
 P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 
 # Other packages this package has dependencies
 # upon at install-time or run-time.
--- a/usr/src/pkgdefs/SUNWmdb/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWmdb/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,6 +49,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 
 #
 # MDB is very carefully written to be independent of as many things on
--- a/usr/src/pkgdefs/SUNWmddr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWmddr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+#
+# Copyright 2009 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.
@@ -38,7 +37,15 @@
 #       ...
 # <type> <pkg.abbr> <name>
 # ...
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris, (Shared Libs)
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWmdr	Solstice Disksuite, (Root)
 P SUNWlvma	Solaris Volume Management APIs
-P SUNWcsl	Core Solaris, (Shared Libs)
-
--- a/usr/src/pkgdefs/SUNWmdu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWmdu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,6 +48,8 @@
 P SUNWcar	Core Architecture, (Root)
 P SUNWcakr	Core Solaris Kernel Architecture (Root)
 P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 
 # Other packages this package has dependencies
 # upon at install-time or run-time.
--- a/usr/src/pkgdefs/SUNWmmsr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWmmsr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #ident	"@(#)depend	1.1	08/06/25 SMI"
@@ -50,4 +50,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWmmsu	MMS - Media Management Software (usr)
--- a/usr/src/pkgdefs/SUNWmmsu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWmmsu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -50,6 +50,7 @@
 P SUNWcsu		Core Solaris, (Usr)
 P SUNWcsd		Core Solaris Devices
 P SUNWcsl		Core Solaris Libraries
+P SUNWcslr		Core Solaris Libraries (Root)
 P SUNWlxml		The XML library
 P SUNWpostgr-83-server	PostgreSQL database server
 P SUNWpostgr-83-client	PostgreSQL client tools
--- a/usr/src/pkgdefs/SUNWmpapi/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWmpapi/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # This package information file defines software dependencies associated
@@ -38,12 +38,13 @@
 # ...
 
 P SUNWcar	Core Architecture, (Root)
-P SUNWcakr      Core Solaris Kernel Architecture (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
 P SUNWkvm	Core Architecture, (Kvm)
 P SUNWcsr	Core Solaris, (Root)
-P SUNWckr       Core Solaris Kernel (Root)
-P SUNWcnetr     Core Solaris Network Infrastructure (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 p SUNWmpapir	SNIA Multipath Management API Common Library (Root)
--- a/usr/src/pkgdefs/SUNWncau/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWncau/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWbip	Basic IP commands
--- a/usr/src/pkgdefs/SUNWndmpu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWndmpu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,5 +48,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWzfsr	ZFS (Root)
 P SUNWndmpr	NDMP (Root)
--- a/usr/src/pkgdefs/SUNWnetcat/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWnetcat/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,3 +48,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWnfscu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWnfscu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,5 +48,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWnfscr	Network File System (NFS) client support (Root)
 P SUNWnfsckr	Network File System (NFS) client kernel support (Root)
--- a/usr/src/pkgdefs/SUNWnfssr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWnfssr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 R SUNWnfssu	Network File System (NFS) server support (Usr)
--- a/usr/src/pkgdefs/SUNWnfssu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWnfssu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,7 +48,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
-R SUNWnfssr	Network File System (NFS) server support (Root)
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWnfscr	Network File System (NFS) client support (Root)
 P SUNWnfsckr	Network File System (NFS) client kernel support (Root)
 P SUNWnfscu	Network File System (NFS) client support (Usr)
--- a/usr/src/pkgdefs/SUNWnge/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWnge/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,11 @@
-# ident	"%Z%%M%	%I%	%E% SMI"
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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.
@@ -48,3 +46,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWnisu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWnisu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 R SUNWnisr	Network Information System (Root)
--- a/usr/src/pkgdefs/SUNWocf/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWocf/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,6 +47,7 @@
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu       Core Solaris, (Usr)
 P SUNWcsd       Core Solaris Devices
-P SUNWcsl       Core Solaris Libraries
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWj5rt	JDK 1.5 runtime environment
 P SUNWocfr	Configuration files for Open Card Framework
--- a/usr/src/pkgdefs/SUNWos86r/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWos86r/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,3 +48,5 @@
 P SUNWcar	Core Archictecture Root
 P SUNWcakr	Core Solaris Kernel Architecture (Root)
 P SUNWkvm	Core Architecture Usr
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr      Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWpcelx/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWpcelx/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,8 +1,7 @@
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -29,4 +28,6 @@
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
+P SUNWcsl       Core Solaris Libraries
+P SUNWcslr      Core Solaris Libraries (Root)
 P SUNWpcmci	PCMCIA Card Services and kernel code
--- a/usr/src/pkgdefs/SUNWpcmcu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWpcmcu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,5 +47,6 @@
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr      Core Solaris Libraries (Root)
 P SUNWcsd	Core Solaris Devices
 P SUNWpcmci	PCMCIA Card Services and kernel code
--- a/usr/src/pkgdefs/SUNWpcmem/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWpcmem/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,6 +47,8 @@
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWpcmci	PCMCIA Card Services and kernel code
 P SUNWpcmcu	PCMCIA usr binaries
 I SUNWpcsra	PCMCIA DDK memory card sample driver
--- a/usr/src/pkgdefs/SUNWpcser/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWpcser/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,5 +47,7 @@
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWpcmci	PCMCIA Card Services and kernel code
 P SUNWpcmcu	PCMCIA usr binaries
--- a/usr/src/pkgdefs/SUNWperl584usr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWperl584usr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu		Core Solaris, (Usr)
 P SUNWcsd		Core Solaris Devices
 P SUNWcsl		Core Solaris Libraries
+P SUNWcslr		Core Solaris Libraries (Root)
 P SUNWperl584core	Perl 5.8.4 (core)
--- a/usr/src/pkgdefs/SUNWpmr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWpmr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,5 +47,6 @@
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu       Core Solaris, (Usr)
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWcsd       Core Solaris Devices
 P SUNWpmu	Power Management binaries
--- a/usr/src/pkgdefs/SUNWpmu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWpmu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWzfsr	ZFS (Root)
--- a/usr/src/pkgdefs/SUNWpolkit/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWpolkit/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,6 +48,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 
 # Other packages this package has dependencies
 # upon at install-time or run-time.
--- a/usr/src/pkgdefs/SUNWpool/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWpool/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -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,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -40,6 +38,16 @@
 #       ...
 # <type> <pkg.abbr> <name>
 # ...
-P SUNWcsl	Core Solaris, (Shared Libs)
+
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWlxml	The XML library
 P SUNWpoolr	Resource Pools (Root)
--- a/usr/src/pkgdefs/SUNWpoold/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWpoold/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -38,7 +37,17 @@
 #       ...
 # <type> <pkg.abbr> <name>
 # ...
-P SUNWcsl	Core Solaris, (Shared Libs)
+
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWj5rt	JDK 1.5 runtime environment
 P SUNWpoolr	Resource Pools (Root)
 P SUNWpool	Resource Pools
--- a/usr/src/pkgdefs/SUNWpoolr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWpoolr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+#
+# Copyright 2009 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.
@@ -47,3 +46,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWpowertop/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWpowertop/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -20,11 +20,19 @@
 #
 
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
 P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWdtrc	Dynamic Tracing (DTrace) Clients 
 P SUNWdtrp	Dynamic Tracing (DTrace) Providers
--- a/usr/src/pkgdefs/SUNWpppdt/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWpppdt/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,5 +48,6 @@
 P SUNWcsu       Core Solaris, (Usr)
 P SUNWcsd       Core Solaris Devices
 P SUNWcsl       Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWpppd      Solaris PPP Device Drivers
 P SUNWpppdu     Solaris PPP daemon and utilities
--- a/usr/src/pkgdefs/SUNWpppdu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWpppdu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -28,5 +28,6 @@
 P SUNWcsu       Core Solaris, (Usr)
 P SUNWcsd       Core Solaris Devices
 P SUNWcsl       Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWpppd      Solaris PPP Device Drivers
 P SUNWperl584core	Perl 5.8.4 (core)
--- a/usr/src/pkgdefs/SUNWpsdcr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWpsdcr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -42,9 +40,13 @@
 #
 
 # Required system dependencies
-P SUNWcsr	Core Solaris Root
+P SUNWcsr	Core Solaris, (Root)
 P SUNWckr	Core Solaris Kernel (Root)
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsd	Core Solaris Devices
-P SUNWcar	Core Archictecture Root
+P SUNWcar	Core Archictecture, (Root)
 P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWpsdir/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWpsdir/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -48,4 +46,8 @@
 P SUNWcsd	Core Solaris Devices
 P SUNWcar	Core Archictecture Root
 P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWpsdcr     Platform Support, Bus-independent Device Drivers (Root)
--- a/usr/src/pkgdefs/SUNWpsdpr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWpsdpr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -48,6 +46,8 @@
 P SUNWckr	Core Solaris Kernel (Root)
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Sparc, (Usr)
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWcsd	Core Sparc Devices
 P SUNWpcmci	PCMCIA Card Services and kernel code
 P SUNWpcmcu	PCMCIA usr binaries
--- a/usr/src/pkgdefs/SUNWpsr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWpsr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -47,6 +47,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWpcr	Solaris Print - Client, (root)
 P SUNWppm	Solaris Print Manager
 I SUNWlpr	LP Print Service, (root)
--- a/usr/src/pkgdefs/SUNWpsu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWpsu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,6 +48,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWpcu	Solaris Print - Client, (usr)
 P SUNWpsr	Solaris Print - LP Server, (root)
 P SUNWpapi	Free Standards Group Open Printing API
--- a/usr/src/pkgdefs/SUNWqfed/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWqfed/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWhmd	SunSwift Adapter Drivers
--- a/usr/src/pkgdefs/SUNWqlc/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWqlc/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 #
@@ -48,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWfctl	Sun Fibre Channel Transport layer
--- a/usr/src/pkgdefs/SUNWqlcu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWqlcu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # This package information file defines software dependencies associated
@@ -47,4 +47,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWqlc	Qlogic ISP 2200/2202 Fibre Channel Device Driver
--- a/usr/src/pkgdefs/SUNWqosu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWqosu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,5 +47,7 @@
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWqos	IP QoS, (Root)
 
--- a/usr/src/pkgdefs/SUNWrcapr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWrcapr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-#	ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -40,7 +38,13 @@
 # <type> <pkg.abbr> <name>
 # ...
 
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
 P SUNWcsr	Core Solaris, (Root)
 P SUNWckr	Core Solaris Kernel (Root)
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWrcapu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWrcapu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-#	ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -39,7 +38,15 @@
 # <type> <pkg.abbr> <name>
 # ...
 
-P SUNWrcapr	Solaris Resource Capping Daemon (Root)
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
-P SUNWcsl	Core Solaris, (Shared Libs)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
+P SUNWrcapr	Solaris Resource Capping Daemon (Root)
 P SUNWzoneu	Solaris Zones (Usr)
--- a/usr/src/pkgdefs/SUNWrcmdc/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWrcmdc/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWkrbu	Kerberos version 5 support (Usr)
--- a/usr/src/pkgdefs/SUNWrcmds/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWrcmds/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,5 +48,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWkrbu	Kerberos version 5 support (Usr)
 R SUNWrcmdr	Remote Network Server Commands (Root)
--- a/usr/src/pkgdefs/SUNWrdcr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWrdcr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # This package information file defines software dependencies associated
@@ -46,5 +46,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWscmu	Sun StorageTek Availability Suite Storage Cache Management (usr)
 P SUNWspsvu	Sun StorageTek Availability Suite Storage Volume Driver (usr)
--- a/usr/src/pkgdefs/SUNWrdcu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWrdcu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -37,6 +37,17 @@
 # <type> <pkg.abbr> <name>
 # ...
 #
+
+P SUNWcar       Core Architecture, (Root)
+P SUNWcakr      Core Solaris Kernel Architecture (Root)
+P SUNWkvm       Core Architecture, (Kvm)
+P SUNWcsr       Core Solaris, (Root)
+P SUNWckr       Core Solaris Kernel (Root)
+P SUNWcnetr     Core Solaris Network Infrastructure (Root)
+P SUNWcsu       Core Solaris, (Usr)
+P SUNWcsd       Core Solaris Devices
+P SUNWcsl       Core Solaris Libraries
+P SUNWcslr      Core Solaris Libraries (Root)
 P SUNWscmu      Sun StorageTek Availability Suite Storage Cache Management (usr)
 P SUNWspsvu     Sun StorageTek Availability Suite Storage Volume Driver (usr)
 P SUNWrdcr      Sun StorageTek Availability Suite Remote Mirror Copy (root)
--- a/usr/src/pkgdefs/SUNWrds/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWrds/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -48,4 +47,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWib	Sun InfiniBand Framework
--- a/usr/src/pkgdefs/SUNWrge/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWrge/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -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,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,3 +48,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWrmodr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWrmodr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,6 @@
 P SUNWcar	Core Archictecture (Root)
 P SUNWcakr	Core Solaris Kernel Architecture (Root)
 P SUNWkvm	Core Architecture (Usr)
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWos86r	Platform Support, OS Functionality (Root)
--- a/usr/src/pkgdefs/SUNWrmodu/Makefile	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWrmodu/Makefile	Tue Aug 04 18:20:38 2009 -0700
@@ -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.
@@ -19,27 +18,16 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.com
 
 .KEEP_STATE:
 
-all: $(FILES)
-install: all $(MACH)_pkg
+all: $(FILES) depend
+install: all pkg
 
 include ../Makefile.targ
-
-sparc_pkg: FRC
-	@if [ "$(SPARC_RM_PKGARCHIVE)" ]; then \
-		[ -d $(SPARC_RM_PKGARCHIVE) ] || \
-			mkdir -p $(SPARC_RM_PKGARCHIVE); \
-		pkgmk -a sparc -f prototype_sparc_realmode \
-			-d $(SPARC_RM_PKGARCHIVE) -r $(ROOT) -o $(PACKAGE); \
-	fi
-
-i386_pkg: pkg sparc_pkg
--- a/usr/src/pkgdefs/SUNWrmodu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWrmodu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,3 +48,5 @@
 P SUNWcar	Core Archictecture (Root)
 P SUNWcakr	Core Solaris Kernel Architecture (Root)
 P SUNWkvm	Core Architecture (Usr)
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWrmodu/prototype_com	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWrmodu/prototype_com	Tue Aug 04 18:20:38 2009 -0700
@@ -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.
@@ -19,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -37,9 +35,3 @@
 i pkginfo
 i copyright
 i depend
-
-d none usr 0755 root sys
-d none usr/lib 0755 root bin
-d none usr/lib/fs 0755 root sys
-d none usr/lib/fs/ufs 0755 root sys
-f none usr/lib/fs/ufs/mboot 0444 root bin
--- a/usr/src/pkgdefs/SUNWrmodu/prototype_i386	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWrmodu/prototype_i386	Tue Aug 04 18:20:38 2009 -0700
@@ -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.
@@ -19,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -39,3 +37,8 @@
 #
 # List i386-specific files here
 #
+d none usr 0755 root sys
+d none usr/lib 0755 root bin
+d none usr/lib/fs 0755 root sys
+d none usr/lib/fs/ufs 0755 root sys
+f none usr/lib/fs/ufs/mboot 0444 root bin
--- a/usr/src/pkgdefs/SUNWrmodu/prototype_sparc_realmode	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-!include prototype_com
-
-#
-# List sparc-specific files here
-#
-
--- a/usr/src/pkgdefs/SUNWrmvolmgr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWrmvolmgr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,6 +48,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 
 # Other packages this package has dependencies
 # upon at install-time or run-time.
--- a/usr/src/pkgdefs/SUNWrmvolmgrr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWrmvolmgrr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,6 +48,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 
 # Other packages this package has dependencies
 # upon at install-time or run-time.
--- a/usr/src/pkgdefs/SUNWrmwbu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWrmwbu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,6 +48,7 @@
 P SUNWcsu       Core Solaris, (Usr)
 P SUNWcsd       Core Solaris Devices
 P SUNWcsl       Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWwbcor	Solaris WBEM Services (root)
 P SUNWwbcou	Solaris WBEM Services (usr)
 P SUNWwbapi     WBEM for Solaris API 
--- a/usr/src/pkgdefs/SUNWrpcib/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWrpcib/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,5 +47,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWib	Sun InfiniBand Framework
 P SUNWipoib	Sun IP over InfiniBand
--- a/usr/src/pkgdefs/SUNWrsm/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWrsm/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWrsmo	RSMPI Operations Registration Module
--- a/usr/src/pkgdefs/SUNWrtls/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWrtls/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,8 +1,7 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -28,3 +27,5 @@
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWrum/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWrum/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -47,4 +47,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWusb	USB Device Drivers
--- a/usr/src/pkgdefs/SUNWsckmu.u/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWsckmu.u/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWsckmr	SMF service for the Key Management daemon
--- a/usr/src/pkgdefs/SUNWscmhdlr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWscmhdlr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-#	ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,4 +47,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWstc	Smart Card Reader Device Driver
--- a/usr/src/pkgdefs/SUNWscmr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWscmr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # This package information file defines software dependencies associated
@@ -46,3 +46,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWscmu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWscmu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # This package information file defines software dependencies associated
@@ -46,4 +46,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWscmr	Sun StorageTek Availability Suite Storage Cache Management (root)
--- a/usr/src/pkgdefs/SUNWscplp/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWscplp/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,5 +48,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWpcr	Solaris Print - Client, (root)
 P SUNWpcu	Solaris Print - Client, (Usr)
--- a/usr/src/pkgdefs/SUNWscpu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWscpu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,6 +48,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWrcmdc	Remote Network Client Commands
 P SUNWrcmds	Remote Network Server Commands (Usr)
 P SUNWbip	Basic IP commands (Usr)
--- a/usr/src/pkgdefs/SUNWscsa1394/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWscsa1394/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,5 +48,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNW1394	Sun IEEE1394 Framework
 P SUNWsbp2	Serial Bus Protocol 2 module
--- a/usr/src/pkgdefs/SUNWscsip/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWscsip/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -20,10 +20,9 @@
 #
 
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -42,4 +41,13 @@
 # ...
 #
 
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWslpr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWslpr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,5 +47,6 @@
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWcsd	Core Solaris Devices
 R SUNWslpu	SLP, (User)
--- a/usr/src/pkgdefs/SUNWslpu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWslpu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,7 +47,7 @@
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWcsd	Core Solaris Devices
 P SUNWj5rt	JDK 1.5 runtime environment
 P SUNWslpr	SLP, (Root)
-R SUNWslpu	SLP (User)
--- a/usr/src/pkgdefs/SUNWsmapi/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWsmapi/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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,9 +21,6 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -51,3 +47,4 @@
 P SUNWcsu       Core Solaris, (Usr)
 P SUNWcsd       Core Solaris Devices
 P SUNWcsl       Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWsmbfskr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWsmbfskr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -51,6 +50,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 
 # Dependencies specific to this package
 P SUNWsmbfsu	SMB/CIFS File System client support (Usr)
--- a/usr/src/pkgdefs/SUNWsmbfsr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWsmbfsr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -51,6 +50,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 
 # Dependencies specific to this package
 P SUNWsmbfsu	SMB/CIFS File System client support (Usr)
--- a/usr/src/pkgdefs/SUNWsmbfsu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWsmbfsu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -51,6 +50,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 
 # Dependencies specific to this package
 P SUNWkrbu	Kerberos version 5 support (Usr)
--- a/usr/src/pkgdefs/SUNWsmbsr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWsmbsr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,12 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -48,7 +45,9 @@
 P SUNWkvm	Core Architecture, (Kvm)
 P SUNWcsr	Core Solaris, (Root)
 P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWsmbskr	SMB Kernel (Root)
--- a/usr/src/pkgdefs/SUNWsmbsu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWsmbsu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -47,9 +47,11 @@
 P SUNWkvm	Core Architecture, (Kvm)
 P SUNWcsr	Core Solaris, (Root)
 P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWsmbskr	SMB Kernel (Root)
 P SUNWsmbsr	SMB Server (Root)
 P SUNWlxml	The XML library
--- a/usr/src/pkgdefs/SUNWsmedia/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWsmedia/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,6 +48,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWnfscr	Network File System (NFS) client support (Root)
 P SUNWnfsckr	Network File System (NFS) client kernel support (Root)
 P SUNWnfscu	Network File System (NFS) client support (Usr)
--- a/usr/src/pkgdefs/SUNWsmhbar/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWsmhbar/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -46,4 +46,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWsmhba	SM-HBA Libraries and CLI
--- a/usr/src/pkgdefs/SUNWsn1rint/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWsn1rint/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 P SUNWcar	Core Architecture, (Root)
@@ -34,5 +33,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWzoneu	Solaris Zones (Usr)
 P SUNWzoner	Solaris Zones (Root)
--- a/usr/src/pkgdefs/SUNWsn1uint/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWsn1uint/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 P SUNWcar	Core Architecture, (Root)
@@ -34,6 +33,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWzoneu	Solaris Zones (Usr)
 P SUNWzoner	Solaris Zones (Root)
 P SUNWsn1rint	Fake Solaris N-1 Brand (Root)
--- a/usr/src/pkgdefs/SUNWsndmr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWsndmr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
-# ident	"%Z%%M%	%I%	%E% SMI"
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+#
+# Copyright 2009 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.
@@ -48,3 +47,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWsndmu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWsndmu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,6 +47,7 @@
 P SUNWcsu		Core Solaris, (Usr)
 P SUNWcsd		Core Solaris Devices
 P SUNWcsl		Core Solaris Libraries
+P SUNWcslr		Core Solaris Libraries (Root)
 P SUNWperl584core	Perl 5.8.4 (core)
 P SUNWperl584usr	Perl 5.8.4 (non-core)
 P SUNWsndmr		Sendmail, (Root)
--- a/usr/src/pkgdefs/SUNWspnego/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWspnego/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -48,6 +47,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris, (Shared Libs)
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWgss	GSSAPI V2
 P SUNWrsg	RPCSEC_GSS
 P SUNWgssc	GSSAPI CONFIG V2
--- a/usr/src/pkgdefs/SUNWspsvr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWspsvr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # This package information file defines software dependencies associated
@@ -46,4 +46,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWscmu	Sun StorageTek Availability Suite Storage Cache Management (usr)
--- a/usr/src/pkgdefs/SUNWspsvu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWspsvu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # This package information file defines software dependencies associated
@@ -46,5 +46,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWscmu	Sun StorageTek Availability Suite Storage Cache Management (usr)
 P SUNWspsvr	Sun StorageTek Availability Suite Storage Volume Driver (root)
--- a/usr/src/pkgdefs/SUNWsshcu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWsshcu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -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.
@@ -19,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,5 +47,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWzlib      The Zip compression library
 P SUNWopenssl-libraries OpenSSL Libraries, (Usr)
--- a/usr/src/pkgdefs/SUNWsshdr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWsshdr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -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.
@@ -19,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,4 +47,5 @@
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWcsd	Core Solaris Devices
--- a/usr/src/pkgdefs/SUNWsshdu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWsshdu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -18,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -48,6 +47,7 @@
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWcsd	Core Solaris Devices
 P SUNWgss	GSSAPI V2
 P SUNWloc	System Localization
--- a/usr/src/pkgdefs/SUNWsshr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWsshr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -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.
@@ -19,10 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,4 +47,5 @@
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWcsd	Core Solaris Devices
--- a/usr/src/pkgdefs/SUNWsshu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWsshu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -46,6 +46,7 @@
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWcsd	Core Solaris Devices
 P SUNWgss	GSSAPI V2
 P SUNWsshcu	SSH Common, (Usr)
--- a/usr/src/pkgdefs/SUNWstatl/Makefile	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1993 by Sun Microsystems, Inc.
-#
-
-include ../Makefile.com
-
-DATAFILES += depend
-
-.KEEP_STATE:
-
-all: $(FILES)
-install: all pkg
-
-include ../Makefile.targ
--- a/usr/src/pkgdefs/SUNWstatl/pkginfo.tmpl	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# This required package information file describes characteristics of the
-# package, such as package abbreviation, full package name, package version,
-# and package architecture.
-#
-PKG="SUNWstatl"
-NAME="Internal Networking Build Libraries"
-ARCH="ISA"
-VERSION="ONVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="Internal Networking Build Libraries"
-VENDOR="Sun Microsystems, Inc."
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
-BASEDIR=/
-SUNW_PKGVERS="1.0"
-#VSTOCK="<reserved by Release Engineering for package part #>"
-#ISTATES="<developer defined>"
-#RSTATES='<developer defined>'
-#ULIMIT="<developer defined>"
-#ORDER="<developer defined>"
-#PSTAMP="<developer defined>"
-#INTONLY="<developer defined>"
--- a/usr/src/pkgdefs/SUNWstatl/prototype_com	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 1990-2003 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-# packaging files
-i pkginfo
-i copyright
-i depend
-#
-# source locations relative to the prototype file
-#
-# SUNWstatl
-#
-d none usr 755 root sys
-d none usr/lib 755 root bin
-d none usr/include 755 root bin
--- a/usr/src/pkgdefs/SUNWstatl/prototype_i386	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#	Copyright (c) 1990-93 Sun Microsystems, Inc.
-#		All Rights Reserved
-#
-#	ident	"%Z%%M%	%I%	%E% SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-#
-#
-# List files which are I386 specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWstatl
-#
--- a/usr/src/pkgdefs/SUNWstatl/prototype_sparc	Tue Aug 04 13:44:26 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#
-# 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.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#	Copyright (c) 1990-93 Sun Microsystems, Inc.
-#		All Rights Reserved
-#
-#	ident	"%Z%%M%	%I%	%E% SMI"
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-#
-# Include ISA independent files (prototype_com)
-#
-!include prototype_com
-#
-#
-#
-# List files which are SPARC specific here
-#
-# source locations relative to the prototype file
-#
-#
-# SUNWstatl
-#
--- a/usr/src/pkgdefs/SUNWstmf/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWstmf/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # This package information file defines software dependencies associated
@@ -47,4 +47,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWstmfu	Common Multiprotocol SCSI Target Libraries and Tools
--- a/usr/src/pkgdefs/SUNWtavor/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWtavor/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,8 +1,7 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -29,4 +28,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWib	Sun InfiniBand Framework
--- a/usr/src/pkgdefs/SUNWtftp/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWtftp/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 R SUNWtftpr	Trivial File Transfer Server (Root)
--- a/usr/src/pkgdefs/SUNWtnetc/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWtnetc/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWkrbu	Kerberos version 5 support (Usr)
--- a/usr/src/pkgdefs/SUNWtnetd/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWtnetd/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,5 +48,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWkrbu	Kerberos version 5 support (Usr)
 R SUNWtnetr	Telnet Server Daemon (Root)
--- a/usr/src/pkgdefs/SUNWtsg/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWtsg/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -41,6 +40,14 @@
 # ...
 #
 
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
 P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWdtbas	CDE application basic runtime environment
--- a/usr/src/pkgdefs/SUNWtsr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWtsr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -43,6 +42,15 @@
 # If we do not declare dependency on SUNWcsr, we cannot always find
 # /etc/pam.conf to modify
 #
-P SUNWcsr       Core Solaris, (Root)
-P SUNWtsu       Trusted Extensions, (Usr)
+
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
 P SUNWcslr	Core Solaris Libraries (Root)
+P SUNWtsu	Trusted Extensions, (Usr)
--- a/usr/src/pkgdefs/SUNWtsu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWtsu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -41,7 +40,14 @@
 # ...
 #
 
-P SUNWtsg       Trusted Extensions global
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
 P SUNWcslr	Core Solaris Libraries (Root)
-P SUNWcsr	Core Solaris, (Root)
+P SUNWtsg	Trusted Extensions global
--- a/usr/src/pkgdefs/SUNWuacm/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWuacm/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,5 +48,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWusb	USB Device Drivers
 P SUNWusbs	USB generic serial module 
--- a/usr/src/pkgdefs/SUNWudapltr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWudapltr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,6 +47,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWudaplr	Sun User Direct Access Programming Library (Root)
 P SUNWudaplu	Sun User Direct Access Programming Library (User)
 P SUNWudapltu	Sun uDAPL for Tavor (User)
--- a/usr/src/pkgdefs/SUNWudapltu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWudapltu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,8 +1,7 @@
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -29,6 +28,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWudaplr	Sun User Direct Access Programming Library (Root)
 P SUNWudaplu	Sun User Direct Access Programming Library (User)
 P SUNWtavor	Sun Tavor HCA Driver
--- a/usr/src/pkgdefs/SUNWudaplu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWudaplu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,4 +47,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWudaplr	Sun User Direct Access Programming Library (Root)
--- a/usr/src/pkgdefs/SUNWudf/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWudf/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWudfr	Universal Disk Format 1.50, (Root 32-bit)
--- a/usr/src/pkgdefs/SUNWuedg/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWuedg/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,5 +48,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWusb	USB Device Drivers
 P SUNWusbs	USB generic serial module 
--- a/usr/src/pkgdefs/SUNWuftdi/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWuftdi/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -47,5 +47,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWusb	USB Device Drivers
 P SUNWusbs	USB generic serial module 
--- a/usr/src/pkgdefs/SUNWugen/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWugen/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWusb	USB Device Drivers
--- a/usr/src/pkgdefs/SUNWugenu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWugenu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWugen	UGEN (USB Generic Driver)
--- a/usr/src/pkgdefs/SUNWuksp/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWuksp/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,5 +48,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWusb	USB Device Drivers
 P SUNWusbs	USB generic serial module 
--- a/usr/src/pkgdefs/SUNWukspfw/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWukspfw/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -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,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -51,5 +49,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWusb	USB Device Drivers
 P SUNWusbs	USB generic serial module 
--- a/usr/src/pkgdefs/SUNWuprl/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWuprl/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,5 +48,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWusb	USB Device Drivers
 P SUNWusbs	USB generic serial module 
--- a/usr/src/pkgdefs/SUNWural/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWural/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -47,4 +47,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWusb	USB Device Drivers
--- a/usr/src/pkgdefs/SUNWusb/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWusb/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -47,5 +47,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWaudd      Audio Drivers (32 bit)
 P SUNWuwb	Ultra Wideband (UWB) support modules
--- a/usr/src/pkgdefs/SUNWusbs/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWusbs/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWusb	USB Device Drivers
--- a/usr/src/pkgdefs/SUNWusbu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWusbu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWusb	USB Device Drivers
--- a/usr/src/pkgdefs/SUNWusbvc/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWusbvc/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -18,13 +18,10 @@
 #
 # CDDL HEADER END
 #
-
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -52,4 +49,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWusb	USB Device Drivers
--- a/usr/src/pkgdefs/SUNWuwb/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWuwb/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -48,3 +48,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWvia823x/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWvia823x/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,8 +1,7 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -30,4 +29,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWaudd	Audio Drivers
--- a/usr/src/pkgdefs/SUNWvscanr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWvscanr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,12 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -48,7 +45,9 @@
 P SUNWkvm	Core Architecture, (Kvm)
 P SUNWcsr	Core Solaris, (Root)
 P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWvscankr	Virus Scan Service Kernel (Root)
--- a/usr/src/pkgdefs/SUNWvscanu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWvscanu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -19,12 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -48,9 +45,11 @@
 P SUNWkvm	Core Architecture, (Kvm)
 P SUNWcsr	Core Solaris, (Root)
 P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWlibmsr	Math & Microtasking Libraries (Root)
 P SUNWvscankr	Virus Scan Service Kernel (Root)
 P SUNWvscanr	Virus Scan Service (Root)
--- a/usr/src/pkgdefs/SUNWwbint/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWwbint/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,5 +48,6 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWopenssl-libraries OpenSSL Libraries, (Usr)
 P SUNWopenssl-include OpenSSL Headers, (Usr)
--- a/usr/src/pkgdefs/SUNWwbsd/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWwbsd/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -47,4 +47,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWsdcard    SD/MMC Drivers
--- a/usr/src/pkgdefs/SUNWwbsup/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWwbsup/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,13 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -50,4 +48,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWopenssl-libraries OpenSSL Libraries, (Usr)
--- a/usr/src/pkgdefs/SUNWwpar/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWwpar/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -48,5 +47,6 @@
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWcsd	Core Solaris Devices
 R SUNWwpau      Wireless WPA Supplicant, (Usr)
--- a/usr/src/pkgdefs/SUNWwpau/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWwpau/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -21,7 +21,6 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -48,5 +47,6 @@
 P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWcsd	Core Solaris Devices
 P SUNWwpar	Wireless WPA Supplicant, (Root)
--- a/usr/src/pkgdefs/SUNWxcu4/Makefile	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWxcu4/Makefile	Tue Aug 04 18:20:38 2009 -0700
@@ -19,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
 include ../Makefile.com
 
-DATAFILES += depend
 
 .KEEP_STATE:
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/pkgdefs/SUNWxcu4/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -0,0 +1,51 @@
+#
+# Copyright 2009 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 (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.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# This package information file defines software dependencies associated
+# with the pkg.  You can define three types of pkg dependencies with this file:
+#	 P indicates a prerequisite for installation
+#	 I indicates an incompatible package
+#	 R indicates a reverse dependency
+# <pkg.abbr> see pkginfo(4), PKG parameter
+# <name> see pkginfo(4), NAME parameter
+# <version> see pkginfo(4), VERSION parameter
+# <arch> see pkginfo(4), ARCH parameter
+# <type> <pkg.abbr> <name>
+# 	(<arch>)<version>
+# 	(<arch>)<version>
+# 	...
+# <type> <pkg.abbr> <name>
+# ...
+#
+
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr      Core Solaris Libraries (Root)
+P SUNWlibms	Math & Microtasking Libraries (Usr)
--- a/usr/src/pkgdefs/SUNWxdt/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWxdt/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -20,10 +20,19 @@
 #
 
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWdtrc	Dynamic Tracing (DTrace) Clients 
 P SUNWdtrp	Dynamic Tracing (DTrace) Providers
--- a/usr/src/pkgdefs/SUNWxvmipar/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWxvmipar/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -47,4 +47,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWxvmdomu	Hypervisor Domain Tools (Usr)
--- a/usr/src/pkgdefs/SUNWxvmipau/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWxvmipau/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -47,4 +47,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWxvmipar	Hypervisor Domain Tools (Usr)
--- a/usr/src/pkgdefs/SUNWzfskr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWzfskr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -18,12 +18,10 @@
 #
 # CDDL HEADER END
 #
-
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -47,6 +45,8 @@
 P SUNWkvm	Core Architecture, (Kvm)
 P SUNWcsr	Core Solaris, (Root)
 P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
--- a/usr/src/pkgdefs/SUNWzfsr/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWzfsr/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -20,10 +20,9 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -47,9 +46,11 @@
 P SUNWkvm	Core Architecture, (Kvm)
 P SUNWcsr	Core Solaris, (Root)
 P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWzfskr	ZFS Kernel (Root)
 P SUNWlibmsr	Math & Microtasking Libraries (Root)
 P SUNWsmapi	Storage Management APIs
--- a/usr/src/pkgdefs/SUNWzfsu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWzfsu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -45,9 +45,11 @@
 P SUNWkvm	Core Architecture, (Kvm)
 P SUNWcsr	Core Solaris, (Root)
 P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWzfsr	ZFS (Root)
 P SUNWsmapi	Storage Management APIs
 P SUNWlxml	The XML library
--- a/usr/src/pkgdefs/SUNWzoneu/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWzoneu/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -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.
@@ -19,14 +18,10 @@
 #
 # CDDL HEADER END
 #
-
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -54,6 +49,7 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWzoner	Solaris Zones (Root)
 P SUNWlxml	The XML library
 P SUNWpool	Resource Pools
--- a/usr/src/pkgdefs/SUNWzyd/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/SUNWzyd/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -47,4 +47,5 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
 P SUNWusb	USB Device Drivers
--- a/usr/src/pkgdefs/common_files/depend	Tue Aug 04 13:44:26 2009 -0700
+++ b/usr/src/pkgdefs/common_files/depend	Tue Aug 04 18:20:38 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # CDDL HEADER START
@@ -47,3 +47,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)