--- a/components/apache2/Makefile Wed Mar 18 05:13:54 2015 -0700
+++ b/components/apache2/Makefile Wed Mar 18 05:33:04 2015 -0700
@@ -94,17 +94,23 @@
CONFIGURE_OPTIONS += --enable-ldap
CONFIGURE_OPTIONS += --enable-ssl
CONFIGURE_OPTIONS += --enable-exception-hook
-CONFIGURE_OPTIONS += --with-pcre
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS) -DSSL_EXPERIMENTAL -DSSL_ENGINE"
CONFIGURE_OPTIONS += LTFLAGS="--silent --tag=CC"
CONFIGURE_OPTIONS.32 += --enable-layout=Solaris-Apache2
CONFIGURE_OPTIONS.64 += --enable-layout=Solaris-Apache2-$(MACH64)
-CONFIGURE_OPTIONS.32 += --with-apr=/usr/apr/1.3/bin/apr-1-config
-CONFIGURE_OPTIONS.64 += --with-apr=/usr/apr/1.3/bin/$(MACH64)/apr-1-config
-CONFIGURE_OPTIONS.32 += --with-apr-util=/usr/apr-util/1.3/bin/apu-1-config
-CONFIGURE_OPTIONS.64 += --with-apr-util=/usr/apr-util/1.3/bin/$(MACH64)/apu-1-config
+CONFIGURE_OPTIONS.32 += --with-apr=/usr/apr/1.5/bin/apr-1-config
+CONFIGURE_OPTIONS.64 += --with-apr=/usr/apr/1.5/bin/$(MACH64)/apr-1-config
+CONFIGURE_OPTIONS.32 += --with-apr-util=/usr/apr-util/1.5/bin/apu-1-config
+CONFIGURE_OPTIONS.64 += --with-apr-util=/usr/apr-util/1.5/bin/$(MACH64)/apu-1-config
+CONFIGURE_OPTIONS.32 += --with-pcre=/usr/bin/pcre-config
+CONFIGURE_OPTIONS.64 += --with-pcre=/usr/bin/$(MACH64)/pcre-config
PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
+ifeq ($(strip $(PARFAIT_BUILD)),yes)
+PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
+endif
+
+configure: $(CONFIGURE_32_and_64)
build: $(BUILD_32_and_64)
--- a/components/apache2/apache-22.p5m Wed Mar 18 05:13:54 2015 -0700
+++ b/components/apache2/apache-22.p5m Wed Mar 18 05:33:04 2015 -0700
@@ -693,8 +693,8 @@
depend type=conditional fmri=web/server/apache-22/module/[email protected] \
predicate=web/php-53
depend type=require fmri=__TBD \
- pkg.debug.depend.file=usr/apr-util/1.3/lib/apr-util-1/apr_dbd_mysql.so
+ pkg.debug.depend.file=usr/apr-util/1.5/lib/apr-util-1/apr_dbd_mysql.so
depend type=require fmri=__TBD \
- pkg.debug.depend.file=usr/apr-util/1.3/lib/apr-util-1/apr_dbd_sqlite3.so
+ pkg.debug.depend.file=usr/apr-util/1.5/lib/apr-util-1/apr_dbd_sqlite3.so
depend type=require fmri=__TBD \
- pkg.debug.depend.file=usr/apr-util/1.3/lib/apr-util-1/apr_ldap-1.so
+ pkg.debug.depend.file=usr/apr-util/1.5/lib/apr-util-1/apr_ldap-1.so
--- a/components/apache2/resolve.deps Wed Mar 18 05:13:54 2015 -0700
+++ b/components/apache2/resolve.deps Wed Mar 18 05:33:04 2015 -0700
@@ -1,8 +1,8 @@
-library/apr-13
-library/apr-util-13
-library/apr-util-13/apr-ldap
-library/apr-util-13/dbd-mysql
-library/apr-util-13/dbd-sqlite
+library/apr-15
+library/apr-util-15
+library/apr-util-15/apr-ldap
+library/apr-util-15/dbd-mysql
+library/apr-util-15/dbd-sqlite
library/openldap
library/pcre
library/security/openssl