[Midnightbsd-cvs] mports: Makefile: Add conflicts

[laffer1 at midnightbsd.org]

Log Message:
-----------
Add conflicts

Modified Files:
--------------
    mports/devel/subversion:
        Makefile (r1.12 -> r1.13)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/subversion/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -L devel/subversion/Makefile -L devel/subversion/Makefile -u -r1.12 -r1.13
--- devel/subversion/Makefile
+++ devel/subversion/Makefile
@@ -21,6 +21,8 @@
 LICENSE=	other
 # for the most part it's similar to a traditional BSD 4 clause license.
 
+CONFLICTS=	subversion-perl-[0-9]* subversion-python-[0-9]* subversion-ruby-[0-9]*
+
 OPTIONS=	NEON "Enable WebDAV/Delta-V repository access" On \
 		BDB  "Enable db4 repository backend" On \
 		MAINTAINER_DEBUG "Build debug version" Off \
@@ -73,7 +75,7 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
+.if ${ARCH} == "amd64"
 CFLAGS+=	-fpic -DPIC
 .endif