--- a/components/libxml2/libxml2.p5m Tue Feb 03 12:52:16 2015 -0800
+++ b/components/libxml2/libxml2.p5m Tue Feb 03 13:01:27 2015 -0800
@@ -18,7 +18,7 @@
#
# 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 committed>
@@ -31,11 +31,12 @@
value=org.opensolaris.category.2008:System/Libraries
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/630
+set name=org.opensolaris.arc-caseid value=PSARC/2009/630
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+link path=lib/$(MACH64)/libxml2.so target=libxml2.so.2
file usr/lib/$(MACH64)/libxml2.so.2 path=lib/$(MACH64)/libxml2.so.2
file $(MACH64)/llib-lxml2.ln path=lib/$(MACH64)/llib-lxml2.ln
+link path=lib/libxml2.so target=libxml2.so.2
file usr/lib/libxml2.so.2 path=lib/libxml2.so.2
file $(MACH32)/llib-lxml2.ln path=lib/llib-lxml2.ln
file path=usr/bin/xml2-config facet.devel=true
@@ -88,8 +89,16 @@
file path=usr/include/libxml2/libxml/xpath.h
file path=usr/include/libxml2/libxml/xpathInternals.h
file path=usr/include/libxml2/libxml/xpointer.h
+link path=usr/lib/$(MACH64)/libxml2.so target=libxml2.so.2
+link path=usr/lib/$(MACH64)/libxml2.so.2 \
+ target=../../../lib/$(MACH64)/libxml2.so.2
+link path=usr/lib/$(MACH64)/llib-lxml2.ln \
+ target=../../../lib/$(MACH64)/llib-lxml2.ln
file path=usr/lib/$(MACH64)/pkgconfig/libxml-2.0.pc
+link path=usr/lib/libxml2.so target=./libxml2.so.2
+link path=usr/lib/libxml2.so.2 target=../../lib/libxml2.so.2
file llib-lxml2 path=usr/lib/llib-lxml2
+link path=usr/lib/llib-lxml2.ln target=../../lib/llib-lxml2.ln
file path=usr/lib/pkgconfig/libxml-2.0.pc
file path=usr/share/aclocal/libxml.m4
file path=usr/share/man/man1/xml2-config.1 facet.devel=all
@@ -99,21 +108,9 @@
file libxml2.3 path=usr/share/man/man3/libxml2.3
legacy pkg=SUNWlxml desc="The XML library" name="The XML library"
license libxml2.license license="libxml license"
-link path=lib/$(MACH64)/libxml2.so target=libxml2.so.2
-link path=lib/libxml2.so target=libxml2.so.2
-link path=usr/lib/$(MACH64)/libxml2.so target=libxml2.so.2
-link path=usr/lib/$(MACH64)/libxml2.so.2 \
- target=../../../lib/$(MACH64)/libxml2.so.2
-link path=usr/lib/$(MACH64)/llib-lxml2.ln \
- target=../../../lib/$(MACH64)/llib-lxml2.ln
-link path=usr/lib/libxml2.so target=./libxml2.so.2
-link path=usr/lib/libxml2.so.2 target=../../lib/libxml2.so.2
-link path=usr/lib/llib-lxml2.ln target=../../lib/llib-lxml2.ln
-
-depend fmri=library/python/libxml2-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-26 \
- type=conditional
-
-depend fmri=library/python/libxml2-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
- predicate=runtime/python-27 \
- type=conditional
+depend type=conditional \
+ fmri=library/python/libxml2-26@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-26
+depend type=conditional \
+ fmri=library/python/libxml2-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \
+ predicate=runtime/python-27