--- a/components/libidn/libidn.p5m Tue Feb 03 12:52:16 2015 -0800
+++ b/components/libidn/libidn.p5m Tue Feb 03 13:01:27 2015 -0800
@@ -18,81 +18,30 @@
#
# 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/libidn@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+ value=pkg:/library/libidn@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
set name=pkg.summary value="IDN - The Internationalized Domains Library"
-set name=pkg.description value="A fully documented implementation of the Stringprep, Punycode and IDNA specifications for the purpose of encoding and decoding internationalized domain names"
-set name=com.oracle.info.description value="the libidn Internationalized Domains Library"
+set name=pkg.description \
+ value="A fully documented implementation of the Stringprep, Punycode and IDNA specifications for the purpose of encoding and decoding internationalized domain names"
+set name=com.oracle.info.description \
+ value="the libidn Internationalized Domains Library"
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/2007/167
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2007/167
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
#
-dir path=usr
-dir path=usr/bin
-dir path=usr/include
-dir path=usr/include/idn
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/lib/pkgconfig
-dir path=usr/lib/$(MACH64)/pkgconfig
-dir path=usr/share
-dir path=usr/share/doc
-dir path=usr/share/doc/idn
-dir path=usr/share/doc/idn/html
-dir path=usr/share/doc/idn/java
-dir path=usr/share/doc/idn/java/gnu
-dir path=usr/share/doc/idn/java/gnu/inet
-dir path=usr/share/doc/idn/java/gnu/inet/encoding
-dir path=usr/share/doc/idn/java/resources
-dir path=usr/share/doc/idn/tld
-dir path=usr/share/doc/idn/tld/templates
-dir path=usr/share/lib
-dir path=usr/share/lib/idn
-dir path=usr/share/locale
-dir path=usr/share/locale/cs
-dir path=usr/share/locale/cs/LC_MESSAGES
-dir path=usr/share/locale/da
-dir path=usr/share/locale/da/LC_MESSAGES
-dir path=usr/share/locale/de
-dir path=usr/share/locale/de/LC_MESSAGES
-dir path=usr/share/locale/en
-dir path=usr/share/locale/en/LC_MESSAGES
-dir path=usr/share/locale/eo
-dir path=usr/share/locale/eo/LC_MESSAGES
-dir path=usr/share/locale/fi
-dir path=usr/share/locale/fi/LC_MESSAGES
-dir path=usr/share/locale/fr
-dir path=usr/share/locale/fr/LC_MESSAGES
-dir path=usr/share/locale/id
-dir path=usr/share/locale/id/LC_MESSAGES
-dir path=usr/share/locale/it
-dir path=usr/share/locale/it/LC_MESSAGES
-dir path=usr/share/locale/ja
-dir path=usr/share/locale/ja/LC_MESSAGES
-dir path=usr/share/locale/nl
-dir path=usr/share/locale/nl/LC_MESSAGES
-dir path=usr/share/locale/pl
-dir path=usr/share/locale/pl/LC_MESSAGES
-dir path=usr/share/locale/ro
-dir path=usr/share/locale/ro/LC_MESSAGES
-dir path=usr/share/locale/sr
-dir path=usr/share/locale/sr/LC_MESSAGES
-dir path=usr/share/locale/vi
-dir path=usr/share/locale/vi/LC_MESSAGES
-dir path=usr/share/locale/zh_CN
-dir path=usr/share/locale/zh_CN/LC_MESSAGES
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/man/man3
+dir path=usr
+dir path=usr/bin
#
file path=usr/bin/idn
+dir path=usr/include
+dir path=usr/include/idn
file path=usr/include/idn/idn-free.h
file path=usr/include/idn/idn-int.h
file path=usr/include/idn/idna.h
@@ -100,20 +49,35 @@
file path=usr/include/idn/punycode.h
file path=usr/include/idn/stringprep.h
file path=usr/include/idn/tld.h
+dir path=usr/lib
+dir path=usr/lib/$(MACH64)
+link path=usr/lib/$(MACH64)/libidn.so target=libidn.so.11.6.2
+link path=usr/lib/$(MACH64)/libidn.so.11 target=libidn.so.11.6.2
+file path=usr/lib/$(MACH64)/libidn.so.11.6.2
+file path=usr/lib/$(MACH64)/llib-lidn.ln
+dir path=usr/lib/$(MACH64)/pkgconfig
+file path=usr/lib/$(MACH64)/pkgconfig/libidn.pc
+link path=usr/lib/libidn.so target=libidn.so.11.6.2
+#
+link path=usr/lib/libidn.so.11 target=libidn.so.11.6.2
file path=usr/lib/libidn.so.11.6.2
-file path=usr/lib/$(MACH64)/libidn.so.11.6.2
file path=usr/lib/llib-lidn
file path=usr/lib/llib-lidn.ln
-file path=usr/lib/$(MACH64)/llib-lidn.ln
+dir path=usr/lib/pkgconfig
file path=usr/lib/pkgconfig/libidn.pc
-file path=usr/lib/$(MACH64)/pkgconfig/libidn.pc
-file path=usr/share/doc/idn/libidn-components.pdf
-file path=usr/share/doc/idn/libidn.pdf
+dir path=usr/share
+dir path=usr/share/doc
+dir path=usr/share/doc/idn
+dir path=usr/share/doc/idn/html
file path=usr/share/doc/idn/html/libidn-components.png
file path=usr/share/doc/idn/html/libidn.html
+dir path=usr/share/doc/idn/java
file path=usr/share/doc/idn/java/about.html
file path=usr/share/doc/idn/java/alphaindex.html
file path=usr/share/doc/idn/java/deprecated.html
+dir path=usr/share/doc/idn/java/gnu
+dir path=usr/share/doc/idn/java/gnu/inet
+dir path=usr/share/doc/idn/java/gnu/inet/encoding
file path=usr/share/doc/idn/java/gnu/inet/encoding/CombiningClass.html
file path=usr/share/doc/idn/java/gnu/inet/encoding/Composition.html
file path=usr/share/doc/idn/java/gnu/inet/encoding/DecompositionKeys.html
@@ -130,11 +94,15 @@
file path=usr/share/doc/idn/java/gnu/inet/encoding/package-summary.html
file path=usr/share/doc/idn/java/gnu/inet/encoding/tree.html
file path=usr/share/doc/idn/java/index.html
+dir path=usr/share/doc/idn/java/resources
file path=usr/share/doc/idn/java/resources/gjdoc.js
file path=usr/share/doc/idn/java/resources/gjdochtml-clean-color1.css
file path=usr/share/doc/idn/java/resources/gjdochtml-clean-layout.css
file path=usr/share/doc/idn/java/resources/inherit.png
file path=usr/share/doc/idn/java/serialized-form.html
+file path=usr/share/doc/idn/libidn-components.pdf
+file path=usr/share/doc/idn/libidn.pdf
+dir path=usr/share/doc/idn/tld
file path=usr/share/doc/idn/tld/ac.tld
file path=usr/share/doc/idn/tld/at.tld
file path=usr/share/doc/idn/tld/biz.tld
@@ -152,6 +120,7 @@
file path=usr/share/doc/idn/tld/pl.tld
file path=usr/share/doc/idn/tld/se.tld
file path=usr/share/doc/idn/tld/sh.tld
+dir path=usr/share/doc/idn/tld/templates
file path=usr/share/doc/idn/tld/templates/arabic_digits
file path=usr/share/doc/idn/tld/templates/arabic_letters
file path=usr/share/doc/idn/tld/templates/greek_standard
@@ -160,24 +129,62 @@
file path=usr/share/doc/idn/tld/templates/latin_extended_a_letters
file path=usr/share/doc/idn/tld/templates/latin_extended_a_letters_icb
file path=usr/share/doc/idn/tld/tm.tld
+dir path=usr/share/lib
+dir path=usr/share/lib/idn
file path=usr/share/lib/idn/libidn-1.19.jar
+dir path=usr/share/locale
+dir path=usr/share/locale/cs
+dir path=usr/share/locale/cs/LC_MESSAGES
file path=usr/share/locale/cs/LC_MESSAGES/libidn.mo
+dir path=usr/share/locale/da
+dir path=usr/share/locale/da/LC_MESSAGES
file path=usr/share/locale/da/LC_MESSAGES/libidn.mo
+dir path=usr/share/locale/de
+dir path=usr/share/locale/de/LC_MESSAGES
file path=usr/share/locale/de/LC_MESSAGES/libidn.mo
+dir path=usr/share/locale/en
+dir path=usr/share/locale/en/LC_MESSAGES
file path=usr/share/locale/en/LC_MESSAGES/libidn.mo
+dir path=usr/share/locale/eo
+dir path=usr/share/locale/eo/LC_MESSAGES
file path=usr/share/locale/eo/LC_MESSAGES/libidn.mo
+dir path=usr/share/locale/fi
+dir path=usr/share/locale/fi/LC_MESSAGES
file path=usr/share/locale/fi/LC_MESSAGES/libidn.mo
+dir path=usr/share/locale/fr
+dir path=usr/share/locale/fr/LC_MESSAGES
file path=usr/share/locale/fr/LC_MESSAGES/libidn.mo
+dir path=usr/share/locale/id
+dir path=usr/share/locale/id/LC_MESSAGES
file path=usr/share/locale/id/LC_MESSAGES/libidn.mo
+dir path=usr/share/locale/it
+dir path=usr/share/locale/it/LC_MESSAGES
file path=usr/share/locale/it/LC_MESSAGES/libidn.mo
+dir path=usr/share/locale/ja
+dir path=usr/share/locale/ja/LC_MESSAGES
file path=usr/share/locale/ja/LC_MESSAGES/libidn.mo
+dir path=usr/share/locale/nl
+dir path=usr/share/locale/nl/LC_MESSAGES
file path=usr/share/locale/nl/LC_MESSAGES/libidn.mo
+dir path=usr/share/locale/pl
+dir path=usr/share/locale/pl/LC_MESSAGES
file path=usr/share/locale/pl/LC_MESSAGES/libidn.mo
+dir path=usr/share/locale/ro
+dir path=usr/share/locale/ro/LC_MESSAGES
file path=usr/share/locale/ro/LC_MESSAGES/libidn.mo
+dir path=usr/share/locale/sr
+dir path=usr/share/locale/sr/LC_MESSAGES
file path=usr/share/locale/sr/LC_MESSAGES/libidn.mo
+dir path=usr/share/locale/vi
+dir path=usr/share/locale/vi/LC_MESSAGES
file path=usr/share/locale/vi/LC_MESSAGES/libidn.mo
+dir path=usr/share/locale/zh_CN
+dir path=usr/share/locale/zh_CN/LC_MESSAGES
file path=usr/share/locale/zh_CN/LC_MESSAGES/libidn.mo
+dir path=usr/share/man
+dir path=usr/share/man/man1
file path=usr/share/man/man1/idn.1
+dir path=usr/share/man/man3
file path=usr/share/man/man3/idna_strerror.3
file path=usr/share/man/man3/idna_to_ascii_4i.3
file path=usr/share/man/man3/idna_to_ascii_4z.3
@@ -225,9 +232,4 @@
file path=usr/share/man/man3/tld_get_z.3
file path=usr/share/man/man3/tld_strerror.3
#
-link path=usr/lib/libidn.so.11 target=libidn.so.11.6.2
-link path=usr/lib/libidn.so target=libidn.so.11.6.2
-link path=usr/lib/$(MACH64)/libidn.so.11 target=libidn.so.11.6.2
-link path=usr/lib/$(MACH64)/libidn.so target=libidn.so.11.6.2
-#
license libidn.license license="LGPLv2.1, GPLv3, FDLv1.3"