[pkgsrc/trunk]: pkgsrc/devel There's no need to CONFLICT between apr and apr1...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3c4d4cd21ae0
branches:  trunk
changeset: 522419:3c4d4cd21ae0
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sat Dec 09 00:52:23 2006 +0000

description:
There's no need to CONFLICT between apr and apr1, cube said so.

diffstat:

 devel/apr/Makefile  |  4 ++--
 devel/apr1/Makefile |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 12cc9c0a7f55 -r 3c4d4cd21ae0 devel/apr/Makefile
--- a/devel/apr/Makefile        Sat Dec 09 00:51:21 2006 +0000
+++ b/devel/apr/Makefile        Sat Dec 09 00:52:23 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/12/08 23:50:47 xtraeme Exp $
+# $NetBSD: Makefile,v 1.49 2006/12/09 00:52:23 xtraeme Exp $
 
 .include "../../www/apache2/Makefile.common"
 
@@ -13,7 +13,7 @@
 
 # Don't bump this when apache upgrades; it is only apache2-2.0.45 and
 # under that includes its own apr.  apr was split out in 2.0.45nb1.
-CONFLICTS=             apache2<=2.0.45 apr>=1.0
+CONFLICTS=             apache2<=2.0.45
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
diff -r 12cc9c0a7f55 -r 3c4d4cd21ae0 devel/apr1/Makefile
--- a/devel/apr1/Makefile       Sat Dec 09 00:51:21 2006 +0000
+++ b/devel/apr1/Makefile       Sat Dec 09 00:52:23 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/12/08 23:29:53 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2006/12/09 00:52:23 xtraeme Exp $
 
 .include "../../www/apache22/Makefile.common"
 
@@ -13,7 +13,7 @@
 
 # Don't bump this when apache upgrades; it is only apache2-2.0.45 and
 # under that includes its own apr.  apr was split out in 2.0.45nb1.
-CONFLICTS=             apache2<=2.0.45 apr<=0.10
+CONFLICTS=             apache2<=2.0.45
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews