diff options
| author | ache <ache@FreeBSD.org> | 2007-06-15 07:31:27 +0800 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2007-06-15 07:31:27 +0800 |
| commit | f2e4ae6c01323e77ce64abe67ba65265da93292a (patch) | |
| tree | de8b26af64a95cecc4b8d20cdfcccf04ce116944 /www | |
| parent | fa5597f847a0d2a4961ab3ba5fe03e2254ad04a9 (diff) | |
| download | freebsd-ports-gnome-f2e4ae6c01323e77ce64abe67ba65265da93292a.tar.gz freebsd-ports-gnome-f2e4ae6c01323e77ce64abe67ba65265da93292a.tar.zst freebsd-ports-gnome-f2e4ae6c01323e77ce64abe67ba65265da93292a.zip | |
Remove CONFLICTS with updated thttpd
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache13/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/www/apache13/Makefile b/www/apache13/Makefile index 2e86396ecd59..8929c34fe8da 100644 --- a/www/apache13/Makefile +++ b/www/apache13/Makefile @@ -7,7 +7,7 @@ PORTNAME= apache PORTVERSION= 1.3.37 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} DISTNAME= apache_${PORTVERSION} @@ -25,7 +25,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-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.* USE_PERL5= yes USE_RC_SUBR= yes |