PSARC 2009/539 Removal of ucb headers and lint libraries

6889898 ucb lint libraries and headers should go go go
author: Garrett D'Amore <Garrett.Damore@Sun.COM> 2009-10-09 17:01:12 -0700
committer: Garrett D'Amore <Garrett.Damore@Sun.COM> 2009-10-09 17:01:12 -0700
commit: 5bbb4db2c3f208d12bf0fd11769728f9e5ba66a2 (patch)
tree: ff1164c9871a611c7597916b0395e944697a5431 /usr/src
parent: 28863dd2d94fb78bea3941334d3783f014da7403 (diff)
download: illumos-joyent-5bbb4db2c3f208d12bf0fd11769728f9e5ba66a2.tar.gz
66 files changed, 91 insertions, 2880 deletions
diff --git a/usr/src/Makefile b/usr/src/Makefile
index 931e28aef3..9e4f144937 100644
--- a/usr/src/Makefile
+++ b/usr/src/Makefile
@@ -42,7 +42,7 @@ i386_SUBDIRS= psm grub
 
 SUBDIRS= $(COMMON_SUBDIRS) $($(MACH)_SUBDIRS)
 
-HDRSUBDIRS=	uts head lib cmd ucbhead
+HDRSUBDIRS=	uts head lib cmd
 
 # UCB headers are bug-for-bug compatible and not checkable against the header
 # standards.
@@ -52,7 +52,7 @@ CHKHDRSUBDIRS=	head uts lib
 #
 # Headers that can be built in parallel
 #
-PARALLEL_HEADERS = sysheaders userheaders libheaders ucbheaders cmdheaders
+PARALLEL_HEADERS = sysheaders userheaders libheaders cmdheaders
 
 #
 # Directories that can be built in parallel
@@ -150,13 +150,13 @@ closedbins: FRC $(ROOTDIRS)
 .PARALLEL: $(PARALLEL_HEADERS) DUMMY
 .PARALLEL: $(PARALLEL_DIRS) DUMMY
 
-$(SUBDIRS) head ucbhead pkgdefs: FRC
+$(SUBDIRS) head pkgdefs: FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 # librpcsvc has a dependency on headers installed by
 # userheaders, hence the .WAIT before libheaders.
 sgs: rootdirs .WAIT sysheaders userheaders .WAIT \
-	libheaders ucbheaders cmdheaders
+	libheaders cmdheaders
 
 #
 # Top-level setup target to setup the development environment that includes
@@ -193,9 +193,6 @@ libheaders: FRC
 sysheaders: FRC
 	@cd uts; pwd; $(MAKE) install_h
 
-ucbheaders: FRC
-	@cd ucbhead; pwd; $(MAKE) install_h
-
 cmdheaders: FRC
 	@cd cmd/fm; pwd; $(MAKE) install_h
 	@cd cmd/mdb; pwd; $(MAKE) install_h
diff --git a/usr/src/pkgdefs/Makefile b/usr/src/pkgdefs/Makefile
index 092e292dc9..bb3fff34b2 100644
--- a/usr/src/pkgdefs/Makefile
+++ b/usr/src/pkgdefs/Makefile
@@ -474,8 +474,6 @@ COMMON_SUBDIRS= \
 	SUNWspnego \
 	SUNWspsvr \
 	SUNWspsvu \
-	SUNWsra  \
-	SUNWsrh  \
 	SUNWsrptr  \
 	SUNWsrptu  \
 	SUNWsshcu \
diff --git a/usr/src/pkgdefs/SUNWscpu/prototype_i386 b/usr/src/pkgdefs/SUNWscpu/prototype_i386
index 9a31ce3582..2cf02ff88e 100644
--- a/usr/src/pkgdefs/SUNWscpu/prototype_i386
+++ b/usr/src/pkgdefs/SUNWscpu/prototype_i386
@@ -62,13 +62,3 @@ s none usr/ucblib/amd64/libtermcap.so=./libtermcap.so.1
 f none usr/ucblib/amd64/libtermcap.so.1 755 root bin
 s none usr/ucblib/amd64/libucb.so=./libucb.so.1
 f none usr/ucblib/amd64/libucb.so.1 755 root bin
-# XX64 - fix me
-f none usr/ucblib/amd64/llib-lcurses 644 root bin
-f none usr/ucblib/amd64/llib-lcurses.ln 644 root bin
-f none usr/ucblib/amd64/llib-ldbm 644 root bin
-f none usr/ucblib/amd64/llib-ldbm.ln 644 root bin
-f none usr/ucblib/amd64/llib-lrpcsoc.ln 644 root bin
-f none usr/ucblib/amd64/llib-ltermcap 644 root bin
-f none usr/ucblib/amd64/llib-ltermcap.ln 644 root bin
-f none usr/ucblib/amd64/llib-lucb 644 root bin
-f none usr/ucblib/amd64/llib-lucb.ln 644 root bin
diff --git a/usr/src/pkgdefs/SUNWscpu/prototype_sparc b/usr/src/pkgdefs/SUNWscpu/prototype_sparc
index d693b4af3a..1b5b7a0a7b 100644
--- a/usr/src/pkgdefs/SUNWscpu/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWscpu/prototype_sparc
@@ -60,12 +60,3 @@ s none usr/ucblib/sparcv9/libtermcap.so=./libtermcap.so.1
 f none usr/ucblib/sparcv9/libtermcap.so.1 755 root bin
 s none usr/ucblib/sparcv9/libucb.so=./libucb.so.1
 f none usr/ucblib/sparcv9/libucb.so.1 755 root bin
-f none usr/ucblib/sparcv9/llib-lcurses 644 root bin
-f none usr/ucblib/sparcv9/llib-lcurses.ln 644 root bin
-f none usr/ucblib/sparcv9/llib-ldbm 644 root bin
-f none usr/ucblib/sparcv9/llib-ldbm.ln 644 root bin
-f none usr/ucblib/sparcv9/llib-lrpcsoc.ln 644 root bin
-f none usr/ucblib/sparcv9/llib-ltermcap 644 root bin
-f none usr/ucblib/sparcv9/llib-ltermcap.ln 644 root bin
-f none usr/ucblib/sparcv9/llib-lucb 644 root bin
-f none usr/ucblib/sparcv9/llib-lucb.ln 644 root bin
diff --git a/usr/src/pkgdefs/SUNWsra/Makefile b/usr/src/pkgdefs/SUNWsra/Makefile
deleted file mode 100644
index f248e7bccb..0000000000
--- a/usr/src/pkgdefs/SUNWsra/Makefile
+++ /dev/null
@@ -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
diff --git a/usr/src/pkgdefs/SUNWsra/pkginfo.tmpl b/usr/src/pkgdefs/SUNWsra/pkginfo.tmpl
deleted file mode 100644
index 6e827bf1a1..0000000000
--- a/usr/src/pkgdefs/SUNWsra/pkginfo.tmpl
+++ /dev/null
@@ -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="SUNWsra"
-NAME="Source Compatibility Archive Libraries"
-ARCH="ISA"
-VERSION="ONVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="libraries in archive (ar) format for source build compatibility with SunOS 4.x"
-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>"
diff --git a/usr/src/pkgdefs/SUNWsra/prototype_com b/usr/src/pkgdefs/SUNWsra/prototype_com
deleted file mode 100644
index 00e3fcd633..0000000000
--- a/usr/src/pkgdefs/SUNWsra/prototype_com
+++ /dev/null
@@ -1,58 +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
-#
-# SUNWsra
-#
-d none usr 755 root sys
-d none usr/ucblib 755 root bin
-f none usr/ucblib/llib-lcurses 644 root bin
-f none usr/ucblib/llib-lcurses.ln 644 root bin
-f none usr/ucblib/llib-ldbm 644 root bin
-f none usr/ucblib/llib-ldbm.ln 644 root bin
-f none usr/ucblib/llib-lrpcsoc 644 root bin
-f none usr/ucblib/llib-lrpcsoc.ln 644 root bin
-f none usr/ucblib/llib-ltermcap 644 root bin
-f none usr/ucblib/llib-ltermcap.ln 644 root bin
-f none usr/ucblib/llib-lucb 644 root bin
-f none usr/ucblib/llib-lucb.ln 644 root bin
diff --git a/usr/src/pkgdefs/SUNWsra/prototype_i386 b/usr/src/pkgdefs/SUNWsra/prototype_i386
deleted file mode 100644
index 02211643f8..0000000000
--- a/usr/src/pkgdefs/SUNWsra/prototype_i386
+++ /dev/null
@@ -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
-#
-#
-# SUNWsra
-#
diff --git a/usr/src/pkgdefs/SUNWsra/prototype_sparc b/usr/src/pkgdefs/SUNWsra/prototype_sparc
deleted file mode 100644
index 8876b9630a..0000000000
--- a/usr/src/pkgdefs/SUNWsra/prototype_sparc
+++ /dev/null
@@ -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
-#
-#
-# SUNWsra
-#
diff --git a/usr/src/pkgdefs/SUNWsrh/Makefile b/usr/src/pkgdefs/SUNWsrh/Makefile
deleted file mode 100644
index f248e7bccb..0000000000
--- a/usr/src/pkgdefs/SUNWsrh/Makefile
+++ /dev/null
@@ -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
diff --git a/usr/src/pkgdefs/SUNWsrh/pkginfo.tmpl b/usr/src/pkgdefs/SUNWsrh/pkginfo.tmpl
deleted file mode 100644
index 1fef78dd99..0000000000
--- a/usr/src/pkgdefs/SUNWsrh/pkginfo.tmpl
+++ /dev/null
@@ -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="SUNWsrh"
-NAME="Source Compatibility 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 source build compatibility with SunOS 4.x"
-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>"
diff --git a/usr/src/pkgdefs/SUNWsrh/prototype_com b/usr/src/pkgdefs/SUNWsrh/prototype_com
deleted file mode 100644
index 60647bdd3a..0000000000
--- a/usr/src/pkgdefs/SUNWsrh/prototype_com
+++ /dev/null
@@ -1,83 +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-1993,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
-# 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
-#
-# SUNWsrh
-#
-d none usr 755 root sys
-d none usr/ucbinclude 755 root bin
-f none usr/ucbinclude/a.out.h 644 root bin
-f none usr/ucbinclude/assert.h 644 root bin
-f none usr/ucbinclude/curses.h 644 root bin
-f none usr/ucbinclude/dbm.h 644 root bin
-s none usr/ucbinclude/fcntl.h=./sys/fcntl.h
-f none usr/ucbinclude/regexp.h 644 root bin
-f none usr/ucbinclude/resolv.h 644 root bin
-f none usr/ucbinclude/setjmp.h 644 root bin
-f none usr/ucbinclude/sgtty.h 644 root bin
-f none usr/ucbinclude/signal.h 644 root bin
-f none usr/ucbinclude/stdio.h 644 root bin
-f none usr/ucbinclude/strings.h 644 root bin
-f none usr/ucbinclude/struct.h 644 root bin
-d none usr/ucbinclude/sys 755 root bin
-f none usr/ucbinclude/sys/dir.h 644 root bin
-f none usr/ucbinclude/sys/fcntl.h 644 root bin
-f none usr/ucbinclude/sys/file.h 644 root bin
-f none usr/ucbinclude/sys/ioctl.h 644 root bin
-f none usr/ucbinclude/sys/param.h 644 root bin
-f none usr/ucbinclude/sys/reboot.h 644 root bin
-f none usr/ucbinclude/sys/resource.h 644 root bin
-f none usr/ucbinclude/sys/rusage.h 644 root bin
-f none usr/ucbinclude/sys/signal.h 644 root bin
-f none usr/ucbinclude/sys/sysmacros.h 644 root bin
-f none usr/ucbinclude/sys/tty.h 644 root bin
-f none usr/ucbinclude/sys/ttychars.h 644 root bin
-f none usr/ucbinclude/sys/types.h 644 root bin
-f none usr/ucbinclude/sys/vfs.h 644 root bin
-f none usr/ucbinclude/sys/wait.h 644 root bin
-f none usr/ucbinclude/syscall.h 644 root bin
-d none usr/ucbinclude/ufs 755 root bin
-f none usr/ucbinclude/ufs/quota.h 644 root bin
-f none usr/ucbinclude/unistd.h 644 root bin
-f none usr/ucbinclude/vfont.h 644 root bin
-f none usr/ucbinclude/vfork.h 644 root bin
diff --git a/usr/src/pkgdefs/SUNWsrh/prototype_i386 b/usr/src/pkgdefs/SUNWsrh/prototype_i386
deleted file mode 100644
index 6f503f8af8..0000000000
--- a/usr/src/pkgdefs/SUNWsrh/prototype_i386
+++ /dev/null
@@ -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
-#
-#
-# SUNWsrh
-#
diff --git a/usr/src/pkgdefs/SUNWsrh/prototype_sparc b/usr/src/pkgdefs/SUNWsrh/prototype_sparc
deleted file mode 100644
index 14df4aff0b..0000000000
--- a/usr/src/pkgdefs/SUNWsrh/prototype_sparc
+++ /dev/null
@@ -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
-#
-#
-# SUNWsrh
-#
diff --git a/usr/src/ucbcmd/plot/Makefile b/usr/src/ucbcmd/plot/Makefile
index 23a3d2de32..4392704b9a 100644
--- a/usr/src/ucbcmd/plot/Makefile
+++ b/usr/src/ucbcmd/plot/Makefile
@@ -19,11 +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"
-#
 
 PROG=	tek t4013 t300 t300s t450 aedplot bgplot dumbplot gigiplot \
 	hpplot hp7221plot implot atoplot plottoa vplot crtplot plot
