--- a/usr/src/cmd/pycups/Makefile.sfw	Fri Feb 08 22:07:50 2013 +0000
+++ b/usr/src/cmd/pycups/Makefile.sfw	Sun Jan 27 21:23:53 2013 +0000
@@ -20,10 +20,9 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile.sfw	1.4	10/01/08 SMI"
+# ident	"@(#)Makefile.sfw	1.5	10/11/01 SMI"
 #
 
 include ../Makefile.cmd.64
@@ -53,7 +52,6 @@
 CFLAGS += -DVERSION=\\\"$(COMPONENT_VERSION:sh)\\\" $(CPPFLAGS)
 CFLAGS64 += -DVERSION=\\\"$(COMPONENT_VERSION:sh)\\\" $(CPPFLAGS)
 
-ROOTPYTHONMODS = $(ROOTLIB)/python2.4/vendor-packages
 ROOTPYTHON26MODS = $(ROOTLIB)/python2.6/vendor-packages
 
 TARGET_ENV +=	CC="$(CC)"
@@ -64,36 +62,25 @@
 TARGET_ENV_64 += 	CFLAGS="$(CFLAGS64)"
 TARGET_ENV_64 += 	LDFLAGS="$(LDFLAGS64) $(LDLIBS64)"
 
-all:	$(VER)/setup.py $(VER)-2.6/setup.py
-	(cd $(VER) ; env $(TARGET_ENV) PYTHON=$(PYTHON24) $(PYTHON24) setup.py build \
-		--build-temp $(MACH) --build-lib .)
-	(cd $(VER) ; env $(TARGET_ENV_64) PYTHON=$(PYTHON24_64) $(PYTHON24_64) setup.py build \
-		--build-temp $(MACH64) --build-lib .)
-	(cd $(VER)-2.6 ; env $(TARGET_ENV) PYTHON=$(PYTHON26) $(PYTHON26) setup.py build \
+all:	$(VER)/setup.py
+	(cd $(VER); env $(TARGET_ENV) PYTHON=$(PYTHON26) $(PYTHON26) setup.py build \
 		--build-temp py26-$(MACH) --build-lib .)
-	(cd $(VER)-2.6 ; env $(TARGET_ENV_64) PYTHON=$(PYTHON26_64) $(PYTHON26_64) setup.py build \
+	(cd $(VER); env $(TARGET_ENV_64) PYTHON=$(PYTHON26_64) $(PYTHON26_64) setup.py build \
 		--build-temp py26-$(MACH64) --build-lib .)
 
 install:	all
-	$(INSTALL_PROTO) -c $(VER)/cups.so $(ROOTPYTHONMODS)
-	$(INSTALL_PROTO) -c $(VER)/64/cups.so $(ROOTPYTHONMODS)/64
-	$(INSTALL_PROTO) -c $(VER)-2.6/cups.so $(ROOTPYTHON26MODS)
-	$(INSTALL_PROTO) -c $(VER)-2.6/64/cups.so $(ROOTPYTHON26MODS)/64
+	$(INSTALL_PROTO) -c $(VER)/cups.so $(ROOTPYTHON26MODS)
+	$(INSTALL_PROTO) -c $(VER)/64/cups.so $(ROOTPYTHON26MODS)/64
 	# apply the file attributes from the packaging
 	for pkg in $(COMPONENT_PACKAGES:sh) ; do \
 		$(SRC)/tools/protofix --pkg $$pkg --perm ; \
 	done
 
-$(VER)-2.6/setup.py:	$(VER)/setup.py
-	$(RM) -r $(@D) ; $(MKDIR) $(@D)
-	(cd $(VER) ; find . | cpio -dump ../$(@D))
-	$(TOUCH) $@
-
 $(VER)/setup.py:	$(VER)/.patched
 	$(TOUCH) $@
 
 clean:
-	-rm -rf $(VER) $(VER)-2.6
+	-rm -rf $(VER)
 
 include ../Makefile.targ
 

--- a/usr/src/pkgdefs/SUNWpycups/depend	Fri Feb 08 22:07:50 2013 +0000
+++ b/usr/src/pkgdefs/SUNWpycups/depend	Sun Jan 27 21:23:53 2013 +0000
@@ -20,10 +20,9 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)depend	1.2	09/10/06 SMI"
+# ident	"@(#)depend	1.3	10/11/01 SMI"
 #
 #
 # This package information file defines software dependencies associated
@@ -53,5 +52,4 @@
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
 P SUNWcupsu	Common Unix Print System v1.3.6 (usr)
-P SUNWPython	The Python interpreter, libraries and utilities
 P SUNWPython26	The Python interpreter, libraries and utilities

--- a/usr/src/pkgdefs/SUNWpycups/prototype_com	Fri Feb 08 22:07:50 2013 +0000
+++ b/usr/src/pkgdefs/SUNWpycups/prototype_com	Sun Jan 27 21:23:53 2013 +0000
@@ -20,10 +20,9 @@
 #
 
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)prototype_com	1.2	09/10/06 SMI"
+# ident	"@(#)prototype_com	1.3	10/11/01 SMI"
 #
 
 i pkginfo
@@ -32,11 +31,6 @@
 
 d none usr 0755 root sys
 d none usr/lib 0755 root bin
-d none usr/lib/python2.4 0755 root bin
-d none usr/lib/python2.4/vendor-packages 0755 root bin
-d none usr/lib/python2.4/vendor-packages/64 0755 root bin
-f none usr/lib/python2.4/vendor-packages/64/cups.so 0555 root bin
-f none usr/lib/python2.4/vendor-packages/cups.so 0555 root bin
 d none usr/lib/python2.6 0755 root bin
 d none usr/lib/python2.6/vendor-packages 0755 root bin
 d none usr/lib/python2.6/vendor-packages/64 0755 root bin