summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2003-10-25 20:23:14 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2003-10-25 20:23:14 +0000
commit21f7e477c5c966f5b1079e601c8fb14b9cfd2127 (patch)
tree774c82b6848267c146ddc6fbed80ff4e7862f3c8 /www
parentFixes to make slave ports happy (diff)
- extend CONFLICTS with w3c-httpd-3.*
Notes
Notes: svn path=/head/; revision=92131
Diffstat (limited to 'www')
-rw-r--r--www/apache13-modssl/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index a251d7a91d44..98161d3c5e52 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -21,8 +21,9 @@ COMMENT= The Apache 1.3 webserver with SSL/TLS functionality
LIB_DEPENDS= mm.13:${PORTSDIR}/devel/mm
PATCH_DEPENDS= ${BUILD_DEPENDS}
-CONFLICTS?= apache+ipv6-1.* apache+ssl-1.* apache-1.* apache-2.* apache_fp-1.* \
- caudium-devel-1.* caudium10-1.* caudium12-* ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
+CONFLICTS?= apache+ipv6-1.* apache+ssl-1.* apache-1.* apache-2.* \
+ apache_fp-1.* caudium-devel-1.* caudium10-1.* caudium12-* \
+ ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* w3c-httpd-3.*
VERSION_APACHE= 1.3.28
VERSION_MODSSL= 2.8.15
USE_OPENSSL= yes