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

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

10 files changed, 20 insertions, 30 deletions

diff --git a/devel/at-spi/Makefile b/devel/at-spi/Makefile
index d96bdd49adc..b14420e0de7 100644
--- a/devel/at-spi/Makefile
+++ b/devel/at-spi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/06/21 14:23:10 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2006/07/05 05:37:40 jlam Exp $
 #
 
 DISTNAME=		at-spi-1.7.7
@@ -11,7 +11,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Assistive Technology Service Provider Interface
 
-USE_TOOLS+=		gmake pkg-config msgfmt
+USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
@@ -27,6 +27,5 @@ PKGCONFIG_OVERRIDE+=    libspi-1.0.pc.in
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 4154b22bc4a..82dde457dbe 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/06/22 10:04:57 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2006/07/05 05:37:40 jlam Exp $
 
 DISTNAME=		devhelp-0.7
 PKGREVISION=		16
@@ -11,7 +11,7 @@ HOMEPAGE=		http://www.imendio.com/projects/devhelp/
 COMMENT=		Documentation viewer based on GNOME2
 
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake perl pkg-config msgfmt
+USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
@@ -26,7 +26,6 @@ BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
 .include "../../www/libgtkhtml/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
diff --git a/devel/eel2/Makefile b/devel/eel2/Makefile
index 78a25ed52eb..a403ffe7ee4 100644
--- a/devel/eel2/Makefile
+++ b/devel/eel2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2006/06/22 10:10:40 joerg Exp $
+# $NetBSD: Makefile,v 1.56 2006/07/05 05:37:40 jlam Exp $
 
 DISTNAME=	eel-2.14.1
 PKGNAME=	${DISTNAME:S/-/2-/}
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Eazel Extensions Library for GNOME2
 
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake msgfmt pkg-config
+USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
@@ -29,7 +29,6 @@ PKGCONFIG_OVERRIDE=	eel-2.0.pc.in
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/devel/glade/Makefile.common b/devel/glade/Makefile.common
index 467768e8ee3..134a8dfdede 100644
--- a/devel/glade/Makefile.common
+++ b/devel/glade/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2006/06/11 13:57:54 joerg Exp $
+# $NetBSD: Makefile.common,v 1.3 2006/07/05 05:37:40 jlam Exp $
 
 DISTNAME=	glade-2.12.1
 CATEGORIES=	devel
@@ -17,12 +17,11 @@ CONFLICTS+=		glade2-[0-9]* glade2-gnome-[0-9]*
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake pkg-config msgfmt
+USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 
 .include "../../devel/gettext-lib/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/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index a9e805b8ccc..4e89117825a 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/06/08 09:47:58 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2006/07/05 05:37:40 jlam Exp $
 
 DISTNAME=		libbonobo-2.14.0
 CATEGORIES=		devel gnome
@@ -14,7 +14,7 @@ CONFLICTS=		bonobo-activation-[0-9]*
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
-USE_TOOLS+=		bison gmake perl:run pkg-config msgfmt
+USE_TOOLS+=		bison gmake intltool msgfmt perl:run pkg-config
 
 PKGCONFIG_OVERRIDE=	bonobo/libbonobo-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	bonobo-activation/bonobo-activation-2.0.pc.in
@@ -36,6 +36,5 @@ PRINT_PLIST_AWK+=	/^@dirrm lib\/(bonobo|bonobo\/monikers)$$/ \
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index 6a8343bdb99..895ae8caaf7 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2006/04/17 13:46:10 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2006/07/05 05:37:40 jlam Exp $
 #
 
 DISTNAME=	libbonoboui-2.14.0
@@ -14,7 +14,7 @@ COMMENT=	GNOME2 Object activation framework library (graphical version)
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake msgfmt pkg-config
+USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
 
 PKGCONFIG_OVERRIDE=	bonobo/libbonoboui-2.0.pc.in
@@ -34,7 +34,6 @@ BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.13.7
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index c425344cb0e..261ea614f50 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2006/04/13 18:23:31 jlam Exp $
+# $NetBSD: Makefile,v 1.58 2006/07/05 05:37:40 jlam Exp $
 #
 
 DISTNAME=	libgnome-2.14.1
@@ -13,7 +13,7 @@ COMMENT=	Core GNOME2 library (non-graphical)
 BUILDLINK_API_DEPENDS.esound+=	esound>=0.2.26
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake msgfmt pkg-config
+USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 
@@ -61,7 +61,6 @@ BUILDLINK_API_DEPENDS.libbonobo+=	libbonobo>=2.13.0
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index b81752cb79e..35f798b08eb 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/06/15 16:54:56 joerg Exp $
+# $NetBSD: Makefile,v 1.39 2006/07/05 05:37:40 jlam Exp $
 #
 
 DISTNAME=	libgsf-1.14.1
@@ -10,7 +10,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME2 structured file library
 
-USE_TOOLS+=		pkg-config gmake msgfmt
+USE_TOOLS+=		gmake intltool msgfmt pkg-config
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	yes
@@ -28,7 +28,6 @@ GCONF2_SCHEMAS=		gsf-office-thumbnailer.schemas
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libwnck/Makefile b/devel/libwnck/Makefile
index ac5994164aa..107514b8394 100644
--- a/devel/libwnck/Makefile
+++ b/devel/libwnck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/05/31 21:52:12 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2006/07/05 05:37:40 jlam Exp $
 #
 
 DISTNAME=	libwnck-2.14.2
@@ -12,7 +12,7 @@ COMMENT=	Library to write pagers and tasklists
 
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake msgfmt pkg-config
+USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
 
 PKGCONFIG_OVERRIDE=	libwnck-1.0.pc.in
@@ -22,7 +22,6 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 9e1b3340f37..b8fac2d68a3 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2006/06/17 17:29:12 rillig Exp $
+# $NetBSD: Makefile,v 1.48 2006/07/05 05:37:40 jlam Exp $
 #
 
 DISTNAME=		oaf-0.6.10
@@ -14,7 +14,7 @@ COMMENT=		New object activation framework for GNOME
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 USE_X11BASE=		YES
-USE_TOOLS+=		bison lex msgfmt
+USE_TOOLS+=		bison intltool lex msgfmt
 USE_LIBTOOL=		YES
 
 BROKEN_GETTEXT_DETECTION=	YES
@@ -27,7 +27,6 @@ PKG_SYSCONFSUBDIR=	oaf
 CONF_FILES+=		${EGDIR}/oaf-config.xml ${PKG_SYSCONFDIR}/oaf-config.xml
 
 .include "../../devel/popt/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml/buildlink3.mk"
 .include "../../x11/gnome-libs/buildlink3.mk"