Sweep pkgsrc and convert packages that included intltool/buildlink3.mk

to use instead "USE_TOOLS+=intltool".  Remove now unused
intltool/buildlink3.mk

5 files changed, 10 insertions, 16 deletions

diff --git a/databases/gnome-mime-data/Makefile b/databases/gnome-mime-data/Makefile
index 962f3ac92ef..b228eb8f69a 100644
--- a/databases/gnome-mime-data/Makefile
+++ b/databases/gnome-mime-data/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/04/13 18:23:30 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2006/07/05 05:37:39 jlam Exp $
 #
 
 DISTNAME=		gnome-mime-data-2.4.2
@@ -17,7 +17,7 @@ CONFLICTS=		gnome-vfs<=1.0.3
 
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		msgfmt perl
+USE_TOOLS+=		intltool msgfmt perl
 GNU_CONFIGURE=		YES
 
 PKGCONFIG_OVERRIDE=	gnome-mime-data-2.0.pc.in
@@ -29,6 +29,4 @@ CONF_FILES=		${EGDIR}/gnome-vfs-mime-magic \
 				${PKG_SYSCONFDIR}/gnome-vfs-mime-magic
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common
index 4b2cd6e3dc6..bfd650aa2f5 100644
--- a/databases/libgda/Makefile.common
+++ b/databases/libgda/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.40 2006/06/08 09:48:40 joerg Exp $
+# $NetBSD: Makefile.common,v 1.41 2006/07/05 05:37:39 jlam Exp $
 #
 
 DISTNAME=		libgda-1.9.102
@@ -13,7 +13,7 @@ COMMENT=		GNU database access library
 DISTINFO_FILE=		${.CURDIR}/../../databases/libgda/distinfo
 PATCHDIR=		${.CURDIR}/../../databases/libgda/patches
 
-USE_TOOLS+=		gmake pkg-config msgfmt
+USE_TOOLS+=		gmake intltool pkg-config msgfmt
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
@@ -39,7 +39,6 @@ SUBST_SED.libs+=	-e 's|$$(top_builddir)/libgda/libgda-2.la|${BUILDLINK_PREFIX.li
 .include "../../databases/libgda/buildlink3.mk"
 .endif
 
-.include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index f4ec5df50ab..f7062cf940b 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2006/04/17 13:46:08 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2006/07/05 05:37:39 jlam Exp $
 #
 
 DISTNAME=		libgnomedb-1.9.102
@@ -11,7 +11,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome-db.org/
 COMMENT=		GNOME2 database library
 
-USE_TOOLS+=		gmake msgfmt pkg-config
+USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		YES
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
@@ -31,7 +31,6 @@ GCONF2_SCHEMAS=		libgnomedb.schemas
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtksourceview/buildlink3.mk"
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index f06ec5a545c..85788a28b94 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/05/18 20:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2006/07/05 05:37:40 jlam Exp $
 #
 
 DISTNAME=		mergeant-0.62
@@ -14,7 +14,7 @@ COMMENT=		GNOME2 GNOME-DB database front-end
 BROKEN_IN=		pkgsrc-2006Q1
 
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake perl pkg-config
+USE_TOOLS+=		gmake intltool perl pkg-config
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--disable-gtk-doc
@@ -26,7 +26,6 @@ USE_LIBTOOL=		YES
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/databases/shared-mime-info/Makefile b/databases/shared-mime-info/Makefile
index b0fbad32302..8f8a4cb1a82 100644
--- a/databases/shared-mime-info/Makefile
+++ b/databases/shared-mime-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/06/15 20:40:15 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2006/07/05 05:37:40 jlam Exp $
 #
 
 DISTNAME=	shared-mime-info-0.17
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		pkg-config msgfmt
+USE_TOOLS+=		intltool msgfmt pkg-config
 
 CONFIGURE_ARGS+=	--disable-update-mimedb
 
@@ -38,6 +38,5 @@ PRINT_PLIST_AWK+=	/^@dirrm share\/mime/ { next; }
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"