summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2002-12-09 20:23:40 +0000
committerwiz <wiz@pkgsrc.org>2002-12-09 20:23:40 +0000
commit07ffc79adacf9d4a8165d80432592a6553b2444b (patch)
tree4ac41bc74a919b94f8be73ea73433208977f3571 /www
parent437371d4902bbcf379f4610a54b860607290cec9 (diff)
downloadpkgsrc-07ffc79adacf9d4a8165d80432592a6553b2444b.tar.gz
Note conflict between apr-devel and apache2 packages.
Diffstat (limited to 'www')
-rw-r--r--www/apache2/Makefile3
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