summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/file-roller/Makefile5
-rw-r--r--audio/glurp/Makefile5
-rw-r--r--audio/gmpc/Makefile5
-rw-r--r--audio/gtkpod/Makefile5
-rw-r--r--audio/liteamp/Makefile5
-rw-r--r--audio/rhythmbox/Makefile5
-rw-r--r--chat/gg2/Makefile5
-rw-r--r--chat/gnomeicu/Makefile5
-rw-r--r--chat/gossip/Makefile5
-rw-r--r--comms/gnome-pilot/Makefile5
-rw-r--r--comms/jpilot/Makefile5
-rw-r--r--databases/gnome-mime-data/Makefile6
-rw-r--r--databases/libgda/Makefile.common5
-rw-r--r--databases/libgnomedb/Makefile5
-rw-r--r--databases/mergeant/Makefile5
-rw-r--r--databases/shared-mime-info/Makefile5
-rw-r--r--devel/at-spi/Makefile5
-rw-r--r--devel/devhelp/Makefile5
-rw-r--r--devel/eel2/Makefile5
-rw-r--r--devel/glade/Makefile.common5
-rw-r--r--devel/libbonobo/Makefile5
-rw-r--r--devel/libbonoboui/Makefile5
-rw-r--r--devel/libgnome/Makefile5
-rw-r--r--devel/libgsf/Makefile5
-rw-r--r--devel/libwnck/Makefile5
-rw-r--r--devel/oaf/Makefile5
-rw-r--r--editors/conglomerate/Makefile5
-rw-r--r--editors/dasher/Makefile5
-rw-r--r--editors/gconf-editor/Makefile5
-rw-r--r--editors/gedit/Makefile5
-rw-r--r--editors/gtranslator/Makefile5
-rw-r--r--editors/leafpad/Makefile5
-rw-r--r--editors/mlview/Makefile5
-rw-r--r--finance/gnucash-devel/Makefile5
-rw-r--r--finance/gnucash/Makefile5
-rw-r--r--fonts/gucharmap/Makefile5
-rw-r--r--games/gnome2-games/Makefile5
-rw-r--r--games/gtetrinet/Makefile5
-rw-r--r--games/gturing/Makefile5
-rw-r--r--games/teg/Makefile5
-rw-r--r--graphics/dia/Makefile.common6
-rw-r--r--graphics/eog2/Makefile5
-rw-r--r--graphics/gimageview/Makefile5
-rw-r--r--graphics/gimp-color-manager/Makefile5
-rw-r--r--graphics/gimp-refocus-it/Makefile5
-rw-r--r--graphics/gimp/Makefile5
-rw-r--r--graphics/gimp24/Makefile5
-rw-r--r--graphics/gnome-backgrounds/Makefile5
-rw-r--r--graphics/gnome-icon-theme/Makefile5
-rw-r--r--graphics/gthumb/Makefile5
-rw-r--r--graphics/inkscape/Makefile5
-rw-r--r--graphics/pornview/Makefile5
-rw-r--r--graphics/refocus-it/Makefile5
-rw-r--r--ham/grig/Makefile5
-rw-r--r--inputmethod/imhangul_status_applet/Makefile5
-rw-r--r--inputmethod/uim/Makefile5
-rw-r--r--mail/balsa2/Makefile5
-rw-r--r--mail/evolution-data-server/Makefile5
-rw-r--r--mail/evolution-exchange/Makefile5
-rw-r--r--mail/evolution/Makefile5
-rw-r--r--mail/mail-notification/Makefile5
-rw-r--r--math/gcalctool/Makefile5
-rw-r--r--math/gnumeric/Makefile5
-rw-r--r--math/qalculate-bases/Makefile5
-rw-r--r--math/qalculate-currency/Makefile5
-rw-r--r--math/qalculate-gtk/Makefile5
-rw-r--r--math/qalculate-units/Makefile5
-rw-r--r--math/qalculate/Makefile5
-rw-r--r--misc/deskbar-applet/Makefile5
-rw-r--r--misc/gnome2-utils/Makefile5
-rw-r--r--misc/goffice/Makefile5
-rw-r--r--misc/gok/Makefile5
-rw-r--r--misc/yelp/Makefile5
-rw-r--r--multimedia/gnome2-media/Makefile5
-rw-r--r--multimedia/gopchop/Makefile5
-rw-r--r--multimedia/totem/Makefile.common5
-rw-r--r--multimedia/xfmedia/Makefile5
-rw-r--r--net/amule/Makefile5
-rw-r--r--net/bug-buddy/Makefile5
-rw-r--r--net/gftp/Makefile.common5
-rw-r--r--net/gnome-netstatus/Makefile5
-rw-r--r--net/tsclient/Makefile5
-rw-r--r--net/vino/Makefile5
-rw-r--r--print/evince/Makefile.common5
-rw-r--r--print/glabels/Makefile5
-rw-r--r--print/libgnomecups/Makefile5
-rw-r--r--print/libgnomeprint/Makefile5
-rw-r--r--security/gnome-keyring-manager/Makefile5
-rw-r--r--security/seahorse-gedit/Makefile5
-rw-r--r--security/seahorse-nautilus/Makefile5
-rw-r--r--security/seahorse/Makefile5
-rw-r--r--sysutils/gnome-menus/Makefile5
-rw-r--r--sysutils/gnome-pkgview/Makefile5
-rw-r--r--sysutils/gnome-vfs2/Makefile.common6
-rw-r--r--sysutils/gnome2-system-monitor/Makefile5
-rw-r--r--sysutils/nautilus-cd-burner/Makefile5
-rw-r--r--sysutils/nautilus/Makefile5
-rw-r--r--sysutils/notification-daemon/Makefile5
-rw-r--r--textproc/gnome-doc-utils/Makefile5
-rw-r--r--textproc/gnome-spell/Makefile5
-rw-r--r--textproc/intltool/buildlink3.mk40
-rw-r--r--textproc/scrollkeeper/Makefile5
-rw-r--r--time/evolution-webcal/Makefile5
-rw-r--r--time/gnotime/Makefile5
-rw-r--r--time/gtodo/Makefile5
-rw-r--r--wm/e16menuedit2/Makefile5
-rw-r--r--wm/metacity/Makefile5
-rw-r--r--www/drivel/Makefile5
-rw-r--r--www/epiphany-extensions/Makefile5
-rw-r--r--www/epiphany/Makefile5
-rw-r--r--www/galeon/Makefile5
-rw-r--r--www/galeon12/Makefile5
-rw-r--r--www/gtkhtml38/Makefile5
-rw-r--r--www/kazehakase/Makefile5
-rw-r--r--x11/Terminal/Makefile5
-rw-r--r--x11/devilspie/Makefile5
-rw-r--r--x11/fast-user-switch-applet/Makefile5
-rw-r--r--x11/gdm/Makefile5
-rw-r--r--x11/gnome-desktop/Makefile5
-rw-r--r--x11/gnome-mag/Makefile5
-rw-r--r--x11/gnome-panel/Makefile6
-rw-r--r--x11/gnome-screensaver/Makefile5
-rw-r--r--x11/gnome-session/Makefile5
-rw-r--r--x11/gnome-themes-extras/Makefile5
-rw-r--r--x11/gnome-themes/Makefile5
-rw-r--r--x11/gnome2-applets/Makefile5
-rw-r--r--x11/gnome2-control-center/Makefile5
-rw-r--r--x11/gnome2-terminal/Makefile5
-rw-r--r--x11/gnopernicus/Makefile5
-rw-r--r--x11/gtksourceview/Makefile5
-rw-r--r--x11/vte/Makefile5
-rw-r--r--x11/xpad/Makefile5
-rw-r--r--x11/zenity/Makefile5
133 files changed, 264 insertions, 440 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 57fd694dec2..54ce060982e 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2006/06/13 17:32:08 drochner Exp $
+# $NetBSD: Makefile,v 1.62 2006/07/05 05:37:39 jlam Exp $
#
DISTNAME= file-roller-2.14.3
@@ -17,7 +17,7 @@ DEPENDS+= zip>=2.3nb2:../../archivers/zip
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_LIBTOOL= yes
-USE_TOOLS+= gmake msgfmt perl pkg-config
+USE_TOOLS+= gmake intltool msgfmt perl pkg-config
USE_PKGLOCALEDIR= yes
GCONF2_SCHEMAS= file-roller.schemas
@@ -36,7 +36,6 @@ BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.4.0
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../sysutils/nautilus/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/glurp/Makefile b/audio/glurp/Makefile
index b511c5e9f71..70020af0721 100644
--- a/audio/glurp/Makefile
+++ b/audio/glurp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/04/17 13:46:15 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2006/07/05 05:37:39 jlam Exp $
#
DISTNAME= glurp-0.11.6
@@ -12,10 +12,9 @@ COMMENT= Graphical GTK+2-based client for musicpd
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
-USE_TOOLS+= pkg-config
+USE_TOOLS+= intltool pkg-config
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index 01ea1106a92..f22ee73f0c8 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/06/19 21:45:54 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2006/07/05 05:37:39 jlam Exp $
#
DISTNAME= gmpc-0.13.0
@@ -12,7 +12,7 @@ COMMENT= GNOME client for the Music Player Daemon
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config msgfmt
+USE_TOOLS+= intltool msgfmt pkg-config
PKGCONFIG_OVERRIDE= data/gmpc.pc.in
USE_DIRS+= xdg-1.1
@@ -21,7 +21,6 @@ USE_DIRS+= xdg-1.1
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libglade2/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/audio/gtkpod/Makefile b/audio/gtkpod/Makefile
index f127b411154..cb847348ad6 100644
--- a/audio/gtkpod/Makefile
+++ b/audio/gtkpod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/04/17 13:46:16 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2006/07/05 05:37:39 jlam Exp $
#
DISTNAME= gtkpod-0.94.0
@@ -14,7 +14,7 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= msgfmt pkg-config perl:run
+USE_TOOLS+= intltool msgfmt perl:run pkg-config
REPLACE_PERL+= scripts/mab2vcard
@@ -28,7 +28,6 @@ BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.4.0
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index 74f4260dce0..e127b3c1011 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/06/21 19:48:31 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2006/07/05 05:37:39 jlam Exp $
DISTNAME= liteamp-0.2.4.2
PKGREVISION= 7
@@ -11,7 +11,7 @@ COMMENT= Light-weight Music Player for GNOME2
USE_DIRS+= gnome2-1.5
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake perl pkg-config msgfmt
+USE_TOOLS+= gmake intltool msgfmt perl pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
@@ -23,7 +23,6 @@ CPPFLAGS+= -UGTK_DISABLE_DEPRECATED
.include "../../audio/libmad/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 3d450a944e9..e854fed7ef7 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/07/03 13:02:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.41 2006/07/05 05:37:39 jlam Exp $
#
DISTNAME= rhythmbox-0.9.5
@@ -13,7 +13,7 @@ COMMENT= Music management application for GNOME
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
@@ -47,7 +47,6 @@ BUILDLINK_API_DEPENDS.totem+= {totem,totem-xine}>=1.1.5
.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
.include "../../sysutils/libnotify/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/gg2/Makefile b/chat/gg2/Makefile
index 61fd8d78233..07aaade0fa7 100644
--- a/chat/gg2/Makefile
+++ b/chat/gg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/04/17 13:46:18 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2006/07/05 05:37:39 jlam Exp $
DISTNAME= gg2-2.2.8
PKGREVISION= 5
@@ -12,7 +12,7 @@ COMMENT= Instant messenger software for Poland; Jabber plugin included
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake pkg-config
+USE_TOOLS+= gmake intltool pkg-config
GNU_CONFIGURE= yes
LIBS+= -lm
PKGCONFIG_OVERRIDE+= lib/gg2_core.pc.in
@@ -29,7 +29,6 @@ CONFIGURE_ARGS+= --without-update
.include "../../chat/libtlen/buildlink3.mk"
.include "../../chat/loudmouth/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/xosd/buildlink3.mk"
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index 3256922bd93..025df3f5297 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/04/17 13:46:18 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2006/07/05 05:37:39 jlam Exp $
DISTNAME= gnomeicu-0.99.5
PKGREVISION= 7
@@ -12,7 +12,7 @@ COMMENT= GNOME ICQ client
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
BROKEN_GETTEXT_DETECTION= YES
@@ -32,7 +32,6 @@ GCONF2_SCHEMAS= gnomeicu.schemas
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../textproc/gtkspell/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile
index 8b2957b7c4c..0dc6bfdd300 100644
--- a/chat/gossip/Makefile
+++ b/chat/gossip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/04/17 13:46:18 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2006/07/05 05:37:39 jlam Exp $
#
DISTNAME= gossip-0.10.2
@@ -14,7 +14,7 @@ COMMENT= GTK2 Jabber Instant Messaging client
BUILD_DEPENDS+= p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
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
@@ -38,7 +38,6 @@ INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} sysconfdir=${EGDIR}
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
diff --git a/comms/gnome-pilot/Makefile b/comms/gnome-pilot/Makefile
index a1f1b734fa1..598610b91eb 100644
--- a/comms/gnome-pilot/Makefile
+++ b/comms/gnome-pilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/06/29 23:48:24 joerg Exp $
+# $NetBSD: Makefile,v 1.35 2006/07/05 05:37:39 jlam Exp $
#
DISTNAME= gnome-pilot-2.0.12
@@ -16,13 +16,12 @@ GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
-USE_TOOLS+= gmake msgfmt perl pkg-config
+USE_TOOLS+= gmake intltool msgfmt perl pkg-config
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../comms/pilot-link-libs/buildlink3.mk"
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index 2966e0e7234..8da7cbdf34d 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2006/06/18 12:26:31 smb Exp $
+# $NetBSD: Makefile,v 1.57 2006/07/05 05:37:39 jlam Exp $
#
DISTNAME= jpilot-0.99.8
@@ -16,7 +16,7 @@ USE_PKGLOCALEDIR= YES
USE_X11= YES
USE_OLD_DES_API= YES
USE_DIRS+= gnome1-1.0
-USE_TOOLS+= msgfmt pkg-config
+USE_TOOLS+= intltool msgfmt pkg-config
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-gtk-prefix="${BUILDLINK_PREFIX.gtk}"
@@ -32,7 +32,6 @@ PLUGINSDIR= ${PREFIX}/lib/jpilot/plugins
.include "../../comms/pilot-link-libs/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
post-extract:
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"
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"
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index f0e8bd04cf8..02156b7ae4e 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2006/05/30 19:40:08 joerg Exp $
+# $NetBSD: Makefile,v 1.44 2006/07/05 05:37:40 jlam Exp $
#
DISTNAME= conglomerate-0.9.1
@@ -15,7 +15,7 @@ DEPENDS+= docbook-xml>=4.2nb6:../../textproc/docbook-xml
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_LIBTOOL= yes
-USE_TOOLS+= gmake msgfmt perl pkg-config
+USE_TOOLS+= gmake intltool msgfmt perl pkg-config
USE_PKGLOCALEDIR= yes
CONFIGURE_ARGS+= --enable-printing
@@ -33,7 +33,6 @@ GCONF2_SCHEMAS= conglomerate.schemas
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
.include "../../textproc/enchant/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index 6878617077f..3cd2790f02d 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/06/29 12:17:16 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2006/07/05 05:37:40 jlam Exp $
DISTNAME= dasher-4.0.2
CATEGORIES= editors gnome
@@ -12,7 +12,7 @@ COMMENT= Easy typing without using keyboard
USE_DIRS+= gnome2-1.5
USE_LANGUAGES+= c++
USE_LIBTOOL= yes
-USE_TOOLS+= gmake pkg-config msgfmt
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -39,7 +39,6 @@ LIBS+= -lcompat
.include "../../net/ORBit2/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index c2da464423c..e1f568f0507 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/04/17 13:46:22 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2006/07/05 05:37:40 jlam Exp $
#
DISTNAME= gconf-editor-2.14.0
@@ -15,7 +15,7 @@ GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1 gnome2-1.5
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
CONFIGURE_ARGS+= --with-gconf-defaults-source=${GCONF2_CONFIG_SOURCE:Q}
CONFIGURE_ARGS+= --with-gconf-mandatory-source=${GCONF2_CONFIG_SOURCE:S/gconf.xml.defaults/gconf.xml.mandatory/g}
@@ -30,7 +30,6 @@ BUILDLINK_API_DEPENDS.GConf2+= GConf2>=2.14.0
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 68cda6d8e9a..74a40ea2d31 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2006/05/31 18:37:47 drochner Exp $
+# $NetBSD: Makefile,v 1.65 2006/07/05 05:37:40 jlam Exp $
#
DISTNAME= gedit-2.14.3
@@ -12,7 +12,7 @@ COMMENT= Lightweight GNOME2 text editor
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake msgfmt perl pkg-config
+USE_TOOLS+= gmake intltool msgfmt perl pkg-config
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
@@ -39,7 +39,6 @@ BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.13.4
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/aspell/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/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/editors/gtranslator/Makefile b/editors/gtranslator/Makefile
index 43bdf687f5d..adaa6e70920 100644
--- a/editors/gtranslator/Makefile
+++ b/editors/gtranslator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/05/08 21:31:28 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2006/07/05 05:37:40 jlam Exp $
DISTNAME= gtranslator-1.0.2
PKGREVISION= 7
@@ -10,7 +10,7 @@ HOMEPAGE= http://gtranslator.sourceforge.net/
COMMENT= Gettext po file editor for the GNOME2 desktop environment
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
MANCOMPRESSED= yes
@@ -24,7 +24,6 @@ CONFIGURE_ARGS+= --disable-debug
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/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/editors/leafpad/Makefile b/editors/leafpad/Makefile
index e9f449e5fb3..7752092352f 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/06/11 14:28:33 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/07/05 05:37:41 jlam Exp $
#
DISTNAME= leafpad-0.8.4
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://tarot.freeshell.org/leafpad/
COMMENT= Simple and light text editor using GTK+
-USE_TOOLS+= pkg-config msgfmt
+USE_TOOLS+= intltool msgfmt pkg-config
GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= YES
@@ -18,6 +18,5 @@ USE_PKGLOCALEDIR= YES
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index 1e1a12cdbaa..e83679b66cf 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/06/29 21:50:51 joerg Exp $
+# $NetBSD: Makefile,v 1.24 2006/07/05 05:37:41 jlam Exp $
#
DISTNAME= mlview-0.7.0
@@ -13,7 +13,7 @@ COMMENT= XML editor for the GNOME environment
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
@@ -27,7 +27,6 @@ GCONF2_SCHEMAS= mlview.schemas
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libcroco/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
diff --git a/finance/gnucash-devel/Makefile b/finance/gnucash-devel/Makefile
index 96d650ae1b3..283d16152e3 100644
--- a/finance/gnucash-devel/Makefile
+++ b/finance/gnucash-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/07/02 11:07:03 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2006/07/05 05:37:41 jlam Exp $
#
DISTNAME= gnucash-1.9.8
@@ -15,7 +15,7 @@ DEPENDS+= guile-www-[0-9]*:../../devel/guile-www
USE_DIRS+= xdg-1.1
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake makeinfo msgfmt pkg-config
+USE_TOOLS+= gmake intltool makeinfo msgfmt pkg-config
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= lib/goffice-0.0.4/libgoffice-1.pc.in
@@ -61,7 +61,6 @@ BUILDLINK_API_DEPENDS.goffice+= goffice>=0.1.2
.include "../../misc/goffice/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0
.include "../../www/gtkhtml38/buildlink3.mk"
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 6581c9f25a7..cbf7265a921 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2006/04/17 13:46:24 wiz Exp $
+# $NetBSD: Makefile,v 1.99 2006/07/05 05:37:41 jlam Exp $
DISTNAME= gnucash-1.8.12
PKGREVISION= 4
@@ -15,7 +15,7 @@ DEPENDS+= p5-Date-Manip>=5.42a:../../devel/p5-Date-Manip
DEPENDS+= p5-Finance-Quote>=1.06:../../finance/p5-Finance-Quote
USE_DIRS+= gnome1-1.5
-USE_TOOLS+= bison gmake pkg-config
+USE_TOOLS+= bison gmake intltool pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
@@ -49,7 +49,6 @@ post-install:
.include "../../lang/guile/buildlink3.mk"
.include "../../math/guppi/buildlink3.mk"
.include "../../net/ORBit/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml/buildlink3.mk"
.include "../../www/gtkhtml/buildlink3.mk"
.include "../../x11/gnome-libs/buildlink3.mk"
diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile
index 8af8cfd33f9..2ee65d5ecb7 100644
--- a/fonts/gucharmap/Makefile
+++ b/fonts/gucharmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/04/17 13:46:08 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2006/07/05 05:37:41 jlam Exp $
#
DISTNAME= gucharmap-1.6.0
@@ -12,7 +12,7 @@ HOMEPAGE= http://gucharmap.sourceforge.net/
COMMENT= Unicode/ISO10646 character map and font viewer
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -29,7 +29,6 @@ GTK2_IMMODULES= yes
.include "../../devel/popt/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/modules.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile
index 5d43b928686..1a084011606 100644
--- a/games/gnome2-games/Makefile
+++ b/games/gnome2-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2006/05/02 17:19:22 drochner Exp $
+# $NetBSD: Makefile,v 1.71 2006/07/05 05:37:41 jlam Exp $
DISTNAME= gnome-games-2.14.1
CATEGORIES= games gnome
@@ -13,7 +13,7 @@ CONFLICTS= xbill-[0-9]*
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_CONFIG_WRAPPER= yes
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
@@ -72,7 +72,6 @@ BUILDLINK_API_DEPENDS.librsvg2+= librsvg2>=2.12.6
.include "../../lang/guile/buildlink3.mk"
.include "../../net/howl/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 07e5a2629b1..a5b8868d1f5 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2006/04/17 13:46:28 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2006/07/05 05:37:41 jlam Exp $
#
DISTNAME= gtetrinet-0.7.7
@@ -12,7 +12,7 @@ COMMENT= Multiplayer tetris game for GNOME2
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= YES
BUILD_DEFS+= USE_INET6
@@ -31,5 +31,4 @@ GCONF2_SCHEMAS= gtetrinet.schemas
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index 8e07115c391..c1065e0d5fa 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2006/04/17 13:46:28 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2006/07/05 05:37:41 jlam Exp $
#
DISTNAME= gturing-0.1.1
@@ -13,13 +13,12 @@ COMMENT= GNOME2 turing machine emulator
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
BUILDLINK_TRANSFORM+= rm:-D.*_DISABLE_DEPRECATED
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/teg/Makefile b/games/teg/Makefile
index 18d4b1eb1e2..b18e9e0442e 100644
--- a/games/teg/Makefile
+++ b/games/teg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/06/29 19:56:16 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/07/05 05:37:41 jlam Exp $
DISTNAME= teg-0.11.1
PKGREVISION= 6
@@ -13,11 +13,10 @@ USE_DIRS= xdg-1.2 gnome2-1.5
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= pkg-config msgfmt
+USE_TOOLS+= intltool msgfmt pkg-config
GCONF2_SCHEMAS+= teg.schemas
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/GConf2/schemas.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/dia/Makefile.common b/graphics/dia/Makefile.common
index 7c974119eb9..e38beae49d1 100644
--- a/graphics/dia/Makefile.common
+++ b/graphics/dia/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2006/05/31 17:50:12 drochner Exp $
+# $NetBSD: Makefile.common,v 1.13 2006/07/05 05:37:41 jlam Exp $
#
DISTNAME= dia-0.95-1
@@ -15,7 +15,7 @@ DISTINFO_FILE= ${.CURDIR}/../../graphics/dia/distinfo
PATCHDIR= ${.CURDIR}/../../graphics/dia/patches
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake pkg-config
+USE_TOOLS+= gmake intltool pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_LANGUAGES+= c++
@@ -37,7 +37,6 @@ BUILDLINK_DEPMETHOD.pango+= build
BUILDLINK_DEPMETHOD.pkgconfig+= build
BUILDLINK_DEPMETHOD.freetype2+= build
BUILDLINK_DEPMETHOD.libart2+= build
-BUILDLINK_DEPMETHOD.intltool+= build
BUILDLINK_DEPMETHOD.libxml2+= build
BUILDLINK_DEPMETHOD.libxslt+= build
BUILDLINK_DEPMETHOD.scrollkeeper+= build
@@ -49,7 +48,6 @@ BUILDLINK_DEPMETHOD.gtk2+= build
.include "../../devel/pango/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 649d96f2300..4eafa95f289 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2006/06/13 17:30:08 drochner Exp $
+# $NetBSD: Makefile,v 1.61 2006/07/05 05:37:41 jlam Exp $
#
DISTNAME= eog-2.14.2
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= Eye of GNOME: an image viewing and cataloging program
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
@@ -35,7 +35,6 @@ BUILDLINK_API_DEPENDS.libart2+= libart2>=2.3.16
.include "../../print/libgnomeprintui/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gnome-desktop/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 6e7f8e616fc..83d6f627e01 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2006/04/17 13:46:31 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2006/07/05 05:37:41 jlam Exp $
DISTNAME= gimageview-0.2.27
PKGREVISION= 7
@@ -13,7 +13,7 @@ USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake pkg-config
+USE_TOOLS+= gmake intltool pkg-config
CONFIGURE_ARGS+= --disable-xinetest
CONFIGURE_ARGS+= --with-gtk2
@@ -31,7 +31,6 @@ LDFLAGS.NetBSD+= ${PTHREAD_LDFLAGS}
.include "../../graphics/libwmf/buildlink3.mk"
.include "../../graphics/mng/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/gimp-color-manager/Makefile b/graphics/gimp-color-manager/Makefile
index 6329e0070e1..23c06dadede 100644
--- a/graphics/gimp-color-manager/Makefile
+++ b/graphics/gimp-color-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/06/30 00:50:08 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/07/05 05:37:41 jlam Exp $
#
DISTNAME= gimp-color-manager-0.1.0
@@ -11,12 +11,11 @@ HOMEPAGE= http://www.khk.net/color/color_manager.html
COMMENT= Gimp Color Manager plugin
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= pkg-config
+USE_TOOLS+= intltool pkg-config
GNU_CONFIGURE= yes
MAKE_ENV+= mkinstalldirs=${INSTALL_DATA_DIR:Q}
.include "../../graphics/gimp/buildlink3.mk"
.include "../../graphics/lcms/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp-refocus-it/Makefile b/graphics/gimp-refocus-it/Makefile
index c061fa51218..1db19f0485c 100644
--- a/graphics/gimp-refocus-it/Makefile
+++ b/graphics/gimp-refocus-it/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/06/30 02:30:17 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/07/05 05:37:41 jlam Exp $
#
DISTNAME= refocus-it-2.0.0
@@ -15,8 +15,7 @@ USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
#just build the plugin
CONFIGURE_ARGS+= --without-cmdline
-USE_TOOLS+= pkg-config msgfmt
+USE_TOOLS+= intltool msgfmt pkg-config
.include "../../graphics/gimp/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index bd142b958ab..b016b14512d 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.140 2006/04/18 20:24:48 tron Exp $
+# $NetBSD: Makefile,v 1.141 2006/07/05 05:37:41 jlam Exp $
DISTNAME= gimp-2.2.11
PKGREVISION= 2
@@ -18,7 +18,7 @@ CONFLICTS+= gimp<=1.2.3
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
PKG_SYSCONFSUBDIR= gimp/2.0
@@ -61,7 +61,6 @@ LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
.include "../../graphics/xpm/buildlink3.mk"
.include "../../graphics/libwmf/buildlink3.mk"
.include "../../print/gimp-print-lib/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../www/libgtkhtml/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/gimp24/Makefile b/graphics/gimp24/Makefile
index afa9b0d22dd..3877118f6cd 100644
--- a/graphics/gimp24/Makefile
+++ b/graphics/gimp24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/06/08 15:39:38 adam Exp $
+# $NetBSD: Makefile,v 1.22 2006/07/05 05:37:41 jlam Exp $
DISTNAME= gimp-2.3.9
CATEGORIES= graphics
@@ -17,7 +17,7 @@ CONFLICTS+= gimp<=1.2.3
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
PKG_SYSCONFSUBDIR= gimp/2.0
@@ -62,7 +62,6 @@ LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
.include "../../graphics/tiff/buildlink3.mk"
.include "../../graphics/libwmf/buildlink3.mk"
.include "../../print/gimp-print-lib/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../www/libgtkhtml/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/gnome-backgrounds/Makefile b/graphics/gnome-backgrounds/Makefile
index f75de0b6b95..62d2ef69b3c 100644
--- a/graphics/gnome-backgrounds/Makefile
+++ b/graphics/gnome-backgrounds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/04/13 18:23:33 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2006/07/05 05:37:41 jlam Exp $
#
DISTNAME= gnome-backgrounds-2.14.0
@@ -13,12 +13,11 @@ COMMENT= Set of background images for the GNOME Desktop
GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.3
-USE_TOOLS+= gmake msgfmt
+USE_TOOLS+= gmake intltool msgfmt
USE_LANGUAGES= # empty
USE_PKGLOCALEDIR= YES
BUILDLINK_DEPMETHOD.gettext= build
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gnome-icon-theme/Makefile b/graphics/gnome-icon-theme/Makefile
index 0914250fa15..a93b8f508ca 100644
--- a/graphics/gnome-icon-theme/Makefile
+++ b/graphics/gnome-icon-theme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2006/04/17 13:46:32 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2006/07/05 05:37:42 jlam Exp $
#
DISTNAME= gnome-icon-theme-2.14.2
@@ -13,7 +13,7 @@ COMMENT= Theme consisting of a set of icons for GNOME
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake msgfmt perl
+USE_TOOLS+= gmake intltool msgfmt perl
USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE= gnome-icon-theme.pc.in
@@ -23,5 +23,4 @@ HICOLOR_ICON_THEME_DEPEND_ONLY= yes
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 6be565b531f..cc162676fe0 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/06/21 21:31:23 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/07/05 05:37:42 jlam Exp $
DISTNAME= gthumb-2.6.9
PKGREVISION= 3
@@ -9,7 +9,7 @@ MAINTAINER= minskim@NetBSD.org
HOMEPAGE= http://gthumb.sourceforge.net/
COMMENT= Image viewer and browser for the GNOME Desktop
-USE_TOOLS+= pkg-config msgfmt
+USE_TOOLS+= intltool msgfmt pkg-config
USE_DIRS+= xdg-1.1 gnome2-1.5
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
@@ -37,7 +37,6 @@ BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.4.0
.include "../../print/libgnomeprintui/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/Xrender/buildlink3.mk"
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 0ef298bf6fc..e7925cfed02 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/07/04 15:46:34 drochner Exp $
+# $NetBSD: Makefile,v 1.25 2006/07/05 05:37:42 jlam Exp $
DISTNAME= inkscape-0.44
CATEGORIES= graphics
@@ -18,7 +18,7 @@ USE_DIRS+= xdg-1.1
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
GNU_CONFIGURE= yes
BUILDLINK_API_DEPENDS.boehm-gc+= boehm-gc>=6.4
@@ -31,7 +31,6 @@ BUILDLINK_API_DEPENDS.boehm-gc+= boehm-gc>=6.4
.include "../../graphics/png/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/gtkspell/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../x11/gtkmm/buildlink3.mk"
diff --git a/graphics/pornview/Makefile b/graphics/pornview/Makefile
index 97537519faa..023c660930c 100644
--- a/graphics/pornview/Makefile
+++ b/graphics/pornview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/04/17 13:46:34 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2006/07/05 05:37:42 jlam Exp $
#
PKGNAME= pornview-0.2.0pre1
@@ -18,12 +18,11 @@ USE_DIRS+= gnome2-1.5
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= msgfmt perl:run
+USE_TOOLS+= intltool msgfmt perl:run
REPLACE_PERL+= src/scripts/helloworld
.include "options.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/refocus-it/Makefile b/graphics/refocus-it/Makefile
index f69c5ea0802..5a6843af74a 100644
--- a/graphics/refocus-it/Makefile
+++ b/graphics/refocus-it/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/04/13 18:23:34 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2006/07/05 05:37:42 jlam Exp $
#
DISTNAME= refocus-it-2.0.0
@@ -14,9 +14,8 @@ GNU_CONFIGURE= yes
#just build the command line tool
CONFIGURE_ARGS+= --without-gimp
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= msgfmt
+USE_TOOLS+= intltool msgfmt
BROKEN_GETTEXT_DETECTION= yes
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/ham/grig/Makefile b/ham/grig/Makefile
index a688c6b8dd0..9d5bee09570 100644
--- a/ham/grig/Makefile
+++ b/ham/grig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/06/11 14:09:01 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/07/05 05:37:42 jlam Exp $
#
DISTNAME= grig-0.4.3
@@ -11,10 +11,9 @@ HOMEPAGE= http://groundstation.sourceforge.net/
COMMENT= Graphical user interface to the Hamlib libraries
USE_LIBTOOL= yes
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
GNU_CONFIGURE= yes
.include "../../ham/hamlib/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/imhangul_status_applet/Makefile b/inputmethod/imhangul_status_applet/Makefile
index 66083fb8846..3ae82bc1575 100644
--- a/inputmethod/imhangul_status_applet/Makefile
+++ b/inputmethod/imhangul_status_applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/06/22 10:22:07 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/07/05 05:37:42 jlam Exp $
#
DISTNAME= imhangul_status_applet-0.3
@@ -15,12 +15,11 @@ DEPENDS+= imhangul>=0.9.6:../../inputmethod/imhangul
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1 gnome2-1.5
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake pkg-config msgfmt
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
GCONF2_SCHEMAS= imhangul_status.schemas
.include "../../devel/GConf2/schemas.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index 3cf7d2932a7..fea1df1bede 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/06/12 16:35:20 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2006/07/05 05:37:42 jlam Exp $
#
DISTNAME= uim-1.1.0
@@ -13,7 +13,7 @@ USE_DIRS+= xdg-1.1
USE_LIBTOOL= YES
USE_NCURSES= # clear_screen, clr_eos
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake pkg-config
+USE_TOOLS+= gmake intltool pkg-config
USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE+= ${WRKSRC}/uim.pc.in
GNU_CONFIGURE= YES
@@ -39,6 +39,5 @@ post-install:
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index c82e5207684..cd8ccaa0f04 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2006/04/17 13:46:38 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2006/07/05 05:37:42 jlam Exp $
DISTNAME= balsa-2.3.10
PKGREVISION= 4
@@ -15,7 +15,7 @@ USE_DIRS+= gnome2-1.5
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake msgfmt perl pkg-config
+USE_TOOLS+= gmake intltool msgfmt perl pkg-config
CONFIGURE_ARGS+= --with-gpgme=${BUILDLINK_PREFIX.gpgme:Q}/bin/gpgme-config
CONFIGURE_ARGS+= --disable-more-warnings
@@ -54,7 +54,6 @@ BUILDLINK_API_DEPENDS.gmime+= gmime>=2.1.9
.include "../../security/gpgme/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/aspell/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../www/gtkhtml38/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index 47d27c1ae45..2f75f5ef2c1 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/06/11 15:05:39 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2006/07/05 05:37:42 jlam Exp $
#
DISTNAME= evolution-data-server-1.6.2
@@ -14,7 +14,7 @@ BUILDLINK_API_DEPENDS.libsoup-devel+= libsoup-devel>=2.2.3
GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
-USE_TOOLS+= bison gmake msgfmt pkg-config
+USE_TOOLS+= bison gmake intltool msgfmt pkg-config
USE_LANGUAGES+= c++
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
@@ -69,7 +69,6 @@ BUILDLINK_TRANSFORM+= rm:-ldl
.include "../../net/libsoup-devel/buildlink3.mk"
.include "../../net/ORBit2/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/pthread.buildlink3.mk"
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index 801cc8f0115..eac9bee7ad7 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/06/29 22:21:17 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/07/05 05:37:42 jlam Exp $
#
DISTNAME= evolution-exchange-2.6.0
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.novell.com/products/evolution/
COMMENT= Support for Microsoft Exchange 2000 and 2003 in Evolution
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake pkg-config msgfmt
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
@@ -30,7 +30,6 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/evolution-exchange
.include "../../net/libsoup-devel/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/krb5.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index bdcd9d7ee9d..20f94cf4005 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2006/05/31 18:22:23 ghen Exp $
+# $NetBSD: Makefile,v 1.110 2006/07/05 05:37:42 jlam Exp $
DISTNAME= evolution-2.6.0
PKGREVISION= 4
@@ -26,7 +26,7 @@ PKG_FAIL_REASON+= "Kerberos support conflicts with SSL"
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= bison gmake msgfmt pkg-config
+USE_TOOLS+= bison gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
@@ -134,7 +134,6 @@ LDFLAGS+= -lsemaphore
.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../www/gtkhtml38/buildlink3.mk"
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 7e47f95fa65..7126fad113c 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/04/17 13:46:38 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2006/07/05 05:37:42 jlam Exp $
#
DISTNAME= mail-notification-2.0
@@ -12,7 +12,7 @@ COMMENT= Status icon that provides new mail notifications
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
@@ -58,7 +58,6 @@ CONFIGURE_ARGS+= --disable-ssl
.include "../../mail/gmime/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 33f7134105a..4a66f6e99e2 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2006/04/17 13:46:39 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2006/07/05 05:37:42 jlam Exp $
#
DISTNAME= gcalctool-5.7.32
@@ -16,7 +16,7 @@ CONFIGURE_ENV+= HAVE_YACC=yes
USE_DIRS+= gnome2-1.5
USE_LIBTOOL= yes
-USE_TOOLS+= bison gmake msgfmt pkg-config
+USE_TOOLS+= bison gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
GCONF2_SCHEMAS= gcalctool.schemas
@@ -27,7 +27,6 @@ GCONF2_SCHEMAS= gcalctool.schemas
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 7451f208e94..ff6e93324c7 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2006/04/17 13:46:39 wiz Exp $
+# $NetBSD: Makefile,v 1.114 2006/07/05 05:37:42 jlam Exp $
#
DISTNAME= gnumeric-1.6.3
@@ -13,7 +13,7 @@ COMMENT= Spreadsheet program from the GNOME project
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake msgfmt perl:run pkg-config
+USE_TOOLS+= gmake intltool msgfmt perl:run pkg-config
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
@@ -53,7 +53,6 @@ BUILDLINK_API_DEPENDS.libgnomeprint+= libgnomeprint>=2.8.2
BUILDLINK_API_DEPENDS.libgnomeprintui+= libgnomeprintui>=2.8.2
.include "../../print/libgnomeprintui/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
# XXX: link test against libpython fails
diff --git a/math/qalculate-bases/Makefile b/math/qalculate-bases/Makefile
index f5391f56150..54f94e54da2 100644
--- a/math/qalculate-bases/Makefile
+++ b/math/qalculate-bases/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/06/19 19:24:34 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/07/05 05:37:42 jlam Exp $
DISTNAME= qalculate-bases-0.9.4
CATEGORIES= math
@@ -11,12 +11,11 @@ COMMENT= Utility for conversion between number bases using Qalculate
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
GNU_CONFIGURE= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
.include "../../math/qalculate/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/qalculate-currency/Makefile b/math/qalculate-currency/Makefile
index ae885c18cd5..f29c67404ec 100644
--- a/math/qalculate-currency/Makefile
+++ b/math/qalculate-currency/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/06/19 19:24:34 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/07/05 05:37:43 jlam Exp $
DISTNAME= qalculate-currency-0.9.4
CATEGORIES= math
@@ -10,11 +10,10 @@ COMMENT= Utility for conversion between currencies using Qalculate
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
GNU_CONFIGURE= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
.include "../../math/qalculate/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/qalculate-gtk/Makefile b/math/qalculate-gtk/Makefile
index 064fe402abb..8b7a6741b99 100644
--- a/math/qalculate-gtk/Makefile
+++ b/math/qalculate-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/06/22 10:22:59 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2006/07/05 05:37:43 jlam Exp $
DISTNAME= qalculate-gtk-0.9.4
CATEGORIES= math
@@ -13,12 +13,11 @@ DEPENDS+= wget>=1.8:../../net/wget
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
GNU_CONFIGURE= yes
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../math/qalculate/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/qalculate-units/Makefile b/math/qalculate-units/Makefile
index 0cb21803492..0800744a8c9 100644
--- a/math/qalculate-units/Makefile
+++ b/math/qalculate-units/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2006/06/19 19:24:34 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2006/07/05 05:37:43 jlam Exp $
DISTNAME= qalculate-units-0.9.4
CATEGORIES= math
@@ -11,11 +11,10 @@ COMMENT= Utility for conversion between units using Qalculate
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
GNU_CONFIGURE= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
.include "../../math/qalculate/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 0f632c36838..599323e2c56 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/06/14 20:14:21 adam Exp $
+# $NetBSD: Makefile,v 1.25 2006/07/05 05:37:43 jlam Exp $
DISTNAME= libqalculate-0.9.4
PKGNAME= qalculate-0.9.4
@@ -13,7 +13,7 @@ USE_GNU_READLINE= yes
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE= ${WRKSRC}/libqalculate.pc.in
@@ -27,7 +27,6 @@ SUBST_STAGE.pthread= post-patch
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../math/cln/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/misc/deskbar-applet/Makefile b/misc/deskbar-applet/Makefile
index 7ae0315cd92..8a4f60f460c 100644
--- a/misc/deskbar-applet/Makefile
+++ b/misc/deskbar-applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/05/18 20:29:59 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2006/07/05 05:37:43 jlam Exp $
#
DISTNAME= deskbar-applet-2.14.0.1
@@ -17,7 +17,7 @@ GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
PKGCONFIG_OVERRIDE= data/deskbar-applet.pc
@@ -34,7 +34,6 @@ PY_PATCHPLIST= yes
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
.include "../../mail/evolution-data-server/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gnome-desktop/buildlink3.mk"
.include "../../x11/py-gtk2/buildlink3.mk"
.include "../../x11/py-gnome2/buildlink3.mk"
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index 2027a613864..96437efda22 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2006/04/17 13:46:40 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2006/07/05 05:37:43 jlam Exp $
#
DISTNAME= gnome-utils-2.14.0
@@ -11,7 +11,7 @@ MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Set of useful GNOME2 utilities and applications
-USE_TOOLS+= gmake msgfmt perl pkg-config
+USE_TOOLS+= gmake intltool msgfmt perl pkg-config
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -43,7 +43,6 @@ BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.13.2
.include "../../print/libgnomeprintui/buildlink3.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/gnome-desktop/buildlink3.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
diff --git a/misc/goffice/Makefile b/misc/goffice/Makefile
index 967d848c80c..1fc622a00a7 100644
--- a/misc/goffice/Makefile
+++ b/misc/goffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/06/22 10:21:14 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/07/05 05:37:43 jlam Exp $
#
DISTNAME= goffice-0.2.1
@@ -14,7 +14,7 @@ USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgoffice-1.pc.in
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake pkg-config msgfmt
+USE_TOOLS+= gmake intltool msgfmt pkg-config
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/GConf2/buildlink3.mk"
@@ -29,7 +29,6 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.3
.include "../../graphics/libart2/buildlink3.mk"
BUILDLINK_API_DEPENDS.libgnomeprint+= libgnomeprint>=2.8.2
.include "../../print/libgnomeprint/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/misc/gok/Makefile b/misc/gok/Makefile
index 3cafa8a72a2..4c40804e4cd 100644
--- a/misc/gok/Makefile
+++ b/misc/gok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2006/06/29 23:49:15 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2006/07/05 05:37:43 jlam Exp $
#
DISTNAME= gok-1.0.7
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= GNOME On-Screen Keyboard
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake pkg-config msgfmt
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -36,7 +36,6 @@ GCONF2_SCHEMAS= gok.schemas
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libwnck/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 4e399c2f1a1..7efb0f7424b 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/05/17 10:45:21 drochner Exp $
+# $NetBSD: Makefile,v 1.52 2006/07/05 05:37:43 jlam Exp $
#
DISTNAME= yelp-2.14.1
@@ -16,7 +16,7 @@ DEPENDS+= docbook>=4.2:../../textproc/docbook
BUILDLINK_API_DEPENDS.libxslt+= libxslt>=1.1.4
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
@@ -49,7 +49,6 @@ BUILDLINK_API_DEPENDS.firefox+= firefox>=1.5nb2
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
index 6aaae08c421..8846c503721 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome2-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2006/06/20 15:51:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.39 2006/07/05 05:37:43 jlam Exp $
DISTNAME= gnome-media-2.14.0
PKGREVISION= 2
@@ -16,7 +16,7 @@ GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-USE_TOOLS+= gmake msgfmt perl pkg-config xgettext
+USE_TOOLS+= gmake intltool msgfmt perl pkg-config xgettext
CONFIGURE_ARGS+= --enable-gtk-doc=no
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
@@ -54,7 +54,6 @@ BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.13.2
.include "../../net/ORBit2/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../sysutils/nautilus-cd-burner/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/multimedia/gopchop/Makefile b/multimedia/gopchop/Makefile
index d85c0422f3f..b21d038cab1 100644
--- a/multimedia/gopchop/Makefile
+++ b/multimedia/gopchop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/06/27 22:11:43 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2006/07/05 05:37:43 jlam Exp $
#
DISTNAME= gopchop-1.1.7
@@ -16,11 +16,10 @@ USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= pkg-config msgfmt
+USE_TOOLS+= intltool msgfmt pkg-config
BROKEN_GETTEXT_DETECTION= yes
.include "../../multimedia/libmpeg2/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/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index 60097e5dddf..ab9c6d942a0 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2006/07/02 11:24:24 drochner Exp $
+# $NetBSD: Makefile.common,v 1.20 2006/07/05 05:37:43 jlam Exp $
#
DISTNAME= totem-1.4.2
@@ -15,7 +15,7 @@ PLIST_SRC= ${.CURDIR}/../../multimedia/totem/PLIST
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_LANGUAGES+= c++
@@ -41,7 +41,6 @@ BUILDLINK_API_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.10.0
.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../sysutils/nautilus/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/iso-codes/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
diff --git a/multimedia/xfmedia/Makefile b/multimedia/xfmedia/Makefile
index a6a777874f2..6207e30554c 100644
--- a/multimedia/xfmedia/Makefile
+++ b/multimedia/xfmedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/06/12 16:28:13 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2006/07/05 05:37:43 jlam Exp $
#
DISTNAME= xfmedia-0.9.1
@@ -15,7 +15,7 @@ GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.2
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
OWN_DIRS= ${PKG_SYSCONFDIR}/xdg/xfmedia
@@ -31,6 +31,5 @@ post-install:
.include "../../mk/x11.buildlink3.mk"
.include "../../multimedia/xine-lib/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/libexo/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/amule/Makefile b/net/amule/Makefile
index 27ef0d1d0c3..8b2e2bfb5c0 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/04/17 13:46:42 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2006/07/05 05:37:43 jlam Exp $
DISTNAME= aMule-2.1.1
PKGNAME= ${DISTNAME:S/aMule/amule/}
@@ -16,7 +16,7 @@ CONFLICTS= xmule-[0-9]*
USE_DIRS+= xdg-1.1
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-wx-config=${LOCALBASE}/bin/wx-config
CONFIGURE_ENV+= gt_cv_func_gnugettext1_libintl=yes
@@ -28,6 +28,5 @@ UNLIMIT_RESOURCES+= datasize
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../x11/wxGTK/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index 3b59d09fb15..2f079fba0b3 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/04/17 13:46:43 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2006/07/05 05:37:43 jlam Exp $
#
DISTNAME= bug-buddy-2.14.0
@@ -14,7 +14,7 @@ COMMENT= Graphical GNOME2 bug reporting tool
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
GCONF2_SCHEMAS= bug-buddy.schemas
@@ -33,7 +33,6 @@ GCONF2_SCHEMAS= bug-buddy.schemas
.include "../../sysutils/gnome-menus/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/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/net/gftp/Makefile.common b/net/gftp/Makefile.common
index f1bd3f1f4bd..97a0287370b 100644
--- a/net/gftp/Makefile.common
+++ b/net/gftp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2006/04/13 18:23:36 jlam Exp $
+# $NetBSD: Makefile.common,v 1.12 2006/07/05 05:37:44 jlam Exp $
DISTNAME= gftp-${VERSION}
CATEGORIES= net
@@ -9,7 +9,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= jmcneill@NetBSD.org
HOMEPAGE= http://gftp.seul.org/
-USE_TOOLS+= msgfmt
+USE_TOOLS+= intltool msgfmt
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -30,5 +30,4 @@ DEPENDS+= openssh-[0-9]*:../../security/openssh
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index de86c30d488..0130f4d4cdd 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/04/17 13:46:43 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2006/07/05 05:37:44 jlam Exp $
#
DISTNAME= gnome-netstatus-2.12.0
@@ -13,7 +13,7 @@ COMMENT= Network status applet for the GNOME panel
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
@@ -26,7 +26,6 @@ GCONF2_SCHEMAS= netstatus.schemas
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index 9a060e84965..4c30496065c 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/04/17 13:46:44 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2006/07/05 05:37:44 jlam Exp $
#
DISTNAME= tsclient-0.132
@@ -14,11 +14,10 @@ DEPENDS+= rdesktop-[0-9]*:../../net/rdesktop
DEPENDS+= vncviewer-[0-9]*:../../net/vncviewer
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake msgfmt perl:run pkg-config
+USE_TOOLS+= gmake intltool msgfmt perl:run pkg-config
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 7d935b77419..51570f13469 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/06/22 10:29:10 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/07/05 05:37:44 jlam Exp $
DISTNAME= vino-2.13.5
PKGREVISION= 1
@@ -13,7 +13,7 @@ COMMENT= VNC server for GNOME
USE_DIRS+= gnome2-1.5
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake perl pkg-config msgfmt
+USE_TOOLS+= gmake intltool msgfmt perl pkg-config
GNU_CONFIGURE= yes
GCONF2_SCHEMAS= vino-server.schemas
@@ -29,7 +29,6 @@ GCONF2_SCHEMAS= vino-server.schemas
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../security/gnutls/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
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"
diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index eed92cfdaee..f06f7e0ee59 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/04/17 13:46:47 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2006/07/05 05:37:44 jlam Exp $
#
DISTNAME= gnome-keyring-manager-2.14.0
@@ -15,7 +15,7 @@ GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.6
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
GCONF2_SCHEMAS= gnome-keyring-manager.schemas
@@ -26,7 +26,6 @@ GCONF2_SCHEMAS= gnome-keyring-manager.schemas
.include "../../security/gnome-keyring/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/seahorse-gedit/Makefile b/security/seahorse-gedit/Makefile
index 87db09c1277..077ec7d795d 100644
--- a/security/seahorse-gedit/Makefile
+++ b/security/seahorse-gedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/04/17 13:46:47 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2006/07/05 05:37:44 jlam Exp $
DISTNAME= seahorse-0.8.1
PKGNAME= seahorse-gedit-0.8.1
@@ -16,7 +16,7 @@ DISTINFO_FILE= ${.CURDIR}/../seahorse/distinfo
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
@@ -41,7 +41,6 @@ INSTALL_DIRS= plugins/gedit
.include "../../security/gpgme/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../editors/gedit/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/seahorse-nautilus/Makefile b/security/seahorse-nautilus/Makefile
index 49244f35c1d..3e810244fb0 100644
--- a/security/seahorse-nautilus/Makefile
+++ b/security/seahorse-nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/04/17 13:46:47 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2006/07/05 05:37:44 jlam Exp $
DISTNAME= seahorse-0.8.1
PKGNAME= seahorse-nautilus-0.8.1
@@ -16,7 +16,7 @@ DISTINFO_FILE= ${.CURDIR}/../seahorse/distinfo
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
@@ -35,7 +35,6 @@ INSTALL_DIRS= plugins/nautilus-ext
.include "../../security/gpgme/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../sysutils/nautilus/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 35092e0b6ad..fcc8dc25a80 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2006/04/17 13:46:08 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2006/07/05 05:37:44 jlam Exp $
DISTNAME= seahorse-0.8.1
PKGREVISION= 2
@@ -14,7 +14,7 @@ DEPENDS+= gnupg>=1.2.1:../../security/gnupg
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
@@ -33,7 +33,6 @@ BUILDLINK_API_DEPENDS.gpgme+= gpgme>=1.0.1nb2
.include "../../net/libsoup-devel/buildlink3.mk"
.include "../../security/gpgme/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile
index f841ef4cbd0..0ed95e7441e 100644
--- a/sysutils/gnome-menus/Makefile
+++ b/sysutils/gnome-menus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2006/06/14 12:06:53 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/07/05 05:37:44 jlam Exp $
#
DISTNAME= gnome-menus-2.14.0
@@ -12,7 +12,7 @@ COMMENT= Implementation of the desktop menu specification for GNOME
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.2
-USE_TOOLS+= gmake pkg-config msgfmt
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
@@ -44,6 +44,5 @@ BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.10.0
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/fam.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index 90888377b7c..aad7aec6d2b 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/04/17 13:46:48 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2006/07/05 05:37:44 jlam Exp $
#
DISTNAME= gnome-pkgview-1.0.6
@@ -10,7 +10,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.greatnorthern.demon.co.uk/gnome-pkgview.html
COMMENT= Displays the version of GNOME components installed
-USE_TOOLS+= msgfmt pkg-config
+USE_TOOLS+= intltool msgfmt pkg-config
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
@@ -22,7 +22,6 @@ GCONF2_SCHEMAS= gnome-pkgview.schemas
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/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/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common
index 34614577931..f3a8e28d99d 100644
--- a/sysutils/gnome-vfs2/Makefile.common
+++ b/sysutils/gnome-vfs2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2006/05/31 18:32:40 drochner Exp $
+# $NetBSD: Makefile.common,v 1.37 2006/07/05 05:37:44 jlam Exp $
#
GNOME_VFS2_VERSION= 2.14.2
@@ -19,7 +19,7 @@ PATCHDIR= ${.CURDIR}/../../sysutils/gnome-vfs2/patches
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
CONFIGURE_ARGS+= --disable-cdda
@@ -101,5 +101,3 @@ do-install:
cd ${WRKSRC}/modules && ${LIBTOOL} --mode=finish \
${PREFIX}/lib/gnome-vfs-2.0/modules
.endif
-
-.include "../../textproc/intltool/buildlink3.mk"
diff --git a/sysutils/gnome2-system-monitor/Makefile b/sysutils/gnome2-system-monitor/Makefile
index 44e9f325f02..5674b617edf 100644
--- a/sysutils/gnome2-system-monitor/Makefile
+++ b/sysutils/gnome2-system-monitor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2006/06/22 10:19:53 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2006/07/05 05:37:45 jlam Exp $
#
DISTNAME= gnome-system-monitor-2.14.0
@@ -16,7 +16,7 @@ USE_DIRS+= gnome2-1.5
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= autoconf gmake msgfmt pkg-config
+USE_TOOLS+= autoconf gmake intltool msgfmt pkg-config
LIBS+= -lutil
GCONF2_SCHEMAS+= gnome-system-monitor.schemas
@@ -36,7 +36,6 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.9.1
.include "../../devel/libwnck/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../sysutils/libgtop2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index ff120a6fabc..cc8820cf670 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/06/30 02:54:11 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2006/07/05 05:37:45 jlam Exp $
#
DISTNAME= nautilus-cd-burner-2.14.1
@@ -14,7 +14,7 @@ COMMENT= CD burner view for Nautilus
DEPENDS+= {cdrtools,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrtools
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -51,6 +51,5 @@ BUILDLINK_API_DEPENDS.nautilus+= nautilus>=2.13.4
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../sysutils/nautilus/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 0f1b139943b..fc9cc751199 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2006/04/17 13:46:07 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2006/07/05 05:37:45 jlam Exp $
#
DISTNAME= nautilus-2.14.1
@@ -13,7 +13,7 @@ COMMENT= Nautilus file manager for GNOME2
USE_PKGLOCALEDIR= yes
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE= libnautilus-extension/libnautilus-extension.pc.in
@@ -44,7 +44,6 @@ BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.8
.include "../../graphics/librsvg2/buildlink3.mk"
.include "../../net/ORBit2/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/sysutils/notification-daemon/Makefile b/sysutils/notification-daemon/Makefile
index 51ce61055cf..0fc8f489efb 100644
--- a/sysutils/notification-daemon/Makefile
+++ b/sysutils/notification-daemon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/04/17 13:46:48 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2006/07/05 05:37:45 jlam Exp $
#
DISTNAME= notification-daemon-0.3.4
@@ -12,7 +12,7 @@ COMMENT= Shows notification messages on the desktop
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_TOOLS+= gmake pkg-config
+USE_TOOLS+= gmake intltool pkg-config
.include "../../mk/bsd.prefs.mk"
@@ -29,6 +29,5 @@ CONFIGURE_ARGS+= --with-dbus-sys=${PKG_SYSCONFDIR}/dbus-1/system.d
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index b98574c78ea..fd298eaacac 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/07/02 10:40:13 rillig Exp $
+# $NetBSD: Makefile,v 1.20 2006/07/05 05:37:45 jlam Exp $
#
DISTNAME= gnome-doc-utils-0.6.0
@@ -14,7 +14,7 @@ COMMENT= Documentation utilities for the GNOME project
DEPENDS+= ${PYPKGPREFIX}-libxml2>=2.6.16:../../textproc/py-libxml2
DEPENDS+= ${PYPKGPREFIX}-libxslt>=1.1.12:../../textproc/py-libxslt
-USE_TOOLS+= pkg-config
+USE_TOOLS+= intltool pkg-config
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
@@ -39,7 +39,6 @@ post-install:
${PYTHONBIN} ${PYCOMPILEALL} ${PREFIX}/share/xml2po
.include "../../lang/python/application.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../textproc/xmlcatmgr/buildlink3.mk"
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index 7f9a93dfdeb..a040e8f57f6 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2006/06/22 10:18:55 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/07/05 05:37:45 jlam Exp $
DISTNAME= gnome-spell-1.0.6
PKGREVISION= 5
@@ -13,7 +13,7 @@ COMMENT= Spell checking as you type like gtkspell
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.3
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake pkg-config msgfmt
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.8.0nb3
@@ -25,6 +25,5 @@ BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.8.0nb3
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../textproc/aspell/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/intltool/buildlink3.mk b/textproc/intltool/buildlink3.mk
deleted file mode 100644
index fe69ecb166a..00000000000
--- a/textproc/intltool/buildlink3.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.14 2006/04/12 10:27:37 rillig Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-INTLTOOL_BUILDLINK3_MK:= ${INTLTOOL_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= intltool
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nintltool}
-BUILDLINK_PACKAGES+= intltool
-
-.if !empty(INTLTOOL_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.intltool+= intltool>=0.34.1
-BUILDLINK_ABI_DEPENDS.intltool?= intltool>=0.34.1nb2
-BUILDLINK_PKGSRCDIR.intltool?= ../../textproc/intltool
-BUILDLINK_DEPMETHOD.intltool?= build
-.endif # INTLTOOL_BUILDLINK3_MK
-
-USE_TOOLS+= perl
-
-.if !empty(INTLTOOL_BUILDLINK3_MK:M+)
-CONFIGURE_ENV+= INTLTOOL_PERL=${PERL5:Q}
-INTLTOOLIZE= ${BUILDLINK_PREFIX.intltool}/bin/intltoolize
-INTLTOOL_OVERRIDE?= intltool-* */intltool-*
-
-_CONFIGURE_POSTREQ+= override-intltool
-
-.PHONY: override-intltool
-override-intltool:
- ${_PKG_SILENT}${_PKG_DEBUG} \
- ${ECHO} "=> Overriding intltool."
- @cd ${WRKSRC} && for f in ${INTLTOOL_OVERRIDE}; do \
- if ${TEST} -f ${BUILDLINK_PREFIX.intltool}/bin/${f}; then \
- ${CP} ${BUILDLINK_PREFIX.intltool}/bin/${f} ${f}; \
- fi; \
- done
-.endif # INTLTOOL_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 6f3aa91723a..e1ac4f385e1 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/06/15 20:40:16 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2006/07/05 05:37:45 jlam Exp $
#
DISTNAME= scrollkeeper-0.3.14
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
DEPENDS+= docbook-xml>=4.4nb4:../../textproc/docbook-xml
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake msgfmt
+USE_TOOLS+= gmake intltool msgfmt
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
@@ -67,7 +67,6 @@ SUBST_SED.sc-gtfd= -e s,scrollkeeper-get-toc-from-docpath\ ,${PREFIX}/bin/scroll
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/xmlcatmgr/catalogs.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/time/evolution-webcal/Makefile b/time/evolution-webcal/Makefile
index 0d8c45102a3..26e2d703719 100644
--- a/time/evolution-webcal/Makefile
+++ b/time/evolution-webcal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/06/22 10:11:18 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2006/07/05 05:37:45 jlam Exp $
#
DISTNAME= evolution-webcal-2.5.90
@@ -13,7 +13,7 @@ COMMENT= GNOME URL handler for web-published iCal calendar files
GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake pkg-config msgfmt
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= YES
GCONF2_SCHEMAS= evolution-webcal.schemas
@@ -23,6 +23,5 @@ GCONF2_SCHEMAS= evolution-webcal.schemas
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../mail/evolution-data-server/buildlink3.mk"
.include "../../net/libsoup-devel/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/time/gnotime/Makefile b/time/gnotime/Makefile
index 4e5c2412f35..2ffdf78ac33 100644
--- a/time/gnotime/Makefile
+++ b/time/gnotime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/06/29 18:58:19 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/07/05 05:37:45 jlam Exp $
DISTNAME= gnotime-2.2.1
PKGREVISION= 8
@@ -11,7 +11,7 @@ COMMENT= Time tracker for GNOME2
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
@@ -26,7 +26,6 @@ GCONF2_SCHEMAS= gnotime.schemas
.include "../../devel/popt/buildlink3.mk"
.include "../../lang/guile/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../www/gtkhtml38/buildlink3.mk"
diff --git a/time/gtodo/Makefile b/time/gtodo/Makefile
index 63fd8d3c76f..063086d1c5a 100644
--- a/time/gtodo/Makefile
+++ b/time/gtodo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/06/16 14:21:38 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2006/07/05 05:37:45 jlam Exp $
#
DISTNAME= gtodo-0.14
@@ -12,7 +12,7 @@ COMMENT= To-do list manager for the GNOME desktop
GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake pkg-config msgfmt
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= YES
GCONF2_SCHEMAS= gtodo.schemas
@@ -21,7 +21,6 @@ GCONF2_SCHEMAS= gtodo.schemas
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/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/wm/e16menuedit2/Makefile b/wm/e16menuedit2/Makefile
index a402d90d87b..fa4ba38ff7d 100644
--- a/wm/e16menuedit2/Makefile
+++ b/wm/e16menuedit2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/04/17 13:46:50 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2006/07/05 05:37:45 jlam Exp $
#
DISTNAME= e16menuedit2-0.0.1
@@ -15,7 +15,7 @@ DEPENDS+= enlightenment-0.16.*:../../wm/enlightenment
BROKEN_GETTEXT_DETECTION= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= automake msgfmt pkg-config
+USE_TOOLS+= automake intltool msgfmt pkg-config
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
MAKE_ENV+= CATALOGS="de.gmo en.gmo ko.gmo tr.gmo"
@@ -26,7 +26,6 @@ pre-configure:
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index f43545fe831..646b01a8ed6 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2006/05/03 11:16:33 drochner Exp $
+# $NetBSD: Makefile,v 1.60 2006/07/05 05:37:45 jlam Exp $
#
DISTNAME= metacity-2.14.3
@@ -12,7 +12,7 @@ COMMENT= GNOME-compliant window manager
USE_DIRS+= gnome2-1.5 theme-1.0
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
@@ -30,7 +30,6 @@ CONFIGURE_ARGS+= --disable-xinerama
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
.include "../../x11/xcursor/buildlink3.mk"
diff --git a/www/drivel/Makefile b/www/drivel/Makefile
index 4e9a77ba51f..bd4d6cf69be 100644
--- a/www/drivel/Makefile
+++ b/www/drivel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2006/06/22 14:18:22 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2006/07/05 05:37:45 jlam Exp $
#
DISTNAME= drivel-2.0.2
@@ -13,7 +13,7 @@ COMMENT= LiveJournal client for the GNOME Desktop
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake pkg-config msgfmt
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= YES
GCONF2_SCHEMAS= drivel.schemas
@@ -32,7 +32,6 @@ BUILDLINK_API_DEPENDS.curl+= curl>=7.14.0nb1
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/gtkspell/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../www/curl/buildlink3.mk"
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 9dc85b17da7..b45a239af88 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2006/05/22 18:03:50 drochner Exp $
+# $NetBSD: Makefile,v 1.30 2006/07/05 05:37:46 jlam Exp $
#
DISTNAME= epiphany-extensions-2.14.1.1
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnome.org/projects/epiphany/extensions.html
COMMENT= Extensions for the Epiphany web browser
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_LANGUAGES+= c++
@@ -42,7 +42,6 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/opensp/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index a1d247faba7..bdc517a24a1 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2006/06/13 17:27:44 drochner Exp $
+# $NetBSD: Makefile,v 1.60 2006/07/05 05:37:46 jlam Exp $
#
DISTNAME= epiphany-2.14.2.1
@@ -12,7 +12,7 @@ COMMENT= The web browser for the GNOME Desktop
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_LANGUAGES+= c++
@@ -67,7 +67,6 @@ BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.8.3
.include "../../sysutils/dbus-glib/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/iso-codes/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 7d528177260..e78f436fd4b 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2006/06/22 21:48:59 jlam Exp $
+# $NetBSD: Makefile,v 1.101 2006/07/05 05:37:46 jlam Exp $
#
DISTNAME= galeon-1.3.21
@@ -17,7 +17,7 @@ CONFLICTS+= galeon-devel-[0-9]*
USE_LANGUAGES= c c++
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -46,7 +46,6 @@ CONF_FILES= ${EGDIR}/sound/events/galeon.soundlist \
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gnome-desktop/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/www/galeon12/Makefile b/www/galeon12/Makefile
index 8f3fb08988b..9c90706a92b 100644
--- a/www/galeon12/Makefile
+++ b/www/galeon12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/04/17 13:46:51 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2006/07/05 05:37:46 jlam Exp $
DISTNAME= galeon-1.2.14
PKGREVISION= 8
@@ -20,7 +20,7 @@ USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_LANGUAGES= c c++
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake intltool
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-mozilla-includes=${BUILDLINK_PREFIX.mozilla}/include/mozilla \
--with-mozilla-libs=${BUILDLINK_PREFIX.mozilla}/lib/mozilla \
@@ -37,7 +37,6 @@ CONFIGURE_ARGS+= --with-mozilla-snapshot=1.7
.include "../../devel/libglade/buildlink3.mk"
.include "../../devel/oaf/buildlink3.mk"
.include "../../graphics/gdk-pixbuf-gnome/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../sysutils/gnome-vfs/buildlink3.mk"
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index fed8c05033f..f0426f4551b 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/06/21 22:59:12 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/07/05 05:37:46 jlam Exp $
#
DISTNAME= gtkhtml-3.10.1
@@ -15,7 +15,7 @@ COMMENT= Lightweight HTML rendering/printing/editing engine
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake pkg-config msgfmt
+USE_TOOLS+= gmake intltool msgfmt pkg-config
PKGCONFIG_OVERRIDE+= src/libgtkhtml.pc.in
@@ -29,7 +29,6 @@ PKGCONFIG_OVERRIDE+= src/libgtkhtml.pc.in
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../net/libsoup-devel/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile
index fb6401c35d3..2f390ae5216 100644
--- a/www/kazehakase/Makefile
+++ b/www/kazehakase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2006/05/18 19:55:35 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2006/07/05 05:37:46 jlam Exp $
#
DISTNAME= kazehakase-0.3.3
@@ -12,7 +12,7 @@ COMMENT= Web browser with multiple layout engines support
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.2
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
@@ -37,7 +37,6 @@ CONF_FILES+= ${EGDIR}/mozilla/encodings.xml ${PKG_SYSCONFDIR}/mozilla/encodings.
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../www/mozilla/gecko-depends.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index 4bc0b64e426..c1d00e7b45a 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2006/06/28 14:58:00 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2006/07/05 05:37:46 jlam Exp $
#
DISTNAME= Terminal-0.2.4
@@ -14,14 +14,13 @@ COMMENT= Terminal emulator primarly for the Xfce
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake pkg-config msgfmt
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_DIRS+= xdg-1.1
.include "../../devel/glib2/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libexo/buildlink3.mk"
.include "../../x11/libxfce4gui/buildlink3.mk"
diff --git a/x11/devilspie/Makefile b/x11/devilspie/Makefile
index 9bd2117e5ba..904eb8ca5e0 100644
--- a/x11/devilspie/Makefile
+++ b/x11/devilspie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/06/11 13:06:19 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2006/07/05 05:37:46 jlam Exp $
DISTNAME= devilspie-0.17.1
PKGREVISION= 1
@@ -11,7 +11,7 @@ COMMENT= Window-matching utility to customize window behavior
BUILD_DEPENDS+= libxslt>=1.0:../../textproc/libxslt
-USE_TOOLS+= pkg-config msgfmt
+USE_TOOLS+= intltool msgfmt pkg-config
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
TEST_TARGET= check
@@ -25,7 +25,6 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.9.1
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../devel/libwnck/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
index 58690b6ee6e..2a9c80a9c16 100644
--- a/x11/fast-user-switch-applet/Makefile
+++ b/x11/fast-user-switch-applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/04/17 13:46:52 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/07/05 05:37:46 jlam Exp $
#
DISTNAME= fast-user-switch-applet-2.14.0
@@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_X11= yes
.include "../../mk/bsd.prefs.mk"
@@ -40,7 +40,6 @@ GCONF2_SCHEMAS= fast-user-switch-applet.schemas
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index c528b5f3814..c6eef62e2a8 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.114 2006/06/25 17:16:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.115 2006/07/05 05:37:46 jlam Exp $
#
DISTNAME= gdm-2.14.5
@@ -19,7 +19,7 @@ USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
PKG_OPTIONS_VAR= PKG_OPTIONS.gdm
PKG_SUPPORTED_OPTIONS= inet6 pam
@@ -128,7 +128,6 @@ PRINT_PLIST_AWK+= /dmx/ { print "$${DMX}" $$0; next }
.include "../../graphics/libart2/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../graphics/librsvg2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 2e05b9ff276..e3fd2f6dc20 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2006/05/31 22:07:18 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2006/07/05 05:37:46 jlam Exp $
#
DISTNAME= gnome-desktop-2.14.2
@@ -13,7 +13,7 @@ COMMENT= Common GNOME2 desktop files and libgnome-desktop library
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake msgfmt perl:run pkg-config
+USE_TOOLS+= gmake intltool msgfmt perl:run pkg-config
USE_LIBTOOL= yes
CONFIGURE_ARGS+= --with-gnome-distributor="The NetBSD Foundation"
@@ -31,7 +31,6 @@ post-install:
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile
index 4d87471c700..6cf61340d73 100644
--- a/x11/gnome-mag/Makefile
+++ b/x11/gnome-mag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2006/06/29 12:14:07 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2006/07/05 05:37:46 jlam Exp $
#
DISTNAME= gnome-mag-0.12.4
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= GNOME screen magnifier
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake pkg-config msgfmt
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -25,6 +25,5 @@ PKGCONFIG_OVERRIDE+= gnome-mag-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/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 9440e17b2fe..1e962dc6676 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2006/07/04 16:39:01 drochner Exp $
+# $NetBSD: Makefile,v 1.76 2006/07/05 05:37:46 jlam Exp $
#
DISTNAME= gnome-panel-2.14.2
@@ -12,7 +12,7 @@ COMMENT= GNOME2 panel application
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake msgfmt perl:run pkg-config
+USE_TOOLS+= gmake intltool msgfmt perl:run pkg-config
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= libpanel-applet/libpanelapplet-2.0.pc.in
@@ -34,7 +34,6 @@ GCONF2_SCHEMAS+= window-list.schemas
GCONF2_ENTRIES= panel-default-setup.entries
BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.14.2
-BUILDLINK_API_DEPENDS.intltool+= intltool>=0.35
BUILDLINK_API_DEPENDS.libglade2+= libglade2>=2.5.0
BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.13.0
BUILDLINK_API_DEPENDS.libwnck+= libwnck>=2.13.5
@@ -62,7 +61,6 @@ PKG_SUGGESTED_OPTIONS= evolution
.include "../../sysutils/gnome-menus/buildlink3.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/gnome-desktop/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 7b70538d92d..cd05ec4f200 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/05/02 15:54:16 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2006/07/05 05:37:46 jlam Exp $
#
DISTNAME= gnome-screensaver-2.14.1
@@ -13,7 +13,7 @@ GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.3
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_X11= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
@@ -47,6 +47,5 @@ post-install:
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/gnome-menus/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 523d4025c40..190c19f50fd 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2006/06/30 03:13:43 joerg Exp $
+# $NetBSD: Makefile,v 1.70 2006/07/05 05:37:46 jlam Exp $
#
DISTNAME= gnome-session-2.14.1
@@ -18,7 +18,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake perl pkg-config msgfmt
+USE_TOOLS+= gmake intltool msgfmt perl pkg-config
USE_LIBTOOL= yes
MAKE_ENV+= REAL_GCONFTOOL=${GCONFTOOL2:Q}
@@ -43,7 +43,6 @@ BUILDLINK_API_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.8.3nb1
.include "../../security/gnome-keyring/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"
.include "../../sysutils/libnotify/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/buildlink3.mk"
.include "../../x11/gnome2-control-center/buildlink3.mk"
.include "../../x11/gnome-desktop/buildlink3.mk"
diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile
index d9e43f37ab2..8dcb3bf2d6b 100644
--- a/x11/gnome-themes-extras/Makefile
+++ b/x11/gnome-themes-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/04/17 13:46:53 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2006/07/05 05:37:46 jlam Exp $
#
DISTNAME= gnome-themes-extras-0.8.1
@@ -23,7 +23,7 @@ USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED
BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
@@ -33,7 +33,6 @@ BUILDLINK_API_DEPENDS.librsvg2+= librsvg2>=2.12.6
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../graphics/librsvg2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/gtk2-engines/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile
index 7193d293e1b..bdac6c3bd67 100644
--- a/x11/gnome-themes/Makefile
+++ b/x11/gnome-themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2006/04/17 13:46:53 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2006/07/05 05:37:47 jlam Exp $
#
DISTNAME= gnome-themes-2.14.0
@@ -14,7 +14,7 @@ COMMENT= Collection of themes and icons for GNOME 2
CONFLICTS+= clearlooks-metacity-[0-9]*
USE_DIRS+= gnome2-1.5 theme-1.0
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -54,7 +54,6 @@ pre-install:
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../wm/metacity/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/gtk2-engines/buildlink3.mk"
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index 6c7afa619ba..36664795b57 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2006/04/17 13:46:53 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2006/07/05 05:37:47 jlam Exp $
#
DISTNAME= gnome-applets-2.14.0
@@ -16,7 +16,7 @@ BUILD_DEPENDS+= gst-plugins0.10-oss>=0.10.0:../../audio/gst-plugins0.10-oss
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
@@ -85,7 +85,6 @@ BUILDLINK_API_DEPENDS.gnome-panel+= gnome-panel>=2.13.4
.include "../../sysutils/libgtop2/buildlink3.mk"
.include "../../sysutils/libnotify/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/libxklavier/buildlink3.mk"
.include "../../x11/gnome-desktop/buildlink3.mk"
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index ed645006b69..dc310e1c97f 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2006/05/03 11:25:48 drochner Exp $
+# $NetBSD: Makefile,v 1.67 2006/07/05 05:37:47 jlam Exp $
#
DISTNAME= control-center-2.14.1
@@ -14,7 +14,7 @@ COMMENT= GNOME2 configuration utility
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.6
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_LIBTOOL= yes
CONFIGURE_ARGS+= --disable-alsa
@@ -63,7 +63,6 @@ BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.8.12
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../sysutils/nautilus/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../wm/metacity/buildlink3.mk"
diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile
index 5ea6669c1bd..57ea85236d6 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2006/07/04 16:06:11 drochner Exp $
+# $NetBSD: Makefile,v 1.57 2006/07/05 05:37:47 jlam Exp $
#
DISTNAME= gnome-terminal-2.14.2
@@ -16,7 +16,7 @@ CONFLICTS= gnome-core-[0-9]*
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake msgfmt perl pkg-config
+USE_TOOLS+= gmake intltool msgfmt perl pkg-config
USE_LIBTOOL= YES
GCONF2_SCHEMAS= gnome-terminal.schemas
@@ -29,7 +29,6 @@ BUILDLINK_API_DEPENDS.startup-notification+= startup-notification>=0.8
.include "../../devel/pango/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libzvt/buildlink3.mk"
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index f809268e2d3..54db664580a 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/07/04 14:32:17 joerg Exp $
+# $NetBSD: Makefile,v 1.46 2006/07/05 05:37:47 jlam Exp $
#
DISTNAME= gnopernicus-1.0.3
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= Collection of accessibility apps for GNOME 2
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake pkg-config msgfmt
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -62,7 +62,6 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.4.1
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gnome-mag/buildlink3.mk"
diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile
index a73fde905c4..05bff09a317 100644
--- a/x11/gtksourceview/Makefile
+++ b/x11/gtksourceview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/04/17 13:46:07 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2006/07/05 05:37:47 jlam Exp $
#
DISTNAME= gtksourceview-1.6.1
@@ -14,7 +14,7 @@ COMMENT= Text widget that extends GTK2's GtkTextView widget
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake msgfmt perl pkg-config
+USE_TOOLS+= gmake intltool msgfmt perl pkg-config
PKGCONFIG_OVERRIDE= gtksourceview-1.0.pc.in
@@ -25,7 +25,6 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../print/libgnomeprint/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/x11/vte/Makefile b/x11/vte/Makefile
index b4e846cb035..aee4368f248 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/07/04 16:03:51 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2006/07/05 05:37:47 jlam Exp $
#
DISTNAME= vte-0.12.2
@@ -16,7 +16,7 @@ USE_DIRS+= gnome2-1.2
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
CONFIGURE_ARGS+= --disable-gtk-doc
CONFIGURE_ARGS+= --disable-python
@@ -33,7 +33,6 @@ BUILDLINK_API_DEPENDS.fontconfig+= fontconfig>=2.1.93
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/libzvt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile
index 72040b184e9..b1399bed917 100644
--- a/x11/xpad/Makefile
+++ b/x11/xpad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2006/06/11 14:52:23 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2006/07/05 05:37:47 jlam Exp $
#
DISTNAME= xpad-1.12
@@ -13,7 +13,7 @@ COMMENT= Sticky notes application in GTK 2
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
USE_PKGLOCALEDIR= yes
LIBS.SunOS+= -lX11
@@ -23,5 +23,4 @@ BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
.include "../../converters/libiconv/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index c17d951a363..07b1ec72ce1 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2006/05/22 08:22:29 rillig Exp $
+# $NetBSD: Makefile,v 1.37 2006/07/05 05:37:47 jlam Exp $
#
DISTNAME= zenity-2.14.1
@@ -14,7 +14,7 @@ COMMENT= Display GNOME dialogs from the command line
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake msgfmt pkg-config
+USE_TOOLS+= gmake intltool msgfmt pkg-config
BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
@@ -26,7 +26,6 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.8.0
.include "../../devel/popt/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"