[pkgsrc/trunk]: pkgsrc/www/apache2 Not all ap-* packages are apache1. Some w...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8cac075dab0b
branches:  trunk
changeset: 481223:8cac075dab0b
user:      erh <erh%pkgsrc.org@localhost>
date:      Tue Sep 28 17:59:55 2004 +0000

description:
Not all ap-* packages are apache1.  Some work for either apache so don't force
a conflict.

diffstat:

 www/apache2/Makefile |  3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r 9b2e306d29f6 -r 8cac075dab0b www/apache2/Makefile
--- a/www/apache2/Makefile      Tue Sep 28 16:01:22 2004 +0000
+++ b/www/apache2/Makefile      Tue Sep 28 17:59:55 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2004/09/23 21:07:25 reed Exp $
+# $NetBSD: Makefile,v 1.46 2004/09/28 17:59:55 erh Exp $
 
 PKGNAME=               apache-${APACHE_VERSION}
 PKGREVISION=           1
@@ -8,7 +8,6 @@
 COMMENT=               Apache HTTP (Web) server, version 2
 
 CONFLICTS=             apache-*ssl-[0-9]* apache-[0-9]* apache6-[0-9]*
-CONFLICTS+=            ap-*-[0-9]*     # Apache-1.x DSOs
 
 BUILD_DEFS+=           USE_INET6