- fix spelling in CONFLICTS

8 files changed, 8 insertions, 8 deletions

diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile
index 1cf8c0b64145..bdbf5d619d8c 100644
--- a/www/apache13+ipv6/Makefile
+++ b/www/apache13+ipv6/Makefile
@@ -17,7 +17,7 @@ PATCHFILES=	apache-1.3.28-v6-20030912.diff.gz
 MAINTAINER=	sumikawa@FreeBSD.org
 COMMENT=	The extremely popular Apache http server.  Very fast, very clean
 
-CONFLICTS=	apache+modssl-1.* apache+ssl-1.* apache-1.* apache-2.* apache_fp-1.* \
+CONFLICTS=	apache+mod_ssl-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.*
 USE_PERL5=      yes
diff --git a/www/apache13-fp/Makefile b/www/apache13-fp/Makefile
index 193c2ee29f93..fd0392dd7dd4 100644
--- a/www/apache13-fp/Makefile
+++ b/www/apache13-fp/Makefile
@@ -22,7 +22,7 @@ COMMENT=	The Apache webserver with MS Frontpage Module
 #PATCH_SITE_SUBDIR=	patches/apply_to_${PORTVERSION}/
 #PATCHFILES=
 
-CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache-2.* \
+CONFLICTS=	apache+ipv6-1.* apache+mod_ssl-1.* apache+ssl-1.* apache-1.* apache-2.* \
 		caudium-devel-1.* caudium10-1.* caudium12-* \
 		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
 APACHE=		${DISTNAME}${EXTRACT_SUFX}
diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index e9ec60f51b50..4709566e6f46 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -20,7 +20,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	sheepkiller@cultdeadsheep.org
 COMMENT=	Apache-SSL: Apache secure webserver integrating OpenSSL
 
-CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache-1.* apache-2.* apache_fp-1.* \
+CONFLICTS=	apache+ipv6-1.* apache+mod_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.*
 APACHE_VERSION=		1.3.28
diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index bf32ad1d3d37..187892a40655 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -19,7 +19,7 @@ DISTNAME=	apache_${PORTVERSION}
 MAINTAINER=	ache@freebsd.org
 COMMENT=	The extremely popular Apache http server.  Very fast, very clean
 
-CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-2.* apache_fp-1.* \
+CONFLICTS=	apache+ipv6-1.* apache+mod_ssl-1.* apache+ssl-1.* apache-2.* apache_fp-1.* \
 		caudium-devel-1.* caudium10-1.* caudium12-* \
 		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
 USE_PERL5=      yes
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 3b5f34d559f5..ea8ba559eb88 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -19,7 +19,7 @@ COMMENT?=	Version 2 of the extremely popular Apache http server
 
 LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
 
-CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
+CONFLICTS=	apache+ipv6-1.* apache+mod_ssl-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
 		caudium-devel-1.* caudium10-1.* caudium12-* \
 		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
 LATEST_LINK=	apache2
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 3b5f34d559f5..ea8ba559eb88 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -19,7 +19,7 @@ COMMENT?=	Version 2 of the extremely popular Apache http server
 
 LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
 
-CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
+CONFLICTS=	apache+ipv6-1.* apache+mod_ssl-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
 		caudium-devel-1.* caudium10-1.* caudium12-* \
 		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
 LATEST_LINK=	apache2
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 3b5f34d559f5..ea8ba559eb88 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -19,7 +19,7 @@ COMMENT?=	Version 2 of the extremely popular Apache http server
 
 LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
 
-CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
+CONFLICTS=	apache+ipv6-1.* apache+mod_ssl-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
 		caudium-devel-1.* caudium10-1.* caudium12-* \
 		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
 LATEST_LINK=	apache2
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 3b5f34d559f5..ea8ba559eb88 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -19,7 +19,7 @@ COMMENT?=	Version 2 of the extremely popular Apache http server
 
 LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
 
-CONFLICTS=	apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
+CONFLICTS=	apache+ipv6-1.* apache+mod_ssl-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \
 		caudium-devel-1.* caudium10-1.* caudium12-* \
 		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.*
 LATEST_LINK=	apache2