summaryrefslogtreecommitdiff
path: root/www/apache2
diff options
context:
space:
mode:
authorerh <erh@pkgsrc.org>2004-09-28 17:59:55 +0000
committererh <erh@pkgsrc.org>2004-09-28 17:59:55 +0000
commit099c5ea404ce26823e37157b3f1d13d8c71b308c (patch)
treed5485c2b7affbb79594040146b513f0434a17516 /www/apache2
parenta1373cfbf124d28dfabd169a9908e1293f55c3c5 (diff)
downloadpkgsrc-099c5ea404ce26823e37157b3f1d13d8c71b308c.tar.gz
Not all ap-* packages are apache1. Some work for either apache so don't force
a conflict.
Diffstat (limited to 'www/apache2')
-rw-r--r--www/apache2/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 9052cc375eb..e50a3ecd548 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2004/09/23 21:07:25 reed Exp $
+# $NetBSD: Makefile,v 1.46 2004/09/28 17:59:55 erh Exp $
PKGNAME= apache-${APACHE_VERSION}
PKGREVISION= 1
@@ -8,7 +8,6 @@ HOMEPAGE= http://httpd.apache.org/
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
BUILD_DEFS+= USE_INET6