From 68ff0fb502c24e9e2220d8e4267adb7af2e9a389 Mon Sep 17 00:00:00 2001
From: marcus <marcus@FreeBSD.org>
Date: Sat, 11 Oct 2003 06:12:14 +0000
Subject: intltool and xml-i18n-tools conflict with each other.

Submitted by:	Oliver Eikemeier <eikemeier@fillmore-labs.com>
---
 textproc/intltool/Makefile       | 2 ++
 textproc/xml-i18n-tools/Makefile | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'textproc')

diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index 79d59a718a74..a2d492aab7f9 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -27,4 +27,6 @@ CONFIGURE_ARGS=	--libdir="${PREFIX}/libdata"
 MAN8=		intltool-extract.8 intltool-merge.8 intltool-prepare.8 \
 		intltool-update.8 intltoolize.8
 
+CONFLICTS=	xml-i18n-tools-*
+
 .include <bsd.port.mk>
diff --git a/textproc/xml-i18n-tools/Makefile b/textproc/xml-i18n-tools/Makefile
index 371b39f01943..eeb7b3596553 100644
--- a/textproc/xml-i18n-tools/Makefile
+++ b/textproc/xml-i18n-tools/Makefile
@@ -18,4 +18,6 @@ USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_LIBTOOL=	yes
 
+CONFLICTS=	intltool-*
+
 .include <bsd.port.mk>
-- 
cgit