@@ -50,7 +48,7 @@ include ../Makefile.ucbcmd
 
 FILEMODE=	755
 
-INC1 = $(ROOT)/usr/ucbinclude
+INC1 = $(SRC)/ucbhead
 
 LDFLAGS +=  -L$(ROOT)/usr/ucblib -R /usr/ucblib
 
diff --git a/usr/src/ucbcmd/rusage/Makefile b/usr/src/ucbcmd/rusage/Makefile
index 1aa43afbb5..7981a4a614 100644
--- a/usr/src/ucbcmd/rusage/Makefile
+++ b/usr/src/ucbcmd/rusage/Makefile
@@ -19,9 +19,7 @@
 # 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.
 #
 
@@ -29,7 +27,7 @@ PROG= rusage
 
 include ../Makefile.ucbcmd
 
-INC1 = $(ROOT)/usr/ucbinclude
+INC1 = $(SRC)/ucbhead
 
 FILEMODE=	755
 
diff --git a/usr/src/ucbcmd/shutdown/Makefile b/usr/src/ucbcmd/shutdown/Makefile
index 4ebe21db3b..e1fed0c17b 100644
--- a/usr/src/ucbcmd/shutdown/Makefile
+++ b/usr/src/ucbcmd/shutdown/Makefile
@@ -19,11 +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"
-#
 
 PROG= shutdown
 
@@ -32,7 +30,7 @@ PROGOBJS= shutdown.o
 
 include ../Makefile.ucbcmd
 
-INC1 = $(ROOT)/usr/ucbinclude
+INC1 = $(SRC)/ucbhead
 
 FILEMODE=	755
 
diff --git a/usr/src/ucbcmd/tset/Makefile b/usr/src/ucbcmd/tset/Makefile
index 937839afcc..8309b5730a 100644
--- a/usr/src/ucbcmd/tset/Makefile
+++ b/usr/src/ucbcmd/tset/Makefile
@@ -19,9 +19,7 @@
 # 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.
 #
 
@@ -33,7 +31,7 @@ FILEMODE=	755
 
 LDLIBS =  -L$(ROOT)/usr/ucblib -R /usr/ucblib $(LDLIBS.cmd) -lucb -ltermcap
 
-CPPFLAGS = -I$(ROOT)/usr/ucbinclude $(CPPFLAGS.master)
+CPPFLAGS = -I$(SRC)/ucbhead $(CPPFLAGS.master)
 
 ROOTSYMLINK= $(ROOTBIN)/reset
 
diff --git a/usr/src/ucbcmd/vipw/Makefile b/usr/src/ucbcmd/vipw/Makefile
index 8812512fc5..a006d2f0b2 100644
--- a/usr/src/ucbcmd/vipw/Makefile
+++ b/usr/src/ucbcmd/vipw/Makefile
@@ -19,9 +19,7 @@
 # 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.
 #
 
@@ -29,7 +27,7 @@ PROG= vipw
 
 include ../Makefile.ucbcmd
 
-INC1 = $(ROOT)/usr/ucbinclude
+INC1 = $(SRC)/ucbhead
 
 LDLIBS =  -L$(ROOT)/usr/ucblib -R /usr/ucblib $(LDLIBS.cmd) -lucb
  
diff --git a/usr/src/ucbhead/Makefile b/usr/src/ucbhead/Makefile
deleted file mode 100644
index 0390e30cca..0000000000
--- a/usr/src/ucbhead/Makefile
+++ /dev/null
@@ -1,80 +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-2003 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ucbhead/Makefile
-#
-# include global definitions
-include ../Makefile.master
-
-LN= ln
-
-HDRS=	\
-a.out.h     assert.h    curses.h    dbm.h       \
-regexp.h    resolv.h    setjmp.h    sgtty.h  \
-signal.h    stdio.h     strings.h   struct.h    syscall.h  \
-unistd.h    vfont.h     vfork.h
-
-SYSHDRS= \
-dir.h        fcntl.h      file.h       ioctl.h \
-param.h      reboot.h     resource.h   rusage.h     signal.h \
-sysmacros.h  tty.h        ttychars.h   types.h      vfs.h \
-wait.h
-
-UFSHDRS= quota.h
-
-ROOTHDRS= $(HDRS:%=$(ROOT)/usr/ucbinclude/%)  \
-	$(SYSHDRS:%=$(ROOT)/usr/ucbinclude/sys/%)  \
-	$(UFSHDRS:%=$(ROOT)/usr/ucbinclude/ufs/%) 
-
-DIRS= sys ufs
-ROOTDIRS= $(ROOT)/usr/ucbinclude $(DIRS:%=$(ROOT)/usr/ucbinclude/%)
-
-FCNTLH= $(ROOT)/usr/ucbinclude/fcntl.h
-SYSFCNTLH= $(ROOT)/usr/ucbinclude/sys/fcntl.h
-
-INS.FCNTLH=	$(RM) $@; $(SYMLINK) sys/fcntl.h $@
-
-# install rules
-$(ROOT)/usr/ucbinclude/sys/%: sys/%
-	$(INS.file)
-
-$(ROOT)/usr/ucbinclude/ufs/%: ufs/%
-	$(INS.file)
-
-$(ROOT)/usr/ucbinclude/%: %
-	$(INS.file)
-
-.KEEP_STATE:
-
-install_h: $(ROOTDIRS) $(ROOTHDRS) $(FCNTLH)
-
-$(FCNTLH): $(SYSFCNTLH)
-	$(INS.FCNTLH)
-
-$(ROOTDIRS):
-	$(INS.dir)
-
diff --git a/usr/src/ucbhead/a.out.h b/usr/src/ucbhead/a.out.h
deleted file mode 100644
index 5ccc525295..0000000000
--- a/usr/src/ucbhead/a.out.h
+++ /dev/null
@@ -1,267 +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 2004 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-/*	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
-/*
- * Portions of this source code were derived from Berkeley 4.3 BSD
- * under license from the Regents of the University of California.
- */
-
-/*
- * SunOS 4.x a.out format -- 32-bit sparc only
- */
-
-#ifndef _A_OUT_H
-#define	_A_OUT_H
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#include <sys/isa_defs.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__sparcv8)
-
-/* contents of <sys/exec.h> included */
-
-/*
- * format of the exec header
- * known by kernel and by user programs
- */
-struct exec {
-	unsigned char	a_dynamic:1;	/* has a __DYNAMIC */
-	unsigned char	a_toolversion:7;
-			/* version of toolset used to create this file */
-	unsigned char	a_machtype;	/* machine type */
-	unsigned short	a_magic;	/* magic number */
-	unsigned int	a_text;		/* size of text segment */
-	unsigned int	a_data;		/* size of initialized data */
-	unsigned int	a_bss;		/* size of uninitialized data */
-	unsigned int	a_syms;		/* size of symbol table */
-	unsigned int	a_entry;	/* entry point */
-	unsigned int	a_trsize;	/* size of text relocation */
-	unsigned int	a_drsize;	/* size of data relocation */
-};
-
-#define	OMAGIC	0407		/* old impure format */
-#define	NMAGIC	0410		/* read-only text */
-#define	ZMAGIC	0413		/* demand load format */
-
-/* machine types */
-
-#define	M_OLDSUN2	0	/* old sun-2 executable files */
-#define	M_SPARC		3	/* runs only on SPARC */
-
-#define	TV_SUN2_SUN3	0
-#define	TV_SUN4		1
-/* end <sys/exec.h> */
-
-/*
- * memory management parameters
- */
-
-#define	PAGSIZ		0x02000
-#define	SEGSIZ		PAGSIZ
-#define	OLD_PAGSIZ	0x00800	/*  Page   size under Release 2.0 */
-#define	OLD_SEGSIZ	0x08000	/* Segment size under Release 2.0 */
-
-/*
- * returns 1 if an object file type is invalid, i.e., if the other macros
- * defined below will not yield the correct offsets.  Note that a file may
- * have N_BADMAG(x) = 0 and may be fully linked, but still may not be
- * executable.
- */
-
-#define	N_BADMAG(x) \
-	((x).a_magic != OMAGIC && (x).a_magic != NMAGIC && \
-	(x).a_magic != ZMAGIC)
-
-/*
- * relocation parameters. These are architecture-dependent
- * and can be deduced from the machine type.  They are used
- * to calculate offsets of segments within the object file;
- * See N_TXTOFF(x), etc. below.
- */
-
-#define	N_PAGSIZ(x) \
-	((x).a_machtype == M_OLDSUN2? OLD_PAGSIZ : PAGSIZ)
-#define	N_SEGSIZ(x) \
-	((x).a_machtype == M_OLDSUN2? OLD_SEGSIZ : SEGSIZ)
-
-/*
- * offsets of various sections of an object file.
- */
-
-#define	N_TXTOFF(x) \
-	/* text segment */ \
-	((x).a_machtype == M_OLDSUN2 \
-	? ((x).a_magic == ZMAGIC ? N_PAGSIZ(x) : sizeof (struct exec)) \
-	: ((x).a_magic == ZMAGIC ? 0 : sizeof (struct exec)))
-
-#define	N_DATOFF(x)   /* data segment */	\
-	(N_TXTOFF(x) + (x).a_text)
-
-#define	N_TRELOFF(x)  /* text reloc'n */	\
-	(N_DATOFF(x) + (x).a_data)
-
-#define	N_DRELOFF(x) /* data relocation */	\
-	(N_TRELOFF(x) + (x).a_trsize)
-
-#define	N_SYMOFF(x) \
-	/* symbol table */ \
-	(N_TXTOFF(x)+(x).a_text+(x).a_data+(x).a_trsize+(x).a_drsize)
-
-#define	N_STROFF(x) \
-	/* string table */ \
-	(N_SYMOFF(x) + (x).a_syms)
-
-/*
- * Macros which take exec structures as arguments and tell where the
- * various pieces will be loaded.
- */
-
-#define	_N_BASEADDR(x) \
-	(((x).a_magic == ZMAGIC) && ((x).a_entry < N_PAGSIZ(x)) ? \
-	    0 : N_PAGSIZ(x))
-
-#define	N_TXTADDR(x) \
-	((x).a_machtype == M_OLDSUN2 ? N_SEGSIZ(x) : _N_BASEADDR(x))
-
-#define	N_DATADDR(x) \
-	(((x).a_magic == OMAGIC)? (N_TXTADDR(x)+(x).a_text) \
-	: (N_SEGSIZ(x)+((N_TXTADDR(x)+(x).a_text-1) & ~(N_SEGSIZ(x)-1))))
-
-#define	N_BSSADDR(x)  (N_DATADDR(x)+(x).a_data)
-
-/*
- * Format of a relocation datum.
- */
-
-/*
- * Sparc relocation types
- */
-
-enum reloc_type
-{
-	RELOC_8,	RELOC_16,	RELOC_32,	/* simplest relocs    */
-	RELOC_DISP8,	RELOC_DISP16,	RELOC_DISP32,	/* Disp's (pc-rel)    */
-	RELOC_WDISP30,	RELOC_WDISP22,		/* SR word disp's	*/
-	RELOC_HI22,	RELOC_22,		/* SR 22-bit relocs   */
-	RELOC_13,	RELOC_LO10,		/* SR 13&10-bit relocs */
-	RELOC_SFA_BASE,	RELOC_SFA_OFF13,		/* SR S.F.A. relocs   */
-	RELOC_BASE10,	RELOC_BASE13,	RELOC_BASE22,	/* base_relative pic */
-	RELOC_PC10,	RELOC_PC22,			/* special pc-rel pic */
-	RELOC_JMP_TBL,				/* jmp_tbl_rel in pic */
-	RELOC_SEGOFF16,				/* ShLib offset-in-seg */
-	RELOC_GLOB_DAT, RELOC_JMP_SLOT, RELOC_RELATIVE /* rtld relocs	*/
-};
-
-/*
- * Format of a relocation datum.
- */
-
-struct reloc_info_sparc	/* used when header.a_machtype == M_SPARC */
-{
-	unsigned int	r_address;
-				/* relocation addr (offset in segment) */
-	unsigned int	r_index   :24;	/* segment index or symbol index */
-	unsigned int	r_extern  : 1;	/* if F, r_index==SEG#; if T, SYM idx */
-	int			  : 2;	/* <unused> */
-	enum reloc_type r_type    : 5;	/* type of relocation to perform */
-	int		r_addend;	/* addend for relocation value */
-};
-
-
-
-/*
- * Format of a symbol table entry
- */
-struct	nlist {
-	union {
-		char	*n_name;	/* for use when in-core */
-		int	n_strx;		/* index into file string table */
-	} n_un;
-	unsigned char	n_type;		/* type flag (N_TEXT,..)  */
-	char	n_other;		/* unused */
-	short	n_desc;			/* see <stab.h> */
-	unsigned int	n_value;	/* value of symbol (or sdb offset) */
-};
-
-/*
- * Simple values for n_type.
- */
-#define	N_UNDF	0x0		/* undefined */
-#define	N_ABS	0x2		/* absolute */
-#define	N_TEXT	0x4		/* text */
-#define	N_DATA	0x6		/* data */
-#define	N_BSS	0x8		/* bss */
-#define	N_COMM	0x12		/* common (internal to ld) */
-#define	N_FN	0x1e		/* file name symbol */
-
-#define	N_EXT	01		/* external bit, or'ed in */
-#define	N_TYPE	0x1e		/* mask for all the type bits */
-
-/*
- * Dbx entries have some of the N_STAB bits set.
- * These are given in <stab.h>
- */
-#define	N_STAB	0xe0		/* if any of these bits set, a dbx symbol */
-
-/*
- * Format for namelist values.
- */
-#define	N_FORMAT	"%08x"
-
-/*
- * secondary sections.
- * this stuff follows the string table.
- * not even its presence or absence is noted in the
- * exec header (?). the secondary header gives
- * the number of sections. following it is an
- * array of "extra_nsects" int's which give the
- * sizeof of the individual sections. the presence of
- * even the header is optional.
- */
-
-#define	EXTRA_MAGIC	1040		/* taxing concept  */
-#define	EXTRA_IDENT	0		/* ident's in 0th extra section */
-
-struct extra_sections {
-		int	extra_magic;		/* should be EXTRA_MAGIC */
-		int	extra_nsects;		/* number of extra sections */
-};
-
-#endif	/* defined(__sparcv8) */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _A_OUT_H */
diff --git a/usr/src/ucbhead/assert.h b/usr/src/ucbhead/assert.h
deleted file mode 100644
index ea79048e92..0000000000
--- a/usr/src/ucbhead/assert.h
+++ /dev/null
@@ -1,58 +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 1997 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.
- */
-
-#ifndef _ASSERT_H
-#define	_ASSERT_H
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#ifdef NDEBUG
-#undef assert
-#define	assert(EX)
-
-#else
-
-#define	_assert(ex)	{if (!(ex)) \
-			{(void)fprintf(stderr, "Assertion failed: file \"%s\", \
-			line %d\n", __FILE__, __LINE__); exit(1); }}
-#define	assert(ex)	_assert(ex)
-
-#endif	/* NDEBUG */
-
-#endif	/* _ASSERT_H */
diff --git a/usr/src/ucbhead/syscall.h b/usr/src/ucbhead/fcntl.h
index d3702c8a20..c51c5b8fcc 100644
--- a/usr/src/ucbhead/syscall.h
+++ b/usr/src/ucbhead/fcntl.h
@@ -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,26 +19,13 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1997 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-/*	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
+#ifndef	_FCNTL_H
+#define	_FCNTL_H
 
-/*
- * Portions of this source code were derived from Berkeley 4.3 BSD
- * under license from the Regents of the University of California.
- */
-
-/*
- * Note that the guard is carefully crafted here.
- */
-
-#ifndef _SYS_SYSCALL_H
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#include <sys/syscall.h>
+#include <sys/fcntl.h>
 
