aboutsummaryrefslogtreecommitdiffstats
path: root/www/apache13-ssl
diff options
context:
space:
mode:
authoranders <anders@FreeBSD.org>2007-06-18 00:59:27 +0800
committeranders <anders@FreeBSD.org>2007-06-18 00:59:27 +0800
commitd817817d03c6620ccc0f551960752befc6392c18 (patch)
tree1c0dcb2aa78dbc500fedf1b753b0c965cafdecba /www/apache13-ssl
parentf811772b2b333a2f9358ce66b04e85e57b4ef4aa (diff)
downloadfreebsd-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-ssl')
-rw-r--r--www/apache13-ssl/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index 5753d1ee51a1..78d66be72bfd 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -29,7 +29,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-1.* apache-2.* 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_VERSION= 1.3.37
APACHE_SSL_VERSION= 1.57