diff options
| author | epg <epg> | 2003-05-30 06:51:29 +0000 |
|---|---|---|
| committer | epg <epg> | 2003-05-30 06:51:29 +0000 |
| commit | e35f53c8d255a71194746a8293ef07623c2d9ffc (patch) | |
| tree | 0caf4f03043a823a13505f8fd1d9ea365ded489f | |
| parent | 146be43603012679de7fe0ab36c0f810650d43f5 (diff) | |
| download | pkgsrc-e35f53c8d255a71194746a8293ef07623c2d9ffc.tar.gz | |
Change the CONFLICTS back to apache2<=2.0.45 and document why (that
version of the package and below included its own apr).
| -rw-r--r-- | devel/apr/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/devel/apr/Makefile b/devel/apr/Makefile index 8f734867676..570adf5832f 100644 --- a/devel/apr/Makefile +++ b/devel/apr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/05/29 01:02:27 itojun Exp $ +# $NetBSD: Makefile,v 1.3 2003/05/30 06:51:29 epg Exp $ PKGNAME= apr-${APR_VERSION}.${APACHE_VERSION} CATEGORIES= devel @@ -6,7 +6,9 @@ CATEGORIES= devel HOMEPAGE= http://apr.apache.org/ COMMENT= Apache Portable Runtime -CONFLICTS= apache2<2.0.46 +# 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 USE_BUILDLINK2= YES USE_LIBTOOL= YES |