6885330 print package refactoringonnv_128

30 files changed, 222 insertions, 820 deletions

diff --git a/usr/src/cmd/print/bsd-sysv-commands/rfc1179.xml b/usr/src/cmd/print/bsd-sysv-commands/rfc1179.xml
index 9709da2a7e..b6783bca28 100644
--- a/usr/src/cmd/print/bsd-sysv-commands/rfc1179.xml
+++ b/usr/src/cmd/print/bsd-sysv-commands/rfc1179.xml
@@ -30,7 +30,7 @@
 	file.
 -->
 
-<service_bundle type='manifest' name='SUNWpcr:rfc1179'>
+<service_bundle type='manifest' name='SUNWpsr:rfc1179'>
 
 <service
     name='application/print/rfc1179'
diff --git a/usr/src/pkgdefs/Makefile b/usr/src/pkgdefs/Makefile
index 31182015ce..75406b2af5 100644
--- a/usr/src/pkgdefs/Makefile
+++ b/usr/src/pkgdefs/Makefile
@@ -333,8 +333,6 @@ COMMON_SUBDIRS= \
 	SUNWllc \
 	SUNWllcr\
 	SUNWlldap \
-	SUNWlp-cmds \
-	SUNWlpr-cmds \
 	SUNWkey  \
 	SUNWloc  \
 	SUNWluxop \
@@ -386,7 +384,6 @@ COMMON_SUBDIRS= \
 	SUNWpcmci  \
 	SUNWpcmcu  \
 	SUNWpcmem \
-	SUNWpcr	\
 	SUNWpcser \
 	SUNWpcu	\
 	SUNWpcwl \
@@ -404,6 +401,7 @@ COMMON_SUBDIRS= \
 	SUNWpoolr \
 	SUNWpowertop \
 	SUNWppm \
+	SUNWppmr \
 	SUNWpppd \
 	SUNWpppdu \
 	SUNWpppdr \
