[pkgsrc/trunk]: pkgsrc/www/apache6 Revert version 1.81, as the mods it contai...

[agc <agc%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c612772081fe
branches:  trunk
changeset: 461687:c612772081fe
user:      agc <agc%pkgsrc.org@localhost>
date:      Fri Sep 19 11:57:51 2003 +0000

description:
Revert version 1.81, as the mods it contained weren't necessary.

diffstat:

 www/apache6/Makefile |  7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diffs (22 lines):

diff -r 3f517dc13535 -r c612772081fe www/apache6/Makefile
--- a/www/apache6/Makefile      Fri Sep 19 11:56:01 2003 +0000
+++ b/www/apache6/Makefile      Fri Sep 19 11:57:51 2003 +0000
@@ -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/}