[pkgsrc/trunk]: pkgsrc/devel/apr This package cannot co-exist with apr1, upda...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/517ed9cbc5ed
branches:  trunk
changeset: 522413:517ed9cbc5ed
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Fri Dec 08 23:50:47 2006 +0000

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

Bump PKGREVISION.

diffstat:

 devel/apr/Makefile |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r fafe0a0f8e0a -r 517ed9cbc5ed devel/apr/Makefile
--- a/devel/apr/Makefile        Fri Dec 08 23:39:24 2006 +0000
+++ b/devel/apr/Makefile        Fri Dec 08 23:50:47 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.47 2006/10/09 12:52:34 joerg Exp $
+# $NetBSD: Makefile,v 1.48 2006/12/08 23:50:47 xtraeme Exp $
 
 .include "../../www/apache2/Makefile.common"
 
 PKGNAME=       apr-${APR_VERSION}.${APACHE_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 
 HOMEPAGE=      http://apr.apache.org/
@@ -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
+CONFLICTS=             apache2<=2.0.45 apr>=1.0
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews