diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2006-12-09 00:52:23 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2006-12-09 00:52:23 +0000 |
| commit | 66d53340841cc42ebd6c4ddbfa51f032e8c11e5d (patch) | |
| tree | ad19a6cf9027bf2660c1960646eb18c2a281486b /devel | |
| parent | c3c8edd6ef72c374d67dabcb23621cfd9dccf1db (diff) | |
| download | pkgsrc-66d53340841cc42ebd6c4ddbfa51f032e8c11e5d.tar.gz | |
There's no need to CONFLICT between apr and apr1, cube said so.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/apr/Makefile | 4 | ||||
| -rw-r--r-- | devel/apr1/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
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 diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile index b24dc1edba2..96e7aa4f00d 100644 --- a/devel/apr1/Makefile +++ b/devel/apr1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/12/08 23:29:53 xtraeme Exp $ +# $NetBSD: Makefile,v 1.2 2006/12/09 00:52:23 xtraeme Exp $ .include "../../www/apache22/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<=0.10 +CONFLICTS= apache2<=2.0.45 PKG_INSTALLATION_TYPES= overwrite pkgviews |