[Midnightbsd-cvs] CVS Commit: Makefile: shouldn't conflict with thttpd anymore, but

[laffer1 at midnightbsd.org]

Log Message:
-----------
shouldn't conflict with thttpd anymore, but technically should with apache 2.2.

Modified Files:
--------------
    mports/www/apache20:
        Makefile (r1.3 -> r1.4)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/apache20/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -Lwww/apache20/Makefile -Lwww/apache20/Makefile -u -r1.3 -r1.4
--- www/apache20/Makefile
+++ www/apache20/Makefile
@@ -25,7 +25,7 @@
 LATEST_LINK=	apache20
 
 CONFLICTS=	caudium-devel-1.* caudium10-1.* caudium12-* \
-		thttpd-2.*
+		apache-2.2.* apache-*-2.2.*
 
 # patch files
 EXTRA_PATCHES+=		${FILESDIR}/build-fix-openssl_beta