--- a/components/apache2-modules/mod_dtrace/apache-dtrace.p5m Fri Jan 23 17:31:40 2015 -0800
+++ b/components/apache2-modules/mod_dtrace/apache-dtrace.p5m Tue Feb 03 19:24:25 2015 -0800
@@ -18,25 +18,26 @@
#
# 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.
#
set name=pkg.fmri \
value=pkg:/web/server/apache-22/module/apache-dtrace@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary \
- value="DTrace plugin for Apache Web Server V2.2"
-set name=com.oracle.info.description value="the DTrace plugin for Apache Web Server V2.2"
+set name=pkg.summary value="DTrace plugin for Apache Web Server V2.2"
+set name=com.oracle.info.description \
+ value="the DTrace plugin for Apache Web Server V2.2"
set name=com.oracle.info.tpno value=$(TPNO)
set name=info.classification \
value="org.opensolaris.category.2008:Web Services/Application and Web Servers"
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid \
- value=PSARC/2008/090
+set name=org.opensolaris.arc-caseid value=PSARC/2008/090
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file dtrace.conf path=etc/apache2/2.2/conf.d/dtrace.conf mode=0644 \
+ original_name=SUNWapch22m-dtrace:etc/apache2/2.2/conf.d/dtrace.conf \
+ preserve=renamenew
+file build/apache22/$(MACH64)/.libs/mod_dtrace.so \
+ path=usr/apache2/2.2/libexec/$(MACH64)/mod_dtrace.so
+file build/apache22/$(MACH32)/.libs/mod_dtrace.so \
+ path=usr/apache2/2.2/libexec/mod_dtrace.so
license apache.license license="Apache v2.0"
-
-file dtrace.conf path=etc/apache2/2.2/conf.d/dtrace.conf mode=0644 preserve=renamenew \
- original_name=SUNWapch22m-dtrace:etc/apache2/2.2/conf.d/dtrace.conf
-file build/apache22/$(MACH32)/.libs/mod_dtrace.so path=usr/apache2/2.2/libexec/mod_dtrace.so
-file build/apache22/$(MACH64)/.libs/mod_dtrace.so path=usr/apache2/2.2/libexec/$(MACH64)/mod_dtrace.so