10 files changed, 98 insertions, 20 deletions

diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 6ff64538a096..39f23879999a 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -213,17 +213,18 @@ post-configure:
 			s,%%WWWGRP%%,${WWWGRP}, ; \
 			s,%%WWWBASEDIR%%,${PREFIX}/www," \
 			${WRKSRC}/docs/conf/httpd-std.conf
+	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," \
+			${WRKSRC}/support/envvars-std
 
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
+	@${MKDIR} ${PREFIX}/etc/apache2/envvars.d
 	@${MKDIR} ${PREFIX}/etc/apache2/Includes
-.if !defined(WITH_APR_FROM_PORTS)
-	@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/000.apache2libs.sh startup script."
+	@${ECHO_CMD} "=> Installing ${PREFIX}/etc/rc.d/000.apache2libs.sh startup script."
 	@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2libs.sh ${PREFIX}/etc/rc.d/000.apache2libs.sh
-.endif
-	@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup script."
+	@${ECHO_CMD} "=> Installing ${PREFIX}/etc/rc.d/apache2.sh startup script."
 	@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh
 	@${ECHO_CMD} ""
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/apache2/files/patch-Makefile.in b/www/apache2/files/patch-Makefile.in
index 5af8aa5efa29..41ed1ba3ff41 100644
--- a/www/apache2/files/patch-Makefile.in
+++ b/www/apache2/files/patch-Makefile.in
@@ -1,5 +1,5 @@
 --- Makefile.in.orig	Thu Aug 26 15:01:18 2004
-+++ Makefile.in	Sun Dec 12 12:07:11 2004
++++ Makefile.in	Fri Dec 17 17:00:02 2004
 @@ -31,15 +31,21 @@
  	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
  	    $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) ; \
@@ -32,7 +32,7 @@
  	    				if test $$j != "^EOL^"; then \
  	    					echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
  	    				fi; \
-@@ -70,14 +79,14 @@
+@@ -70,23 +79,17 @@
  	    				-e 's#@@Port@@#$(PORT)#g' \
  	    				< $$i; \
  	    		fi \
@@ -49,8 +49,18 @@
 +	    		$(INSTALL_DATA) $(DESTDIR)$(EXAMPLESDIR)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
  	    	fi; \
  	    done ; \
- 	done ; \
-@@ -108,45 +117,41 @@
+-	done ; \
+-	if test -f "$(builddir)/envvars-std"; then \
+-	    cp -p envvars-std $(DESTDIR)$(sbindir); \
+-	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+-	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+-	    fi ; \
+-	fi
++	done ; 
+ 
+ install-build:
+ 	@echo Installing build system files 
+@@ -108,45 +111,41 @@
  	doxygen $(top_srcdir)/docs/doxygen.conf
  
  install-htdocs:
@@ -125,7 +135,7 @@
  install-other:
  	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
  	@test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir)
-@@ -188,11 +193,13 @@
+@@ -188,11 +187,13 @@
  	@test -d $(DESTDIR)$(mandir)      || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)
  	@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
  	@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
