[Midnightbsd-cvs] CVS Commit: Makefile: Remove conflicts definitions that don't apply to

[laffer1 at midnightbsd.org]

Log Message:
-----------
Remove conflicts definitions that don't apply to us.

Modified Files:
--------------
    mports/www/apache22:
        Makefile (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/apache22/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lwww/apache22/Makefile -Lwww/apache22/Makefile -u -r1.2 -r1.3
--- www/apache22/Makefile
+++ www/apache22/Makefile
@@ -32,13 +32,7 @@
 
 LATEST_LINK=	apache22
 
-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-* \
-		ru-apache+mod_ssl-1.* ru-apache-1.* thttpd-2.* \
-		apache-2.0.* apache-*-2.0.* apache-2.1.* apache-*-2.1.*
+CONFLICTS=	thttpd-2.* apache-2.0.* apache-*-2.0.*
 
 SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \