summaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorjmmv <jmmv>2002-12-05 12:05:51 +0000
committerjmmv <jmmv>2002-12-05 12:05:51 +0000
commit65c79a18f896478733e317900f60cabd95666627 (patch)
treeb6cf6050b90599d3fc6ef2cf0d848a7958583fbf /textproc
parent941321ac12d62d8f9e3c37bd3613d89ea5eaca06 (diff)
downloadpkgsrc-65c79a18f896478733e317900f60cabd95666627.tar.gz
intltool conflicts with xml-i18n-tools (they install files in the same
place). Add CONFLICTS sentenctes according to this.
Diffstat (limited to 'textproc')
-rw-r--r--textproc/intltool/Makefile4
-rw-r--r--textproc/xml-i18n-tools/Makefile4
2 files changed, 6 insertions, 2 deletions
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index 7ce1afdd5ad..6399283813b 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/10/19 10:54:58 rh Exp $
+# $NetBSD: Makefile,v 1.4 2002/12/05 12:05:51 jmmv Exp $
#
DISTNAME= intltool-0.18
@@ -10,6 +10,8 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Toolbox for internationalisation
+CONFLICTS+= xml-i18n-tools-[0-9]*
+
USE_GMAKE= YES
USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
diff --git a/textproc/xml-i18n-tools/Makefile b/textproc/xml-i18n-tools/Makefile
index 699e6782a7f..11473e037f2 100644
--- a/textproc/xml-i18n-tools/Makefile
+++ b/textproc/xml-i18n-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2002/10/19 10:54:59 rh Exp $
+# $NetBSD: Makefile,v 1.7 2002/12/05 12:05:52 jmmv Exp $
DISTNAME= xml-i18n-tools-0.9
CATEGORIES= textproc gnome
@@ -8,6 +8,8 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://news.gnome.org/gnome-news/979851911/
COMMENT= XML internationalisation tools
+CONFLICTS+= intltool-[0-9]*
+
USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
USE_GMAKE= YES