Correct envvars path on apachectl(1)

Submitted by:	Franco Venturi <fventuri@attbi.com>

4 files changed, 56 insertions, 12 deletions

diff --git a/www/apache2/files/patch-support:apachectl.in b/www/apache2/files/patch-support:apachectl.in
index 0287f77..57d2af8 100644
--- a/www/apache2/files/patch-support:apachectl.in
+++ b/www/apache2/files/patch-support:apachectl.in
@@ -1,6 +1,17 @@
---- support/apachectl.in.orig	Thu Apr  4 18:15:44 2002
-+++ support/apachectl.in	Sun Apr  7 08:49:25 2002
-@@ -47,6 +47,7 @@
+--- support/apachectl.in.orig	Mon May 27 20:46:01 2002
++++ support/apachectl.in	Thu Jul 11 21:12:36 2002
+@@ -31,8 +31,8 @@
+ HTTPD='@exp_sbindir@/@progname@'
+ #
+ # pick up any necessary environment variables
+-if test -f @exp_bindir@/envvars; then
+-  . @exp_bindir@/envvars
++if test -f @exp_sbindir@/envvars; then
++  . @exp_sbindir@/envvars
+ fi
+ #
+ # a command that outputs a formatted text version of the HTML at the
+@@ -46,6 +46,7 @@
  #
  # --------------------                              --------------------
  # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
diff --git a/www/apache20/files/patch-support:apachectl.in b/www/apache20/files/patch-support:apachectl.in
index 0287f77..57d2af8 100644
--- a/www/apache20/files/patch-support:apachectl.in
+++ b/www/apache20/files/patch-support:apachectl.in
@@ -1,6 +1,17 @@
---- support/apachectl.in.orig	Thu Apr  4 18:15:44 2002
-+++ support/apachectl.in	Sun Apr  7 08:49:25 2002
-@@ -47,6 +47,7 @@
+--- support/apachectl.in.orig	Mon May 27 20:46:01 2002
++++ support/apachectl.in	Thu Jul 11 21:12:36 2002
+@@ -31,8 +31,8 @@
+ HTTPD='@exp_sbindir@/@progname@'
+ #
+ # pick up any necessary environment variables
+-if test -f @exp_bindir@/envvars; then
+-  . @exp_bindir@/envvars
++if test -f @exp_sbindir@/envvars; then
++  . @exp_sbindir@/envvars
+ fi
+ #
+ # a command that outputs a formatted text version of the HTML at the
+@@ -46,6 +46,7 @@
  #
  # --------------------                              --------------------
  # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
diff --git a/www/apache21/files/patch-support:apachectl.in b/www/apache21/files/patch-support:apachectl.in
index 0287f77..57d2af8 100644
--- a/www/apache21/files/patch-support:apachectl.in
+++ b/www/apache21/files/patch-support:apachectl.in
@@ -1,6 +1,17 @@
---- support/apachectl.in.orig	Thu Apr  4 18:15:44 2002
-+++ support/apachectl.in	Sun Apr  7 08:49:25 2002
-@@ -47,6 +47,7 @@
+--- support/apachectl.in.orig	Mon May 27 20:46:01 2002
++++ support/apachectl.in	Thu Jul 11 21:12:36 2002
+@@ -31,8 +31,8 @@
+ HTTPD='@exp_sbindir@/@progname@'
+ #
+ # pick up any necessary environment variables
+-if test -f @exp_bindir@/envvars; then
+-  . @exp_bindir@/envvars
++if test -f @exp_sbindir@/envvars; then
++  . @exp_sbindir@/envvars
+ fi
+ #
+ # a command that outputs a formatted text version of the HTML at the
+@@ -46,6 +46,7 @@
  #
  # --------------------                              --------------------
  # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
diff --git a/www/apache22/files/patch-support:apachectl.in b/www/apache22/files/patch-support:apachectl.in
index 0287f77..57d2af8 100644
--- a/www/apache22/files/patch-support:apachectl.in
+++ b/www/apache22/files/patch-support:apachectl.in
@@ -1,6 +1,17 @@
---- support/apachectl.in.orig	Thu Apr  4 18:15:44 2002
-+++ support/apachectl.in	Sun Apr  7 08:49:25 2002
-@@ -47,6 +47,7 @@
+--- support/apachectl.in.orig	Mon May 27 20:46:01 2002
++++ support/apachectl.in	Thu Jul 11 21:12:36 2002
+@@ -31,8 +31,8 @@
+ HTTPD='@exp_sbindir@/@progname@'
+ #
+ # pick up any necessary environment variables
+-if test -f @exp_bindir@/envvars; then
+-  . @exp_bindir@/envvars
++if test -f @exp_sbindir@/envvars; then
++  . @exp_sbindir@/envvars
+ fi
+ #
+ # a command that outputs a formatted text version of the HTML at the
+@@ -46,6 +46,7 @@
  #
  # --------------------                              --------------------
  # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||