Update apache to 1.3.19nb1. Changes from 1.3.19 include using mod_ssl

2.8.2 patches and more thorough use of APACHE_SYSCONFDIR setting.

5 files changed, 18 insertions, 26 deletions

diff --git a/www/apache/Makefile b/www/apache/Makefile
index 745da2e8d0a..20ee9a75eec 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,14 +1,10 @@
-# $NetBSD: Makefile,v 1.65 2001/04/14 19:50:04 kim Exp $
-#
-# The fourth number in the PKGNAME version indicates a NetBSD pkg revision
-# (to indicate changes in the shipped third party patches such as the mod_ssl
-# EAPI when there has been no change to the Apache version number).
+# $NetBSD: Makefile,v 1.66 2001/04/29 20:42:28 jlam Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
 
 DISTNAME=		apache_1.3.19
-PKGNAME=		apache-1.3.19
+PKGNAME=		apache-1.3.19nb1
 CATEGORIES=		www
 MASTER_SITES=		http://httpd.apache.org/dist/httpd/ \
 			http://www.apache.de/dist/httpd/ \
@@ -25,7 +21,7 @@ COMMENT=		HTTP (Web) server
 
 CONFLICTS=		apache-*modssl-* apache6-*
 
-MODSSL_DISTNAME=	mod_ssl-2.8.1-1.3.19
+MODSSL_DISTNAME=	mod_ssl-2.8.2-1.3.19
 MODSSL_SRC=		${WRKDIR}/${MODSSL_DISTNAME}
 
 EXTRACT_ONLY=		${DISTFILES:N*.gif}
@@ -114,12 +110,11 @@ pre-configure:
 		-e "s|@APACHE_SYSCONFDIR@|${APACHE_SYSCONFDIR}|g"	\
 		${FILESDIR}/config.layout > ${WRKDIR}/config.layout
 
-post-build:
-	${SED}	-e "s|@PREFIX@|${PREFIX}|g"				\
-		${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
-
 pre-install:
 	${FIND} ${WRKSRC}/htdocs -name '*.orig' -exec ${RM} -f {} \;
+	${SED}	-e "s|@PREFIX@|${PREFIX}|g"				\
+		-e "s|@APACHE_SYSCONFDIR@|${APACHE_SYSCONFDIR}|g"	\
+		${FILESDIR}/apache.sh > ${WRKDIR}/apache.sh
 	${SED}	-e "s|@CAT@|${CAT}|g"					\
 		-e "s|@RM@|${RM}|g"					\
 		-e "s|@RMDIR@|${RMDIR}|g"				\
diff --git a/www/apache/distinfo b/www/apache/distinfo
index fd7ab7cab4b..40a3c680182 100644
--- a/www/apache/distinfo
+++ b/www/apache/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 12:02:33 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/04/29 20:42:28 jlam Exp $
 
 SHA1 (apache_1.3.19.tar.gz) = 2cc8d431ef9eb1037f876394fef4aecb83948501
 Size (apache_1.3.19.tar.gz) = 1928677 bytes
-SHA1 (mod_ssl-2.8.1-1.3.19.tar.gz) = 3d93a88015fc3cf108923fd4085c28de617afcab
-Size (mod_ssl-2.8.1-1.3.19.tar.gz) = 749778 bytes
+SHA1 (mod_ssl-2.8.2-1.3.19.tar.gz) = 8827a0f54a219d59915cc6520507704bbefa35b2
+Size (mod_ssl-2.8.2-1.3.19.tar.gz) = 750091 bytes
 SHA1 (sitedrivenby.gif) = 7671e9a8ec2cad3961b268befd33c0920e07c658
 Size (sitedrivenby.gif) = 8519 bytes
 SHA1 (patch-aa) = aed136dfee27b1fe98892d669d218c1070782b5e
-SHA1 (patch-ab) = ef7300383b4946ba78ffb592c174b5ea683b60f8
+SHA1 (patch-ab) = 71ea1f3a59e0f7bc37175b0eefd462a1f7ca4fb6
 SHA1 (patch-ac) = 4c18bb80f3fbe8d44c941e403ff10fd92b820785
 SHA1 (patch-ad) = 79e9b2adb23e412195f0382b30b56496af735297
 SHA1 (patch-ae) = 29e1da736d6948d550039cc4ddd1e7743e7e0feb
diff --git a/www/apache/files/apache.sh b/www/apache/files/apache.sh
index e3e9c21300f..a7f00f27aa0 100644
--- a/www/apache/files/apache.sh
+++ b/www/apache/files/apache.sh
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $NetBSD: apache.sh,v 1.10 2001/02/07 15:08:30 tron Exp $
+# $NetBSD: apache.sh,v 1.11 2001/04/29 20:42:29 jlam Exp $
 #
 # PROVIDE: apache
 # REQUIRE: DAEMON
@@ -9,14 +9,13 @@ name="apache"
 ctl_command="@PREFIX@/sbin/apachectl"
 command="@PREFIX@/sbin/httpd"
 pidfile="/var/run/httpd.pid"
-conffile="@PREFIX@/etc/httpd/httpd.conf"
 
 apache_start="start"
 
-if [ -f @PREFIX@/etc/httpd/apache_start.conf ]
+if [ -f @APACHE_SYSCONFDIR@/apache_start.conf ]
 then
 	# This file can reset apache_start to "startssl"
-	. @PREFIX@/etc/httpd/apache_start.conf
+	. @APACHE_SYSCONFDIR@/apache_start.conf
 fi
 
 cmd=${1:-start}
diff --git a/www/apache/patches/patch-ab b/www/apache/patches/patch-ab
index 6545bfa93cd..8e062eafa1b 100644
--- a/www/apache/patches/patch-ab
+++ b/www/apache/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.9 2001/03/13 20:52:28 jlam Exp $
+$NetBSD: patch-ab,v 1.10 2001/04/29 20:42:29 jlam Exp $
 
 --- conf/httpd.conf-dist.orig	Sun Mar  4 02:42:23 2001
 +++ conf/httpd.conf-dist
-@@ -197,7 +197,14 @@
+@@ -197,7 +197,12 @@
  # the order below without expert advice.
  #
  # Example:
@@ -10,8 +10,6 @@ $NetBSD: patch-ab,v 1.9 2001/03/13 20:52:28 jlam Exp $
 +# LoadModule foo_module lib/httpd/mod_foo.so
 +
 +<IfDefine SSL>
-+LoadFile !libcrypto.so
-+LoadFile !libssl.so
 +LoadModule ssl_module lib/httpd/mod_ssl.so
 +AddModule mod_ssl.c
 +</IfDefine>
diff --git a/www/apache/pkg/DEINSTALL b/www/apache/pkg/DEINSTALL
index caf4bf2cd0d..bab5bd8609b 100644
--- a/www/apache/pkg/DEINSTALL
+++ b/www/apache/pkg/DEINSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.6 2001/04/14 19:42:54 kim Exp $
+# $NetBSD: DEINSTALL,v 1.7 2001/04/29 20:42:29 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -84,7 +84,7 @@ EOF
 EOF
 			for file in ${modified_files}
 			do
-				echo "  ${file}"
+				echo "	${file}"
 			done
 		fi
 		if [ -n "${existing_dirs}" ]
@@ -96,7 +96,7 @@ EOF
 EOF
 			for dir in ${existing_dirs}
 			do
-				echo "  ${dir}"
+				echo "	${dir}"
 			done
 		fi
 		${CAT} << EOF