summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2003-10-11 06:12:14 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2003-10-11 06:12:14 +0000
commit11b73965f00bd36a8df144b2982d314e90ca1aa1 (patch)
tree7f0d9637057cddf7df7ccefe2d92a914750a904c
parentAdd CONFLICTS for ports that install files with the same name. (diff)
intltool and xml-i18n-tools conflict with each other.
Submitted by: Oliver Eikemeier <eikemeier@fillmore-labs.com>
Notes
Notes: svn path=/head/; revision=90834
-rw-r--r--textproc/intltool/Makefile2
-rw-r--r--textproc/xml-i18n-tools/Makefile2
2 files changed, 4 insertions, 0 deletions
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>