From 9e056a81b0e32752cf20d80929a13edeef87d0c8 Mon Sep 17 00:00:00 2001 From: xtraeme Date: Fri, 8 Dec 2006 23:50:47 +0000 Subject: This package cannot co-exist with apr1, update CONFLICTS properly. Bump PKGREVISION. --- devel/apr/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'devel/apr') diff --git a/devel/apr/Makefile b/devel/apr/Makefile index 5744c50917e..47b61b914ed 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -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 @@ 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 +CONFLICTS= apache2<=2.0.45 apr>=1.0 PKG_INSTALLATION_TYPES= overwrite pkgviews -- cgit v1.2.3