[pkgsrc/trunk]: pkgsrc/www There's no need for CONFLICT between apache2 and a...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/12cc9c0a7f55
branches:  trunk
changeset: 522418:12cc9c0a7f55
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sat Dec 09 00:51:21 2006 +0000

description:
There's no need for CONFLICT between apache2 and apache22,
cube said so.

diffstat:

 www/apache2/Makefile  |  4 ++--
 www/apache22/Makefile |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 35abc05a5623 -r 12cc9c0a7f55 www/apache2/Makefile
--- a/www/apache2/Makefile      Sat Dec 09 00:47:34 2006 +0000
+++ b/www/apache2/Makefile      Sat Dec 09 00:51:21 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2006/12/08 23:51:37 xtraeme Exp $
+# $NetBSD: Makefile,v 1.108 2006/12/09 00:51:21 xtraeme Exp $
 
 .include "Makefile.common"
 
@@ -9,7 +9,7 @@
 HOMEPAGE=      http://httpd.apache.org/
 COMMENT=       Apache HTTP (Web) server, version 2
 
-CONFLICTS=     apache-*ssl-[0-9]* apache>=2.2 apache6-[0-9]*
+CONFLICTS=     apache-*ssl-[0-9]* apache6-[0-9]*
 
 BUILD_DEFS+=   USE_INET6
 BUILD_DEFS+=   VARBASE
diff -r 35abc05a5623 -r 12cc9c0a7f55 www/apache22/Makefile
--- a/www/apache22/Makefile     Sat Dec 09 00:47:34 2006 +0000
+++ b/www/apache22/Makefile     Sat Dec 09 00:51:21 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2006/12/09 00:51:21 xtraeme Exp $
 
 .include "Makefile.common"
 
@@ -9,7 +9,7 @@
 HOMEPAGE=      http://httpd.apache.org/
 COMMENT=       Apache HTTP (Web) server, version 2
 
-CONFLICTS=     apache-{,*ssl}-[0-9]* apache-[0-9]* apache6-[0-9]*
+CONFLICTS=     apache-{,*ssl}-[0-9]* apache6-[0-9]*
 
 BUILD_DEFS+=   USE_INET6
 BUILD_DEFS+=   VARBASE