--- a/components/libtorrent/libtorrent.p5m	Tue Feb 03 12:52:16 2015 -0800
+++ b/components/libtorrent/libtorrent.p5m	Tue Feb 03 13:01:27 2015 -0800
@@ -18,40 +18,29 @@
 #
 # 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/libtorrent@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+    value=pkg:/library/libtorrent@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="libtorrent - a Bittorrent library for rtorrent"
 set name=com.oracle.info.description value="the bittorrent library for rtorrent"
 set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification value="org.opensolaris.category.2008:System/Libraries"
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=info.classification \
+    value=org.opensolaris.category.2008:System/Libraries
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=org.opensolaris.arc-caseid \
-    value=PSARC/2009/336
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2009/336
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-license libtorrent.license license='GPLv2'
-
-dir path=usr
-dir path=usr/include
-dir path=usr/include/torrent
-dir path=usr/include/torrent/data
-dir path=usr/include/torrent/peer
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/lib/$(MACH64)/pkgconfig
-dir path=usr/lib/pkgconfig
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man3
+dir  path=usr
+dir  path=usr/include
+dir  path=usr/include/torrent
 file path=usr/include/torrent/bitfield.h
 file path=usr/include/torrent/chunk_manager.h
 file path=usr/include/torrent/common.h
 file path=usr/include/torrent/connection_manager.h
+dir  path=usr/include/torrent/data
 file path=usr/include/torrent/data/block.h
 file path=usr/include/torrent/data/block_list.h
 file path=usr/include/torrent/data/block_transfer.h
@@ -72,6 +61,7 @@
 file path=usr/include/torrent/object.h
 file path=usr/include/torrent/object_stream.h
 file path=usr/include/torrent/path.h
+dir  path=usr/include/torrent/peer
 file path=usr/include/torrent/peer/client_info.h
 file path=usr/include/torrent/peer/client_list.h
 file path=usr/include/torrent/peer/connection_list.h
@@ -89,12 +79,20 @@
 file path=usr/include/torrent/torrent.h
 file path=usr/include/torrent/tracker.h
 file path=usr/include/torrent/tracker_list.h
-file path=usr/lib/$(MACH64)/libtorrent.so.9.2.0
-file path=usr/lib/$(MACH64)/pkgconfig/libtorrent.pc
-file path=usr/lib/libtorrent.so.9.2.0
-file path=usr/lib/pkgconfig/libtorrent.pc
-file libtorrent.3 path=usr/share/man/man3/libtorrent.3
+dir  path=usr/lib
+dir  path=usr/lib/$(MACH64)
 link path=usr/lib/$(MACH64)/libtorrent.so target=libtorrent.so.9.2.0
 link path=usr/lib/$(MACH64)/libtorrent.so.9 target=libtorrent.so.9.2.0
+file path=usr/lib/$(MACH64)/libtorrent.so.9.2.0
+dir  path=usr/lib/$(MACH64)/pkgconfig
+file path=usr/lib/$(MACH64)/pkgconfig/libtorrent.pc
 link path=usr/lib/libtorrent.so target=libtorrent.so.9.2.0
 link path=usr/lib/libtorrent.so.9 target=libtorrent.so.9.2.0
+file path=usr/lib/libtorrent.so.9.2.0
+dir  path=usr/lib/pkgconfig
+file path=usr/lib/pkgconfig/libtorrent.pc
+dir  path=usr/share
+dir  path=usr/share/man
+dir  path=usr/share/man/man3
+file libtorrent.3 path=usr/share/man/man3/libtorrent.3
+license libtorrent.license license=GPLv2