diff --git a/www/apache2/files/patch-support:Makefile.in b/www/apache2/files/patch-support:Makefile.in
new file mode 100644
index 000000000000..66b6420974ec
--- /dev/null
+++ b/www/apache2/files/patch-support:Makefile.in
@@ -0,0 +1,14 @@
+--- support/Makefile.in.orig	Fri Dec 17 17:03:38 2004
++++ support/Makefile.in	Fri Dec 17 17:01:44 2004
+@@ -23,10 +23,7 @@
+ 	    fi ; \
+ 	done
+ 	@if test -f "$(builddir)/envvars-std"; then \
+-	    cp -p envvars-std $(DESTDIR)$(sbindir); \
+-	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+-	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+-	    fi ; \
++	    cp -p envvars-std $(DESTDIR)$(sbindir)/envvars; \
+ 	fi
+ 
+ htpasswd_OBJECTS = htpasswd.lo
diff --git a/www/apache2/files/patch-support:envvars-std.in b/www/apache2/files/patch-support:envvars-std.in
new file mode 100644
index 000000000000..26a094f31394
--- /dev/null
+++ b/www/apache2/files/patch-support:envvars-std.in
@@ -0,0 +1,13 @@
+--- support/envvars-std.in.orig	Fri Dec 17 14:39:21 2004
++++ support/envvars-std.in	Fri Dec 17 14:41:06 2004
+@@ -21,3 +21,10 @@
+ export @SHLIBPATH_VAR@
+ #
+ @OS_SPECIFIC_VARS@
++
++ENVVARS_DIR=%%PREFIX%%/etc/apache2/envvars.d
++
++for envvars_file in $(ls ${ENVVARS_DIR}/*.env 2>/dev/null)
++do
++	. ${envvars_file}
++done
diff --git a/www/apache2/pkg-plist b/www/apache2/pkg-plist
index b541c70585b6..a296908cc563 100644
--- a/www/apache2/pkg-plist
+++ b/www/apache2/pkg-plist
@@ -202,7 +202,6 @@ sbin/apxs
 sbin/checkgid
 sbin/dbmmanage
 sbin/envvars
-sbin/envvars-std
 sbin/htdbm
 sbin/htdigest
 sbin/htpasswd
@@ -524,6 +523,8 @@ share/apache2/build/special.mk
 @dirrm lib/apache2
 @dirrm include/apache2
 @exec mkdir -p %D/etc/apache2/Includes 2> /dev/null || true
+@exec mkdir -p %D/etc/apache2/envvars.d 2> /dev/null || true
 @unexec rmdir %D/etc/apache2/Includes 2> /dev/null || true
+@unexec rmdir %D/etc/apache2/envvars.d 2> /dev/null || true
 @unexec rm -f %D/etc/apache2/httpd.conf.bak 2> /dev/null || true
 @unexec rmdir %D/etc/apache2 2> /dev/null || echo "===> If you plan to do not reinstall apache2, you can safely remove %D/etc/apache2."
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 6ff64538a096..39f23879999a 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -213,17 +213,18 @@ post-configure:
 			s,%%WWWGRP%%,${WWWGRP}, ; \
 			s,%%WWWBASEDIR%%,${PREFIX}/www," \
 			${WRKSRC}/docs/conf/httpd-std.conf
+	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," \
+			${WRKSRC}/support/envvars-std
 
 pre-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 post-install:
+	@${MKDIR} ${PREFIX}/etc/apache2/envvars.d
 	@${MKDIR} ${PREFIX}/etc/apache2/Includes
-.if !defined(WITH_APR_FROM_PORTS)
-	@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/000.apache2libs.sh startup script."
+	@${ECHO_CMD} "=> Installing ${PREFIX}/etc/rc.d/000.apache2libs.sh startup script."
 	@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2libs.sh ${PREFIX}/etc/rc.d/000.apache2libs.sh
-.endif
-	@${ECHO_CMD} "Installing ${PREFIX}/etc/rc.d/apache2.sh startup script."
+	@${ECHO_CMD} "=> Installing ${PREFIX}/etc/rc.d/apache2.sh startup script."
 	@${INSTALL_SCRIPT} -m 751 ${WRKDIR}/apache2.sh ${PREFIX}/etc/rc.d/apache2.sh
 	@${ECHO_CMD} ""
 	@${CAT} ${PKGMESSAGE}
diff --git a/www/apache20/files/patch-Makefile.in b/www/apache20/files/patch-Makefile.in
index 5af8aa5efa29..41ed1ba3ff41 100644
--- a/www/apache20/files/patch-Makefile.in
+++ b/www/apache20/files/patch-Makefile.in
@@ -1,5 +1,5 @@
 --- Makefile.in.orig	Thu Aug 26 15:01:18 2004
-+++ Makefile.in	Sun Dec 12 12:07:11 2004
++++ Makefile.in	Fri Dec 17 17:00:02 2004
 @@ -31,15 +31,21 @@
  	if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
  	    $(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) ; \
@@ -32,7 +32,7 @@
  	    				if test $$j != "^EOL^"; then \
  	    					echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
  	    				fi; \
-@@ -70,14 +79,14 @@
+@@ -70,23 +79,17 @@
  	    				-e 's#@@Port@@#$(PORT)#g' \
  	    				< $$i; \
  	    		fi \
@@ -49,8 +49,18 @@
 +	    		$(INSTALL_DATA) $(DESTDIR)$(EXAMPLESDIR)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
  	    	fi; \
  	    done ; \
- 	done ; \
-@@ -108,45 +117,41 @@
+-	done ; \
+-	if test -f "$(builddir)/envvars-std"; then \
+-	    cp -p envvars-std $(DESTDIR)$(sbindir); \
+-	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+-	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+-	    fi ; \
+-	fi
++	done ; 
+ 
+ install-build:
+ 	@echo Installing build system files 
+@@ -108,45 +111,41 @@
  	doxygen $(top_srcdir)/docs/doxygen.conf
  
  install-htdocs:
@@ -125,7 +135,7 @@
  install-other:
  	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
  	@test -d $(DESTDIR)$(runtimedir) || $(MKINSTALLDIRS) $(DESTDIR)$(runtimedir)
-@@ -188,11 +193,13 @@
+@@ -188,11 +187,13 @@
  	@test -d $(DESTDIR)$(mandir)      || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)
  	@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
  	@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
diff --git a/www/apache20/files/patch-support:Makefile.in b/www/apache20/files/patch-support:Makefile.in
new file mode 100644
index 000000000000..66b6420974ec
--- /dev/null
+++ b/www/apache20/files/patch-support:Makefile.in
@@ -0,0 +1,14 @@
+--- support/Makefile.in.orig	Fri Dec 17 17:03:38 2004
++++ support/Makefile.in	Fri Dec 17 17:01:44 2004
+@@ -23,10 +23,7 @@
+ 	    fi ; \
+ 	done
+ 	@if test -f "$(builddir)/envvars-std"; then \
+-	    cp -p envvars-std $(DESTDIR)$(sbindir); \
+-	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+-	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+-	    fi ; \
++	    cp -p envvars-std $(DESTDIR)$(sbindir)/envvars; \
+ 	fi
+ 
+ htpasswd_OBJECTS = htpasswd.lo
diff --git a/www/apache20/files/patch-support:envvars-std.in b/www/apache20/files/patch-support:envvars-std.in
new file mode 100644
index 000000000000..26a094f31394
--- /dev/null
+++ b/www/apache20/files/patch-support:envvars-std.in
@@ -0,0 +1,13 @@
+--- support/envvars-std.in.orig	Fri Dec 17 14:39:21 2004
++++ support/envvars-std.in	Fri Dec 17 14:41:06 2004
+@@ -21,3 +21,10 @@
+ export @SHLIBPATH_VAR@
+ #
+ @OS_SPECIFIC_VARS@
++
++ENVVARS_DIR=%%PREFIX%%/etc/apache2/envvars.d
++
++for envvars_file in $(ls ${ENVVARS_DIR}/*.env 2>/dev/null)
++do
++	. ${envvars_file}
++done
diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist
index b541c70585b6..a296908cc563 100644
--- a/www/apache20/pkg-plist
+++ b/www/apache20/pkg-plist
@@ -202,7 +202,6 @@ sbin/apxs
 sbin/checkgid
 sbin/dbmmanage
 sbin/envvars
-sbin/envvars-std
 sbin/htdbm
 sbin/htdigest
 sbin/htpasswd
@@ -524,6 +523,8 @@ share/apache2/build/special.mk
 @dirrm lib/apache2
 @dirrm include/apache2
 @exec mkdir -p %D/etc/apache2/Includes 2> /dev/null || true
+@exec mkdir -p %D/etc/apache2/envvars.d 2> /dev/null || true
 @unexec rmdir %D/etc/apache2/Includes 2> /dev/null || true
+@unexec rmdir %D/etc/apache2/envvars.d 2> /dev/null || true
 @unexec rm -f %D/etc/apache2/httpd.conf.bak 2> /dev/null || true
 @unexec rmdir %D/etc/apache2 2> /dev/null || echo "===> If you plan to do not reinstall apache2, you can safely remove %D/etc/apache2."