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/apache21 | |
| 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/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} \ |