diff options
| author | pgollucci <pgollucci@FreeBSD.org> | 2010-05-06 07:16:08 +0800 |
|---|---|---|
| committer | pgollucci <pgollucci@FreeBSD.org> | 2010-05-06 07:16:08 +0800 |
| commit | 6f5b03cdf2f28bc1c745f22b7db6c31821edb267 (patch) | |
| tree | 718b50aed30d6163549e1d81f3fe0b8fe9110c4e /www/apache20 | |
| parent | fda43d5ce71fc78c5231e8ba1ac4e8406132b1ae (diff) | |
| download | freebsd-ports-gnome-6f5b03cdf2f28bc1c745f22b7db6c31821edb267.tar.gz freebsd-ports-gnome-6f5b03cdf2f28bc1c745f22b7db6c31821edb267.tar.zst freebsd-ports-gnome-6f5b03cdf2f28bc1c745f22b7db6c31821edb267.zip | |
- add caudium14 conflict
- fix caudium12 conflict
With Hat: apache@
Diffstat (limited to 'www/apache20')
| -rw-r--r-- | www/apache20/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/www/apache20/Makefile b/www/apache20/Makefile index f23f3fb22293..b6f2c0dfdd95 100644 --- a/www/apache20/Makefile +++ b/www/apache20/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+ipv6-1.* apache+mod_ssl+mod_accel-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-* \ + caudium-devel-1.* caudium10-1.* caudium12-1.* caudium14-1.* \ ru-apache+mod_ssl-1.* ru-apache-1.* # patch files |