diff options
author | wiz <wiz> | 2002-12-09 20:23:40 +0000 |
---|---|---|
committer | wiz <wiz> | 2002-12-09 20:23:40 +0000 |
commit | 42d98c448a72fcd1cbf977628b064059b32d1028 (patch) | |
tree | 4ac41bc74a919b94f8be73ea73433208977f3571 /www/apache2 | |
parent | 861979a7508dd6857fc3200afc8d04e8611071a8 (diff) | |
download | pkgsrc-42d98c448a72fcd1cbf977628b064059b32d1028.tar.gz |
Note conflict between apr-devel and apache2 packages.
Diffstat (limited to 'www/apache2')
-rw-r--r-- | www/apache2/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 3bb6b42fdd1..118b33d739b 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2002/10/04 02:35:51 itojun Exp $ +# $NetBSD: Makefile,v 1.17 2002/12/09 20:23:42 wiz Exp $ DISTNAME= httpd-${APACHE_VERSION} PKGNAME= apache-${APACHE_VERSION} @@ -15,6 +15,7 @@ COMMENT= Apache HTTP (Web) server, version 2 CONFLICTS= apache-*ssl-[0-9]* apache-[0-9]* apache6-[0-9]* CONFLICTS+= ap-*-[0-9]* # Apache-1.x DSOs +CONFLICTS+= apr-[0-9]* # devel/apr-devel package BUILD_DEFS+= USE_INET6 |