diff options
| author | Anders Nordby <anders@FreeBSD.org> | 2007-06-17 16:59:27 +0000 |
|---|---|---|
| committer | Anders Nordby <anders@FreeBSD.org> | 2007-06-17 16:59:27 +0000 |
| commit | 675c2953ebd8eca7c4bfbad1e0dd8cce6c058cff (patch) | |
| tree | 09217ec5f585954f286454c4f7b487e97a39c165 /www/apache21 | |
| parent | Upgrade graphics/xaralx-devel from 0.7r1762 to 0.7r1768 (diff) | |
Remove thttpd from conflicts list, it has a different name for its
passwd program now.
Approved by: maintainers/erwin
Diffstat (limited to 'www/apache21')
| -rw-r--r-- | www/apache21/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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} \ |