diff options
| author | xtraeme <xtraeme> | 2006-12-09 00:52:23 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme> | 2006-12-09 00:52:23 +0000 |
| commit | 732a29ab99047a30d845f4700e09775eee627615 (patch) | |
| tree | ad19a6cf9027bf2660c1960646eb18c2a281486b /devel/apr | |
| parent | 83d93fe950fea013def659e6e62d1296832b6c9c (diff) | |
| download | pkgsrc-732a29ab99047a30d845f4700e09775eee627615.tar.gz | |
There's no need to CONFLICT between apr and apr1, cube said so.
Diffstat (limited to 'devel/apr')
| -rw-r--r-- | devel/apr/Makefile | 4 |
1 files changed, 2 insertions, 2 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 |