--- a/components/apache2/patches/Makefile.in.patch Wed Feb 29 22:39:04 2012 +0000
+++ b/components/apache2/patches/Makefile.in.patch Thu Mar 01 03:33:56 2012 -0800
@@ -1,5 +1,5 @@
--- Makefile.in Tue Nov 25 12:24:49 2008
-+++ Makefile.in Thu May 19 08:09:10 2011
++++ Makefile.in Tue Feb 28 07:08:05 2012
@@ -49,6 +49,9 @@
-e 's#@@[email protected]@#$(PORT)#g' \
-e 's#@@[email protected]@#$(SSLPORT)#g' \
@@ -10,20 +10,27 @@
< $$i; \
else \
sed -n -e '/@@[email protected]@/q' \
[email protected]@ -87,6 +90,12 @@
[email protected]@ -87,6 +90,19 @@
cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
fi ; \
fi
-+ @if ! grep "$(sysconfdir)/envvars" $(DESTDIR)$(sbindir)/envvars > /dev/null; then \
-+ echo 'if [ -f $(sysconfdir)/envvars ]; then' >> $(DESTDIR)$(sbindir)/envvars ; \
-+ echo '. $(sysconfdir)/envvars' >> $(DESTDIR)$(sbindir)/envvars ; \
++ @if ! grep "{APACHE_USER_ENVVARS}" $(DESTDIR)$(sbindir)/envvars > /dev/null; then \
++ echo '# If you run apachectl with APACHE_USER_ENVVARS in its environment'\
++ >> $(DESTDIR)$(sbindir)/envvars ; \
++ echo '# the specified file will be sourced here. The standard path is'\
++ >> $(DESTDIR)$(sbindir)/envvars ; \
++ echo '# /etc/apache2/2.2/envvars.' >> $(DESTDIR)$(sbindir)/envvars ; \
++ echo '' >> $(DESTDIR)$(sbindir)/envvars ; \
++ echo 'if [ "x$${APACHE_USER_ENVVARS}" != "x" -a -f "$${APACHE_USER_ENVVARS}" ]; then'\
++ >> $(DESTDIR)$(sbindir)/envvars ; \
++ echo '. "$${APACHE_USER_ENVVARS}"' >> $(DESTDIR)$(sbindir)/envvars ; \
+ echo 'fi' >> $(DESTDIR)$(sbindir)/envvars ; \
+ fi
+ @grep "^#" $(top_builddir)/support/envvars-std > $(DESTDIR)$(sysconfdir)/envvars
# Create a sanitized config_vars.mk
build/config_vars.out: build/config_vars.mk
[email protected]@ -165,7 +174,6 @@
[email protected]@ -165,7 +181,6 @@
install-other:
@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)