--- a/components/bind/bindc.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/bind/bindc.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,53 +18,48 @@
 #
 # 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.
 #
 
 set name=pkg.fmri \
     value=pkg:/network/dns/bind@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="BIND DNS tools"
+set name=pkg.description value="DNS tools and related libraries."
 set name=pkg.human-version value=$(HUMAN_VERSION)
-set name=pkg.summary value="BIND DNS tools"
 set name=com.oracle.info.description value="the BIND DNS tools"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
-    value="org.opensolaris.category.2008:Applications/Internet"
-set name=pkg.description value="DNS tools and related libraries."
+    value=org.opensolaris.category.2008:Applications/Internet
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2009/308
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-set name=org.opensolaris.arc-caseid \
-	value=PSARC/2009/308
-
-license bind.license license="ISC license"
-
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/dns
-dir path=usr/sbin
-
+dir  path=usr
+dir  path=usr/lib
+dir  path=usr/lib/dns
+link path=usr/lib/dns/libbind9.so target=libbind9.so.50.0.11
+link path=usr/lib/dns/libbind9.so.50 target=libbind9.so.50.0.11
 file path=usr/lib/dns/libbind9.so.50.0.11
+link path=usr/lib/dns/libdns.so target=libdns.so.113.1.1
+link path=usr/lib/dns/libdns.so.113 target=libdns.so.113.1.1
 file path=usr/lib/dns/libdns.so.113.1.1
+link path=usr/lib/dns/libisc.so target=libisc.so.110.0.2
+link path=usr/lib/dns/libisc.so.110 target=libisc.so.110.0.2
 file path=usr/lib/dns/libisc.so.110.0.2
+link path=usr/lib/dns/libisccc.so target=libisccc.so.50.0.6
+link path=usr/lib/dns/libisccc.so.50 target=libisccc.so.50.0.6
 file path=usr/lib/dns/libisccc.so.50.0.6
+link path=usr/lib/dns/libisccfg.so target=libisccfg.so.50.0.10
+link path=usr/lib/dns/libisccfg.so.50 target=libisccfg.so.50.0.10
 file path=usr/lib/dns/libisccfg.so.50.0.10
+link path=usr/lib/dns/liblwres.so target=liblwres.so.50.0.11
+link path=usr/lib/dns/liblwres.so.50 target=liblwres.so.50.0.11
 file path=usr/lib/dns/liblwres.so.50.0.11
+dir  path=usr/sbin
 file path=usr/sbin/dig
 file path=usr/sbin/host
 file path=usr/sbin/nslookup
 file path=usr/sbin/nsupdate
 file path=usr/sbin/rndc
 file path=usr/sbin/rndc-confgen
-
-link path=usr/lib/dns/libbind9.so target=libbind9.so.50.0.11
-link path=usr/lib/dns/libbind9.so.50 target=libbind9.so.50.0.11
-link path=usr/lib/dns/libdns.so target=libdns.so.113.1.1
-link path=usr/lib/dns/libdns.so.113 target=libdns.so.113.1.1
-link path=usr/lib/dns/libisc.so target=libisc.so.110.0.2
-link path=usr/lib/dns/libisc.so.110 target=libisc.so.110.0.2
-link path=usr/lib/dns/libisccc.so target=libisccc.so.50.0.6
-link path=usr/lib/dns/libisccc.so.50 target=libisccc.so.50.0.6
-link path=usr/lib/dns/libisccfg.so target=libisccfg.so.50.0.10
-link path=usr/lib/dns/libisccfg.so.50 target=libisccfg.so.50.0.10
-link path=usr/lib/dns/liblwres.so target=liblwres.so.50.0.11
-link path=usr/lib/dns/liblwres.so.50 target=liblwres.so.50.0.11
+license bind.license license="ISC license"