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/apache13-modperl | |
| 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
Notes
Notes:
svn path=/head/; revision=193725
Diffstat (limited to 'www/apache13-modperl')
| -rw-r--r-- | www/apache13-modperl/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
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 |