--- a/components/fastcgi/fcgi.p5m	Fri Jan 23 17:31:40 2015 -0800
+++ b/components/fastcgi/fcgi.p5m	Tue Feb 03 19:24:25 2015 -0800
@@ -18,22 +18,21 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
     value=pkg:/library/fastcgi@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value=FastCGI
 set name=pkg.description \
     value="FastCGI is a high-speed and scalable interface for communicating with the web server"
-set name=pkg.summary value=FastCGI
 set name=com.oracle.info.description value="the FastCGI web server interface"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
 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/2009/014
+set name=org.opensolaris.arc-caseid value=PSARC/2009/014
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file path=usr/bin/$(MACH64)/cgi-fcgi
 file path=usr/bin/cgi-fcgi
@@ -44,11 +43,19 @@
 file path=usr/include/fastcgi/fcgimisc.h
 file path=usr/include/fastcgi/fcgio.h
 file path=usr/include/fastcgi/fcgios.h
+link path=usr/lib/$(MACH64)/libfcgi++.so target=libfcgi++.so.0.0.0
+link path=usr/lib/$(MACH64)/libfcgi++.so.0 target=libfcgi++.so.0.0.0
+file path=usr/lib/$(MACH64)/libfcgi++.so.0.0.0
+link path=usr/lib/$(MACH64)/libfcgi.so target=libfcgi.so.0.0.0
+link path=usr/lib/$(MACH64)/libfcgi.so.0 target=libfcgi.so.0.0.0
 file path=usr/lib/$(MACH64)/libfcgi.so.0.0.0
-file path=usr/lib/$(MACH64)/libfcgi++.so.0.0.0
 file path=usr/lib/$(MACH64)/llib-lfcgi.ln
+link path=usr/lib/libfcgi++.so target=libfcgi++.so.0.0.0
+link path=usr/lib/libfcgi++.so.0 target=libfcgi++.so.0.0.0
+file path=usr/lib/libfcgi++.so.0.0.0
+link path=usr/lib/libfcgi.so target=libfcgi.so.0.0.0
+link path=usr/lib/libfcgi.so.0 target=libfcgi.so.0.0.0
 file path=usr/lib/libfcgi.so.0.0.0
-file path=usr/lib/libfcgi++.so.0.0.0
 file llib-lfcgi path=usr/lib/llib-lfcgi
 file path=usr/lib/llib-lfcgi.ln
 file doc/cgi-fcgi.1 path=usr/share/man/man1/cgi-fcgi.1
@@ -57,13 +64,5 @@
 file doc/FCGI_SetExitStatus.3 path=usr/share/man/man3/FCGI_SetExitStatus.3
 file doc/FCGI_StartFilterData.3 path=usr/share/man/man3/FCGI_StartFilterData.3
 license fcgi.license license=FastCGI
-link path=usr/lib/$(MACH64)/libfcgi.so target=libfcgi.so.0.0.0
-link path=usr/lib/$(MACH64)/libfcgi.so.0 target=libfcgi.so.0.0.0
-link path=usr/lib/$(MACH64)/libfcgi++.so target=libfcgi++.so.0.0.0
-link path=usr/lib/$(MACH64)/libfcgi++.so.0 target=libfcgi++.so.0.0.0
-link path=usr/lib/libfcgi.so target=libfcgi.so.0.0.0
-link path=usr/lib/libfcgi.so.0 target=libfcgi.so.0.0.0
-link path=usr/lib/libfcgi++.so target=libfcgi++.so.0.0.0
-link path=usr/lib/libfcgi++.so.0 target=libfcgi++.so.0.0.0