Update Apaches to 1.3.2.

apache-modssl: update mod_ssl to 2.0.12, and rename pkg to
"apache-1.3.2-modssl-2.0.12" such that mod_ssl version changes are noted.

7 files changed, 18 insertions, 49 deletions

diff --git a/www/apache-modssl/Makefile b/www/apache-modssl/Makefile
index dc5d9869651..fa2e4d062fe 100644
--- a/www/apache-modssl/Makefile
+++ b/www/apache-modssl/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.5 1998/10/03 21:01:15 tv Exp $
+# $NetBSD: Makefile,v 1.6 1998/10/03 22:00:23 tv Exp $
 #
 
-PKGNAME=	apache-modssl-1.3.1
+PKGNAME=	apache-1.3.2-modssl-2.0.12
 CATEGORIES=	www security
 
 MASTER_SITES+=	http://www.engelschall.com/sw/mod_ssl/distrib/ \
 		ftp://ftp.engelschall.com/sw/mod_ssl/ \
 		ftp://ftp.ulpgc.es/pub/mod_ssl/
-DISTFILES+=	mod_ssl-2.0.6-1.3.1${EXTRACT_SUFX}
-EXTRACT_ONLY+=	mod_ssl-2.0.6-1.3.1${EXTRACT_SUFX}
+DISTFILES+=	mod_ssl-2.0.12-1.3.2${EXTRACT_SUFX}
+EXTRACT_ONLY+=	mod_ssl-2.0.12-1.3.2${EXTRACT_SUFX}
 
 DEPENDS+=	SSLeay-0.9.0b:../../security/ssleay
 
-CONFLICTS=	apache-1.3.1
+CONFLICTS=	apache-1.3.1 apache-1.3.2 apache-modssl-1.3.2
 
 RESTRICTED=	"Contains cryptography"
 IS_INTERACTIVE=	yes
@@ -40,8 +40,8 @@ fetch-depends:
 
 pre-patch: pre-patch-modssl
 pre-patch-modssl:
-	@cd ${WRKDIR}/mod_ssl-2.0.6-1.3.1 \
-		&& ${ECHO_MSG} "===>  Applying mod_ssl-2.0.6 extension" \
+	@cd ${WRKDIR}/mod_ssl-2.0.12-1.3.2 \
+		&& ${ECHO_MSG} "===>  Applying mod_ssl-2.0.12 extension" \
 		&& ./configure --with-apache=../${DISTNAME}
 
 pre-install: certificate
diff --git a/www/apache-modssl/files/md5 b/www/apache-modssl/files/md5
index 9dc7476b83a..f279df865f1 100644
--- a/www/apache-modssl/files/md5
+++ b/www/apache-modssl/files/md5
@@ -1,5 +1,5 @@
-$NetBSD: md5,v 1.3 1998/10/03 21:01:15 tv Exp $
+$NetBSD: md5,v 1.4 1998/10/03 22:00:23 tv Exp $
 
-MD5 (apache_1.3.1.tar.gz) = fd28c26f94451216a23f34f5fe22e2b4
-MD5 (mod_ssl-2.0.6-1.3.1.tar.gz) = bc7387ca02a7f29263ee7283755b44ba
+MD5 (mod_ssl-2.0.12-1.3.2.tar.gz) = 607426ac2f73e0c7968cbba9c4dc701e
+MD5 (apache_1.3.2.tar.gz) = a86e38366bcd9797400818ae6eb1400f
 MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1
