diff options
| author | pgollucci <pgollucci@FreeBSD.org> | 2010-12-08 04:38:17 +0800 |
|---|---|---|
| committer | pgollucci <pgollucci@FreeBSD.org> | 2010-12-08 04:38:17 +0800 |
| commit | 619c082c8c38d42f2f17b661cd844c46e4ff88a7 (patch) | |
| tree | e4dfd40587953c65033319340cef4dd85d825ce9 /www | |
| parent | aa35c0d816e1bf6e9ccb4199334a11dedadfdbb8 (diff) | |
| download | freebsd-ports-gnome-619c082c8c38d42f2f17b661cd844c46e4ff88a7.tar.gz freebsd-ports-gnome-619c082c8c38d42f2f17b661cd844c46e4ff88a7.tar.zst freebsd-ports-gnome-619c082c8c38d42f2f17b661cd844c46e4ff88a7.zip | |
- update conflicts
Diffstat (limited to 'www')
| -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 |