summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2006-12-08 23:50:47 +0000
committerxtraeme <xtraeme@pkgsrc.org>2006-12-08 23:50:47 +0000
commit4b4c1f4db78e9580e08f10d0e65213a1d0418823 (patch)
tree1d47f3f4169d0997e2fc7c83ca75533a4bc5f2d5 /devel
parentdeddd516cf8c651409663a893b4a3eea886b0028 (diff)
downloadpkgsrc-4b4c1f4db78e9580e08f10d0e65213a1d0418823.tar.gz
This package cannot co-exist with apr1, update CONFLICTS
properly. Bump PKGREVISION.
Diffstat (limited to 'devel')
-rw-r--r--devel/apr/Makefile6
1 files changed, 3 insertions, 3 deletions
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