From 66d53340841cc42ebd6c4ddbfa51f032e8c11e5d Mon Sep 17 00:00:00 2001 From: xtraeme Date: Sat, 9 Dec 2006 00:52:23 +0000 Subject: There's no need to CONFLICT between apr and apr1, cube said so. --- devel/apr/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'devel/apr') diff --git a/devel/apr/Makefile b/devel/apr/Makefile index 47b61b914ed..76e89cc09a2 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -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 @@ PKG_DESTDIR_SUPPORT= user-destdir # 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 -- cgit v1.2.3