summaryrefslogtreecommitdiff
path: root/www/apache
diff options
context:
space:
mode:
authortv <tv@pkgsrc.org>1998-10-03 22:00:22 +0000
committertv <tv@pkgsrc.org>1998-10-03 22:00:22 +0000
commit9d4f395c15d6b2e4fe76eae4285358d8ca77f52c (patch)
treecd0d3ad7537930330c56d036dccff6576bc954f5 /www/apache
parentb5773363c7a0fd3e932a5a1f25f2f70bc1a51d28 (diff)
downloadpkgsrc-9d4f395c15d6b2e4fe76eae4285358d8ca77f52c.tar.gz
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.
Diffstat (limited to 'www/apache')
-rw-r--r--www/apache/Makefile8
-rw-r--r--www/apache/files/md54
-rw-r--r--www/apache/patches/patch-aa16
-rw-r--r--www/apache/pkg/PLIST3
4 files changed, 8 insertions, 23 deletions
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