summaryrefslogtreecommitdiff
path: root/www/apache22
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2006-12-09 00:51:21 +0000
committerxtraeme <xtraeme@pkgsrc.org>2006-12-09 00:51:21 +0000
commitc3c8edd6ef72c374d67dabcb23621cfd9dccf1db (patch)
tree9ba57e1dfa5566e7a4d7fc42ad5a1e07d6a6d0f6 /www/apache22
parent85201244770861512840d525b4160e63852b8c28 (diff)
downloadpkgsrc-c3c8edd6ef72c374d67dabcb23621cfd9dccf1db.tar.gz
There's no need for CONFLICT between apache2 and apache22,
cube said so.
Diffstat (limited to 'www/apache22')
-rw-r--r--www/apache22/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index af30fef877c..35026e4f376 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/12/08 23:31:52 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2006/12/09 00:51:21 xtraeme Exp $
.include "Makefile.common"
@@ -9,7 +9,7 @@ CATEGORIES= www
HOMEPAGE= http://httpd.apache.org/
COMMENT= Apache HTTP (Web) server, version 2
-CONFLICTS= apache-{,*ssl}-[0-9]* apache-[0-9]* apache6-[0-9]*
+CONFLICTS= apache-{,*ssl}-[0-9]* apache6-[0-9]*
BUILD_DEFS+= USE_INET6
BUILD_DEFS+= VARBASE