diff -r b9ecf50e4c5c -r ad1cb0530c69 components/php-5_3/apache-php53.p5m --- a/components/php-5_3/apache-php53.p5m Wed Mar 12 01:01:18 2014 -0700 +++ b/components/php-5_3/apache-php53.p5m Wed Mar 12 06:18:38 2014 -0700 @@ -18,13 +18,13 @@ # # 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. # -set name=pkg.fmri value=pkg:/web/server/apache-22/module/apache-php53@5.3.27,$(BUILD_VERSION) +set name=pkg.fmri value=pkg:/web/server/apache-22/module/apache-php53@$(COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="PHP Server for Apache Web Server" set name=info.classification value="org.opensolaris.category.2008:Web Services/Application and Web Servers" -set name=info.source-url value=http://us.php.net/get/php-5.3.27.tar.gz/from/this/mirror +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=$(COMPONENT_PROJECT_URL) set name=org.opensolaris.arc-caseid value=PSARC/2012/067 set name=org.opensolaris.consolidation value=$(CONSOLIDATION) @@ -32,7 +32,7 @@ license apache-php53.license license='PHP, GPLv2, LGPLv2, Apache v2.0' \ com.oracle.info.description="the PHP module for the Apache web server" \ com.oracle.info.name=apache-php53 \ - com.oracle.info.version=5.3.27 + com.oracle.info.version=$(COMPONENT_VERSION) file path=etc/apache2/2.2/conf.d/php/php5.3.conf mode=0644 preserve=renamenew link path=etc/apache2/2.2/conf.d/php/php.conf target=php5.3.conf \ @@ -40,7 +40,7 @@ file path=usr/apache2/2.2/libexec/mod_php5.3.so # need generic dependency on PHP itself -depend fmri=web/php-53@5.3.27 type=require +depend fmri=web/php-53@$(COMPONENT_VERSION) type=require # if php5.2 apache is present drag forward because php.conf files # move around