From 619c082c8c38d42f2f17b661cd844c46e4ff88a7 Mon Sep 17 00:00:00 2001 From: pgollucci Date: Tue, 7 Dec 2010 20:38:17 +0000 Subject: - update conflicts --- www/apache22/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'www/apache22') 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 -- cgit