--- a/components/readline/readline.p5m	Fri Jul 12 09:49:41 2013 -0700
+++ b/components/readline/readline.p5m	Fri Jul 12 09:52:14 2013 -0700
@@ -26,28 +26,18 @@
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/library/readline@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="GNU readline provides interactive line-editing and history"
 set name=pkg.description \
     value="The GNU Readline library provides a set of functions for use by applications that allow users to edit command lines as they are typed in."
-set name=pkg.summary value="GNU readline provides interactive line-editing and history"
 set name=com.oracle.info.description value="GNU readline"
+set name=com.oracle.info.tpno value=9042
 set name=info.classification \
     value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2007/188
+set name=org.opensolaris.arc-caseid value=PSARC/2007/188
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=usr
-dir path=usr/demo
-dir path=usr/demo/readline
-dir path=usr/include
-dir path=usr/include/readline
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/share
-dir path=usr/share/info
-dir path=usr/share/man
-dir path=usr/share/man/man3
 file examples/Inputrc path=usr/demo/readline/Inputrc
 file path=usr/include/readline/chardefs.h
 file path=usr/include/readline/history.h
@@ -57,10 +47,14 @@
 file path=usr/include/readline/rlstdc.h
 file path=usr/include/readline/rltypedefs.h
 file path=usr/include/readline/tilde.h
+link path=usr/lib/$(MACH64)/libhistory.so target=libhistory.so.5
 file path=usr/lib/$(MACH64)/libhistory.so.5
+link path=usr/lib/$(MACH64)/libreadline.so target=libreadline.so.5
 file path=usr/lib/$(MACH64)/libreadline.so.5
 file $(MACH64)/llib-lreadline.ln path=usr/lib/$(MACH64)/llib-lreadline.ln
+link path=usr/lib/libhistory.so target=libhistory.so.5
 file path=usr/lib/libhistory.so.5
+link path=usr/lib/libreadline.so target=libreadline.so.5
 file path=usr/lib/libreadline.so.5
 file llib-lreadline path=usr/lib/llib-lreadline
 file $(MACH32)/llib-lreadline.ln path=usr/lib/llib-lreadline.ln
@@ -70,7 +64,3 @@
 file path=usr/share/man/man3/history.3
 file path=usr/share/man/man3/readline.3
 license readline.license license="GPLv2, FDLv1.2"
-link path=usr/lib/$(MACH64)/libhistory.so target=libhistory.so.5
-link path=usr/lib/$(MACH64)/libreadline.so target=libreadline.so.5
-link path=usr/lib/libhistory.so target=libhistory.so.5
-link path=usr/lib/libreadline.so target=libreadline.so.5