[pkgsrc/trunk]: pkgsrc/www/apache2 This package cannot co-exist with apache22...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6434b0a26fba
branches:  trunk
changeset: 522414:6434b0a26fba
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Fri Dec 08 23:51:37 2006 +0000

description:
This package cannot co-exist with apache22, update CONFLICTS
properly.

Bump PKGREVISION.

diffstat:

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

diffs (22 lines):

diff -r 517ed9cbc5ed -r 6434b0a26fba www/apache2/Makefile
--- a/www/apache2/Makefile      Fri Dec 08 23:50:47 2006 +0000
+++ b/www/apache2/Makefile      Fri Dec 08 23:51:37 2006 +0000
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.106 2006/11/05 17:52:38 adrianp Exp $
+# $NetBSD: Makefile,v 1.107 2006/12/08 23:51:37 xtraeme Exp $
 
 .include "Makefile.common"
 
 PKGNAME=       apache-${APACHE_VERSION}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    www
 
 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]* apache>=2.2 apache6-[0-9]*
 
 BUILD_DEFS+=   USE_INET6
 BUILD_DEFS+=   VARBASE