--- a/components/xz/xz.p5m Tue Mar 04 10:19:09 2014 -0800
+++ b/components/xz/xz.p5m Wed Mar 05 09:08:04 2014 -0800
@@ -18,7 +18,7 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
#
<transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -26,7 +26,8 @@
value=pkg:/compress/xz@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary \
value="XZ Utils - loss-less file compression application and library."
-set name=com.oracle.info.description value="the xz file compression application and library"
+set name=com.oracle.info.description \
+ value="the xz file compression application and library"
set name=com.oracle.info.tpno value=4463
set name=info.classification \
value="org.opensolaris.category.2008:Applications/System Utilities"
@@ -34,19 +35,26 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2011/092
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/$(MACH64)/lzmadec
-file path=usr/bin/$(MACH64)/lzmainfo
-file path=usr/bin/$(MACH64)/xz
-file path=usr/bin/$(MACH64)/xzdec
-file path=usr/bin/$(MACH64)/xzdiff
-file path=usr/bin/$(MACH64)/xzgrep
-file path=usr/bin/$(MACH64)/xzless
-file path=usr/bin/$(MACH64)/xzmore
-file path=usr/bin/lzmadec
-file path=usr/bin/lzmainfo
-file path=usr/bin/xz
-file path=usr/bin/xzdec
+link path=usr/bin/lzcat target=xz
+link path=usr/bin/lzcmp target=xzdiff
+link path=usr/bin/lzdiff target=xzdiff
+link path=usr/bin/lzegrep target=xzgrep
+link path=usr/bin/lzfgrep target=xzgrep
+link path=usr/bin/lzgrep target=xzgrep
+link path=usr/bin/lzless target=xzless
+link path=usr/bin/lzma target=xz
+file usr/bin/$(MACH64)/lzmadec path=usr/bin/lzmadec
+file usr/bin/$(MACH64)/lzmainfo path=usr/bin/lzmainfo
+link path=usr/bin/lzmore target=xzmore
+link path=usr/bin/unlzma target=xz
+link path=usr/bin/unxz target=xz
+file usr/bin/$(MACH64)/xz path=usr/bin/xz
+link path=usr/bin/xzcat target=xz
+link path=usr/bin/xzcmp target=xzdiff
+file usr/bin/$(MACH64)/xzdec path=usr/bin/xzdec
file path=usr/bin/xzdiff
+link path=usr/bin/xzegrep target=xzgrep
+link path=usr/bin/xzfgrep target=xzgrep
file path=usr/bin/xzgrep
file path=usr/bin/xzless
file path=usr/bin/xzmore
@@ -65,9 +73,13 @@
file path=usr/include/lzma/stream_flags.h
file path=usr/include/lzma/version.h
file path=usr/include/lzma/vli.h
+link path=usr/lib/$(MACH64)/liblzma.so target=liblzma.so.$(COMPONENT_VERSION)
file path=usr/lib/$(MACH64)/liblzma.so.$(COMPONENT_VERSION)
+link path=usr/lib/$(MACH64)/liblzma.so.5 target=liblzma.so.$(COMPONENT_VERSION)
file path=usr/lib/$(MACH64)/pkgconfig/liblzma.pc
+link path=usr/lib/liblzma.so target=liblzma.so.$(COMPONENT_VERSION)
file path=usr/lib/liblzma.so.$(COMPONENT_VERSION)
+link path=usr/lib/liblzma.so.5 target=liblzma.so.$(COMPONENT_VERSION)
file path=usr/lib/pkgconfig/liblzma.pc
file path=usr/share/doc/xz/AUTHORS
file path=usr/share/doc/xz/COPYING
@@ -85,49 +97,6 @@
file path=usr/share/locale/cs/LC_MESSAGES/xz.mo
file path=usr/share/locale/de/LC_MESSAGES/xz.mo
file path=usr/share/locale/it/LC_MESSAGES/xz.mo
-file path=usr/share/man/man1/lzmainfo.1
-file path=usr/share/man/man1/xz.1
-file path=usr/share/man/man1/xzdec.1
-file path=usr/share/man/man1/xzdiff.1
-file path=usr/share/man/man1/xzgrep.1
-file path=usr/share/man/man1/xzless.1
-file path=usr/share/man/man1/xzmore.1
-license xz.license license=LGPLv2.1
-link path=usr/bin/$(MACH64)/lzcat target=xz
-link path=usr/bin/$(MACH64)/lzcmp target=xzdiff
-link path=usr/bin/$(MACH64)/lzdiff target=xzdiff
-link path=usr/bin/$(MACH64)/lzegrep target=xzgrep
-link path=usr/bin/$(MACH64)/lzfgrep target=xzgrep
-link path=usr/bin/$(MACH64)/lzgrep target=xzgrep
-link path=usr/bin/$(MACH64)/lzless target=xzless
-link path=usr/bin/$(MACH64)/lzma target=xz
-link path=usr/bin/$(MACH64)/lzmore target=xzmore
-link path=usr/bin/$(MACH64)/unlzma target=xz
-link path=usr/bin/$(MACH64)/unxz target=xz
-link path=usr/bin/$(MACH64)/xzcat target=xz
-link path=usr/bin/$(MACH64)/xzcmp target=xzdiff
-link path=usr/bin/$(MACH64)/xzegrep target=xzgrep
-link path=usr/bin/$(MACH64)/xzfgrep target=xzgrep
-link path=usr/bin/lzcat target=xz
-link path=usr/bin/lzcmp target=xzdiff
-link path=usr/bin/lzdiff target=xzdiff
-link path=usr/bin/lzegrep target=xzgrep
-link path=usr/bin/lzfgrep target=xzgrep
-link path=usr/bin/lzgrep target=xzgrep
-link path=usr/bin/lzless target=xzless
-link path=usr/bin/lzma target=xz
-link path=usr/bin/lzmore target=xzmore
-link path=usr/bin/unlzma target=xz
-link path=usr/bin/unxz target=xz
-link path=usr/bin/xzcat target=xz
-link path=usr/bin/xzcmp target=xzdiff
-link path=usr/bin/xzegrep target=xzgrep
-link path=usr/bin/xzfgrep target=xzgrep
-link path=usr/lib/$(MACH64)/liblzma.so target=liblzma.so.$(COMPONENT_VERSION)
-link path=usr/lib/$(MACH64)/liblzma.so.5 \
- target=liblzma.so.$(COMPONENT_VERSION)
-link path=usr/lib/liblzma.so target=liblzma.so.$(COMPONENT_VERSION)
-link path=usr/lib/liblzma.so.5 target=liblzma.so.$(COMPONENT_VERSION)
link path=usr/share/man/man1/lzcat.1 target=xz.1
link path=usr/share/man/man1/lzcmp.1 target=xzdiff.1
link path=usr/share/man/man1/lzdiff.1 target=xzdiff.1
@@ -137,10 +106,18 @@
link path=usr/share/man/man1/lzless.1 target=xzless.1
link path=usr/share/man/man1/lzma.1 target=xz.1
link path=usr/share/man/man1/lzmadec.1 target=xzdec.1
+file path=usr/share/man/man1/lzmainfo.1
link path=usr/share/man/man1/lzmore.1 target=xzmore.1
link path=usr/share/man/man1/unlzma.1 target=xz.1
link path=usr/share/man/man1/unxz.1 target=xz.1
+file path=usr/share/man/man1/xz.1
link path=usr/share/man/man1/xzcat.1 target=xz.1
link path=usr/share/man/man1/xzcmp.1 target=xzdiff.1
+file path=usr/share/man/man1/xzdec.1
+file path=usr/share/man/man1/xzdiff.1
link path=usr/share/man/man1/xzegrep.1 target=xzgrep.1
link path=usr/share/man/man1/xzfgrep.1 target=xzgrep.1
+file path=usr/share/man/man1/xzgrep.1
+file path=usr/share/man/man1/xzless.1
+file path=usr/share/man/man1/xzmore.1
+license xz.license license=LGPLv2.1