-#endif /* _SYS_SYSCALL_H */
+#endif	/* _FCNTL_H */
diff --git a/usr/src/ucbhead/resolv.h b/usr/src/ucbhead/resolv.h
deleted file mode 100644
index 1370e09d62..0000000000
--- a/usr/src/ucbhead/resolv.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 1997 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-/*	Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
-
-/*
- * Copyright (c) 1983, 1987 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
- */
-
-/*
- * Global defines and variables for resolver stub.
- */
-
-#ifndef _RESOLV_H
-#define	_RESOLV_H
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#include <sys/types.h>
-#include <netinet/in.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define	ADDRSORT	1		/* enable the address-sorting option */
-#define	MAXADDR		10		/* max # addresses to sort by */
-
-#define	MAXDNAME	256
-#define	MAXNS		3		/* max # name servers we'll track */
-#define	MAXDNSRCH	3		/* max # default domain levels to try */
-#define	LOCALDOMAINPARTS 2		/* min levels in name that is "local" */
-
-#define	RES_TIMEOUT	6		/* seconds between retries */
-
-struct state {
-	int	retrans;		/* retransmition time interval */
-	int	retry;			/* number of times to retransmit */
-	int	options;		/* option flags - see below. */
-	int	nscount;		/* number of name servers */
-	struct	sockaddr_in nsaddr_list[MAXNS];	/* address of name server */
-#define	nsaddr	nsaddr_list[0]		/* for backward compatibility */
-	ushort_t id;			/* current packet id */
-	char	defdname[MAXDNAME];	/* default domain */
-	char	*dnsrch[MAXDNSRCH+1];	/* components of domain to search */
-	int	ascount;		/* number of addresses */
-	struct  in_addr sort_list[MAXADDR]; /* address sorting list */
-};
-
-/*
- * Resolver options
- */
-#define	RES_INIT	0x0001		/* address initialized */
-#define	RES_DEBUG	0x0002		/* print debug messages */
-#define	RES_AAONLY	0x0004		/* authoritative answers only */
-#define	RES_USEVC	0x0008		/* use virtual circuit */
-#define	RES_PRIMARY	0x0010		/* query primary server only */
-#define	RES_IGNTC	0x0020		/* ignore trucation errors */
-#define	RES_RECURSE	0x0040		/* recursion desired */
-#define	RES_DEFNAMES	0x0080		/* use default domain name */
-#define	RES_STAYOPEN	0x0100		/* Keep TCP socket open */
-#define	RES_DNSRCH	0x0200		/* search up local domain tree */
-
-#define	RES_DEFAULT	(RES_RECURSE | RES_DEFNAMES | RES_DNSRCH)
-
-extern struct state _res;
-extern char *p_cdname(), *p_rr(), *p_type(), *p_class();
-
-#ifdef	__cplusplus
-}
-#endif
-
-#endif /* _RESOLV_H */
-
diff --git a/usr/src/ucbhead/struct.h b/usr/src/ucbhead/struct.h
deleted file mode 100644
index 09deb59234..0000000000
--- a/usr/src/ucbhead/struct.h
+++ /dev/null
@@ -1,53 +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 1997 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.
- */
-
-/*
- * access to information relating to the fields of a structure
- */
-
-#ifndef _STRUCT_H
-#define	_STRUCT_H
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#define	fldoff(str, fld)	((long)&(((struct str *)0)->fld))
-#define	fldsiz(str, fld)	(sizeof (((struct str *)0)->fld))
-#define	strbase(str, ptr, fld)	((struct str *)((char *)(ptr)-fldoff(str, fld)))
-
-#endif /* !_STRUCT_H */
diff --git a/usr/src/ucbhead/sys/reboot.h b/usr/src/ucbhead/sys/reboot.h
deleted file mode 100644
index 9ff17c1a63..0000000000
--- a/usr/src/ucbhead/sys/reboot.h
+++ /dev/null
@@ -1,68 +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 1997 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.
- */
-
-#ifndef _VM_REBOOT_H
-#define	_VM_REBOOT_H
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/*
- * Arguments to reboot system call and flags to init.
- *
- * On the VAX, these are passed to boot program in r11,
- * and on to init.
- *
- * On the Sun, these are parsed from the boot command line
- * and used to construct the argument list for init.
- */
-
-#define	RB_AUTOBOOT	0	/* flags for system auto-booting itself */
-
-#define	RB_ASKNAME	0x001	/* ask for file name to reboot from */
-#define	RB_SINGLE	0x002	/* reboot to single user only */
-#define	RB_NOSYNC	0x004	/* dont sync before reboot */
-#define	RB_HALT		0x008	/* don't reboot, just halt */
-#define	RB_INITNAME	0x010	/* name given for /etc/init */
-#define	RB_NOBOOTRC	0x020	/* don't run /etc/rc.boot */
-#define	RB_DEBUG	0x040	/* being run under debugger */
-#define	RB_DUMP		0x080	/* dump system core */
-#define	RB_WRITABLE	0x100	/* mount root read/write */
-#define	RB_STRING	0x200	/* pass boot args to prom monitor */
-
-#endif	/* _VM_REBOOT_H */
diff --git a/usr/src/ucbhead/sys/tty.h b/usr/src/ucbhead/sys/tty.h
deleted file mode 100644
index 7b3a226294..0000000000
--- a/usr/src/ucbhead/sys/tty.h
+++ /dev/null
@@ -1,225 +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 1998 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.
- */
-
-#ifndef _SYS_TTY_H
-#define	_SYS_TTY_H
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#include <sys/ttychars.h>
-#include <sys/ttydev.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * A clist structure is the head of a linked list queue of characters.
- * The routines getc* and putc* manipulate these structures.
- */
-
-struct clist {
-	int	c_cc;		/* character count */
-	struct cblock *c_cf;	/* pointer to first */
-	struct cblock *c_cl;	/* pointer to last */
-};
-
-/* Macro to find clist structure given pointer into it	*/
-#define	CMATCH(pointer)		(char *)(cfree + (pointer - cfree))
-
-/* Character control block for interrupt level control	*/
-
-struct ccblock {
-	caddr_t	c_ptr;		/* buffer address	*/
-	ushort_t c_count;	/* character count	*/
-	ushort_t c_size;	/* buffer size		*/
-};
-
-/*
- * A tty structure is needed for each UNIX character device that
- * is used for normal terminal IO.
- */
-#define	NCC	8
-struct tty {
-	struct	clist t_rawq;	/* raw input queue */
-	struct	clist t_canq;	/* canonical queue */
-	struct	clist t_outq;	/* output queue */
-	struct	ccblock	t_tbuf;	/* tx control block */
-	struct	ccblock t_rbuf;	/* rx control block */
-	int	(* t_proc)();	/* routine for device functions */
-	ushort_t t_iflag;	/* input modes */
-	ushort_t t_oflag;	/* output modes */
-	ushort_t t_cflag;	/* control modes */
-	ushort_t t_lflag;	/* line discipline modes */
-	short	t_state;	/* internal state */
-	o_pid_t	t_pgrp;		/* process group name */
-	char	t_line;		/* line discipline */
-	char	t_delct;	/* delimiter count */
-	char	t_term;		/* terminal type */
-	char	t_tmflag;	/* terminal flags */
-	char	t_col;		/* current column */
-	char	t_row;		/* current row */
-	char	t_vrow;		/* variable row */
-	char	t_lrow;		/* last physical row */
-	char	t_hqcnt;	/* no. high queue packets on t_outq */
-	char	t_dstat;
-			/* used by terminal handlers and line disciplines */
-	unsigned char	t_cc[NCC];	/* settable control chars */
-};
-
-/*
- * The structure of a clist block
- */
-#define	CLSIZE	64
-struct cblock {
-	struct cblock *c_next;
-	char	c_first;
-	char	c_last;
-	char	c_data[CLSIZE];
-};
-
-extern struct cblock	*cfree;
-extern struct cblock	*getcb();
-extern struct cblock	*getcf();
-extern struct clist	ttnulq;
-extern int		cfreecnt;
-
-struct chead {
-	struct cblock *c_next;
-	int	c_size;
-	int	c_flag;
-};
-extern struct chead cfreelist;
-
-struct inter {
-	int	cnt;
-};
-
-#define	QESC	0200	/* queue escape */
-#define	HQEND	01	/* high queue end */
-
-#define	TTIPRI	28
-#define	TTOPRI	29
-
-#ifdef u3b15
-/*
- * following defs allow for job control in both vpm and
- * stand-alone tty environments
- */
-#define	VPMTTY	1
-#define	SATTY	2
-#endif
-
-/* limits */
-extern int ttlowat[], tthiwat[];
-#define	TTYHOG	256
-#define	TTXOLO	132
-#define	TTXOHI	180
-
-/* Hardware bits */
-#define	DONE	0200
-#define	IENABLE	0100
-#define	OVERRUN	040000
-#define	FRERROR	020000
-#define	PERROR	010000
-
-/* Internal state */
-#define	TIMEOUT	01		/* Delay timeout in progress */
-#define	WOPEN	02		/* Waiting for open to complete */
-#define	ISOPEN	04		/* Device is open */
-#define	TBLOCK	010
-#define	CARR_ON	020		/* Software copy of carrier-present */
-#define	BUSY	040		/* Output in progress */
-#define	OASLP	0100		/* Wakeup when output done */
-#define	IASLP	0200		/* Wakeup when input done */
-#define	TTSTOP	0400		/* Output stopped by ctl-s */
-#define	EXTPROC	01000		/* External processing */
-#define	TACT	02000
-#define	CLESC	04000		/* Last char escape */
-#define	RTO	010000		/* Raw Timeout */
-#define	TTIOW	020000
-#define	TTXON	040000
-#define	TTXOFF	0100000
-
-/* l_output status */
-#define	CPRES	0100000
-
-/* device commands */
-#define	T_OUTPUT	0
-#define	T_TIME		1
-#define	T_SUSPEND	2
-#define	T_RESUME	3
-#define	T_BLOCK		4
-#define	T_UNBLOCK	5
-#define	T_RFLUSH	6
-#define	T_WFLUSH	7
-#define	T_BREAK		8
-#define	T_INPUT		9
-#define	T_DISCONNECT	10
-#define	T_PARM		11
-#define	T_SWTCH		12
-
-/*
- * Terminal flags (set in t_tmflgs).
- */
-
-#define	SNL	1		/* non-standard new-line needed */
-#define	ANL	2		/* automatic new-line */
-#define	LCF	4		/* Special treatment of last col, row */
-#define	TERM_CTLECHO	010	/* Echo terminal control characters */
-#define	TERM_INVIS	020	/* do not send escape sequences to user */
-#define	QLOCKB		040	/* high queue locked for base level */
-#define	QLOCKI		0100	/* high queue locked for interrupts */
-#define	TERM_BIT 0200		/* Bit reserved for terminal drivers. */
-				/* Usually used to indicate that an esc */
-				/* character has arrived and that the */
-				/* next character is special. */
-				/* This bit is the same as the TM_SET */
-				/* bit which may never be set by a user */
-/*
- *	device reports
- */
-#define	L_BUF		0
-#define	L_BREAK		3
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/* _SYS_TTY_H */
diff --git a/usr/src/ucbhead/ufs/quota.h b/usr/src/ucbhead/ufs/quota.h
deleted file mode 100644
index defdb318eb..0000000000
--- a/usr/src/ucbhead/ufs/quota.h
+++ /dev/null
@@ -1,52 +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 1997 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.
- */
-
-/*
- * Note that the guard is carefully crafted here.
- * Don't change and keep the convention for now.
- */
-
-#ifndef _SYS_FS_UFS_QUOTA_H
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#include <sys/types.h>
-#include <sys/fs/ufs_quota.h>
-
-#endif	/* _SYS_FS_UFS_QUOTA_H */
diff --git a/usr/src/ucbhead/vfont.h b/usr/src/ucbhead/vfont.h
deleted file mode 100644
index 112af12eda..0000000000
--- a/usr/src/ucbhead/vfont.h
+++ /dev/null
@@ -1,79 +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 1997 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.
- */
-
-/*
- * The structures header and dispatch define the format of a font file.
- *
- * A font file contains one struct 'header', an array of NUM_DISPATCH struct
- * 'dispatch'es, then an array of bytes containing bit maps.
- *
- * See vfont(5) for more details.
- */
-
-#ifndef _vfont_h
-#define	_vfont_h
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct header {
-	short		magic;		/* Magic number VFONT_MAGIC */
-	unsigned short	size;		/* Total # bytes of bitmaps */
-	short		maxx;		/* Maximum horizontal glyph size */
-	short		maxy;		/* Maximum vertical   glyph size */
-	short		xtend;		/* (unused?) */
-};
-#define	VFONT_MAGIC	0436
-
-struct dispatch {
-	unsigned short	addr;		/* &(glyph) - &(start of bitmaps) */
-	short		nbytes;		/* # bytes of glyphs (0 if no glyph) */
-	char		up, down, left, right;	/* Widths from baseline point */
-	short		width;		/* Logical width, used by troff */
-};
-#define	NUM_DISPATCH	256
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_vfont_h */
diff --git a/usr/src/ucbhead/vfork.h b/usr/src/ucbhead/vfork.h
deleted file mode 100644
index eb0dcde7b2..0000000000
--- a/usr/src/ucbhead/vfork.h
+++ /dev/null
@@ -1,56 +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 2004 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-/*
- * this atrocity is necessary on sparc because registers modified
- * by the child get propagated back to the parent via the window
- * save/restore mechanism.
- */
-
-#ifndef _vfork_h
-#define	_vfork_h
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __STDC__
-extern int vfork(void);
-#else
-extern int vfork();
-#endif
-
-#if defined(__sparc)
-#pragma unknown_control_flow(vfork)
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* !_vfork_h */
diff --git a/usr/src/ucblib/libcurses/Makefile.com b/usr/src/ucblib/libcurses/Makefile.com
index 60cff941a1..0db5f7836c 100644
--- a/usr/src/ucblib/libcurses/Makefile.com
+++ b/usr/src/ucblib/libcurses/Makefile.com
@@ -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"
-#
 
 LIBRARY=	libcurses.a
 VERS=		.1
