diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile index 2341d623503f..c7c730516238 100644 --- a/www/apache13+ipv6/Makefile +++ b/www/apache13+ipv6/Makefile @@ -18,7 +18,10 @@ PATCHFILES= apache-1.3.29-v6-20031112.diff.gz MAINTAINER= sumikawa@FreeBSD.org COMMENT= The extremely popular Apache http server. Very fast, very clean -CONFLICTS= apache+mod_ssl-1.* apache+ssl-1.* apache-1.* apache-2.* apache_fp-1.* \ +CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* \ + apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \ + apache+mod_ssl+mod_snmp+mod_accel-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 974b381b4ecb..7a48b9990f54 100644 --- a/www/apache13-fp/Makefile +++ b/www/apache13-fp/Makefile @@ -27,7 +27,10 @@ FORBIDDEN= multiple vulnerabilities: http://www.apacheweek.com/features/security #PATCH_SITE_SUBDIR= patches/apply_to_${PORTVERSION}/ #PATCHFILES= -CONFLICTS= apache+ipv6-1.* apache+mod_ssl-1.* apache+ssl-1.* apache-1.* apache-2.* \ +CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* \ + apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \ + apache+mod_ssl+mod_snmp+mod_accel-1. \ + apache+ipv6-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 e3fdd50dc69b..25431ae4685f 100644 --- a/www/apache13-ssl/Makefile +++ b/www/apache13-ssl/Makefile @@ -25,7 +25,10 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= clement@FreeBSD.org COMMENT= Apache-SSL: Apache secure webserver integrating OpenSSL -CONFLICTS= apache+ipv6-1.* apache+mod_ssl-1.* apache-1.* apache-2.* apache_fp-1.* \ +CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* \ + apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \ + apache+mod_ssl+mod_snmp+mod_accel-1.* \ + apache+ipv6-1.* apache-1.* apache-2.* apache_fp-1.* \ caudium-devel-1.* caudium10-1.* caudium12-* \ ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* diff --git a/www/apache13/Makefile b/www/apache13/Makefile index b79366c97faf..fd339001d1ea 100644 --- a/www/apache13/Makefile +++ b/www/apache13/Makefile @@ -20,7 +20,10 @@ DISTNAME= apache_${PORTVERSION} MAINTAINER= ache@freebsd.org COMMENT= The extremely popular Apache http server. Very fast, very clean -CONFLICTS= apache+ipv6-1.* apache+mod_ssl-1.* apache+ssl-1.* apache-2.* apache_fp-1.* \ +CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* \ + apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \ + apache+mod_ssl+mod_snmp+mod_accel-1.* \ + apache+ipv6-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 7eb744a305a3..ae8b91613caf 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -25,7 +25,10 @@ LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 LATEST_LINK= apache2 -CONFLICTS= apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \ +CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* \ + apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \ + apache+mod_ssl+mod_snmp+mod_accel-1.* \ + apache+ipv6-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.* diff --git a/www/apache20/Makefile b/www/apache20/Makefile index 7eb744a305a3..ae8b91613caf 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -25,7 +25,10 @@ LIB_DEPENDS= expat.5:${PORTSDIR}/textproc/expat2 LATEST_LINK= apache2 -CONFLICTS= apache+ipv6-1.* apache+modssl-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \ +CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* \ + apache+mod_ssl+mod_snmp+ipv6-1.* apache+mod_ssl+mod_accel-1.* \ + apache+mod_ssl+mod_snmp+mod_accel-1.* \ + apache+ipv6-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.*