diff --git a/usr/src/pkgdefs/SUNWlp-cmds/prototype_com b/usr/src/pkgdefs/SUNWlp-cmds/prototype_com
deleted file mode 100644
index 5d09fea16e..0000000000
--- a/usr/src/pkgdefs/SUNWlp-cmds/prototype_com
+++ /dev/null
@@ -1,60 +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 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-# packaging files
-i pkginfo
-i copyright
-i depend
-#
-# source locations relative to the prototype file
-#
-# SUNWpapi-lp-cmds
-#
-d none usr 755 root sys
-d none usr/bin 755 root bin
-s none usr/bin/cancel=../sbin/print-service
-s none usr/bin/disable=../sbin/print-service
-s none usr/bin/enable=../sbin/print-service
-s none usr/bin/lp=../sbin/print-service
-s none usr/bin/lpstat=../sbin/print-service
-d none usr/sbin 755 root bin
-s none usr/sbin/accept=./print-service
-s none usr/sbin/lpmove=./print-service
-s none usr/sbin/reject=./print-service
diff --git a/usr/src/pkgdefs/SUNWlp-cmds/prototype_sparc b/usr/src/pkgdefs/SUNWlp-cmds/prototype_sparc
deleted file mode 100644
index a520804be7..0000000000
--- a/usr/src/pkgdefs/SUNWlp-cmds/prototype_sparc
+++ /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 (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 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
-#
-#
-# SUNWpapi-lp-cmds
-#
diff --git a/usr/src/pkgdefs/SUNWlpr-cmds/Makefile b/usr/src/pkgdefs/SUNWlpr-cmds/Makefile
deleted file mode 100644
index e1484be2db..0000000000
--- a/usr/src/pkgdefs/SUNWlpr-cmds/Makefile
+++ /dev/null
@@ -1,49 +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 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-
-include ../Makefile.com
-
-DATAFILES += depend
-CLEANFILES += action
-
-ACTION=grep SUNWpapi depend > /dev/null || \
-	( chmod 666 depend; \
-	echo "P SUNWpapi      Free Standards Group Open Printing API" >> depend; \
-	chmod 444 depend );
-
-.KEEP_STATE:
-
-all: $(FILES) action
-install: all pkg
-
-# action is a pseudotarget denoting completed work on the depend file
-action: depend
-	$(ACTION)
-	touch $@
-
-include ../Makefile.targ
-include ../Makefile.prtarg
diff --git a/usr/src/pkgdefs/SUNWlpr-cmds/pkginfo.tmpl b/usr/src/pkgdefs/SUNWlpr-cmds/pkginfo.tmpl
deleted file mode 100644
index 38f6ab861e..0000000000
--- a/usr/src/pkgdefs/SUNWlpr-cmds/pkginfo.tmpl
+++ /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 (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="SUNWlpr-cmds"
-NAME="Berkeley LPR commands"
-ARCH="ISA"
-VERSION="ONVERS,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="Berkeley LPR commands using the FSG OpenPrinting API (PAPI)"
-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/SUNWlpr-cmds/prototype_com b/usr/src/pkgdefs/SUNWlpr-cmds/prototype_com
deleted file mode 100644
index c6994812d6..0000000000
--- a/usr/src/pkgdefs/SUNWlpr-cmds/prototype_com
+++ /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 (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 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-#
-# This required package information file contains a list of package contents.
-# The 'pkgmk' command uses this file to identify the contents of a package
-# and their location on the development machine when building the package.
-# Can be created via a text editor or through use of the 'pkgproto' command.
-
-#!search <pathname pathname ...>	# where to find pkg objects
-#!include <filename>			# include another 'prototype' file
-#!default <mode> <owner> <group>	# default used if not specified on entry
-#!<param>=<value>			# puts parameter in pkg environment
-
-# packaging files
-i pkginfo
-i copyright
-i depend
-#
-# source locations relative to the prototype file
-#
-# SUNWpapi-lpr-cmds
-#
-d none usr 755 root sys
-d none usr/bin 755 root bin 
-s none usr/bin/lpc=../sbin/print-service
-s none usr/bin/lpq=../sbin/print-service
-s none usr/bin/lpr=../sbin/print-service
-s none usr/bin/lprm=../sbin/print-service
diff --git a/usr/src/pkgdefs/SUNWlpr-cmds/prototype_i386 b/usr/src/pkgdefs/SUNWlpr-cmds/prototype_i386
deleted file mode 100644
index e033491157..0000000000
--- a/usr/src/pkgdefs/SUNWlpr-cmds/prototype_i386
+++ /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 (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 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
-#
-#
-# SUNWpapi-lpr-cmds
-#
diff --git a/usr/src/pkgdefs/SUNWpcr/Makefile b/usr/src/pkgdefs/SUNWpcr/Makefile
deleted file mode 100644
index ec46e085da..0000000000
--- a/usr/src/pkgdefs/SUNWpcr/Makefile
+++ /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 2004 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-include ../Makefile.com
-
-TMPLFILES += postinstall
-DATAFILES += i.manifest r.manifest i.preserve depend
-
-ACTION=grep SUNWlpr depend > /dev/null || \
-	( chmod 666 depend; \
-	echo "I SUNWlpr	LP Print Service, (root)" >> depend; \
-	chmod 444 depend );
-
-.KEEP_STATE:
-
-all: $(FILES) action
-
-install: all pkg
-
-# action is a pseudotarget denoting completed work on the depend file
-action: depend
-	$(ACTION)
-	touch $@
-
-include ../Makefile.targ
-include ../Makefile.prtarg
diff --git a/usr/src/pkgdefs/SUNWpcr/pkginfo.tmpl b/usr/src/pkgdefs/SUNWpcr/pkginfo.tmpl
deleted file mode 100644
index 3ccaf669cb..0000000000
--- a/usr/src/pkgdefs/SUNWpcr/pkginfo.tmpl
+++ /dev/null
@@ -1,60 +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="SUNWpcr"
-NAME="Solaris Print - Client, (root)"
-ARCH="ISA"
-# this should be changed to ONVERS when ON catches up to the version number
-VERSION="13.1,REV=0.0.0"
-SUNW_PRODNAME="SunOS"
-SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="root"
-MAXINST="1000"
-CATEGORY="system"
-DESC="client configuration files and utilities for the print service"
-VENDOR="Sun Microsystems, Inc."
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none preserve manifest"
-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/SUNWpcr/postinstall.tmpl b/usr/src/pkgdefs/SUNWpcr/postinstall.tmpl
deleted file mode 100644
index b695c38822..0000000000
--- a/usr/src/pkgdefs/SUNWpcr/postinstall.tmpl
+++ /dev/null
@@ -1,112 +0,0 @@
-#/bin/sh
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# 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 2008 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-
-#    Deconfigure the old SAF Listeners
-#
-PMTAB=$BASEDIR/etc/saf/tcp/_pmtab
-if [ -f $PMTAB ] ; then
-    sed -e '/^lp:/D' -e '/^lpd:/D' -e '/^0:/D' $PMTAB >/tmp/t.$$
-    cp /tmp/t.$$ $PMTAB
-fi
-
-#    Convert the old LP configuration for Client use
-#
-PCONF=$BASEDIR/etc/printers.conf
-LP_DIR=$BASEDIR/etc/lp
-
-egrep -v -c -e "^#" ${PCONF} 2>/dev/null 1>/dev/null
-STATUS=$?
-
-if [ -d ${LP_DIR} -a ${STATUS} -ne 0 ] ; then
-    # get the default printer
-    if [ -f ${LP_DIR}/default ] ; then
-        DEFAULT=`cat ${LP_DIR}/default`
-        #echo "Default: ${DEFAULT}"
-    fi    
-
-    cat <<EOF >/tmp/p.$$
-#
-#        Printers.conf derived from converted LP configuration data
-#        during package installation.  All future updates should be
-#        performed using lpadmin(1M) or lpset(1M)
-#
-EOF
-
-    if [ -d ${LP_DIR}/printers ] ; then
-        cd ${LP_DIR}/printers
-        for PRINTER in * ; do
-            if [ "${PRINTER}" = "*" ] ; then
-                continue
-            fi
-
-            #echo "Convert: ${PRINTER}"
-
-            DEVICE=`grep Device: ${PRINTER}/configuration 2>/dev/null`
-            STATUS=$?
-            DEVICE=`echo ${DEVICE} | sed -e "s/^Device: //"`
-            if [ $STATUS -eq 0 ] ; then
-                ADDR="`uname -n`,${PRINTER},Solaris:"
-                #echo "	is local (${ADDR})"
-            fi
-
-            REMOTE=`grep Remote: ${PRINTER}/configuration 2>/dev/null`
-            STATUS=$?
-            REMOTE=`echo ${REMOTE} | sed -e "s/^Remote: //"`
-            if [ $STATUS -eq 0 ] ; then
-                if [ `echo ${REMOTE} | grep -c \!` -ne 0 ] ; then
-                    ADDR=`echo $REMOTE | sed -e 's/\!/,/g'`
-                else
-                    ADDR="${REMOTE},${PRINTER}"
-                fi
-                #echo "	is remote (${ADDR})"
-                # remove the remote printer config directory, there is no going
-                # back
-                rm -rf ${PRINTER} 2>/dev/null
-            fi
-
-            if [ -n "${ADDR}" ] ; then
-                if [ -n "${DEFAULT}" -a "${DEFAULT}" = "${PRINTER}" ]; then
-                    echo "${PRINTER}|_default:\\" >>/tmp/p.$$
-                else
-                    echo "${PRINTER}:\\" >>/tmp/p.$$
-                fi
-                echo "	:bsdaddr=${ADDR}:" >>/tmp/p.$$
-            fi
-        done
-    fi
-    cp /tmp/p.$$ ${PCONF}
-fi
-
-# This works around the problem of legacy cleanup service removal until
-# r.manifest is fixed to work on alternate pkg root.
-if [ "${PKG_INSTALL_ROOT:-/}" != "/" ] ; then
-        echo "/usr/sbin/svccfg delete -f svc:/application/print/cleanup 2>/dev/null" >> \
-            $BASEDIR/var/svc/profile/upgrade
-fi
-
-
-exit 0
diff --git a/usr/src/pkgdefs/SUNWpcr/prototype_i386 b/usr/src/pkgdefs/SUNWpcr/prototype_i386
deleted file mode 100644
index 80f5350a75..0000000000
--- a/usr/src/pkgdefs/SUNWpcr/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
-#
-#
-# SUNWpcr
-#
diff --git a/usr/src/pkgdefs/SUNWpcr/prototype_sparc b/usr/src/pkgdefs/SUNWpcr/prototype_sparc
deleted file mode 100644
index 442090b52d..0000000000
--- a/usr/src/pkgdefs/SUNWpcr/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
-#
-#
-# SUNWpcr
-#
diff --git a/usr/src/pkgdefs/SUNWpcu/Makefile b/usr/src/pkgdefs/SUNWpcu/Makefile
index 9e8f55a682..81a7513248 100644
--- a/usr/src/pkgdefs/SUNWpcu/Makefile
+++ b/usr/src/pkgdefs/SUNWpcu/Makefile
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.com
@@ -30,10 +29,8 @@ include ../Makefile.com
 TMPLFILES += preremove
 DATAFILES += depend
 
-ACTION=grep SUNWpcr depend > /dev/null || \
+ACTION=grep SUNWlpu depend > /dev/null || \
 	( chmod 666 depend; \
-	echo "P SUNWpcr       Solaris Print - Client, (root)" >> depend; \
-	echo "P SUNWpapi      Free Standards Group Open Printing API" >> depend; \
 	echo "P SUNWperl584core SUNWperl584core Perl 5.8.4 (core)" >> depend; \
 	echo "I SUNWlpu       LP Print Service, (usr)" >> depend; \
 	chmod 444 depend );
diff --git a/usr/src/pkgdefs/SUNWpcu/prototype_com b/usr/src/pkgdefs/SUNWpcu/prototype_com
index cb60b73934..97fd08c8f7 100644
--- a/usr/src/pkgdefs/SUNWpcu/prototype_com
+++ b/usr/src/pkgdefs/SUNWpcu/prototype_com
@@ -42,9 +42,6 @@ i preremove
 #
 d none usr 0755 root sys
 d none usr/bin 0755 root bin
-f none usr/bin/lpget 0511 root lp
-f none usr/bin/lpset 4511 root lp
-f none usr/bin/lptest 555 root lp
 s none usr/bin/desktop-print-management=../sbin/print-service
 f none usr/bin/desktop-print-management-applet 0555 root bin
 s none usr/bin/desktop-print-management-prefs=../sbin/print-service
@@ -54,14 +51,6 @@ d none usr/lib/lp/bin 0755 root lp
 f none usr/lib/lp/bin/desktop-print-management-applet 0555 root bin
 f none usr/lib/lp/bin/desktop-print-management-prefs 0555 root bin
 f none usr/lib/lp/bin/desktop-print-management 0555 root bin
-f none usr/lib/libprint.so.2 0755 root bin
-s none usr/lib/libprint.so=./libprint.so.2
-d none usr/lib/print 0755 root lp
-f none usr/lib/print/Makefile.yp 0444 root lp
-f none usr/lib/print/in.lpd 0555 root bin
-f none usr/lib/print/conv_fix 0555 root lp
-f none usr/lib/print/conv_lp 0555 root lp
-f none usr/lib/print/conv_lpd 0555 root lp
 d none usr/sbin 0755 root bin
 s none usr/sbin/lpadmin=./print-service
 f none usr/sbin/print-service 0555 root bin
@@ -72,4 +61,17 @@ f none usr/share/applications/desktop-print-management-prefs.desktop 444 root bi
 d none usr/share/gnome 755 root other
 d none usr/share/gnome/autostart 755 root bin
 f none usr/share/gnome/autostart/desktop-print-management-applet.desktop 444 root bin
-
+#	lp-cmds
+s none usr/bin/cancel=../sbin/print-service
+s none usr/bin/disable=../sbin/print-service
+s none usr/bin/enable=../sbin/print-service
+s none usr/bin/lp=../sbin/print-service
+s none usr/bin/lpstat=../sbin/print-service
+s none usr/sbin/accept=./print-service
+s none usr/sbin/lpmove=./print-service
+s none usr/sbin/reject=./print-service
+# lpr-cmds
+s none usr/bin/lpc=../sbin/print-service
+s none usr/bin/lpq=../sbin/print-service
+s none usr/bin/lpr=../sbin/print-service
+s none usr/bin/lprm=../sbin/print-service
diff --git a/usr/src/pkgdefs/SUNWppm/Makefile b/usr/src/pkgdefs/SUNWppm/Makefile
index dd7b5140d2..3978ca1da5 100644
--- a/usr/src/pkgdefs/SUNWppm/Makefile
+++ b/usr/src/pkgdefs/SUNWppm/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,8 @@
 #
 # CDDL HEADER END
 #
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1999-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 
 include ../Makefile.com
@@ -32,7 +28,7 @@ DATAFILES += depend
 
 ACTION= \
 	( chmod 666 depend; \
-	echo "P SUNWpcu		Solaris Print - Client, (usr)" >> depend; \
+	echo "P SUNWpsu		Solaris Print - LP Server, (usr)" >> depend; \
 	echo "P SUNWrcmdc	Remote Network Client Commands" >> depend; \
 	chmod 444 depend );
 
diff --git a/usr/src/pkgdefs/SUNWpcr/preremove b/usr/src/pkgdefs/SUNWppmr/Makefile
index 42edcac2e2..7fa6a9d6b5 100644
--- a/usr/src/pkgdefs/SUNWpcr/preremove
+++ b/usr/src/pkgdefs/SUNWppmr/Makefile
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # CDDL HEADER START
 #
@@ -19,15 +18,19 @@
 #
 # 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"
 #
 
-# Remove ppdmgr created cache files
-/bin/rm -f $BASEDIR/var/lp/ppd/caches/*
-/bin/rm -f $BASEDIR/var/lp/ppd/ppdcache
+include ../Makefile.com
+
+DATAFILES += i.manifest r.manifest
+
+.KEEP_STATE:
+
+all: $(FILES)
+install: all pkg
 
-exit 0
+include ../Makefile.targ
+include ../Makefile.prtarg
diff --git a/usr/src/pkgdefs/SUNWppmr/depend b/usr/src/pkgdefs/SUNWppmr/depend
new file mode 100644
index 0000000000..5a110939b1
--- /dev/null
+++ b/usr/src/pkgdefs/SUNWppmr/depend
@@ -0,0 +1,53 @@
+#
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# This package information file defines software dependencies associated
+# with the pkg.  You can define three types of pkg dependencies with this file:
+#	 P indicates a prerequisite for installation
+#	 I indicates an incompatible package
+#	 R indicates a reverse dependency
+# <pkg.abbr> see pkginfo(4), PKG parameter
+# <name> see pkginfo(4), NAME parameter
+# <version> see pkginfo(4), VERSION parameter
+# <arch> see pkginfo(4), ARCH parameter
+# <type> <pkg.abbr> <name>
+# 	(<arch>)<version>
+# 	(<arch>)<version>
+# 	...
+# <type> <pkg.abbr> <name>
+# ...
+#
+
+P SUNWcar	Core Architecture, (Root)
+P SUNWcakr	Core Solaris Kernel Architecture (Root)
+P SUNWkvm	Core Architecture, (Kvm)
+P SUNWcsr	Core Solaris, (Root)
+P SUNWckr	Core Solaris Kernel (Root)
+P SUNWcnetr	Core Solaris Network Infrastructure (Root)
+P SUNWcsu	Core Solaris, (Usr)
+P SUNWcsd	Core Solaris Devices
+P SUNWcsl	Core Solaris Libraries
+P SUNWcslr	Core Solaris Libraries (Root)
+I SUNWlpr	LP Print Service, (root)
+P SUNWppm	Solaris Print Manager
+P SUNWpsr	Solaris Print - LP Server, (root)
diff --git a/usr/src/pkgdefs/SUNWlp-cmds/pkginfo.tmpl b/usr/src/pkgdefs/SUNWppmr/pkginfo.tmpl
index 1eec27a3fc..798f736143 100644
--- a/usr/src/pkgdefs/SUNWlp-cmds/pkginfo.tmpl
+++ b/usr/src/pkgdefs/SUNWppmr/pkginfo.tmpl
@@ -20,10 +20,9 @@
 #
 
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 #
@@ -31,29 +30,22 @@
 # package, such as package abbreviation, full package name, package version,
 # and package architecture.
 #
-PKG="SUNWlp-cmds"
-NAME="System V LP commands"
+PKG=SUNWppmr
+NAME="Solaris Print Manager (Root)"
 ARCH="ISA"
 VERSION="ONVERS,REV=0.0.0"
 SUNW_PRODNAME="SunOS"
 SUNW_PRODVERS="RELEASE/VERSION"
-SUNW_PKGTYPE="usr"
-MAXINST="1000"
-CATEGORY="system"
-DESC="System V LP commands using the FSG OpenPrinting API (PAPI)"
-VENDOR="Sun Microsystems, Inc."
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-CLASSES="none"
+SUNW_PKGTYPE="root"
+MAXINST=1000
+CATEGORY=system
+DESC="Graphical tool for managing printers under Solaris."
+VENDOR=Sun Microsystems, Inc.
+HOTLINE=Please contact your local service provider
+EMAIL=
+CLASSES="none manifest"
 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/SUNWppmr/postinstall b/usr/src/pkgdefs/SUNWppmr/postinstall
new file mode 100644
index 0000000000..1adbe87f4d
--- /dev/null
+++ b/usr/src/pkgdefs/SUNWppmr/postinstall
@@ -0,0 +1,62 @@
+#
+# 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 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#
+
+#
+# If appropriate, enable this service.
+#
+BASEPREFIX=`echo $BASEDIR | sed "s/\//_/g"`
+
+PPDFILENAME=`echo sunwppmr_ppd_cache_update"$BASEPREFIX" | cut -c 1-256`
+PPDTMPFILE=/tmp/$PPDFILENAME
+if [ -f $PPDTMPFILE ] ; then
+
+	# Enable the ppd-cache-update service.
+	echo "/usr/sbin/svcadm enable application/print/ppd-cache-update" >> \
+	    $BASEDIR/var/svc/profile/upgrade
+
+	# Ensure pre-existing printer configuration files with an
+	# old system PPD file delivery location are updated to
+	# reflect the newest location of PPD files.
+	NEW_PATH=/usr/share/ppd
+	if [ -d $NEW_PATH ] ; then
+		OLD_PATH=/usr/lib/lp/model/ppd/system
+		PNTRS=$BASEDIR/etc/lp/printers
+		for f in `/bin/find $PNTRS -name configuration 2>/dev/null` ; do
+		    /bin/grep ${OLD_PATH} ${f} >/dev/null 2>&1
+			if [ $? -eq 0 ] ; then
+				/bin/sed \
+		    -e "s;${OLD_PATH}/foomatic;${NEW_PATH}/SUNWfoomatic;g" \
+		    -e "s;${OLD_PATH}/gimp;${NEW_PATH}/SUNWgimp;g" \
+                    -e "s;${OLD_PATH}/hpijs;${NEW_PATH}/SUNWhpijs;g" \
+		    ${f} >/tmp/lp.$$
+				/bin/mv -f /tmp/lp.$$ ${f}
+			fi
+		done
+		rm $PPDTMPFILE
+	fi
+fi
+
+exit 0
diff --git a/usr/src/pkgdefs/SUNWlp-cmds/Makefile b/usr/src/pkgdefs/SUNWppmr/preinstall
index e1484be2db..d812a2fa0c 100644
--- a/usr/src/pkgdefs/SUNWlp-cmds/Makefile
+++ b/usr/src/pkgdefs/SUNWppmr/preinstall
@@ -19,31 +19,27 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-include ../Makefile.com
+if [ "$UPDATE" = "yes" ]; then
+	BASEPREFIX=`echo $BASEDIR | sed "s/\//_/g"`
 
-DATAFILES += depend
-CLEANFILES += action
+	MANIFESTDIR="$BASEDIR/var/svc/manifest/application/print"
+	PPDFILENAME=`echo sunwppmr_ppd_cache_update"$BASEPREFIX" | cut -c 1-256`
+	PPDTMPFILE=/tmp/$PPDFILENAME
 
-ACTION=grep SUNWpapi depend > /dev/null || \
-	( chmod 666 depend; \
-	echo "P SUNWpapi      Free Standards Group Open Printing API" >> depend; \
-	chmod 444 depend );
+	if [ -f $PPDTMPFILE ] ; then
+		rm $PPDTMPFILE
+	fi
 
-.KEEP_STATE:
-
-all: $(FILES) action
-install: all pkg
-
-# action is a pseudotarget denoting completed work on the depend file
-action: depend
-	$(ACTION)
-	touch $@
-
-include ../Makefile.targ
-include ../Makefile.prtarg
+	#
+	# If we are upgrading a system with ppd-cache-update service already
+	# installed, then don't take any action in postinstall script.
+	#
+	if [ ! -f $MANIFESTDIR/ppd-cache-update.xml ] ; then
+		touch $PPDTMPFILE
+	fi
+fi
diff --git a/usr/src/pkgdefs/SUNWpcr/prototype_com b/usr/src/pkgdefs/SUNWppmr/prototype_com
index cbecda9efe..d4fc8d5cf1 100644
--- a/usr/src/pkgdefs/SUNWpcr/prototype_com
+++ b/usr/src/pkgdefs/SUNWppmr/prototype_com
@@ -18,45 +18,42 @@
 #
 # CDDL HEADER END
 #
+
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
+
 # This 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
+#!search
+#!default 0711 root bin
 
 # packaging files
 i pkginfo
 i copyright
 i depend
-i postinstall
-i preremove
-i i.preserve
-i i.manifest
-i r.manifest
+
+#
+# source locations relative to the prototype file
 #
-# SUNWpcr - Solaris Print root files
+# SUNWppmr
 #
-d none etc 0755 root sys
-e preserve etc/printers.conf 0644 root sys
+
+d none lib 0755 root bin
+d none lib/svc 0755 root bin
+d none lib/svc/method 0755 root bin
+f none lib/svc/method/ppd-cache-update 0555 root bin
 d none var 755 root sys
+d none var/lp 775 lp lp
+d none var/lp/ppd 755 root lp
+d none var/lp/ppd/caches 755 root lp
 d none var/svc 755 root sys
 d none var/svc/manifest 755 root sys
 d none var/svc/manifest/application 755 root sys
 d none var/svc/manifest/application/print 755 root sys
-f manifest var/svc/manifest/application/print/rfc1179.xml 0444 root sys
-d none var/spool 755 root bin
-d none var/spool/print 0755 root lp
-d none var/lp 775 lp lp
-d none var/lp/ppd 755 root lp
-d none var/lp/ppd/caches 755 root lp
+f manifest var/svc/manifest/application/print/ppd-cache-update.xml 0444 root sys
 f none var/lp/ppd/manufaliases 444 root lp
diff --git a/usr/src/pkgdefs/SUNWlp-cmds/prototype_i386 b/usr/src/pkgdefs/SUNWppmr/prototype_i386
index fc0351d75f..ff981c7ace 100644
--- a/usr/src/pkgdefs/SUNWlp-cmds/prototype_i386
+++ b/usr/src/pkgdefs/SUNWppmr/prototype_i386
@@ -18,14 +18,9 @@
 #
 # CDDL HEADER END
 #
-
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-#
 # This 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.
@@ -48,5 +43,5 @@
 # source locations relative to the prototype file
 #
 #
-# SUNWpapi-lp-cmds
+# SUNWppmr
 #
diff --git a/usr/src/pkgdefs/SUNWlpr-cmds/prototype_sparc b/usr/src/pkgdefs/SUNWppmr/prototype_sparc
index 39517853b2..7e1ff87a69 100644
--- a/usr/src/pkgdefs/SUNWlpr-cmds/prototype_sparc
+++ b/usr/src/pkgdefs/SUNWppmr/prototype_sparc
@@ -18,14 +18,9 @@
 #
 # CDDL HEADER END
 #
-
-#
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-#
 # This 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.
@@ -48,5 +43,5 @@
 # source locations relative to the prototype file
 #
 #
-# SUNWpapi-lpr-cmds
+# SUNWppmr
 #
diff --git a/usr/src/pkgdefs/SUNWpsr/depend b/usr/src/pkgdefs/SUNWpsr/depend
index ce999e5713..1aa2df6de5 100644
--- a/usr/src/pkgdefs/SUNWpsr/depend
+++ b/usr/src/pkgdefs/SUNWpsr/depend
@@ -48,6 +48,4 @@ P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
 P SUNWcslr	Core Solaris Libraries (Root)
-P SUNWpcr	Solaris Print - Client, (root)
-P SUNWppm	Solaris Print Manager
 I SUNWlpr	LP Print Service, (root)
diff --git a/usr/src/pkgdefs/SUNWpsr/postinstall b/usr/src/pkgdefs/SUNWpsr/postinstall
index 5e718eab78..27e00ee565 100644
--- a/usr/src/pkgdefs/SUNWpsr/postinstall
+++ b/usr/src/pkgdefs/SUNWpsr/postinstall
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 #
@@ -37,34 +36,4 @@ if [ -f $LPTMPFILE ]; then
 	rm $LPTMPFILE
 fi
 
-PPDFILENAME=`echo sunwpsr_ppd_cache_update"$BASEPREFIX" | cut -c 1-256`
-PPDTMPFILE=/tmp/$PPDFILENAME
-if [ -f $PPDTMPFILE ] ; then
-
-	# Enable the ppd-cache-update service.
-	echo "/usr/sbin/svcadm enable application/print/ppd-cache-update" >> \
-	    $BASEDIR/var/svc/profile/upgrade
-
-	# Ensure pre-existing printer configuration files with an
-	# old system PPD file delivery location are updated to
-	# reflect the newest location of PPD files.
-	NEW_PATH=/usr/share/ppd
-	if [ -d $NEW_PATH ] ; then
-		OLD_PATH=/usr/lib/lp/model/ppd/system
-		PNTRS=$BASEDIR/etc/lp/printers
-		for f in `/bin/find $PNTRS -name configuration 2>/dev/null` ; do
-		    /bin/grep ${OLD_PATH} ${f} >/dev/null 2>&1
-			if [ $? -eq 0 ] ; then
-				/bin/sed \
-		    -e "s;${OLD_PATH}/foomatic;${NEW_PATH}/SUNWfoomatic;g" \
-		    -e "s;${OLD_PATH}/gimp;${NEW_PATH}/SUNWgimp;g" \
-                    -e "s;${OLD_PATH}/hpijs;${NEW_PATH}/SUNWhpijs;g" \
-		    ${f} >/tmp/lp.$$
-				/bin/mv -f /tmp/lp.$$ ${f}
-			fi
-		done
-		rm $PPDTMPFILE
-	fi
-fi
-
 exit 0
diff --git a/usr/src/pkgdefs/SUNWpsr/preinstall b/usr/src/pkgdefs/SUNWpsr/preinstall
index ee7d9b96cc..450a613fb6 100644
--- a/usr/src/pkgdefs/SUNWpsr/preinstall
+++ b/usr/src/pkgdefs/SUNWpsr/preinstall
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 if [ "$UPDATE" = "yes" ]; then
@@ -30,16 +29,11 @@ if [ "$UPDATE" = "yes" ]; then
 
 	MANIFESTDIR="$BASEDIR/var/svc/manifest/application/print"
 	LPFILENAME=`echo sunwpsr_lpsched"$BASEPREFIX" | cut -c 1-256`
-	PPDFILENAME=`echo sunwpsr_ppd_cache_update"$BASEPREFIX" | cut -c 1-256`
 	LPTMPFILE=/tmp/$LPFILENAME
-	PPDTMPFILE=/tmp/$PPDFILENAME
 
 	if [ -f $LPTMPFILE ] ; then
 		rm $LPTMPFILE
 	fi
-	if [ -f $PPDTMPFILE ] ; then
-		rm $PPDTMPFILE
-	fi
 
 	#
 	# If we are upgrading a system with smf(5) already installed, then we
@@ -54,11 +48,4 @@ if [ "$UPDATE" = "yes" ]; then
 		fi
 	fi
 
-	#
-	# If we are upgrading a system with ppd-cache-update service already
-	# installed, then don't take any action in postinstall script.
-	#
-	if [ ! -f $MANIFESTDIR/ppd-cache-update.xml ] ; then
-		touch $PPDTMPFILE
-	fi
 fi
diff --git a/usr/src/pkgdefs/SUNWpsr/prototype_com b/usr/src/pkgdefs/SUNWpsr/prototype_com
index 741f53b3c4..891ebe1ba5 100644
--- a/usr/src/pkgdefs/SUNWpsr/prototype_com
+++ b/usr/src/pkgdefs/SUNWpsr/prototype_com
@@ -20,11 +20,9 @@
 #
 
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -59,8 +57,6 @@ d none var/svc/manifest 755 root sys
 d none var/svc/manifest/application 755 root sys
 d none var/svc/manifest/application/print 755 root sys
 f manifest var/svc/manifest/application/print/server.xml 0444 root sys
-#	Manifest for updating the ppdcache
-f manifest var/svc/manifest/application/print/ppd-cache-update.xml 0444 root sys
 #	LP configuation
 d none etc 755 root sys
 d none etc/lp 775 lp lp
@@ -68,9 +64,9 @@ d none etc/lp/classes 775 lp lp
 d none etc/lp/forms 775 lp lp
 d none etc/lp/interfaces 775 lp lp
 s none etc/lp/logs=../../var/lp/logs
+d none etc/lp/ppd 775 lp lp
 d none etc/lp/printers 775 lp lp
 d none etc/lp/pwheels 775 lp lp
-d none etc/lp/ppd 775 lp lp
 #	filter descriptions
 d none etc/lp/fd 755 root lp
 f none etc/lp/fd/download.fd 644 root lp
@@ -108,6 +104,8 @@ d none lib 0755 root bin
 d none lib/svc 0755 root bin
 d none lib/svc/method 0755 root bin
 f none lib/svc/method/print-svc 0555 root bin
-#
-#	Method for updating the ppdcache
-f none lib/svc/method/ppd-cache-update 0555 root bin
+
+#	Solaris Print - Client (root)
+e preserve etc/printers.conf 0644 root sys
+f manifest var/svc/manifest/application/print/rfc1179.xml 0444 root sys
+d none var/spool/print 0755 root lp
diff --git a/usr/src/pkgdefs/SUNWpsu/prototype_com b/usr/src/pkgdefs/SUNWpsu/prototype_com
index d078e2ab01..b41788b8a3 100644
--- a/usr/src/pkgdefs/SUNWpsu/prototype_com
+++ b/usr/src/pkgdefs/SUNWpsu/prototype_com
@@ -19,10 +19,9 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 #
 # This required package information file contains a list of package contents.
 # The 'pkgmk' command uses this file to identify the contents of a package
@@ -246,3 +245,15 @@ l none usr/share/lib/terminfo/a/att583ibm-80=../../../../../usr/share/lib/termin
 l none usr/share/lib/terminfo/a/att593eps=../../../../../usr/share/lib/terminfo/5/593eps
 l none usr/share/lib/terminfo/a/att593hp=../../../../../usr/share/lib/terminfo/5/593hp
 l none usr/share/lib/terminfo/a/att593ibm=../../../../../usr/share/lib/terminfo/5/593ibm
+#	Solaris Print - Client (usr)
+d none usr/bin 0755 root bin
+f none usr/bin/lpget 0511 root lp
+f none usr/bin/lpset 4511 root lp
+f none usr/bin/lptest 555 root lp
+f none usr/lib/libprint.so.2 0755 root bin
+s none usr/lib/libprint.so=./libprint.so.2
+f none usr/lib/print/Makefile.yp 0444 root lp
+f none usr/lib/print/in.lpd 0555 root bin
+f none usr/lib/print/conv_fix 0555 root lp
+f none usr/lib/print/conv_lp 0555 root lp
+f none usr/lib/print/conv_lpd 0555 root lp
diff --git a/usr/src/pkgdefs/SUNWscplp/depend b/usr/src/pkgdefs/SUNWscplp/depend
index 93ff36c280..25cf6ab5dd 100644
--- a/usr/src/pkgdefs/SUNWscplp/depend
+++ b/usr/src/pkgdefs/SUNWscplp/depend
@@ -49,5 +49,5 @@ P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
 P SUNWcslr	Core Solaris Libraries (Root)
-P SUNWpcr	Solaris Print - Client, (root)
+P SUNWpsr	Solaris Print - LP Server, (root)
 P SUNWpcu	Solaris Print - Client, (Usr)