summaryrefslogtreecommitdiff
path: root/www/apache2
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2006-12-08 23:51:37 +0000
committerxtraeme <xtraeme@pkgsrc.org>2006-12-08 23:51:37 +0000
commit34741368628eadb86e99c03d42b01a71b54d4529 (patch)
tree74cb8b3eeca374f42e922792e4d467f78dae7e4e /www/apache2
parent4b4c1f4db78e9580e08f10d0e65213a1d0418823 (diff)
downloadpkgsrc-34741368628eadb86e99c03d42b01a71b54d4529.tar.gz
This package cannot co-exist with apache22, update CONFLICTS
properly. Bump PKGREVISION.
Diffstat (limited to 'www/apache2')
-rw-r--r--www/apache2/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index afcb6b1b298..cd18c4dcee1 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.106 2006/11/05 17:52:38 adrianp Exp $
+# $NetBSD: Makefile,v 1.107 2006/12/08 23:51:37 xtraeme Exp $
.include "Makefile.common"
PKGNAME= apache-${APACHE_VERSION}
-PKGREVISION= 2
+PKGREVISION= 3
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]* apache>=2.2 apache6-[0-9]*
BUILD_DEFS+= USE_INET6
BUILD_DEFS+= VARBASE