diff -r aaef0df2e4f3 -r 1a27f000029f components/php-common/php-common.p5m --- a/components/php-common/php-common.p5m Mon Jun 09 23:01:38 2014 -0700 +++ b/components/php-common/php-common.p5m Tue Jun 10 14:07:48 2014 -0700 @@ -29,16 +29,18 @@ set name=pkg.fmri \ value=pkg:/web/php-common@$(COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.description \ - value="A general-purpose scripting language originally designed for web development to produce dynamic web pages." -set name=pkg.summary value="PHP Server" -set name=com.oracle.info.description value="the PHP scripting language" + value="The common components for all versions of PHP, a general-purpose scripting language originally designed for web development to produce dynamic web pages." +set name=pkg.summary value="common components for PHP" +set name=com.oracle.info.description \ + value="the common components for the PHP scripting language" +set name=com.oracle.info.name value=$(COMPONENT_NAME) set name=info.classification \ value="org.opensolaris.category.2008:Development/PHP" set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) set name=org.opensolaris.arc-caseid value=PSARC/2012/067 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) -license php.license license='PHP, GPLv2, LGPLv2, Apache v2.0' +license php-common.license license=Oracle file php.conf path=etc/apache2/2.2/conf.d/php.conf file php.1.sunman path=usr/share/man/man1/php.1