diff --git a/www/apache-modssl/patches/patch-aa b/www/apache-modssl/patches/patch-aa
deleted file mode 100644
index e3f3f6a4500..00000000000
--- a/www/apache-modssl/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 1998/09/04 23:37:23 explorer Exp $
-
-*** Makefile.tmpl~	Tue May 12 04:52:11 1998
---- Makefile.tmpl	Tue Jul 21 14:50:58 1998
-***************
-*** 324,329 ****
---- 324,332 ----
-  	@osdir=`grep '^OSDIR=' $(TOP)/$(SRC)/Makefile.config | sed -e 's:^OSDIR=.*/os:os:'`; \
-  	echo "$(UMASK) 022; $(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(includedir)/"; \
-  	$(UMASK) 022; $(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(root)$(includedir)/
-+ 	# The above umask won't work if the original files were extracted with umask 077.
-+ 	echo 'chmod 444 $(root)$(includedir)/*'
-+ 	chmod 444 $(root)$(includedir)/*
-  	@echo "<=== [include]"
-  
-  #   create an initial document root containing the Apache manual,
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 46cf4944b8c..987336a712e 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.21 1998/10/03 21:01:14 tv Exp $
+# $NetBSD: Makefile,v 1.22 1998/10/03 22:00:22 tv Exp $
 #
 # The apache-modssl pkg .include's us, so that pkg tuning rules work for
 # both without a major duplication of Makefiles.  So we use ?= and += in
 # many of the constructs up here at top.
 #
 
-DISTNAME=	apache_1.3.1
-PKGNAME?=	apache-1.3.1
+DISTNAME=	apache_1.3.2
+PKGNAME?=	apache-1.3.2
 CATEGORIES?=	www
 MASTER_SITES+=	http://www.apache.org/dist/ \
 		http://www.netbsd.org/images/logos/
@@ -17,7 +17,7 @@ MAINTAINER=	cjs@netbsd.org
 HOMEPAGE=	http://www.apache.org/
 
 EXTRACT_ONLY+=	${DISTNAME}${EXTRACT_SUFX}
-CONFLICTS?=	apache-modssl-1.3.1
+CONFLICTS?=	apache-1.3.0 apache-1.3.1 apache-modssl-1.3.1 apache-modssl-1.3.2
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS+=--compat --prefix=${PREFIX}/http --exec-prefix=${PREFIX} \
 		--mandir=${PREFIX}/man --libexecdir=${PREFIX}/lib/apache \
diff --git a/www/apache/files/md5 b/www/apache/files/md5
index b5a07941f85..cbc0a28ba21 100644
--- a/www/apache/files/md5
+++ b/www/apache/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.7 1998/09/05 23:14:45 hubertf Exp $
+$NetBSD: md5,v 1.8 1998/10/03 22:00:22 tv Exp $
 
-MD5 (apache_1.3.1.tar.gz) = fd28c26f94451216a23f34f5fe22e2b4
+MD5 (apache_1.3.2.tar.gz) = a86e38366bcd9797400818ae6eb1400f
 MD5 (sitedrivenby.gif) = ad0647dceb931d02bfd046e55915f7b1
diff --git a/www/apache/patches/patch-aa b/www/apache/patches/patch-aa
deleted file mode 100644
index dea0454e38e..00000000000
--- a/www/apache/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.4 1998/08/07 11:14:22 agc Exp $
-
-*** Makefile.tmpl~	Tue May 12 04:52:11 1998
---- Makefile.tmpl	Tue Jul 21 14:50:58 1998
-***************
-*** 324,329 ****
---- 324,332 ----
-  	@osdir=`grep '^OSDIR=' $(TOP)/$(SRC)/Makefile.config | sed -e 's:^OSDIR=.*/os:os:'`; \
-  	echo "$(UMASK) 022; $(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(includedir)/"; \
-  	$(UMASK) 022; $(CP) $(TOP)/$(SRC)/$${osdir}/os.h $(root)$(includedir)/
-+ 	# The above umask won't work if the original files were extracted with umask 077.
-+ 	echo 'chmod 444 $(root)$(includedir)/*'
-+ 	chmod 444 $(root)$(includedir)/*
-  	@echo "<=== [include]"
-  
-  #   create an initial document root containing the Apache manual,
diff --git a/www/apache/pkg/PLIST b/www/apache/pkg/PLIST
index d1dba55a3b4..e060651cc54 100644
--- a/www/apache/pkg/PLIST
+++ b/www/apache/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 1998/10/03 21:01:14 tv Exp $
+@comment $NetBSD: PLIST,v 1.5 1998/10/03 22:00:23 tv Exp $
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
@@ -221,6 +221,7 @@ http/include/ap_config_auto.h
 http/include/ap_compat.h
 http/include/ap_ctype.h
 http/include/ap_md5.h
+http/include/ap_mmn.h
 http/include/buff.h
 http/include/compat.h
 http/include/conf.h