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

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

4 files changed, 8 insertions, 12 deletions

diff --git a/print/evince/Makefile.common b/print/evince/Makefile.common
index a2601de158d..46c3d223778 100644
--- a/print/evince/Makefile.common
+++ b/print/evince/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2006/05/31 18:17:23 drochner Exp $
+# $NetBSD: Makefile.common,v 1.6 2006/07/05 05:37:44 jlam Exp $
 #
 
 DISTNAME=		evince-0.5.3
@@ -16,7 +16,7 @@ GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake msgfmt pkg-config
+USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_LANGUAGES+=		c++
 
 # XXX fake for "configure" to allow build w/o a gs installed
@@ -35,6 +35,5 @@ BUILDLINK_API_DEPENDS.poppler-glib+=	poppler-glib>=0.5.2
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/print/glabels/Makefile b/print/glabels/Makefile
index 1bdd7ce3744..380074e3fb8 100644
--- a/print/glabels/Makefile
+++ b/print/glabels/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/06/29 12:14:43 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2006/07/05 05:37:44 jlam Exp $
 #
 
 DISTNAME=		glabels-2.0.2
@@ -14,7 +14,7 @@ USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_DIRS+=		gnome2-1.5
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake pkg-config msgfmt
+USE_TOOLS+=		gmake intltool msgfmt pkg-config
 
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
@@ -22,7 +22,6 @@ USE_TOOLS+=		gmake pkg-config msgfmt
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../print/libgnomeprintui/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/print/libgnomecups/Makefile b/print/libgnomecups/Makefile
index 27a9e1764ae..28c213ac2a1 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/06/07 12:29:00 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/07/05 05:37:44 jlam Exp $
 #
 
 DISTNAME=	libgnomecups-0.2.2
@@ -10,7 +10,7 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	GNOME interface to CUPS
 
-USE_TOOLS+=		pkg-config msgfmt
+USE_TOOLS+=		intltool msgfmt pkg-config
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
@@ -19,5 +19,4 @@ PKGCONFIG_OVERRIDE=	libgnomecups-1.0.pc.in
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../print/cups/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index d714ff130ea..4ae65ae6d21 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2006/04/17 13:46:07 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2006/07/05 05:37:44 jlam Exp $
 #
 
 DISTNAME=	libgnomeprint-2.12.1
@@ -11,7 +11,7 @@ MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.levien.com/gnome/print-arch.html
 COMMENT=	Library for the GNOME2 Printing Architecture
 
-USE_TOOLS+=		bison gmake msgfmt pkg-config
+USE_TOOLS+=		bison gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
@@ -54,7 +54,6 @@ PRINT_PLIST_AWK+=	/cups/ { print "$${USE_CUPS}" $$0; next; }
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"