diff options
author | anders <anders@FreeBSD.org> | 2007-06-18 00:59:27 +0800 |
---|---|---|
committer | anders <anders@FreeBSD.org> | 2007-06-18 00:59:27 +0800 |
commit | d817817d03c6620ccc0f551960752befc6392c18 (patch) | |
tree | 1c0dcb2aa78dbc500fedf1b753b0c965cafdecba /www/apache13-modperl | |
parent | f811772b2b333a2f9358ce66b04e85e57b4ef4aa (diff) | |
download | freebsd-ports-gnome-d817817d03c6620ccc0f551960752befc6392c18.tar.gz freebsd-ports-gnome-d817817d03c6620ccc0f551960752befc6392c18.tar.zst freebsd-ports-gnome-d817817d03c6620ccc0f551960752befc6392c18.zip |
Remove thttpd from conflicts list, it has a different name for its
passwd program now.
Approved by: maintainers/erwin
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 |