Bump Apache dependency to Apache 2

@@ -286,17 +286,17 @@
 /var/lp/logs/lpsched -C 2 -N -t '$file.$N'
 #
 # The entry below is used by turnacct(1M)
 #
 /var/adm/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never
-apache -C 24 -a '/usr/apache/bin/apachectl graceful' -p 1m -t '/var/apache/old-logs/$basename.%Y-%m' '/var/apache/logs/*{access,error}_log'
+apache -C 24 -a '/usr/apache2/2.2/bin/apachectl graceful' -p 1m -t '/var/apache2/2.2/old-logs/$basename.%Y-%m' '/var/apache2/2.2/logs/*{access,error}_log'
 /var/log/syslog -C 8 -P 'Thu Nov  1 09:16:38 2001' -a 'kill -HUP `cat /var/run/syslog.pid`'
-/var/apache/logs/access_log -P 'Thu Nov  1 08:27:56 2001'
-/var/apache/logs/error_log -P 'Thu Nov  1 08:27:56 2001'
-/var/apache/logs/suexec_log -P 'Thu Nov  1 08:27:56 2001'
-/var/apache/logs/mod_jserv.log -P 'Thu Nov  1 08:27:56 2001'
-/var/apache/logs/jserv.log -P 'Thu Nov  1 08:27:56 2001'
+/var/apache2/2.2/logs/access_log -P 'Thu Nov  1 08:27:56 2001'
+/var/apache2/2.2/logs/error_log -P 'Thu Nov  1 08:27:56 2001'
+/var/apache2/2.2/logs/suexec_log -P 'Thu Nov  1 08:27:56 2001'
+/var/apache2/2.2/logs/mod_jserv.log -P 'Thu Nov  1 08:27:56 2001'
+/var/apache2/2.2/logs/jserv.log -P 'Thu Nov  1 08:27:56 2001'
 EOF
 }
 
 
 ###########################################################################

@@ -820,17 +820,17 @@
         set_file('std.out.expect', <<'EOF');
 /var/adm/messages -C 4 -P 'Thu Nov  1 16:56:42 2001' -a 'kill -HUP `cat /var/run/syslog.pid`'
 /var/cron/log -s 512k -t /var/cron/olog
 /var/lp/logs/lpsched -C 2 -N -t '$file.$N'
 /var/adm/pacct -C 0 -a '/usr/lib/acct/accton pacct' -g adm -m 664 -o adm -p never
-apache -C 24 -a '/usr/apache/bin/apachectl graceful' -p 1m -t '/var/apache/old-logs/$basename.%Y-%m' '/var/apache/logs/*{access,error}_log'
+apache -C 24 -a '/usr/apache2/2.2/bin/apachectl graceful' -p 1m -t '/var/apache2/2.2/old-logs/$basename.%Y-%m' '/var/apache2/2.2/logs/*{access,error}_log'
 /var/log/syslog -C 8 -P 'Thu Nov  1 09:16:38 2001' -a 'kill -HUP `cat /var/run/syslog.pid`'
-/var/apache/logs/access_log -P 'Thu Nov  1 08:27:56 2001'
-/var/apache/logs/error_log -P 'Thu Nov  1 08:27:56 2001'
-/var/apache/logs/suexec_log -P 'Thu Nov  1 08:27:56 2001'
-/var/apache/logs/mod_jserv.log -P 'Thu Nov  1 08:27:56 2001'
-/var/apache/logs/jserv.log -P 'Thu Nov  1 08:27:56 2001'
+/var/apache2/2.2/logs/access_log -P 'Thu Nov  1 08:27:56 2001'
+/var/apache2/2.2/logs/error_log -P 'Thu Nov  1 08:27:56 2001'
+/var/apache2/2.2/logs/suexec_log -P 'Thu Nov  1 08:27:56 2001'
+/var/apache2/2.2/logs/mod_jserv.log -P 'Thu Nov  1 08:27:56 2001'
+/var/apache2/2.2/logs/jserv.log -P 'Thu Nov  1 08:27:56 2001'
 EOF
 
         set_file('checktest', <<'EOF');
 [ -s std.err ] && { cat std.err; exit 1; }
 exec /bin/diff std.out.expect std.out