@@ -76,21 +74,7 @@ include $(SRC)/lib/Makefile.lib
 ROOTLIBDIR=	$(ROOT)/usr/ucblib
 ROOTLIBDIR64=	$(ROOT)/usr/ucblib/$(MACH64)
 
-LIBS = $(DYNLIB) $(LINTLIB)
-
-LINTSRC= $(LINTLIB:%.ln=%)
-ROOTLINTDIR= $(ROOTLIBDIR)
-ROOTLINTDIR64= $(ROOTLIBDIR)/$(MACH64)
-ROOTLINT= $(LINTSRC:%=$(ROOTLINTDIR)/%)
-ROOTLINT64= $(LINTSRC:%=$(ROOTLINTDIR64)/%)
-
-# install rule for lint source file target
-$(ROOTLINTDIR)/%: ../%
-	$(INS.file)
-$(ROOTLINTDIR64)/%: ../%
-	$(INS.file)
-
-$(LINTLIB):= SRCS=../llib-lcurses
+LIBS = $(DYNLIB)
 
 CFLAGS	+=	$(CCVERBOSE)
 CFLAGS64 +=	$(CCVERBOSE)
@@ -99,7 +83,7 @@ DYNFLAGS32 =	-R/usr/ucblib
 DYNFLAGS64 =	-R/usr/ucblib/$(MACH64)
 LDLIBS +=	-ltermcap -lucb -lc
 
-CPPFLAGS = -I$(ROOT)/usr/ucbinclude -I../../../lib/libc/inc $(CPPFLAGS.master)
+CPPFLAGS = -I$(SRC)/ucbhead -I../../../lib/libc/inc $(CPPFLAGS.master)
 
 .KEEP_STATE:
 
diff --git a/usr/src/ucblib/libcurses/amd64/Makefile b/usr/src/ucblib/libcurses/amd64/Makefile
index 121bc4c173..e538678e29 100644
--- a/usr/src/ucblib/libcurses/amd64/Makefile
+++ b/usr/src/ucblib/libcurses/amd64/Makefile
@@ -19,11 +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"
-#
 
 include ../Makefile.com
 include ../../../lib/Makefile.lib.64
@@ -34,4 +32,4 @@ BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/ucblib/libcurses/i386/Makefile b/usr/src/ucblib/libcurses/i386/Makefile
index 7ec09c4a9c..75f501557f 100644
--- a/usr/src/ucblib/libcurses/i386/Makefile
+++ b/usr/src/ucblib/libcurses/i386/Makefile
@@ -19,11 +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"
-#
 
 include ../Makefile.com
 
