summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authoritojun <itojun>2001-03-30 22:09:35 +0000
committeritojun <itojun>2001-03-30 22:09:35 +0000
commit5f0165bc1c19162f41556a5c66f1a39cb593ba74 (patch)
tree48d94534164ca12c1ba8af11ba8ab6bb8e3b1a96 /www
parentf22aee8641c557fecbfc36d95f643146f44c4d39 (diff)
downloadpkgsrc-5f0165bc1c19162f41556a5c66f1a39cb593ba74.tar.gz
let it conflict with ap-* (apache1 modules)
Diffstat (limited to 'www')
-rw-r--r--www/apache-current/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/www/apache-current/Makefile b/www/apache-current/Makefile
index 0318ada8dd1..2651d874493 100644
--- a/www/apache-current/Makefile
+++ b/www/apache-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/03/30 22:07:20 itojun Exp $
+# $NetBSD: Makefile,v 1.3 2001/03/30 22:09:35 itojun Exp $
DISTNAME= httpd-2_0_15-alpha
PKGNAME= apache-2.0.15
@@ -11,7 +11,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.apache.org/
COMMENT= HTTP (Web) server
-CONFLICTS= apache-*modssl-* apache-* apache6-*
+CONFLICTS= apache-*modssl-* apache-* apache6-* ap-*
# autodetect
BUILD_DEFS+= USE_INET6