--- a/components/bind/Makefile	Fri Jul 16 00:58:56 2010 -0500
+++ b/components/bind/Makefile	Mon Jul 19 10:23:15 2010 -0500
@@ -26,6 +26,8 @@
 
 COMPONENT_NAME=		bind
 COMPONENT_VERSION=	9.7.0-P2
+IPS_PKG_NAME =		network/dns/bind
+COMPONENT_CLASSIFICATION="Applications/Internet utility"
 COMPONENT_DESCRIPTION=	"Berkeley Internet Name Domain server and utilities"
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL =	http://www.isc.org/software/bind

--- a/components/bind/bind.ips	Fri Jul 16 00:58:56 2010 -0500
+++ b/components/bind/bind.ips	Mon Jul 19 10:23:15 2010 -0500
@@ -21,11 +21,11 @@
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
-    value=pkg:/$(PUBLISHER)/bind@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.description value=$(COMPONENT_DESCRIPTION)
-set name=pkg.summary value=$(COMPONENT_SUMMARY)
+    value=pkg:/$(PUBLISHER)/network/dns/bind@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
+set name=pkg.summary value="$(COMPONENT_SUMMARY) "
 set name=info.classification \
-    value=org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION)
+    value="org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION) "
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)

--- a/components/file/Makefile	Fri Jul 16 00:58:56 2010 -0500
+++ b/components/file/Makefile	Mon Jul 19 10:23:15 2010 -0500
@@ -26,7 +26,9 @@
 
 COMPONENT_NAME=		file
 COMPONENT_VERSION=	5.0.4
+IPS_PKG_NAME=		file/file
 COMPONENT_DESCRIPTION=	"command and library to determine file type"
+COMPONENT_CLASSIFICATION="Applications/System Utilities"
 COMPONENT_SRC=		$(COMPONENT_NAME)-5.04
 COMPONENT_PROJECT_URL =	ftp://ftp.astron.com/pub/file/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz

--- a/components/file/file.ips	Fri Jul 16 00:58:56 2010 -0500
+++ b/components/file/file.ips	Mon Jul 19 10:23:15 2010 -0500
@@ -21,11 +21,11 @@
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
-    value=pkg:/$(PUBLISHER)/file@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.description value=$(COMPONENT_DESCRIPTION)
-set name=pkg.summary value=$(COMPONENT_SUMMARY)
+    value=pkg:/$(PUBLISHER)/file/file@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
+set name=pkg.summary value="$(COMPONENT_SUMMARY) "
 set name=info.classification \
-    value=org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION)
+    value="org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION) "
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)

--- a/components/lcms/Makefile	Fri Jul 16 00:58:56 2010 -0500
+++ b/components/lcms/Makefile	Mon Jul 19 10:23:15 2010 -0500
@@ -26,7 +26,9 @@
 
 COMPONENT_NAME=		lcms
 COMPONENT_VERSION=	1.19
+IPS_PKG_NAME=		library/lcms
 COMPONENT_DESCRIPTION=	"Little Color Management System"
+COMPONENT_CLASSIFICATION="System/Multimedia Libraries"
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.littlecms.com/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz

--- a/components/lcms/lcms.ips	Fri Jul 16 00:58:56 2010 -0500
+++ b/components/lcms/lcms.ips	Mon Jul 19 10:23:15 2010 -0500
@@ -21,11 +21,11 @@
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
-    value=pkg:/$(PUBLISHER)/lcms@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.description value=$(COMPONENT_DESCRIPTION)
-set name=pkg.summary value=$(COMPONENT_SUMMARY)
+    value=pkg:/$(PUBLISHER)/library/lcms@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
+set name=pkg.summary value="$(COMPONENT_SUMMARY) "
 set name=info.classification \
-    value=org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION)
+    value="org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION) "
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)

--- a/components/pycups/Makefile	Fri Jul 16 00:58:56 2010 -0500
+++ b/components/pycups/Makefile	Mon Jul 19 10:23:15 2010 -0500
@@ -26,7 +26,9 @@
 
 COMPONENT_NAME=		pycups
 COMPONENT_VERSION=	1.9.46
+IPS_PKG_NAME=		library/python-2/pycups
 COMPONENT_DESCRIPTION=	"Python language bindings for CUPS"
+COMPONENT_CLASSIFICATION="System/Printing"
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://cyberelk.net/tim/software/pycups/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.bz2

--- a/components/pycups/pycups.ips	Fri Jul 16 00:58:56 2010 -0500
+++ b/components/pycups/pycups.ips	Mon Jul 19 10:23:15 2010 -0500
@@ -21,11 +21,11 @@
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
-    value=pkg:/$(PUBLISHER)/pycups@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.description value=$(COMPONENT_DESCRIPTION)
-set name=pkg.summary value=$(COMPONENT_SUMMARY)
+    value=pkg:/$(PUBLISHER)/library/python-2/pycups@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
+set name=pkg.summary value="$(COMPONENT_SUMMARY) "
 set name=info.classification \
