Remove thttpd from conflicts list, it has a different name for its

passwd program now.

Approved by:	maintainers/erwin

7 files changed, 7 insertions, 8 deletions

diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile
index 42832711a154..e33c3484b3e7 100644
--- a/www/apache13+ipv6/Makefile
+++ b/www/apache13+ipv6/Makefile
@@ -24,7 +24,7 @@ CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-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.*
+		ru-apache+mod_ssl-1.* ru-apache-1.*
 USE_PERL5=	yes
 USE_RC_SUBR=	yes
 
diff --git a/www/apache13-modperl/Makefile b/www/apache13-modperl/Makefile
index bdf7763edd14..2d2650afe04e 100644
--- a/www/apache13-modperl/Makefile
+++ b/www/apache13-modperl/Makefile
@@ -27,8 +27,7 @@ CONFLICTS=	apache-1.* apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+
 		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.* \
-		apache-*-2.*
+		ru-apache+mod_ssl-1.* ru-apache-1.* apache-*-2.*
 
 USE_PERL5=	YES
 USE_RC_SUBR=	apache
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index 959e38c868c3..9afa12b1a4f6 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -35,7 +35,7 @@ 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.* w3c-httpd-3.*
+		ru-apache+mod_ssl-1.* ru-apache-1.* w3c-httpd-3.*
 VERSION_APACHE=	1.3.37
 VERSION_MODSSL=	2.8.28
 VERSION_MODSNMP=	1.3.14.13
diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index 5753d1ee51a1..78d66be72bfd 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -29,7 +29,7 @@ CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-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.*
+		ru-apache+mod_ssl-1.* ru-apache-1.*
 
 APACHE_VERSION=		1.3.37
 APACHE_SSL_VERSION=	1.57
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index e4e73c7ba994..fba6ddb7feef 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -30,7 +30,7 @@ CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-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.*
+		ru-apache+mod_ssl-1.* ru-apache-1.*
 
 # patch files
 EXTRA_PATCHES+=		${FILESDIR}/build-fix-openssl_beta
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 1bc458b767d4..eb795d852771 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -32,7 +32,7 @@ CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-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.* \
+		ru-apache+mod_ssl-1.* ru-apache-1.* \
 		apache-2.0.* apache-*-2.0.*
 
 SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index b88768c24746..a88b8420aa8d 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -37,7 +37,7 @@ CONFLICTS=	apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-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.* \
+		ru-apache+mod_ssl-1.* ru-apache-1.* \
 		apache-2.0.* apache-*-2.0.* apache-2.1.* apache-*-2.1.*
 
 SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \