--- a/components/php-5_3/php-pear.p5m Tue Feb 03 12:52:16 2015 -0800
+++ b/components/php-5_3/php-pear.p5m Tue Feb 03 13:01:27 2015 -0800
@@ -18,45 +18,33 @@
#
# CDDL HEADER END
#
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
#
# All the files under /var/php are mode=0644
<transform file path=var/php/.* -> default mode 0644>
<transform file path=var/php/.* -> default group bin>
<transform file path=var/php/.* -> default preserve renamenew>
-
-set name=pkg.fmri value=pkg:/web/php-53/extension/php-pear@$(COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.fmri \
+ value=pkg:/web/php-53/extension/php-pear@$(COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="PHP Extension and Application Repository"
set name=pkg.description \
value="Framework and reusable PHP components from PEAR repository for PHP"
-set name=pkg.summary value="PHP Extension and Application Repository"
-set name=info.classification \
- value="org.opensolaris.category.2008:Development/PHP"
-set name=info.source-url value=http://us.php.net/get/php-$(COMPONENT_VERSION).tar.gz/from/this/mirror
+
+# This package name has known conflicts with other packages in the WOS
+set name=pkg.linted.pkglint.manifest004 value=true
+set name=info.classification value=org.opensolaris.category.2008:Development/PHP
+set name=info.source-url \
+ value=http://us.php.net/get/php-$(COMPONENT_VERSION).tar.gz/from/this/mirror
set name=info.upstream-url value=http://pear.php.net/
set name=org.opensolaris.arc-caseid value=PSARC/2012/067
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-
-# This package name has known conflicts with other packages in the WOS
-set pkg.linted.pkglint.manifest004=true
-
-
-license php-pear.license license='PHP, LGPLv2.1' \
- com.oracle.info.description="the PEAR extension module for PHP" \
- com.oracle.info.name=php-pear \
- com.oracle.info.version=$(COMPONENT_VERSION) \
- com.oracle.info.tpno=$(TPNO_PHP_5_3)
-
-dir path=var/php/5.3/include/php
-dir path=var/php/5.3/modules
-dir path=var/php/5.3/pear/.registry/.channel.__uri
-dir path=var/php/5.3/pear/.registry/.channel.doc.php.net
-dir path=var/php/5.3/pear/.registry/.channel.pecl.php.net
-
file path=etc/php/5.3/pear.conf mode=0644 preserve=renamenew
file path=usr/php/5.3/bin/pear mode=0555
file path=usr/php/5.3/bin/peardev mode=0555
file path=usr/php/5.3/bin/pecl mode=0555
+dir path=var/php/5.3/include/php
+dir path=var/php/5.3/modules
file path=var/php/5.3/pear/.channels/.alias/pear.txt
file path=var/php/5.3/pear/.channels/.alias/pecl.txt
file path=var/php/5.3/pear/.channels/.alias/phpdocs.txt
@@ -68,6 +56,9 @@
file path=var/php/5.3/pear/.depdblock
file path=var/php/5.3/pear/.filemap
file path=var/php/5.3/pear/.lock
+dir path=var/php/5.3/pear/.registry/.channel.__uri
+dir path=var/php/5.3/pear/.registry/.channel.doc.php.net
+dir path=var/php/5.3/pear/.registry/.channel.pecl.php.net
file path=var/php/5.3/pear/.registry/archive_tar.reg
file path=var/php/5.3/pear/.registry/console_getopt.reg
file path=var/php/5.3/pear/.registry/pear.reg
@@ -180,39 +171,26 @@
file path=var/php/5.3/pear/doc/PEAR/LICENSE
file path=var/php/5.3/pear/doc/PEAR/README
file path=var/php/5.3/pear/doc/Structures_Graph/docs/generate.sh
-file \
- path=var/php/5.3/pear/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph.html
-file \
- path=var/php/5.3/pear/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Manipulator_AcyclicTest.html
-file \
- path=var/php/5.3/pear/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Manipulator_TopologicalSorter.html
-file \
- path=var/php/5.3/pear/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Node.html
-file \
- path=var/php/5.3/pear/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Manipulator_AcyclicTest_php.html
-file \
- path=var/php/5.3/pear/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Manipulator_TopologicalSorter_php.html
-file \
- path=var/php/5.3/pear/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Node_php.html
-file \
- path=var/php/5.3/pear/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_php.html
-file \
- path=var/php/5.3/pear/doc/Structures_Graph/docs/html/Structures_Graph/tutorial_Structures_Graph.pkg.html
-file \
- path=var/php/5.3/pear/doc/Structures_Graph/docs/html/classtrees_Structures_Graph.html
+file path=var/php/5.3/pear/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph.html
+file path=var/php/5.3/pear/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Manipulator_AcyclicTest.html
+file path=var/php/5.3/pear/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Manipulator_TopologicalSorter.html
+file path=var/php/5.3/pear/doc/Structures_Graph/docs/html/Structures_Graph/Structures_Graph_Node.html
+file path=var/php/5.3/pear/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Manipulator_AcyclicTest_php.html
+file path=var/php/5.3/pear/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Manipulator_TopologicalSorter_php.html
+file path=var/php/5.3/pear/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_Node_php.html
+file path=var/php/5.3/pear/doc/Structures_Graph/docs/html/Structures_Graph/_Structures_Graph_php.html
+file path=var/php/5.3/pear/doc/Structures_Graph/docs/html/Structures_Graph/tutorial_Structures_Graph.pkg.html
+file path=var/php/5.3/pear/doc/Structures_Graph/docs/html/classtrees_Structures_Graph.html
file path=var/php/5.3/pear/doc/Structures_Graph/docs/html/elementindex.html
-file \
- path=var/php/5.3/pear/doc/Structures_Graph/docs/html/elementindex_Structures_Graph.html
+file path=var/php/5.3/pear/doc/Structures_Graph/docs/html/elementindex_Structures_Graph.html
file path=var/php/5.3/pear/doc/Structures_Graph/docs/html/errors.html
file path=var/php/5.3/pear/doc/Structures_Graph/docs/html/index.html
-file \
- path=var/php/5.3/pear/doc/Structures_Graph/docs/html/li_Structures_Graph.html
+file path=var/php/5.3/pear/doc/Structures_Graph/docs/html/li_Structures_Graph.html
file path=var/php/5.3/pear/doc/Structures_Graph/docs/html/media/banner.css
file path=var/php/5.3/pear/doc/Structures_Graph/docs/html/media/stylesheet.css
file path=var/php/5.3/pear/doc/Structures_Graph/docs/html/packages.html
file path=var/php/5.3/pear/doc/Structures_Graph/docs/html/todolist.html
-file \
- path=var/php/5.3/pear/doc/Structures_Graph/docs/tutorials/Structures_Graph/Structures_Graph.pkg
+file path=var/php/5.3/pear/doc/Structures_Graph/docs/tutorials/Structures_Graph/Structures_Graph.pkg
file path=var/php/5.3/pear/doc/XML_Util/examples/example.php
file path=var/php/5.3/pear/doc/XML_Util/examples/example2.php
file path=var/php/5.3/pear/pearcmd.php
@@ -221,31 +199,29 @@
file path=var/php/5.3/pear/test/Structures_Graph/tests/testCase/BasicGraph.php
file path=var/php/5.3/pear/test/XML_Util/tests/AllTests.php
file path=var/php/5.3/pear/test/XML_Util/tests/testBasic_apiVersion.phpt
-file \
- path=var/php/5.3/pear/test/XML_Util/tests/testBasic_attributesToString.phpt
-file \
- path=var/php/5.3/pear/test/XML_Util/tests/testBasic_collapseEmptyTags.phpt
-file \
- path=var/php/5.3/pear/test/XML_Util/tests/testBasic_createCDataSection.phpt
+file path=var/php/5.3/pear/test/XML_Util/tests/testBasic_attributesToString.phpt
+file path=var/php/5.3/pear/test/XML_Util/tests/testBasic_collapseEmptyTags.phpt
+file path=var/php/5.3/pear/test/XML_Util/tests/testBasic_createCDataSection.phpt
file path=var/php/5.3/pear/test/XML_Util/tests/testBasic_createComment.phpt
file path=var/php/5.3/pear/test/XML_Util/tests/testBasic_createEndElement.phpt
-file \
- path=var/php/5.3/pear/test/XML_Util/tests/testBasic_createStartElement.phpt
+file path=var/php/5.3/pear/test/XML_Util/tests/testBasic_createStartElement.phpt
file path=var/php/5.3/pear/test/XML_Util/tests/testBasic_createTag.phpt
-file \
- path=var/php/5.3/pear/test/XML_Util/tests/testBasic_createTagFromArray.phpt
-file \
- path=var/php/5.3/pear/test/XML_Util/tests/testBasic_getDocTypeDeclaration.phpt
-file \
- path=var/php/5.3/pear/test/XML_Util/tests/testBasic_getXmlDeclaration.phpt
+file path=var/php/5.3/pear/test/XML_Util/tests/testBasic_createTagFromArray.phpt
+file path=var/php/5.3/pear/test/XML_Util/tests/testBasic_getDocTypeDeclaration.phpt
+file path=var/php/5.3/pear/test/XML_Util/tests/testBasic_getXmlDeclaration.phpt
file path=var/php/5.3/pear/test/XML_Util/tests/testBasic_isValidName.phpt
file path=var/php/5.3/pear/test/XML_Util/tests/testBasic_raiseError.phpt
file path=var/php/5.3/pear/test/XML_Util/tests/testBasic_replaceEntities.phpt
file path=var/php/5.3/pear/test/XML_Util/tests/testBasic_reverseEntities.phpt
-file \
- path=var/php/5.3/pear/test/XML_Util/tests/testBasic_splitQualifiedName.phpt
+file path=var/php/5.3/pear/test/XML_Util/tests/testBasic_splitQualifiedName.phpt
file path=var/php/5.3/pear/test/XML_Util/tests/testBug_4950.phpt
file path=var/php/5.3/pear/test/XML_Util/tests/testBug_5392.phpt
+
+license php-pear.license license="PHP, LGPLv2.1" \
+ com.oracle.info.description="the PEAR extension module for PHP" \
+ com.oracle.info.name=php-pear com.oracle.info.tpno=$(TPNO_PHP_5_3) \
+ com.oracle.info.version=$(COMPONENT_VERSION)
+
# need generic dependency on PHP itself
-depend fmri=web/php-53@$(COMPONENT_VERSION) type=require
+depend type=require fmri=web/php-53@$(COMPONENT_VERSION)