-    value=org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION)
+    value="org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION) "
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)

--- a/components/rsync/Makefile	Fri Jul 16 00:58:56 2010 -0500
+++ b/components/rsync/Makefile	Mon Jul 19 10:23:15 2010 -0500
@@ -26,7 +26,9 @@
 
 COMPONENT_NAME=		rsync
 COMPONENT_VERSION=	3.0.7
+IPS_PKG_NAME=		network/rsync
 COMPONENT_DESCRIPTION=	"utility for fast incremental file transfer"
+COMPONENT_CLASSIFICATION="Applications/System Utilities"
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=	http://www.samba.org/rsync/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz

--- a/components/rsync/rsync.ips	Fri Jul 16 00:58:56 2010 -0500
+++ b/components/rsync/rsync.ips	Mon Jul 19 10:23:15 2010 -0500
@@ -21,11 +21,11 @@
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
-    value=pkg:/$(PUBLISHER)/rsync@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.description value=$(COMPONENT_DESCRIPTION)
-set name=pkg.summary value=$(COMPONENT_SUMMARY)
+    value=pkg:/$(PUBLISHER)/network/rsync@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
+set name=pkg.summary value="$(COMPONENT_SUMMARY) "
 set name=info.classification \
-    value=org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION)
+    value="org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION) "
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)

--- a/make-rules/ips.mk	Fri Jul 16 00:58:56 2010 -0500
+++ b/make-rules/ips.mk	Mon Jul 19 10:23:15 2010 -0500
@@ -76,9 +76,9 @@
 
 PKG_OPTIONS +=		$(PKG_MACROS:%=-D %)
 # multi-word macros get broken up, so we handle them "specially"
-PKG_OPTIONS +=		-D COMPONENT_SUMMARY=\"$(COMPONENT_SUMMARY)\"
-PKG_OPTIONS +=		-D COMPONENT_DESCRIPTION=\"$(COMPONENT_DESCRIPTION)\"
-PKG_OPTIONS +=		-D COMPONENT_CLASSIFICATION=\"$(COMPONENT_CLASSIFICATION)\"
+PKG_OPTIONS +=		-D COMPONENT_SUMMARY=$(COMPONENT_SUMMARY)
+PKG_OPTIONS +=		-D COMPONENT_DESCRIPTION=$(COMPONENT_DESCRIPTION)
+PKG_OPTIONS +=		-D COMPONENT_CLASSIFICATION=$(COMPONENT_CLASSIFICATION)
 
 MANIFEST_BASE =		$(COMPONENT_SRC)/manifest-$(MACH)
 
@@ -92,7 +92,9 @@
 PUBLISHED=$(MOGRIFIED:%.resolved=%.published)
 
 COPYRIGHT_FILE =	$(COMPONENT_NAME)-$(COMPONENT_VERSION).copyright
-IPS_PKG_NAME =		$(COMPONENT_NAME)
+ifeq	($(IPS_PKG_NAME),)
+	IPS_PKG_NAME =	$(COMPONENT_NAME)
+endif
 IPS_COMPONENT_VERSION =	$(COMPONENT_VERSION)
 
 .DEFAULT:		publish

--- a/transforms/manifest-metadata-template	Fri Jul 16 00:58:56 2010 -0500
+++ b/transforms/manifest-metadata-template	Mon Jul 19 10:23:15 2010 -0500
@@ -22,14 +22,14 @@
 #
 
 set name=pkg.fmri value=pkg:/$(PUBLISHER)/$(IPS_PKG_NAME)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary value=$(COMPONENT_SUMMARY)
-set name=pkg.description value=$(COMPONENT_DESCRIPTION)
-set name=info.classification value=org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION)
+set name=pkg.summary value="$(COMPONENT_SUMMARY) "
+set name=pkg.description value="$(COMPONENT_DESCRIPTION) "
+set name=info.classification value="org.opensolaris.category.2008:$(COMPONENT_CLASSIFICATION) "
 set name=info.upstream_url value=$(COMPONENT_PROJECT_URL)
 set name=info.source_url value=$(COMPONENT_ARCHIVE_URL)
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
-#license $(COPYRIGHT_FILE) license=$(COPYRIGHTS)
+#license $(COPYRIGHT_FILE) license='$(COPYRIGHTS)'
 
 # set name=variant.opensolaris.zone value=global value=nonglobal
 # set name=variant.arch value=i386 value=sparc

--- a/transforms/publish-cleanup	Fri Jul 16 00:58:56 2010 -0500
+++ b/transforms/publish-cleanup	Mon Jul 19 10:23:15 2010 -0500
@@ -26,8 +26,9 @@
 # comparing manifests for change.
 #
 
-<transform set value="^$" -> drop>
-<transform set name=info.classification value=".+:\"\"" -> drop>
+<transform set -> edit value "\s$" "">
+<transform set value="^\s*$" -> drop>
+<transform set name=info.classification value=".+:" -> drop>
 
 # drop the license actions from the manifests, we aren't going to compare them
 <transform license -> drop>