From e7614e75fb33014d9a0e41ddf13877a4a60efeac Mon Sep 17 00:00:00 2001
From: epg <epg@pkgsrc.org>
Date: Fri, 30 May 2003 06:51:29 +0000
Subject: Change the CONFLICTS back to apache2<=2.0.45 and document why (that
 version of the package and below included its own apr).

---
 devel/apr/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'devel/apr')

diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 8f734867676..570adf5832f 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/05/29 01:02:27 itojun Exp $
+# $NetBSD: Makefile,v 1.3 2003/05/30 06:51:29 epg Exp $
 
 PKGNAME=	apr-${APR_VERSION}.${APACHE_VERSION}
 CATEGORIES=	devel
@@ -6,7 +6,9 @@ CATEGORIES=	devel
 HOMEPAGE=	http://apr.apache.org/
 COMMENT=	Apache Portable Runtime
 
-CONFLICTS=		apache2<2.0.46
+# 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
 
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
-- 
cgit v1.2.3