@@ -32,4 +30,4 @@ BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDL
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/ucblib/libcurses/llib-lcurses b/usr/src/ucblib/libcurses/llib-lcurses
deleted file mode 100644
index a21ce02071..0000000000
--- a/usr/src/ucblib/libcurses/llib-lcurses
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright 1990 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/* LINTLIBRARY */
-
-# include	<curses.h>
-# include	<signal.h>
-# include	<varargs.h>
-# include	<ctype.h>
-
-/* addch.c */
-int waddch(win, c) register struct _win_st *win; char c; { static int x; return(x); }
-
-/* addstr.c */
-int waddstr(win, str) register struct _win_st *win; register char *str; { static int x; return(x); }
-
-/* box.c */
-int box(win, vert, hor) register struct _win_st *win; char vert; char hor; { static int x; return(x); }
-
-/* clear.c */
-int wclear(win) register struct _win_st *win; { static int x; return(x); }
-
-/* clrtobot.c */
-int wclrtobot(win) register struct _win_st *win; { static int x; return(x); }
-
-/* clrtoeol.c */
-int wclrtoeol(win) register struct _win_st *win; { static int x; return(x); }
-
-/* cr_put.c */
-int mvcur(ly, lx, y, x) int ly; int lx; int y; int x; { static int z; return(z); }
-int fgoto() { static int x; return(x); }
-int plodput(c) int c; { static int x; return(x); }
-int plod(cnt) int cnt; { static int x; return(x); }
-int tabcol(col, ts) int col; int ts; { static int x; return(x); }
-
-/* cr_tty.c */
-int gettmode() { static int x; return(x); }
-int setterm(type) register char *type; { static int x; return(x); }
-int zap() { static int x; return(x); }
-char *getcap(name) char *name; { static char *x; return(x); }
-
-/* curses.c */
-
-/* delch.c */
-int wdelch(win) register struct _win_st *win; { static int x; return(x); }
-
-/* deleteln.c */
-int wdeleteln(win) register struct _win_st *win; { static int x; return(x); }
-
-/* delwin.c */
-int delwin(win) register struct _win_st *win; { static int x; return(x); }
-
-/* endwin.c */
-int endwin() { static int x; return(x); }
-
-/* erase.c */
-int werase(win) register struct _win_st *win; { static int x; return(x); }
-
-/* fullname.c */
-char *fullname(bp, def) register char *bp; register char *def; { static char *x; return(x); }
-
-/* getch.c */
-int wgetch(win) register struct _win_st *win; { static int x; return(x); }
-
-/* getstr.c */
-int wgetstr(win, str) register struct _win_st *win; register char *str; { static int x; return(x); }
-
-/* id_subwins.c */
-int _id_subwins(orig) register struct _win_st *orig; { static int x; return(x); }
-
-/* idlok.c */
-int idlok(win, bf) register struct _win_st *win; char bf; { static int x; return(x); }
-
-/* initscr.c */
-struct _win_st *initscr() { static struct _win_st *x; return(x); }
-
-/* insch.c */
-int winsch(win, c) register struct _win_st *win; char c; { static int x; return(x); }
-
-/* insertln.c */
-int winsertln(win) register struct _win_st *win; { static int x; return(x); }
-
-/* longname.c */
-char *longname(bp, def) register char *bp; register char *def; { static char *x; return(x); }
-
-/* move.c */
-int wmove(win, y, x) register struct _win_st *win; register int y; register int x; { static int z; return(z); }
-
-/* mvprintw.c */
-int mvprintw(y, x, fmt, __builtin_va_alist) register int y; register int x; char *fmt; int __builtin_va_alist; { static int z; return(z); }
-int mvwprintw(win, y, x, fmt, __builtin_va_alist) register struct _win_st *win; register int y; register int x; char *fmt; int __builtin_va_alist; { static int z; return(z); }
-
-/* mvscanw.c */
-int mvscanw(y, x, fmt, __builtin_va_alist) register int y; register int x; char *fmt; int __builtin_va_alist; { static int z; return(z); }
-int mvwscanw(win, y, x, fmt, __builtin_va_alist) register struct _win_st *win; register int y; register int x; char *fmt; int __builtin_va_alist; { static int z; return(z); }
-
-/* mvwin.c */
-int mvwin(win, by, bx) register struct _win_st *win; register int by; register int bx; { static int x; return(x); }
-
-/* newwin.c */
-struct _win_st *newwin(num_lines, num_cols, begy, begx) int num_lines; int num_cols; int begy; int begx; { static struct _win_st *x; return(x); }
-struct _win_st *subwin(orig, num_lines, num_cols, begy, begx) register struct _win_st *orig; int num_lines; int num_cols; int begy; int begx; { static struct _win_st *x; return(x); }
-int _set_subwin_(orig, win) register struct _win_st *orig; register struct _win_st *win; { static int x; return(x); }
-int _swflags_(win) register struct _win_st *win; { static int x; return(x); }
-
-/* overlay.c */
-int overlay(win1, win2) register struct _win_st *win1; register struct _win_st *win2; { static int x; return(x); }
-
-/* overwrite.c */
-int overwrite(win1, win2) register struct _win_st *win1; register struct _win_st *win2; { static int x; return(x); }
-
-/* printw.c */
-int printw(fmt, __builtin_va_alist) char *fmt; int __builtin_va_alist; { static int x; return(x); }
-int wprintw(win, fmt, __builtin_va_alist) struct _win_st *win; char *fmt; int __builtin_va_alist; { static int x; return(x); }
-int _sprintw(win, fmt, ap) struct _win_st *win; char *fmt; va_list ap; { static int x; return(x); }
-
-/* putchar.c */
-char _putchar(c) register char c; { static char x; return(x); }
-
-/* refresh.c */
-int wrefresh(win) register struct _win_st *win; { static int x; return(x); }
-
-/* scanw.c */
-int scanw(fmt, __builtin_va_alist) char *fmt; int __builtin_va_alist; { static int x; return(x); }
-int wscanw(win, fmt, __builtin_va_alist) struct _win_st *win; char *fmt; int __builtin_va_alist; { static int x; return(x); }
-int _sscans(win, fmt, ap) struct _win_st *win; char *fmt; va_list ap; { static int x; return(x); }
-
-/* scroll.c */
-int scroll(win) register struct _win_st *win; { static int x; return(x); }
-
-/* standout.c */
-char *wstandout(win) register struct _win_st *win; { static char *x; return(x); }
-char *wstandend(win) register struct _win_st *win; { static char *x; return(x); }
-
-/* toucholap.c */
-int touchoverlap(win1, win2) register struct _win_st *win1; register struct _win_st *win2; { static int x; return(x); }
-
-/* touchwin.c */
-int touchwin(win) register struct _win_st *win; { static int x; return(x); }
-int touchline(win, y, sx, ex) register struct _win_st *win; register int y; register int sx; register int ex; { static int x; return(x); }
-
-/* tstp.c */
-void tstp()  {}
-
-/* unctrl.c */
diff --git a/usr/src/ucblib/libcurses/sparc/Makefile b/usr/src/ucblib/libcurses/sparc/Makefile
index d88f114405..79054c8e18 100644
--- a/usr/src/ucblib/libcurses/sparc/Makefile
+++ b/usr/src/ucblib/libcurses/sparc/Makefile
@@ -19,11 +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"
-#
 
 include ../Makefile.com
 
@@ -32,4 +30,4 @@ BUILD.SO= $(CC) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/ucblib/libcurses/sparcv9/Makefile b/usr/src/ucblib/libcurses/sparcv9/Makefile
index 121bc4c173..e538678e29 100644
--- a/usr/src/ucblib/libcurses/sparcv9/Makefile
+++ b/usr/src/ucblib/libcurses/sparcv9/Makefile
@@ -19,11 +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"
-#
 
 include ../Makefile.com
 include ../../../lib/Makefile.lib.64
@@ -34,4 +32,4 @@ BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/ucblib/libdbm/Makefile.com b/usr/src/ucblib/libdbm/Makefile.com
index 18157757c9..668444cfc8 100644
--- a/usr/src/ucblib/libdbm/Makefile.com
+++ b/usr/src/ucblib/libdbm/Makefile.com
@@ -19,11 +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"
-#
 
 LIBRARY=	libdbm.a
 VERS=		.1
@@ -36,26 +34,12 @@ include $(SRC)/lib/Makefile.lib
 ROOTLIBDIR=	$(ROOT)/usr/ucblib
 ROOTLIBDIR64=	$(ROOT)/usr/ucblib/$(MACH64)
 
-LIBS = $(DYNLIB) $(LINTLIB)
-
-LINTSRC= $(LINTLIB:%.ln=%)
-ROOTLINTDIR= $(ROOTLIBDIR)
-ROOTLINTDIR64= $(ROOTLIBDIR)/$(MACH64)
-ROOTLINT= $(LINTSRC:%=$(ROOTLINTDIR)/%)
-ROOTLINT64= $(LINTSRC:%=$(ROOTLINTDIR64)/%)
-
-# install rule for lint source file target
-$(ROOTLINTDIR)/%: ../%
-	$(INS.file)
-$(ROOTLINTDIR64)/%: ../%
-	$(INS.file)
-
-$(LINTLIB):= SRCS=../llib-ldbm
+LIBS = $(DYNLIB)
 
 CFLAGS	+=	$(CCVERBOSE)
 LDLIBS +=	-lc
 
-CPPFLAGS = -I$(ROOT)/usr/ucbinclude $(CPPFLAGS.master)
+CPPFLAGS = -I$(SRC)/ucbhead $(CPPFLAGS.master)
 
 .KEEP_STATE:
 
diff --git a/usr/src/ucblib/libdbm/amd64/Makefile b/usr/src/ucblib/libdbm/amd64/Makefile
index 5b91d3c694..20434991fd 100644
--- a/usr/src/ucblib/libdbm/amd64/Makefile
+++ b/usr/src/ucblib/libdbm/amd64/Makefile
@@ -19,11 +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"
-#
 
 include ../Makefile.com
 include ../../../lib/Makefile.lib.64
@@ -33,4 +31,4 @@ BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/ucblib/libdbm/dbm.c b/usr/src/ucblib/libdbm/dbm.c
index 002bbd4eba..f006db5ea9 100644
--- a/usr/src/ucblib/libdbm/dbm.c
+++ b/usr/src/ucblib/libdbm/dbm.c
@@ -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,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -32,8 +31,6 @@
  * under license from the Regents of the University of California.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*LINTLIBRARY*/
 
 #include	<sys/types.h>
@@ -43,7 +40,7 @@
 #include	<strings.h>
 #include	<malloc.h>
 #include	<sys/stat.h>
-#include	<fcntl.h>
+#include	<sys/fcntl.h>
 #include	<dbm.h>
 #include	<errno.h>
 
diff --git a/usr/src/ucblib/libdbm/i386/Makefile b/usr/src/ucblib/libdbm/i386/Makefile
index e2080593d5..85705049e2 100644
--- a/usr/src/ucblib/libdbm/i386/Makefile
+++ b/usr/src/ucblib/libdbm/i386/Makefile
@@ -19,11 +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"
-#
 
 include ../Makefile.com
 
@@ -31,4 +29,4 @@ BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDL
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/ucblib/libdbm/llib-ldbm b/usr/src/ucblib/libdbm/llib-ldbm
deleted file mode 100644
index 1b2f5e06e8..0000000000
--- a/usr/src/ucblib/libdbm/llib-ldbm
+++ /dev/null
@@ -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 1990 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/* LINTLIBRARY */
-
-#include	<dbm.h>
-#include	<sys/stat.h>
-#include	<sys/types.h>
-
-/* dbm.c */
-int dbminit(file) char *file; { static int x; return(x); }
-int dbmflush() { static int x; return(x); }
-int dbmclose() { static int x; return(x); }
-datum fetch(key) datum key; { static datum x; return(x); }
-int delete(key) datum key; { static int x; return(x); }
-int store(key, content) datum key; datum content; { static int x; return(x); }
-datum firstkey() { static datum x; return(x); }
-datum nextkey(key) datum key; { static datum x; return(x); }
diff --git a/usr/src/ucblib/libdbm/sparc/Makefile b/usr/src/ucblib/libdbm/sparc/Makefile
index e2a26e9aea..c9b8beb496 100644
--- a/usr/src/ucblib/libdbm/sparc/Makefile
+++ b/usr/src/ucblib/libdbm/sparc/Makefile
@@ -19,11 +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"
-#
 
 include ../Makefile.com
 
@@ -31,4 +29,4 @@ BUILD.SO= $(CC) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/ucblib/libdbm/sparcv9/Makefile b/usr/src/ucblib/libdbm/sparcv9/Makefile
index 5b91d3c694..20434991fd 100644
--- a/usr/src/ucblib/libdbm/sparcv9/Makefile
+++ b/usr/src/ucblib/libdbm/sparcv9/Makefile
@@ -19,11 +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"
-#
 
 include ../Makefile.com
 include ../../../lib/Makefile.lib.64
@@ -33,4 +31,4 @@ BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/ucblib/librpcsoc/Makefile.com b/usr/src/ucblib/librpcsoc/Makefile.com
index 86a4edf8a8..9931ff87ab 100644
--- a/usr/src/ucblib/librpcsoc/Makefile.com
+++ b/usr/src/ucblib/librpcsoc/Makefile.com
@@ -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"
-#
 
 LIBRARY= librpcsoc.a
 VERS = .1
@@ -49,10 +47,7 @@ DYNFLAGS += $(ZINTERPOSE)
 ROOTLIBDIR=	$(ROOT)/usr/ucblib
 ROOTLIBDIR64=   $(ROOT)/usr/ucblib/$(MACH64)
 
-LINTSRC= $(LINTLIB:%.ln=%)
-$(LINTLIB):= SRCS=../$(LINTSRC)
-
-CPPFLAGS = -I$(ROOT)/usr/ucbinclude -I../../../lib/libc/inc $(CPPFLAGS.master)
+CPPFLAGS = -I$(SRC)/ucbhead -I../../../lib/libc/inc $(CPPFLAGS.master)
 
 .KEEP_STATE:
 
@@ -62,6 +57,3 @@ lint: lintcheck
 include $(SRC)/lib/Makefile.targ
 include ../../Makefile.ucbtarg
 
-# install rule for lint library target
-$(ROOTLINTDIR)/%: ../%
-	$(INS.file)
diff --git a/usr/src/ucblib/librpcsoc/amd64/Makefile b/usr/src/ucblib/librpcsoc/amd64/Makefile
index 57275bc453..49026576ef 100644
--- a/usr/src/ucblib/librpcsoc/amd64/Makefile
+++ b/usr/src/ucblib/librpcsoc/amd64/Makefile
@@ -19,11 +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"
-#
 
 include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
@@ -32,7 +30,7 @@ DYNFLAGS += $(DYNFLAGS64)
 BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \
 	-L $(ROOT)/usr/ucblib/$(MACH64) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS)
 
-LIBS=	$(DYNLIB) $(LINTLIB)
+LIBS=	$(DYNLIB)
 
 .KEEP_STATE:
 
diff --git a/usr/src/ucblib/librpcsoc/i386/Makefile b/usr/src/ucblib/librpcsoc/i386/Makefile
index 2912bdb172..8c2e44b15a 100644
--- a/usr/src/ucblib/librpcsoc/i386/Makefile
+++ b/usr/src/ucblib/librpcsoc/i386/Makefile
@@ -19,21 +19,19 @@
 # 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"
-#
 
 include ../Makefile.com
 
 DYNFLAGS += $(DYNFLAGS32)
 BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
 
-LIBS = $(DYNLIB) $(LINTLIB)
+LIBS = $(DYNLIB)
 
 .KEEP_STATE:
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/ucblib/librpcsoc/llib-lrpcsoc b/usr/src/ucblib/librpcsoc/llib-lrpcsoc
deleted file mode 100644
index 68a07ff75f..0000000000
--- a/usr/src/ucblib/librpcsoc/llib-lrpcsoc
+++ /dev/null
@@ -1,71 +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) 1997 by Sun Microsystems, Inc.
- * All rights reserved.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/* LINTLIBRARY */
-
-#include <stdio.h>
-#include <rpc/rpc.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netdb.h>
-#include <errno.h>
-#include <rpc/pmap_clnt.h>
-#include <sys/syslog.h>
-#include <sys/ioctl.h>
-#include <sys/filio.h>
-#include <sys/types.h>
-#include <sys/errno.h>
-#include <netinet/in.h>
-
-/* clnt_tcp.c */
-CLIENT *clnttcp_create(struct sockaddr_in *, ulong_t, ulong_t,
-    int *, uint_t, uint_t);
-
-/* clnt_udp.c */
-CLIENT *clntudp_bufcreate(struct sockaddr_in *, ulong_t, ulong_t,
-    struct timeval, int *, uint_t, uint_t);
-CLIENT *clntudp_create(struct sockaddr_in *, ulong_t, ulong_t,
-    struct timeval wait, int *);
-
-/* get_myaddress.c */
-int get_myaddress(struct sockaddr_in *);
-
-/* getrpcport.c */
-int getrpcport(char *, int, int, int);
-
-/* rtime.c */
-int rtime(struct sockaddr_in *, struct timeval *, struct timeval *);
-
-/* svc_tcp.c */
-SVCXPRT *svctcp_create(int, uint_t, uint_t);
-SVCXPRT *svcfd_create(int, uint_t, uint_t);
-
-/* svc_udp.c */
-SVCXPRT *svcudp_bufcreate(int, uint_t, uint_t);
-SVCXPRT *svcudp_create(int);
-int svcudp_enablecache(SVCXPRT *, ulong_t);
diff --git a/usr/src/ucblib/librpcsoc/sparc/Makefile b/usr/src/ucblib/librpcsoc/sparc/Makefile
index 3dffb149aa..ebb1fecfe8 100644
--- a/usr/src/ucblib/librpcsoc/sparc/Makefile
+++ b/usr/src/ucblib/librpcsoc/sparc/Makefile
@@ -19,21 +19,19 @@
 # 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"
-#
 
 include ../Makefile.com
 
 DYNFLAGS += $(DYNFLAGS32)
 BUILD.SO= $(CC) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
 
-LIBS = $(DYNLIB) $(LINTLIB)
+LIBS = $(DYNLIB)
 
 .KEEP_STATE:
 
 all: $(LIBS)
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/ucblib/librpcsoc/sparcv9/Makefile b/usr/src/ucblib/librpcsoc/sparcv9/Makefile
index 57275bc453..49026576ef 100644
--- a/usr/src/ucblib/librpcsoc/sparcv9/Makefile
+++ b/usr/src/ucblib/librpcsoc/sparcv9/Makefile
@@ -19,11 +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"
-#
 
 include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
@@ -32,7 +30,7 @@ DYNFLAGS += $(DYNFLAGS64)
 BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \
 	-L $(ROOT)/usr/ucblib/$(MACH64) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS)
 
-LIBS=	$(DYNLIB) $(LINTLIB)
+LIBS=	$(DYNLIB)
 
 .KEEP_STATE:
 
diff --git a/usr/src/ucblib/libtermcap/Makefile.com b/usr/src/ucblib/libtermcap/Makefile.com
index 4f98d37dfd..2bc6e3ca2e 100644
--- a/usr/src/ucblib/libtermcap/Makefile.com
+++ b/usr/src/ucblib/libtermcap/Makefile.com
@@ -19,11 +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"
-#
 
 LIBRARY=	libtermcap.a
 VERS=		.1
@@ -38,28 +36,14 @@ include $(SRC)/lib/Makefile.lib
 ROOTLIBDIR=	$(ROOT)/usr/ucblib
 ROOTLIBDIR64=	$(ROOT)/usr/ucblib/$(MACH64)
 
-LIBS = $(DYNLIB) $(LINTLIB)
-
-LINTSRC= $(LINTLIB:%.ln=%)
-ROOTLINTDIR= $(ROOTLIBDIR)
-ROOTLINTDIR64= $(ROOTLIBDIR)/$(MACH64)
-ROOTLINT= $(LINTSRC:%=$(ROOTLINTDIR)/%)
-ROOTLINT64= $(LINTSRC:%=$(ROOTLINTDIR64)/%)
-
-# install rule for lint source file target
-$(ROOTLINTDIR)/%: ../%
-	$(INS.file)
-$(ROOTLINTDIR64)/%: ../%
-	$(INS.file)
-
-$(LINTLIB):= SRCS=../llib-ltermcap
+LIBS = $(DYNLIB)
 
 CFLAGS	+=	$(CCVERBOSE)
 CFLAGS64 +=	$(CCVERBOSE)
 LDLIBS +=	-lc
 
 DEFS= -DCM_N -DCM_GT -DCM_B -DCM_D
-CPPFLAGS = $(DEFS) -I$(ROOT)/usr/ucbinclude $(CPPFLAGS.master)
+CPPFLAGS = $(DEFS) -I$(SRC)/ucbhead $(CPPFLAGS.master)
 
 .KEEP_STATE:
 
diff --git a/usr/src/ucblib/libtermcap/amd64/Makefile b/usr/src/ucblib/libtermcap/amd64/Makefile
index 5567585245..4faa7cf698 100644
--- a/usr/src/ucblib/libtermcap/amd64/Makefile
+++ b/usr/src/ucblib/libtermcap/amd64/Makefile
@@ -19,11 +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"
-#
 
 include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
@@ -34,4 +32,4 @@ BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/ucblib/libtermcap/i386/Makefile b/usr/src/ucblib/libtermcap/i386/Makefile
index e2080593d5..85705049e2 100644
--- a/usr/src/ucblib/libtermcap/i386/Makefile
+++ b/usr/src/ucblib/libtermcap/i386/Makefile
@@ -19,11 +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"
-#
 
 include ../Makefile.com
 
@@ -31,4 +29,4 @@ BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDL
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/ucblib/libtermcap/llib-ltermcap b/usr/src/ucblib/libtermcap/llib-ltermcap
deleted file mode 100644
index 8c3ecc759f..0000000000
--- a/usr/src/ucblib/libtermcap/llib-ltermcap
+++ /dev/null
@@ -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 1990 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/* LINTLIBRARY */
-
-#include <sgtty.h>
-#include <ctype.h>
-#include <sys/ioctl.h>
-
-/* termcap.c */
-int tgetent(bp, name) char *bp; char *name; { static int x; return(x); }
-int tgetnum(id) char *id; { static int x; return(x); }
-int tgetflag(id) char *id; { static int x; return(x); }
-char *tgetstr(id, area) char *id; char **area; { static char *x; return(x); }
-
-/* tgoto.c */
-char *tgoto(cm, destcol, destline) char *cm; int destcol; int destline; { static char *x; return(x); }
-
-/* tputs.c */
-int tputs(cp, affcnt, outc) register char *cp; int affcnt; int (*outc)(); { static int x; return(x); }
-
diff --git a/usr/src/ucblib/libtermcap/sparc/Makefile b/usr/src/ucblib/libtermcap/sparc/Makefile
index e2a26e9aea..c9b8beb496 100644
--- a/usr/src/ucblib/libtermcap/sparc/Makefile
+++ b/usr/src/ucblib/libtermcap/sparc/Makefile
@@ -19,11 +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"
-#
 
 include ../Makefile.com
 
@@ -31,4 +29,4 @@ BUILD.SO= $(CC) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/ucblib/libtermcap/sparcv9/Makefile b/usr/src/ucblib/libtermcap/sparcv9/Makefile
index 5567585245..4faa7cf698 100644
--- a/usr/src/ucblib/libtermcap/sparcv9/Makefile
+++ b/usr/src/ucblib/libtermcap/sparcv9/Makefile
@@ -19,11 +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"
-#
 
 include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
@@ -34,4 +32,4 @@ BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) \
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/ucblib/libucb/Makefile.com b/usr/src/ucblib/libucb/Makefile.com
index 079a9a94d9..a2a2b5c2c9 100644
--- a/usr/src/ucblib/libucb/Makefile.com
+++ b/usr/src/ucblib/libucb/Makefile.com
@@ -19,11 +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"
-#
 
 LIBRARY=	libucb.a
 VERS=		.1
@@ -87,27 +85,13 @@ SRCS=		$(PORTGENOBJS:%.o=../port/gen/%.c) \
 		$(PORTSTDIOOBJS:%.o=../port/stdio/%.c) \
 		$(PORTSYSOBJS:%.o=../port/sys/%.c)
 
-LIBS = $(DYNLIB) $(LINTLIB)
-
-LINTSRC= $(LINTLIB:%.ln=%)
-ROOTLINTDIR= $(ROOTLIBDIR)
-ROOTLINTDIR64= $(ROOTLIBDIR)/$(MACH64)
-ROOTLINT= $(LINTSRC:%=$(ROOTLINTDIR)/%)
-ROOTLINT64= $(LINTSRC:%=$(ROOTLINTDIR64)/%)
-
-# install rule for lint source file target
-$(ROOTLINTDIR)/%: ../port/%
-	$(INS.file)
-$(ROOTLINTDIR64)/%: ../%
-	$(INS.file)
-
-$(LINTLIB):= SRCS=../port/llib-lucb
+LIBS = $(DYNLIB)
 
 CFLAGS	+=	$(CCVERBOSE)
 CFLAGS64 +=	$(CCVERBOSE)
 LDLIBS +=	-lelf -lc
 
-CPPFLAGS = -D$(MACH) -I$(ROOT)/usr/ucbinclude -I../inc \
+CPPFLAGS = -D$(MACH) -I$(SRC)/ucbhead -I../inc \
 		-I../../../lib/libc/inc $(CPPFLAGS.master)
 
 ASFLAGS= -P -D__STDC__ -DLOCORE -D_SYS_SYS_S -D_ASM $(CPPFLAGS)
diff --git a/usr/src/ucblib/libucb/amd64/Makefile b/usr/src/ucblib/libucb/amd64/Makefile
index 99d85cfe7c..564565f610 100644
--- a/usr/src/ucblib/libucb/amd64/Makefile
+++ b/usr/src/ucblib/libucb/amd64/Makefile
@@ -19,11 +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"
-#
 
 SYSOBJS= signal.o
 
@@ -40,4 +38,4 @@ pics/%.o: ../$(MACH)/sys/%.c
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/ucblib/libucb/amd64/llib-lucb b/usr/src/ucblib/libucb/amd64/llib-lucb
deleted file mode 100644
index 4e91e5210a..0000000000
--- a/usr/src/ucblib/libucb/amd64/llib-lucb
+++ /dev/null
@@ -1,256 +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 2004 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-#include <sys/time.h>
-#include <varargs.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <sys/syscall.h>
-#include <sys/siginfo.h>
-#include <sys/ucontext.h>
-#include <signal.h>
-#include <ucontext.h>
-#include <setjmp.h>
-#include <sys/resource.h>
-#include <sys/utsname.h>
-#include <sys/systeminfo.h>
-#include <sys/errno.h>
-#include <sys/unistd.h>
-#include <sys/mman.h>
-#include <sys/uadmin.h>
-#include <sys/times.h>
-#include <wait.h>
-#include <sys/procset.h>
-#include <sys/param.h>
-#include <values.h>
-#include <ctype.h>
-#include <nan.h>
-#include <memory.h>
-#include <string.h>
-#include <locale.h>
-#include <fcntl.h>
-#include <nlist.h>
-#include <sys/dir.h>
-#include <sys/stat.h>
-#include <sys/priocntl.h>
-#include <sys/file.h>
-#include <sys/fcntl.h>
-#include <sys/statvfs.h>
-#include <sys/vfs.h>
-
-#include <sys/timeb.h>
-
-/* port/sys/gettimeofday.c */
-int gettimeofday(struct timeval *tp, void *tzp);
-int settimeofday(struct timeval *tp, void *tzp);
-
-/* port/sys/signal.c */
-int _sigvechandler(int sig, siginfo_t *sip, ucontext_t *ucp);
-int _sigsetmask(int mask);
-int ucbsigsetmask(int mask);
-int _sigblock(int mask);
-int ucbsigblock(int mask);
-int usigpause(int mask);
-int ucbsigpause(int mask);
-int _sigvec(int sig, struct sigvec *nvec, struct sigvec *ovec);
-int ucbsigvec(int sig, struct sigvec *nvec, struct sigvec *ovec);
-int _sigstack(struct sigstack *nss, struct sigstack *oss);
-void ucbsignal(int s, void (*a)());
-void usignal(int s, void (*a)());
-int _siginterrupt(int sig, int flag);
-int ucbsiginterrupt(int sig, int flag);
-
-/* port/sys/setjmp.c */
-int setjmp(jmp_buf env);
-int _setjmp(jmp_buf env);
-void _longjmp(jmp_buf env, int val);
-void longjmp(jmp_buf env, int val);
-
-/* port/sys/getdtblsize.c */
-int getdtablesize(void);
-
-/* port/sys/gethostid.c */
-long gethostid(void);
-
-/* port/sys/gethostname.c */
-int gethostname(char *name, int namelen);
-int sethostname(char *name, int namelen);
-
-/* port/sys/getpagesize.c */
-int getpagesize(void);
-
-/* port/sys/killpg.c */
-int killpg(int pgrp, int sig);
-
-/* port/sys/mctl.c */
-int mctl(caddr_t addr, size_t len, int function, int arg);
-
-/* port/sys/reboot.c */
-int reboot(int howto, char *bootargs);
-
-/* port/sys/setreid.c */
-int setreuid(int ruid, int euid);
-int setregid(int rgid, int egid);
-
-/* port/sys/wait3.c */
-int wait3(int *status, int options, struct rusage *rp);
-int wstat(int code, int status);
-
-/* port/sys/wait4.c */
-pid_t wait4(pid_t pid, int *status, int options, struct rusage *rusage);
-
-/* port/sys/getrusage.c */
-int getrusage(int who, struct rusage *rusage);
-
-/* port/sys/setpgrp.c */
-int setpgrp(pid_t pid1, pid_t pid2);
-
-/* port/stdio/sprintf.c */
-char *sprintf(const char *string, const char *format, ...);
-
-/* port/stdio/doprnt.c */
-int _doprnt(char *format, va_list in_args, FILE *iop);
-/*
- * void _mkarglst(fmt, args, arglst) char *fmt; stva_list args;
- *	stva_list arglst[];  {}
- * void _getarg(fmt, pargs, argno) char *fmt; stva_list *pargs; int argno;  {}
- */
-
-/* port/stdio/fopen.c */
-FILE *fopen(const char *file, const char *mode);
-FILE *freopen(const char *file, const char *mode, FILE *iop);
-
-/* port/stdio/fprintf.c */
-int fprintf(FILE *iop, const char *format, ...);
-
-/* port/stdio/printf.c */
-/* VARARGS1 */
-int printf(const char *format, ...);
-
-/* port/stdio/vfprintf.c */
-/* VARARGS 2 */
-int vfprintf(FILE *iop, const char *format, va_list);
-
-/* port/stdio/vprintf.c */
-/* VARARGS 1 */
-int vprintf(const char *format, va_list);
-
-/* port/stdio/vsprintf.c */
-/* VARARGS 2 */
-char *vsprintf(char *string, char *format, va_list);
-
-/* port/gen/nlist.c */
-int nlist(const char *name, struct nlist *list);
-
-/* port/gen/readdir.c */
-struct direct *readdir(DIR *dirp);
-
-/* port/gen/scandir.c */
-int scandir(char *dirname, struct direct *(*namelist[]), int (*select)(),
-	int (*dcomp)());
-int alphasort(struct direct **d1, struct direct **d2);
-
-/* port/gen/setpriority.c */
-int getpriority(int which, int who);
-int setpriority(int which, int who, int prio);
-
-/* port/gen/siglist.c */
-
-/* port/gen/_psignal.c */
-void _psignal(unsigned sig, char *s);
-
-/* port/gen/bcmp.c */
-int bcmp(char *s1, char *s2, int len);
-
-/* port/gen/bcopy.c */
-void bcopy(char *s1, char *s2, int len);
-
-/* port/gen/bzero.c */
-void bzero(char *sp, int len);
-
-/* port/gen/ftime.c */
-int ftime(struct timeb *tp);
-
-/* port/gen/getusershell.c */
-char *getusershell(void);
-int endusershell(void);
-int setusershell(void);
-
-/* port/gen/getwd.c */
-char *getwd(char *pathname);
-
-/* port/gen/index.c */
-char *index(char *sp, char c);
-
-/* port/gen/mkstemp.c */
-int mkstemp(char *as);
-
-/* port/gen/nice.c */
-int nice(int incr);
-
-/* port/gen/psignal.c */
-void psignal(unsigned sig, char *s);
-
-/* port/gen/rand.c */
-int srand(unsigned x);
-int rand(void);
-
-/* port/gen/random.c */
-int srandom(unsigned x);
-char *initstate(unsigned seed, char *arg_state, int n);
-char *setstate(char *arg_state);
-long random(void);
-
-/* port/gen/regex.c */
-char *re_comp(char *sp);
-int re_exec(char *p1);
-
-/* port/gen/rindex.c */
-char *rindex(char *sp, char c);
-
-/* port/gen/setbuffer.c */
-void setbuffer(FILE *iop, char *abuf, int asize);
-int setlinebuf(FILE *iop);
-
-/* port/gen/statfs.c */
-int statfs(char *path, struct statfs *buf);
-int fstatfs(int fd, struct statfs *buf);
-int cnvtvfs(struct statfs *buf, struct statvfs *vbuf);
-
-/* port/gen/times.c */
-clock_t times(struct tms *tmsp);
-
-/* port/gen/ualarm.c */
-unsigned ualarm(unsigned usecs, unsigned reload);
-
-/* port/gen/usleep.c */
-int usleep(unsigned n);
diff --git a/usr/src/ucblib/libucb/i386/Makefile b/usr/src/ucblib/libucb/i386/Makefile
index 8edc02b3de..d1041b19a3 100644
--- a/usr/src/ucblib/libucb/i386/Makefile
+++ b/usr/src/ucblib/libucb/i386/Makefile
@@ -19,11 +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"
-#
 
 SYSOBJS=	 	\
 	signal.o
@@ -36,4 +34,4 @@ DYNFLAGS += $(DYNFLAGS32)
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS) 
diff --git a/usr/src/ucblib/libucb/port/gen/nlist.c b/usr/src/ucblib/libucb/port/gen/nlist.c
index 02ef8371e0..b99967e0ec 100644
--- a/usr/src/ucblib/libucb/port/gen/nlist.c
+++ b/usr/src/ucblib/libucb/port/gen/nlist.c
@@ -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,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1997 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -37,15 +36,13 @@
  * contributors.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*LINTLIBRARY*/
 
 #include <sys/types.h>
 #include "libelf.h"
 #include <stdlib.h>
 #include <unistd.h>
-#include <fcntl.h>
+#include <sys/fcntl.h>
 #include <nlist.h>
 #include <sys/file.h>
 #include <string.h>
diff --git a/usr/src/ucblib/libucb/port/llib-lucb b/usr/src/ucblib/libucb/port/llib-lucb
deleted file mode 100644
index d1f187baab..0000000000
--- a/usr/src/ucblib/libucb/port/llib-lucb
+++ /dev/null
@@ -1,250 +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 2004 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-#include <sys/time.h>
-#include <varargs.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <sys/syscall.h>
-#include <sys/siginfo.h>
-#include <sys/ucontext.h>
-#include <signal.h>
-#include <ucontext.h>
-#include <setjmp.h>
-#include <sys/resource.h>
-#include <sys/utsname.h>
-#include <sys/systeminfo.h>
-#include <sys/errno.h>
-#include <unistd.h>
-#include <sys/mman.h>
-#include <sys/uadmin.h>
-#include <sys/times.h>
-#include <wait.h>
-#include <sys/procset.h>
-#include <sys/param.h>
-#include <values.h>
-#include <ctype.h>
-#include <nan.h>
-#include <memory.h>
-#include <string.h>
-#include <locale.h>
-#include <fcntl.h>
-#include <nlist.h>
-#include <sys/dir.h>
-#include <sys/stat.h>
-#include <sys/priocntl.h>
-#include <sys/file.h>
-#include <sys/fcntl.h>
-#include <sys/statvfs.h>
-#include <sys/vfs.h>
-
-#include <sys/timeb.h>
-
-/* port/sys/gettimeofday.c */
-int gettimeofday(struct timeval *, void *);
-int settimeofday(struct timeval *, void *);
-
-/* port/sys/signal.c */
-int _sigvechandler(int, siginfo_t *, ucontext_t *);
-int _sigsetmask(int);
-int ucbsigsetmask(int);
-int _sigblock(int);
-int ucbsigblock(int);
-int usigpause(int);
-int ucbsigpause(int);
-int _sigvec(int, struct sigvec *, struct sigvec *);
-int ucbsigvec(int, struct sigvec *, struct sigvec *);
-int _sigstack(struct sigstack *, struct sigstack *);
-void ucbsignal(int, void (*)());
-void usignal(int, void (*)());
-int _siginterrupt(int, int);
-int ucbsiginterrupt(int, int);
-#ifdef sparc
-void __sigcleanup(struct sigcontext *);
-#endif
-
-/* port/sys/flock.c */
-int flock(int, int);
-
-/* port/sys/getdtblsize.c */
-int getdtablesize(void);
-
-/* port/sys/gethostid.c */
-long gethostid(void);
-
-/* port/sys/gethostname.c */
-int gethostname(char *, int);
-int sethostname(char *, int);
-
-/* port/sys/getpagesize.c */
-int getpagesize(void);
-
-/* port/sys/killpg.c */
-int killpg(int, int);
-
-/* port/sys/mctl.c */
-int mctl(caddr_t, size_t, int, int);
-
-/* port/sys/reboot.c */
-int reboot(int, char *);
-
-/* port/sys/setreid.c */
-int setreuid(int, int);
-int setregid(int, int);
-
-/* port/sys/wait3.c */
-int wait3(int *, int, struct rusage *);
-int wstat(int, int);
-
-/* port/sys/wait4.c */
-int wait4(pid_t, int *, int, struct rusage *);
-
-/* port/sys/getrusage.c */
-int getrusage(int, struct rusage *);
-
-/* port/sys/setpgrp.c */
-int setpgrp(pid_t, pid_t);
-
-/* port/stdio/sprintf.c */
-char *sprintf(const char *, const char *, ...);
-
-/* port/stdio/doprnt.c */
-int _doprnt(char *, va_list, FILE *);
-/* void _mkarglst(char *, stva_list args, stva_list arglst[]); */
-/* void _getarg(char *, stva_list *, int); */
-
-
-
-
-/* port/stdio/fopen.c */
-FILE *fopen(const char *, const char *);
-FILE *fopen64(const char *, const char *);
-FILE *freopen(const char *, const char *, FILE *);
-FILE *freopen64(const char *, const char *, FILE *);
-
-/* port/stdio/fprintf.c */
-int fprintf(FILE *, const char *, ...);
-
-/* port/stdio/printf.c */
-/* VARARGS1 */
-int printf(const char *, ...);
-
-/* port/stdio/vfprintf.c */
-/* VARARGS2 */
-int vfprintf(FILE *, const char *, va_list);
-
-/* port/stdio/vprintf.c */
-/* VARARGS1 */
-int vprintf(const char *, va_list);
-
-/* port/stdio/vsprintf.c */
-/* VARARGS2 */
-char *vsprintf(char *, char *, va_list);
-
-/* port/gen/nlist.c */
-int nlist(const char *, struct nlist *);
-
-/* port/gen/setpriority.c */
-int getpriority(int, int);
-int setpriority(int, int, int);
-
-/* port/gen/siglist.c */
-
-/* port/gen/_psignal.c */
-void _psignal(unsigned, char *);
-
-/* port/gen/bcmp.c */
-int bcmp(char *, char *, int);
-
-/* port/gen/bcopy.c */
-void bcopy(char *, char *, int);
-
-/* port/gen/bzero.c */
-void bzero(char *, int);
-
-/* port/gen/ftime.c */
-int ftime(struct timeb *);
-
-/* port/gen/getusershell.c */
-char *getusershell(void);
-int endusershell(void);
-int setusershell(void);
-
-/* port/gen/getwd.c */
-char *getwd(char *);
-
-/* port/gen/index.c */
-char *index(char *, char);
-
-/* port/gen/mkstemp.c */
-int mkstemp(char *);
-
-/* port/gen/nice.c */
-int nice(int);
-
-/* port/gen/psignal.c */
-void psignal(unsigned, char *);
-
-/* port/gen/rand.c */
-int srand(unsigned);
-int rand(void);
-
-/* port/gen/random.c */
-int srandom(unsigned);
-char *initstate(unsigned, char *, int);
-char *setstate(char *);
-long random(void);
-
-/* port/gen/regex.c */
-char *re_comp(char *);
-int re_exec(char *);
-
-/* port/gen/rindex.c */
-char *rindex(char *, char);
-
-/* port/gen/setbuffer.c */
-void setbuffer(FILE *, char *, int);
-int setlinebuf(FILE *);
-
-/* port/gen/statfs.c */
-int statfs(char *, struct statfs *);
-int fstatfs(int, struct statfs *);
-int cnvtvfs(struct statfs *, struct statvfs *);
-
-/* port/gen/times.c */
-clock_t times(struct tms *);
-
-/* port/gen/ualarm.c */
-unsigned ualarm(unsigned, unsigned);
-
-/* port/gen/usleep.c */
-int usleep(unsigned);
diff --git a/usr/src/ucblib/libucb/port/stdio/fopen.c b/usr/src/ucblib/libucb/port/stdio/fopen.c
index c6fcb4ee42..01ab2dde2c 100644
--- a/usr/src/ucblib/libucb/port/stdio/fopen.c
+++ b/usr/src/ucblib/libucb/port/stdio/fopen.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -37,14 +37,12 @@
  * contributors.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*LINTLIBRARY*/
 
 #include <sys/types.h>
 #include "file64.h"
 #include <stdio.h>
