diff options
| author | Philip M. Gollucci <pgollucci@FreeBSD.org> | 2010-12-07 20:38:17 +0000 |
|---|---|---|
| committer | Philip M. Gollucci <pgollucci@FreeBSD.org> | 2010-12-07 20:38:17 +0000 |
| commit | 811824fc151745025f8182c69c9aab820fe04f1c (patch) | |
| tree | 75aa6ff4b3fb7a5efc845db0bd55e2140de9df41 /www/apache22 | |
| parent | e693d81eabf9672ce90a7da50106803ba6383fe0 (diff) | |
| download | ports-811824fc151745025f8182c69c9aab820fe04f1c.tar.gz ports-811824fc151745025f8182c69c9aab820fe04f1c.zip | |
- update conflicts
Notes
Notes:
svn path=/head/; revision=265818
Diffstat (limited to 'www/apache22')
| -rw-r--r-- | www/apache22/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 619ec6f81bc8..10b25a7587b9 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -32,7 +32,8 @@ CONFLICTS= apache+mod_ssl-1.* apache+mod_ssl+ipv6-1.* apache+mod_ssl+modsnmp-1.* apache+ipv6-1.* apache+ssl-1.* apache-1.* apache_fp-1.* \ caudium-devel-1.* caudium10-1.* caudium12-1.* caudium14-1.* \ ru-apache+mod_ssl-1.* ru-apache-1.* \ - apache-2.0.* apache-*-2.0.* + apache-2.0.* apache-*-2.0.* \ + apache-*-2.2.* USE_APACHE= common22 USE_BZIP2= yes |