[Midnightbsd-cvs] mports: Makefile: fix conflicts

[laffer1 at midnightbsd.org]

Log Message:
-----------
fix conflicts

Modified Files:
--------------
    mports/devel/apr-svn:
        Makefile (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/apr-svn/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L devel/apr-svn/Makefile -L devel/apr-svn/Makefile -u -r1.2 -r1.3
--- devel/apr-svn/Makefile
+++ devel/apr-svn/Makefile
@@ -9,6 +9,6 @@
 APR_UTIL_WITH_BERKELEY_DB=	yes
 APR_SVN_WITHOUT_THREADS_4=	yes
 MASTERDIR=			${.CURDIR}/../apr
-CONFLICTS=			apr-[0-9]*
+CONFLICTS=			apr-[0-9]* apr-db42-[0-9]*
 
 .include "${MASTERDIR}/Makefile"