From 675c2953ebd8eca7c4bfbad1e0dd8cce6c058cff Mon Sep 17 00:00:00 2001 From: Anders Nordby Date: Sun, 17 Jun 2007 16:59:27 +0000 Subject: Remove thttpd from conflicts list, it has a different name for its passwd program now. Approved by: maintainers/erwin --- www/apache20/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'www/apache20') 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 -- cgit v1.2.3