summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>2003-09-19 11:57:51 +0000
committeragc <agc@pkgsrc.org>2003-09-19 11:57:51 +0000
commitd287a26a5e564ad9b547666bf72e3dac605153ee (patch)
tree6b1be9b987aec8e15a4ecd06d5902f99a18d4316 /www
parentec70ade70df048696cc837a5883094dfc7f2c361 (diff)
downloadpkgsrc-d287a26a5e564ad9b547666bf72e3dac605153ee.tar.gz
Revert version 1.81, as the mods it contained weren't necessary.
Diffstat (limited to 'www')
-rw-r--r--www/apache6/Makefile7
1 files changed, 1 insertions, 6 deletions
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 8abf582d2d1..423826d9176 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2003/09/17 19:41:19 grant Exp $
+# $NetBSD: Makefile,v 1.82 2003/09/19 11:57:51 agc Exp $
#
# This package does not compile in mod_ssl support hooks, as it conflicts
# with IPv6-enable patch.
@@ -8,12 +8,7 @@
DISTNAME= apache_${APACHE_VERSION}
PKGNAME= apache6-${APACHE_VERSION}
-<<<<<<< Makefile
-#PKGREVISION= 3
APACHE_VERSION= 1.3.28
-=======
-APACHE_VERSION= 1.3.28
->>>>>>> 1.79
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
${MASTER_SITE_APACHE:=httpd/old/}