2 files changed, 53 insertions, 53 deletions

diff --git a/www/apache13-modssl/files/patch-aa b/www/apache13-modssl/files/patch-aa
index 21ea6449f6ca..6bb44ee30a0a 100644
--- a/www/apache13-modssl/files/patch-aa
+++ b/www/apache13-modssl/files/patch-aa
@@ -1,40 +1,40 @@
-*** configure.bak	Sun Jul 12 13:25:46 1998
---- configure	Thu Jul 23 16:52:04 1998
+*** configure.orig	Tue Jan 12 13:23:40 1999
+--- configure	Tue Jan 12 13:33:38 1999
 ***************
-*** 877,884 ****
-      echo "       DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid"
-      echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard"
-      echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock"
+*** 1024,1031 ****
+      echo "       DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
+      echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
+      echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
 !     echo "      DEFAULT_XFERLOG: ${logfiledir_relative}access_log"
 !     echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}error_log"
       echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
-      echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf"
+      echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
       echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
---- 877,884 ----
-      echo "       DEFAULT_PIDLOG: ${runtimedir_relative}httpd.pid"
-      echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}httpd.scoreboard"
-      echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}httpd.lock"
+--- 1024,1031 ----
+      echo "       DEFAULT_PIDLOG: ${runtimedir_relative}${thetarget}.pid"
+      echo "   DEFAULT_SCOREBOARD: ${runtimedir_relative}${thetarget}.scoreboard"
+      echo "     DEFAULT_LOCKFILE: ${runtimedir_relative}${thetarget}.lock"
 !     echo "      DEFAULT_XFERLOG: ${logfiledir_relative}httpd-access.log"
 !     echo "     DEFAULT_ERRORLOG: ${logfiledir_relative}httpd-error.log"
       echo "    TYPES_CONFIG_FILE: ${sysconfdir_relative}mime.types"
-      echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}httpd.conf"
+      echo "   SERVER_CONFIG_FILE: ${sysconfdir_relative}${thetarget}.conf"
       echo "   ACCESS_CONFIG_FILE: ${sysconfdir_relative}access.conf"
 ***************
-*** 942,949 ****
-  echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci
-  echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci
-  echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci
+*** 1106,1113 ****
+  echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
+  echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
+  echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
 ! echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}access_log\"'" >>$src/apaci
 ! echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}error_log\"'" >>$src/apaci
   echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
-  echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci
+  echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci
   echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
---- 942,949 ----
-  echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}httpd.pid\"'" >>$src/apaci
-  echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}httpd.scoreboard\"'" >>$src/apaci
-  echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}httpd.lock\"'" >>$src/apaci
+--- 1106,1113 ----
+  echo "echo '-DDEFAULT_PIDLOG=\"${runtimedir_relative}${thetarget}.pid\"'" >>$src/apaci
+  echo "echo '-DDEFAULT_SCOREBOARD=\"${runtimedir_relative}${thetarget}.scoreboard\"'" >>$src/apaci
+  echo "echo '-DDEFAULT_LOCKFILE=\"${runtimedir_relative}${thetarget}.lock\"'" >>$src/apaci
 ! echo "echo '-DDEFAULT_XFERLOG=\"${logfiledir_relative}httpd-access.log\"'" >>$src/apaci
 ! echo "echo '-DDEFAULT_ERRORLOG=\"${logfiledir_relative}httpd-error.log\"'" >>$src/apaci
   echo "echo '-DTYPES_CONFIG_FILE=\"${sysconfdir_relative}mime.types\"'" >>$src/apaci
-  echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}httpd.conf\"'" >>$src/apaci
+  echo "echo '-DSERVER_CONFIG_FILE=\"${sysconfdir_relative}${thetarget}.conf\"'" >>$src/apaci
   echo "echo '-DACCESS_CONFIG_FILE=\"${sysconfdir_relative}access.conf\"'" >>$src/apaci
diff --git a/www/apache13-modssl/files/patch-ac b/www/apache13-modssl/files/patch-ac
index 11aedaa76270..f631045f2106 100644
--- a/www/apache13-modssl/files/patch-ac
+++ b/www/apache13-modssl/files/patch-ac
@@ -1,53 +1,53 @@
-*** conf/httpd.conf-dist.orig	Thu May  7 01:12:39 1998
---- conf/httpd.conf-dist	Fri Jun  5 19:34:17 1998
+*** conf/httpd.conf-dist.orig	Tue Jan 12 13:51:58 1999
+--- conf/httpd.conf-dist	Tue Jan 12 13:52:37 1999
 ***************
-*** 50,56 ****
+*** 252,258 ****
   #  don't use Group #-1 on these systems!
-  
+  #
   User nobody
 ! Group #-1
   
+  #
   # ServerAdmin: Your address, where problems with the server should be
-  # e-mailed.
---- 50,56 ----
+--- 252,258 ----
   #  don't use Group #-1 on these systems!
-  
+  #
   User nobody
-! Group nogroup
+! Group nobody
   
+  #
   # ServerAdmin: Your address, where problems with the server should be
-  # e-mailed.
 ***************
-*** 94,100 ****
-  # The location of the access logfile (Common Logfile Format).
-  # If this does not start with /, ServerRoot is prepended to it.
-  
+*** 470,476 ****
+  # define per-<VirtualHost> access logfiles, transactions will be
+  # logged therein and *not* in this file.
+  #
 ! CustomLog logs/access_log common
   
-  # If you would like to have an agent and referer logfile uncomment the
-  # following directives.
---- 94,100 ----
-  # The location of the access logfile (Common Logfile Format).
-  # If this does not start with /, ServerRoot is prepended to it.
-  
+  #
+  # If you would like to have agent and referer logfiles, uncomment the
+--- 470,476 ----
+  # define per-<VirtualHost> access logfiles, transactions will be
+  # logged therein and *not* in this file.
+  #
 ! #CustomLog logs/access_log common
   
-  # If you would like to have an agent and referer logfile uncomment the
-  # following directives.
+  #
+  # If you would like to have agent and referer logfiles, uncomment the
 ***************
-*** 105,111 ****
-  # If you prefer a single logfile with access, agent and referer information
+*** 483,489 ****
+  # If you prefer a single logfile with access, agent, and referer information
   # (Combined Logfile Format) you can use the following directive.
-  
+  #
 ! #CustomLog logs/access_log combined
   
-  # PidFile: The file the server should log its pid to
-  PidFile logs/httpd.pid
---- 105,111 ----
-  # If you prefer a single logfile with access, agent and referer information
+  #
+  # Optionally add a line containing the server version and virtual host
+--- 483,489 ----
+  # If you prefer a single logfile with access, agent, and referer information
   # (Combined Logfile Format) you can use the following directive.
-  
+  #
 ! CustomLog logs/access_log combined
   
-  # PidFile: The file the server should log its pid to
-  PidFile logs/httpd.pid
+  #
+  # Optionally add a line containing the server version and virtual host