Upgrade to 1.3b3

5 files changed, 28 insertions, 34 deletions

diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 9d7bbd9cc276..dd1ee6508087 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:    apache HTTPD
-# Version required:     1.3b2
+# Version required:     1.3b3
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 ache@nagual.pp.ru
 #
-# $Id: Makefile,v 1.39 1997/08/25 23:02:41 ache Exp $
+# $Id: Makefile,v 1.41 1997/10/23 16:39:46 ache Exp $
 #
 
-DISTNAME=       apache_1.3b2
-PKGNAME=        apache-1.3b2
+DISTNAME=       apache_1.3b3
+PKGNAME=        apache-1.3b3
 CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
@@ -35,7 +35,7 @@ post-patch:
 .endif
 
 CONF_DIR=   ${PREFIX}/etc/apache
-MAN1=   htpasswd.1
+MAN1=   apachectl.1 htpasswd.1
 MAN8=   httpd.8
 
 do-install:
@@ -52,6 +52,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/src/support/httpd.8 \
 		${PREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/src/support/htpasswd.1 \
+		       ${WRKSRC}/src/support/apachectl.1 \
 		${PREFIX}/man/man1
 	cd ${WRKSRC} && \
 	for file in httpd.conf srm.conf access.conf ; do \
diff --git a/www/apache20/distinfo b/www/apache20/distinfo
index 3e571565fe7d..985f9b5e2163 100644
--- a/www/apache20/distinfo
+++ b/www/apache20/distinfo
@@ -1 +1 @@
-MD5 (apache_1.3b2.tar.gz) = f9cb0c120e15989b670bd8e1c0b3b7c1
+MD5 (apache_1.3b3.tar.gz) = befabda0148e3a26a93920c8721c5918
diff --git a/www/apache20/files/patch-ak b/www/apache20/files/patch-ak
index 6dfaab049632..207c8693fe6c 100644
--- a/www/apache20/files/patch-ak
+++ b/www/apache20/files/patch-ak
@@ -1,14 +1,14 @@
-*** src/support/apachectl.orig	Thu Oct 16 22:58:26 1997
---- src/support/apachectl	Thu Oct 23 03:35:09 1997
+*** src/support/apachectl.orig	Sun Oct 26 02:35:19 1997
+--- src/support/apachectl	Fri Nov 21 22:58:08 1997
 ***************
 *** 21,30 ****
   # --------------------                              --------------------
   # 
   # the path to your PID file
-! PIDFILE=/usr/local/etc/httpd/logs/httpd.pid
+! PIDFILE=/usr/local/apache/logs/httpd.pid
   #
   # the path to your httpd binary
-! HTTPD=/usr/local/etc/httpd/src/httpd
+! HTTPD=/usr/local/apache/src/httpd
   #
   # a command that outputs a formatted text version of the HTML at the
   # url given on the command line.  Designed for lynx, however other
@@ -24,22 +24,8 @@
   # a command that outputs a formatted text version of the HTML at the
   # url given on the command line.  Designed for lynx, however other
 ***************
-*** 33,42 ****
-  #
-  # the URL to your server's mod_status status page.  If you do not
-  # have one, then status and fullstatus will not work.
-! STATUSURL="http://localhost/server-status"
-  #
-  # --------------------                              --------------------
-  # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
-  
-  ERROR=0
-  ARGV="$@"
---- 33,44 ----
-  #
-  # the URL to your server's mod_status status page.  If you do not
-  # have one, then status and fullstatus will not work.
-! STATUSURL="http://localhost/status"
+*** 37,42 ****
+--- 37,44 ----
   #
   # --------------------                              --------------------
   # ||||||||||||||||||||   END CONFIGURATION SECTION  ||||||||||||||||||||
diff --git a/www/apache20/files/patch-al b/www/apache20/files/patch-al
index a7dca4f5b423..893063557d83 100644
--- a/www/apache20/files/patch-al
+++ b/www/apache20/files/patch-al
@@ -1,24 +1,30 @@
-*** src/support/log_server_status.bak	Thu Oct 16 22:58:27 1997
---- src/support/log_server_status	Thu Oct 23 00:13:07 1997
+*** src/support/log_server_status.orig	Thu Oct 23 00:30:46 1997
+--- src/support/log_server_status	Fri Nov 21 23:05:50 1997
 ***************
-*** 62,68 ****
+*** 63,72 ****
   #
   require 'sys/socket.ph';
   
 ! $wherelog = "/var/log/graph/";  # Logs will be like "/var/log/graph/960312"
   $server = "localhost";          # Name of server, could be "www.foo.com"
   $port = "80";                   # Port on server
-  $request = "/status/?auto";     # Request to send
---- 62,68 ----
+! $request = "/status/?auto";     # Request to send
+  
+  sub tcp_connect
+  {
+--- 63,72 ----
   #
   require 'sys/socket.ph';
   
 ! $wherelog = "/var/log/httpd-status-";  # Logs will be like "/var/log/graph/960312"
   $server = "localhost";          # Name of server, could be "www.foo.com"
   $port = "80";                   # Port on server
-  $request = "/status/?auto";     # Request to send
+! $request = "/server-status/?auto";     # Request to send
+  
+  sub tcp_connect
+  {
 ***************
-*** 88,98 ****
+*** 89,99 ****
   ### Main
   
   {
@@ -30,7 +36,7 @@
   	if ($res) {
   		print OUT "$time:-1:-1:-1:-1:$res\n";
   		exit 1;
---- 88,98 ----
+--- 89,99 ----
   ### Main
   
   {
diff --git a/www/apache20/pkg-plist b/www/apache20/pkg-plist
index 45e3d1d15ebc..798a3cd1b7a8 100644
--- a/www/apache20/pkg-plist
+++ b/www/apache20/pkg-plist
@@ -13,6 +13,7 @@ sbin/htpasswd
 sbin/log_server_status
 sbin/logresolve
 sbin/rotatelogs
+man/man1/apachectl.1.gz
 man/man1/htpasswd.1.gz
 man/man8/httpd.8.gz
 www/icons/README