-#include <fcntl.h>
+#include <sys/fcntl.h>
 #include <unistd.h>
 #include <sys/file.h>
 #include "stdiom.h"
diff --git a/usr/src/ucblib/libucb/port/sys/flock.c b/usr/src/ucblib/libucb/port/sys/flock.c
index 7bc8d034cb..ee473bf2f8 100644
--- a/usr/src/ucblib/libucb/port/sys/flock.c
+++ b/usr/src/ucblib/libucb/port/sys/flock.c
@@ -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,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 1997 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -32,13 +31,11 @@
  * under license from the Regents of the University of California.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*LINTLIBRARY*/
 
 #include <sys/types.h>
 #include <sys/file.h>
-#include <fcntl.h>
+#include <sys/fcntl.h>
 #include <errno.h>
 
 int
diff --git a/usr/src/ucblib/libucb/sparc/Makefile b/usr/src/ucblib/libucb/sparc/Makefile
index ceceefc9ba..bfa844235b 100644
--- a/usr/src/ucblib/libucb/sparc/Makefile
+++ b/usr/src/ucblib/libucb/sparc/Makefile
@@ -19,11 +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"
-#
 
 SYSOBJS=	 	\
 	setjmp.o	\
@@ -41,4 +39,4 @@ pics/%.o: sys/%.s
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
+install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/ucblib/libucb/sparcv9/Makefile b/usr/src/ucblib/libucb/sparcv9/Makefile
index 90e748660f..89af3cc63e 100644
--- a/usr/src/ucblib/libucb/sparcv9/Makefile
+++ b/usr/src/ucblib/libucb/sparcv9/Makefile
@@ -19,11 +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"
-#
 
 SYSOBJS=	 	\
 	setjmp.o	\
@@ -47,4 +45,4 @@ pics/%.o: sys/%.s
 
 .KEEP_STATE:
 
-install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/ucblib/libucb/sparcv9/llib-lucb b/usr/src/ucblib/libucb/sparcv9/llib-lucb
deleted file mode 100644
index ef235b901e..0000000000
--- a/usr/src/ucblib/libucb/sparcv9/llib-lucb
+++ /dev/null
@@ -1,256 +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) 1995-1997, by Sun Microsystems, Inc.
- * All Rights Reserved
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/* LINTLIBRARY */
-/* PROTOLIB1 */
-
-#include <sys/time.h>
-#include <varargs.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <sys/syscall.h>
-#include <sys/siginfo.h>
-#include <sys/ucontext.h>
-#include <signal.h>
-#include <ucontext.h>
-#include <setjmp.h>
-#include <sys/resource.h>
-#include <sys/utsname.h>
-#include <sys/systeminfo.h>
-#include <sys/errno.h>
-#include <sys/unistd.h>
-#include <sys/mman.h>
-#include <sys/uadmin.h>
-#include <sys/times.h>
-#include <wait.h>
-#include <sys/procset.h>
-#include <sys/param.h>
-#include <values.h>
-#include <ctype.h>
-#include <nan.h>
-#include <memory.h>
-#include <string.h>
-#include <locale.h>
-#include <fcntl.h>
-#include <nlist.h>
-#include <sys/dir.h>
-#include <sys/stat.h>
-#include <sys/priocntl.h>
-#include <sys/file.h>
-#include <sys/fcntl.h>
-#include <sys/statvfs.h>
-#include <sys/vfs.h>
-
-#include <sys/timeb.h>
-
-/* port/sys/gettimeofday.c */
-int gettimeofday(struct timeval *tp, void *tzp);
-int settimeofday(struct timeval *tp, void *tzp);
-
-/* port/sys/signal.c */
-int _sigvechandler(int sig, siginfo_t *sip, ucontext_t *ucp);
-int _sigsetmask(int mask);
-int ucbsigsetmask(int mask);
-int _sigblock(int mask);
-int ucbsigblock(int mask);
-int usigpause(int mask);
-int ucbsigpause(int mask);
-int _sigvec(int sig, struct sigvec *nvec, struct sigvec *ovec);
-int ucbsigvec(int sig, struct sigvec *nvec, struct sigvec *ovec);
-int _sigstack(struct sigstack *nss, struct sigstack *oss);
-void ucbsignal(int s, void (*a)());
-void usignal(int s, void (*a)());
-int _siginterrupt(int sig, int flag);
-int ucbsiginterrupt(int sig, int flag);
-
-/* port/sys/setjmp.c */
-int setjmp(jmp_buf env);
-int _setjmp(jmp_buf env);
-void _longjmp(jmp_buf env, int val);
-void longjmp(jmp_buf env, int val);
-
-/* port/sys/getdtblsize.c */
-int getdtablesize(void);
-
-/* port/sys/gethostid.c */
-long gethostid(void);
-
-/* port/sys/gethostname.c */
-int gethostname(char *name, int namelen);
-int sethostname(char *name, int namelen);
-
-/* port/sys/getpagesize.c */
-int getpagesize(void);
-
-/* port/sys/killpg.c */
-int killpg(int pgrp, int sig);
-
-/* port/sys/mctl.c */
-int mctl(caddr_t addr, size_t len, int function, int arg);
-
-/* port/sys/reboot.c */
-int reboot(int howto, char *bootargs);
-
-/* port/sys/setreid.c */
-int setreuid(int ruid, int euid);
-int setregid(int rgid, int egid);
-
-/* port/sys/wait3.c */
-int wait3(int *status, int options, struct rusage *rp);
-int wstat(int code, int status);
-
-/* port/sys/wait4.c */
-pid_t wait4(pid_t pid, int *status, int options, struct rusage *rusage);
-
-/* port/sys/getrusage.c */
-int getrusage(int who, struct rusage *rusage);
-
-/* port/sys/setpgrp.c */
-int setpgrp(pid_t pid1, pid_t pid2);
-
-/* port/stdio/sprintf.c */
-char *sprintf(const char *string, const char *format, ...);
-
-/* port/stdio/doprnt.c */
-int _doprnt(char *format, va_list in_args, FILE *iop);
-/*
- * void _mkarglst(fmt, args, arglst) char *fmt; stva_list args;
- *	stva_list arglst[];  {}
- * void _getarg(fmt, pargs, argno) char *fmt; stva_list *pargs; int argno;  {}
- */
-
-/* port/stdio/fopen.c */
-FILE *fopen(const char *file, const char *mode);
-FILE *freopen(const char *file, const char *mode, FILE *iop);
-
-/* port/stdio/fprintf.c */
-int fprintf(FILE *iop, const char *format, ...);
-
-/* port/stdio/printf.c */
-/* VARARGS1 */
-int printf(const char *format, ...);
-
-/* port/stdio/vfprintf.c */
-/* VARARGS 2 */
-int vfprintf(FILE *iop, const char *format, va_list);
-
-/* port/stdio/vprintf.c */
-/* VARARGS 1 */
-int vprintf(const char *format, va_list);
-
-/* port/stdio/vsprintf.c */
-/* VARARGS 2 */
-char *vsprintf(char *string, char *format, va_list);
-
-/* port/gen/nlist.c */
-int nlist(const char *name, struct nlist *list);
-
-/* port/gen/readdir.c */
-struct direct *readdir(DIR *dirp);
-
-/* port/gen/scandir.c */
-int scandir(char *dirname, struct direct *(*namelist[]), int (*select)(),
-	int (*dcomp)());
-int alphasort(struct direct **d1, struct direct **d2);
-
-/* port/gen/setpriority.c */
-int getpriority(int which, int who);
-int setpriority(int which, int who, int prio);
-
-/* port/gen/siglist.c */
-
-/* port/gen/_psignal.c */
-void _psignal(unsigned sig, char *s);
-
-/* port/gen/bcmp.c */
-int bcmp(char *s1, char *s2, int len);
-
-/* port/gen/bcopy.c */
-void bcopy(char *s1, char *s2, int len);
-
-/* port/gen/bzero.c */
-void bzero(char *sp, int len);
-
-/* port/gen/ftime.c */
-int ftime(struct timeb *tp);
-
-/* port/gen/getusershell.c */
-char *getusershell(void);
-int endusershell(void);
-int setusershell(void);
-
-/* port/gen/getwd.c */
-char *getwd(char *pathname);
-
-/* port/gen/index.c */
-char *index(char *sp, char c);
-
-/* port/gen/mkstemp.c */
-int mkstemp(char *as);
-
-/* port/gen/nice.c */
-int nice(int incr);
-
-/* port/gen/psignal.c */
-void psignal(unsigned sig, char *s);
-
-/* port/gen/rand.c */
-int srand(unsigned x);
-int rand(void);
-
-/* port/gen/random.c */
-int srandom(unsigned x);
-char *initstate(unsigned seed, char *arg_state, int n);
-char *setstate(char *arg_state);
-long random(void);
-
-/* port/gen/regex.c */
-char *re_comp(char *sp);
-int re_exec(char *p1);
-
-/* port/gen/rindex.c */
-char *rindex(char *sp, char c);
-
-/* port/gen/setbuffer.c */
-void setbuffer(FILE *iop, char *abuf, int asize);
-int setlinebuf(FILE *iop);
-
-/* port/gen/statfs.c */
-int statfs(char *path, struct statfs *buf);
-int fstatfs(int fd, struct statfs *buf);
-int cnvtvfs(struct statfs *buf, struct statvfs *vbuf);
-
-/* port/gen/times.c */
-clock_t times(struct tms *tmsp);
-
-/* port/gen/ualarm.c */
-unsigned ualarm(unsigned usecs, unsigned reload);
-
-/* port/gen/usleep.c */
-int usleep(unsigned n);
author	Garrett D'Amore <Garrett.Damore@Sun.COM>	2009-10-09 17:01:12 -0700
committer	Garrett D'Amore <Garrett.Damore@Sun.COM>	2009-10-09 17:01:12 -0700
commit	5bbb4db2c3f208d12bf0fd11769728f9e5ba66a2 (patch)
tree	ff1164c9871a611c7597916b0395e944697a5431 /usr/src
parent	28863dd2d94fb78bea3941334d3783f014da7403 (diff)
download	illumos-joyent-5bbb4db2c3f208d12bf0fd11769728f9e5ba66a2.tar.gz