summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-08-10 20:56:10 +0000
committerjlam <jlam@pkgsrc.org>2005-08-10 20:56:10 +0000
commit7820875fff0afd6ebe69c1b4bdbb85e3952a0f1f (patch)
tree4d8a0ec4125811389b8272e1e14bc12417f9448c
parent50dfb1eae01aa73de001b1546218ed750ef35575 (diff)
downloadpkgsrc-7820875fff0afd6ebe69c1b4bdbb85e3952a0f1f.tar.gz
Remove the abuse of buildlink that was pkg-config/buildlink3.mk. That
file's sole purpose was to provide a dependency on pkg-config and set some environment variables. Instead, turn pkg-config into a "tool" in the tools framework, where the pkg-config wrapper automatically adds PKG_CONFIG_LIBDIR to the environment before invoking the real pkg-config. For all package Makefiles that included pkg-config/buildlink3.mk, remove that inclusion and replace it with USE_TOOLS+=pkg-config.
-rw-r--r--archivers/file-roller/Makefile5
-rw-r--r--archivers/libcomprex/Makefile4
-rw-r--r--audio/amarok/Makefile5
-rw-r--r--audio/arts/Makefile5
-rw-r--r--audio/aumix-gtk/Makefile5
-rw-r--r--audio/bmp-musepack/Makefile4
-rw-r--r--audio/bmp/Makefile.common4
-rw-r--r--audio/gkrellm-volume/Makefile5
-rw-r--r--audio/gkrellm-xmms/Makefile5
-rw-r--r--audio/gmpc/Makefile4
-rw-r--r--audio/gnome-speech/Makefile5
-rw-r--r--audio/goom/Makefile4
-rw-r--r--audio/gqmpeg-devel/Makefile4
-rw-r--r--audio/libao/Makefile.common5
-rw-r--r--audio/libcdaudio/Makefile4
-rw-r--r--audio/libcddb/Makefile4
-rw-r--r--audio/libid3tag/Makefile4
-rw-r--r--audio/libmad/Makefile4
-rw-r--r--audio/libopendaap/Makefile5
-rw-r--r--audio/libvisual-bmp/Makefile4
-rw-r--r--audio/libvisual-plugins/Makefile4
-rw-r--r--audio/libvisual-xmms/Makefile4
-rw-r--r--audio/libvisual/Makefile4
-rw-r--r--audio/liteamp/Makefile5
-rw-r--r--audio/muse/Makefile7
-rw-r--r--audio/musicbrainz/Makefile5
-rw-r--r--audio/ncmpc/Makefile5
-rw-r--r--audio/rhythmbox/Makefile5
-rw-r--r--audio/speex/Makefile4
-rw-r--r--audio/streamtuner/Makefile5
-rw-r--r--audio/sweep/Makefile5
-rw-r--r--audio/tunesbrowser/Makefile4
-rw-r--r--audio/xmms-faad/Makefile5
-rw-r--r--audio/xmms-mad/Makefile4
-rw-r--r--audio/xmms-modplug/Makefile4
-rw-r--r--audio/xmms-musepack/Makefile4
-rw-r--r--cad/gattrib/Makefile4
-rw-r--r--cad/geda-utils/Makefile5
-rw-r--r--cad/geda/Makefile4
-rw-r--r--cad/gnetlist/Makefile7
-rw-r--r--cad/gschem/Makefile4
-rw-r--r--cad/gsmc/Makefile5
-rw-r--r--cad/gsymcheck/Makefile4
-rw-r--r--cad/libgeda/Makefile4
-rw-r--r--cad/transcalc/Makefile5
-rw-r--r--chat/bitlbee/Makefile5
-rw-r--r--chat/ekg/Makefile5
-rw-r--r--chat/gaim/Makefile5
-rw-r--r--chat/gg2/Makefile5
-rw-r--r--chat/gnomeicu/Makefile5
-rw-r--r--chat/gossip/Makefile5
-rw-r--r--chat/irssi/Makefile4
-rw-r--r--chat/loudmouth/Makefile5
-rw-r--r--chat/mu-conference/Makefile5
-rw-r--r--chat/xchat-systray-integration/Makefile5
-rw-r--r--chat/xchat/Makefile.common5
-rw-r--r--comms/jpilot-syncmal/Makefile5
-rw-r--r--comms/jpilot/Makefile4
-rw-r--r--converters/fribidi/Makefile4
-rw-r--r--converters/wv/Makefile5
-rw-r--r--converters/wv2/Makefile4
-rw-r--r--databases/dbh/Makefile4
-rw-r--r--databases/gq/Makefile4
-rw-r--r--databases/gramps/Makefile4
-rw-r--r--databases/gramps2/Makefile4
-rw-r--r--databases/libgda/Makefile.common5
-rw-r--r--databases/libgnomedb/Makefile5
-rw-r--r--databases/mergeant/Makefile5
-rw-r--r--databases/rrdtool/Makefile5
-rw-r--r--databases/shared-mime-info/Makefile4
-rw-r--r--devel/ArX/Makefile4
-rw-r--r--devel/ArX2/Makefile4
-rw-r--r--devel/GConf2/Makefile.common6
-rw-r--r--devel/anjuta/Makefile6
-rw-r--r--devel/at-spi/Makefile5
-rw-r--r--devel/atk/Makefile5
-rw-r--r--devel/blib/Makefile5
-rw-r--r--devel/coconut/Makefile4
-rw-r--r--devel/devhelp/Makefile5
-rw-r--r--devel/eel2/Makefile5
-rw-r--r--devel/eet/Makefile4
-rw-r--r--devel/g-wrap/Makefile5
-rw-r--r--devel/gail/Makefile5
-rw-r--r--devel/gal2/Makefile5
-rw-r--r--devel/gal20/Makefile5
-rw-r--r--devel/gconfmm/Makefile5
-rw-r--r--devel/glade2/Makefile.common5
-rw-r--r--devel/glib2/Makefile5
-rw-r--r--devel/glibmm/Makefile5
-rw-r--r--devel/gnome2-libole2/Makefile4
-rw-r--r--devel/gob2/Makefile4
-rw-r--r--devel/libbonobo/Makefile5
-rw-r--r--devel/libbonoboui/Makefile5
-rw-r--r--devel/libgail-gnome/Makefile4
-rw-r--r--devel/libglade2/Makefile5
-rw-r--r--devel/libglademm/Makefile5
-rw-r--r--devel/libgnome/Makefile5
-rw-r--r--devel/libgnomemm/Makefile5
-rw-r--r--devel/libgnomeui/Makefile5
-rw-r--r--devel/libgnomeuimm/Makefile5
-rw-r--r--devel/libgphoto2/Makefile4
-rw-r--r--devel/libgsf/Makefile4
-rw-r--r--devel/libidn/Makefile4
-rw-r--r--devel/libmatchbox/Makefile4
-rw-r--r--devel/libntlm/Makefile4
-rw-r--r--devel/libstatgrab/Makefile4
-rw-r--r--devel/libwnck/Makefile5
-rw-r--r--devel/ogre/Makefile5
-rw-r--r--devel/p5-ExtUtils-PkgConfig/Makefile4
-rw-r--r--devel/p5-glib2/Makefile5
-rw-r--r--devel/pango/Makefile5
-rw-r--r--devel/pkg-config/buildlink3.mk26
-rw-r--r--editors/abiword/Makefile.common5
-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/gice/Makefile5
-rw-r--r--editors/gtranslator/Makefile5
-rw-r--r--editors/leafpad/Makefile4
-rw-r--r--editors/mlview/Makefile5
-rw-r--r--emulators/blinkensim/Makefile4
-rw-r--r--emulators/ckmame/Makefile4
-rw-r--r--emulators/fuse/Makefile5
-rw-r--r--finance/gkrellm-stock/Makefile4
-rw-r--r--finance/gnucash/Makefile5
-rw-r--r--fonts/Xft2/Makefile5
-rw-r--r--fonts/gucharmap/Makefile5
-rw-r--r--games/asc/Makefile5
-rw-r--r--games/ccgo/Makefile4
-rw-r--r--games/crack-attack/Makefile4
-rw-r--r--games/freeciv-client-gtk2/Makefile4
-rw-r--r--games/gnocatan/Makefile5
-rw-r--r--games/gnome2-games/Makefile5
-rw-r--r--games/grhino/Makefile4
-rw-r--r--games/gtetrinet/Makefile5
-rw-r--r--games/gtkmagnetic/Makefile5
-rw-r--r--games/gturing/Makefile5
-rw-r--r--games/sirius/Makefile5
-rw-r--r--games/wesnoth/Makefile4
-rw-r--r--graphics/blinkenthemes/Makefile5
-rw-r--r--graphics/blinkentools/Makefile4
-rw-r--r--graphics/cairo/Makefile4
-rw-r--r--graphics/dia/Makefile.common5
-rw-r--r--graphics/digikam/Makefile5
-rw-r--r--graphics/eog2/Makefile5
-rw-r--r--graphics/exif/Makefile4
-rw-r--r--graphics/gfract/Makefile5
-rw-r--r--graphics/gimageview/Makefile5
-rw-r--r--graphics/gimp-ufraw/Makefile5
-rw-r--r--graphics/gimp/Makefile5
-rw-r--r--graphics/gphoto2/Makefile4
-rw-r--r--graphics/gqview/Makefile4
-rw-r--r--graphics/graphviz/Makefile4
-rw-r--r--graphics/gthumb/Makefile4
-rw-r--r--graphics/gtkglext/Makefile5
-rw-r--r--graphics/imlib2/Makefile4
-rw-r--r--graphics/inkscape/Makefile5
-rw-r--r--graphics/kipi-plugins/Makefile5
-rw-r--r--graphics/libexif-gtk/Makefile4
-rw-r--r--graphics/libgdiplus/Makefile5
-rw-r--r--graphics/libgnomecanvas/Makefile5
-rw-r--r--graphics/libgnomecanvasmm/Makefile5
-rw-r--r--graphics/libkexif/Makefile5
-rw-r--r--graphics/librsvg2/Makefile.common4
-rw-r--r--graphics/showimg/Makefile5
-rw-r--r--ham/gmfsk/Makefile5
-rw-r--r--ham/xdx/Makefile5
-rw-r--r--ham/xlog/Makefile5
-rw-r--r--inputmethod/imhangul/Makefile4
-rw-r--r--inputmethod/imhangul_status_applet/Makefile5
-rw-r--r--inputmethod/nabi/Makefile4
-rw-r--r--inputmethod/uim/Makefile5
-rw-r--r--lang/classpath-gui/Makefile5
-rw-r--r--lang/mono/Makefile5
-rw-r--r--lang/sablevm-classpath-gui/Makefile5
-rw-r--r--mail/balsa2/Makefile5
-rw-r--r--mail/dspam/Makefile5
-rw-r--r--mail/evolution-data-server/Makefile5
-rw-r--r--mail/evolution/Makefile5
-rw-r--r--mail/evolution14/Makefile6
-rw-r--r--mail/gmime/Makefile5
-rw-r--r--mail/mail-notification/Makefile5
-rw-r--r--mail/sylpheed-claws-ghostscript-viewer/Makefile4
-rw-r--r--mail/ximian-connector/Makefile5
-rw-r--r--math/calcoo/Makefile4
-rw-r--r--math/cln/Makefile5
-rw-r--r--math/galculator/Makefile5
-rw-r--r--math/gcalctool/Makefile5
-rw-r--r--math/gnumeric14/Makefile5
-rw-r--r--meta-pkgs/xfce4/Makefile.common7
-rw-r--r--misc/blccc/Makefile4
-rw-r--r--misc/gkrellm-flynn/Makefile5
-rw-r--r--misc/gkrellm-launch/Makefile4
-rw-r--r--misc/gkrellm-leds/Makefile4
-rw-r--r--misc/gkrellm-moon/Makefile4
-rw-r--r--misc/gkrellm-weather/Makefile5
-rw-r--r--misc/gnome2-utils/Makefile5
-rw-r--r--misc/gok/Makefile5
-rw-r--r--misc/gperiodic/Makefile5
-rw-r--r--misc/gxmame/Makefile5
-rw-r--r--misc/kanjipad/Makefile5
-rw-r--r--misc/kdeaccessibility3/Makefile4
-rw-r--r--misc/libcdio/Makefile5
-rw-r--r--misc/yelp/Makefile5
-rw-r--r--mk/tools/bsd.tools.mk3
-rw-r--r--mk/tools/pkg-config.mk50
-rw-r--r--mk/tools/replace.mk13
-rw-r--r--multimedia/avidemux/Makefile5
-rw-r--r--multimedia/dirac/Makefile4
-rw-r--r--multimedia/gmencoder/Makefile5
-rw-r--r--multimedia/gnome2-media/Makefile5
-rw-r--r--multimedia/gst-plugins/Makefile.common5
-rw-r--r--multimedia/gstreamer/Makefile5
-rw-r--r--multimedia/kdemultimedia3/Makefile4
-rw-r--r--multimedia/kmplayer/Makefile5
-rw-r--r--multimedia/libassetml/Makefile5
-rw-r--r--multimedia/libdv/Makefile.common4
-rw-r--r--multimedia/libmpeg2/Makefile5
-rw-r--r--multimedia/libogg/Makefile4
-rw-r--r--multimedia/mplayer-plugin-firefox/Makefile.common5
-rw-r--r--multimedia/openquicktime/Makefile5
-rw-r--r--multimedia/swfdec/Makefile.common4
-rw-r--r--multimedia/totem/Makefile.common5
-rw-r--r--multimedia/xine-lib/Makefile.common5
-rw-r--r--multimedia/xvid4conf/Makefile4
-rw-r--r--net/ORBit2/Makefile5
-rw-r--r--net/amule/Makefile5
-rw-r--r--net/bug-buddy/Makefile5
-rw-r--r--net/dc_gui2/Makefile5
-rw-r--r--net/ed2k-gtk-gui/Makefile4
-rw-r--r--net/etherape/Makefile5
-rw-r--r--net/ethereal/Makefile5
-rw-r--r--net/gift/Makefile4
-rw-r--r--net/gkrellm-multiping/Makefile5
-rw-r--r--net/gkrellm-snmp/Makefile4
-rw-r--r--net/gkrellm-wireless/Makefile5
-rw-r--r--net/gnet/Makefile4
-rw-r--r--net/gnet1/Makefile4
-rw-r--r--net/gnome-netstatus/Makefile5
-rw-r--r--net/howl/Makefile4
-rw-r--r--net/jigdo/Makefile8
-rw-r--r--net/libIDL/Makefile5
-rw-r--r--net/libsoup-devel/Makefile4
-rw-r--r--net/libsoup/Makefile4
-rw-r--r--net/linc/Makefile4
-rw-r--r--net/py-ORBit/Makefile5
-rw-r--r--net/tsclient/Makefile5
-rw-r--r--net/vino/Makefile5
-rw-r--r--net/wistumbler2-gtk/Makefile5
-rw-r--r--news/pan/Makefile5
-rw-r--r--parallel/linda/Makefile4
-rw-r--r--print/ggv2/Makefile5
-rw-r--r--print/glabels/Makefile5
-rw-r--r--print/gpdf/Makefile5
-rw-r--r--print/imposter/Makefile5
-rw-r--r--print/libgnomecups/Makefile4
-rw-r--r--print/libgnomeprint/Makefile5
-rw-r--r--print/libgnomeprintui/Makefile5
-rw-r--r--security/gnome-keyring/Makefile4
-rw-r--r--security/gpa/Makefile4
-rw-r--r--security/gpass/Makefile4
-rw-r--r--security/gsasl/Makefile4
-rw-r--r--security/gss/Makefile4
-rw-r--r--security/hydra/Makefile4
-rw-r--r--security/seahorse/Makefile5
-rw-r--r--security/xmlsec1/Makefile4
-rw-r--r--sysutils/dbus/Makefile.common5
-rw-r--r--sysutils/desktop-file-utils/Makefile4
-rw-r--r--sysutils/gkrellm-server/Makefile4
-rw-r--r--sysutils/gkrellm/Makefile4
-rw-r--r--sysutils/gnome-menus/Makefile5
-rw-r--r--sysutils/gnome-pkgview/Makefile4
-rw-r--r--sysutils/gnome-vfs/Makefile5
-rw-r--r--sysutils/gnome-vfs2/Makefile.common5
-rw-r--r--sysutils/gnome-vfsmm/Makefile5
-rw-r--r--sysutils/gnome2-system-monitor/Makefile5
-rw-r--r--sysutils/gtk-send-pr/Makefile4
-rw-r--r--sysutils/idesk/Makefile5
-rw-r--r--sysutils/libgtop2/Makefile5
-rw-r--r--sysutils/mc/Makefile4
-rw-r--r--sysutils/nautilus-cd-burner/Makefile5
-rw-r--r--sysutils/nautilus/Makefile5
-rw-r--r--sysutils/rox-session/Makefile4
-rw-r--r--sysutils/rox/Makefile4
-rw-r--r--sysutils/vcdimager-devel/Makefile5
-rw-r--r--sysutils/xcdroast/Makefile5
-rw-r--r--textproc/enchant/Makefile4
-rw-r--r--textproc/gnome-doc-utils/Makefile4
-rw-r--r--textproc/gnome-spell/Makefile5
-rw-r--r--textproc/gtkspell/Makefile4
-rw-r--r--textproc/libcroco/Makefile5
-rw-r--r--time/evolution-webcal/Makefile5
-rw-r--r--time/gnotime/Makefile5
-rw-r--r--time/gtodo-applet/Makefile4
-rw-r--r--time/gtodo/Makefile5
-rw-r--r--wm/e16menuedit2/Makefile5
-rw-r--r--wm/matchbox/Makefile4
-rw-r--r--wm/metacity/Makefile5
-rw-r--r--wm/obconf/Makefile4
-rw-r--r--wm/openbox/Makefile5
-rw-r--r--wm/openbox2/Makefile4
-rw-r--r--wm/selectwm/Makefile8
-rw-r--r--wm/skippy/Makefile5
-rw-r--r--wm/waimea/Makefile5
-rw-r--r--wm/windowlab/Makefile5
-rw-r--r--wm/wmctrl/Makefile4
-rw-r--r--www/ap2-transform/Makefile4
-rw-r--r--www/bluefish/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/gtkhtml30/Makefile5
-rw-r--r--www/gtkhtml36/Makefile5
-rw-r--r--www/libgtkhtml/Makefile5
-rw-r--r--www/liferea/Makefile5
-rw-r--r--www/mozilla/Makefile.common6
-rw-r--r--x11/Xcomposite/Makefile4
-rw-r--r--x11/Xfixes/Makefile4
-rw-r--r--x11/Xrandr-mixedcase/Makefile4
-rw-r--r--x11/Xrender/Makefile4
-rw-r--r--x11/compositeext/Makefile4
-rw-r--r--x11/devilspie/Makefile4
-rw-r--r--x11/fbdesk/Makefile4
-rw-r--r--x11/fixesext/Makefile4
-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/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/gnustep-back/Makefile4
-rw-r--r--x11/gromit/Makefile4
-rw-r--r--x11/gtk-thinice-engine/Makefile5
-rw-r--r--x11/gtk2-chtheme/Makefile5
-rw-r--r--x11/gtk2-engines-bluecurve/Makefile5
-rw-r--r--x11/gtk2-engines/Makefile4
-rw-r--r--x11/gtk2-theme-switch/Makefile5
-rw-r--r--x11/gtk2/Makefile5
-rw-r--r--x11/gtkglarea2/Makefile8
-rw-r--r--x11/gtkmm/Makefile5
-rw-r--r--x11/gtksourceview/Makefile5
-rw-r--r--x11/gtkterm2/Makefile4
-rw-r--r--x11/kdebase3/Makefile4
-rw-r--r--x11/lablgtk2/Makefile5
-rw-r--r--x11/libxklavier/Makefile4
-rw-r--r--x11/libzvt/Makefile5
-rw-r--r--x11/mlterm/Makefile4
-rw-r--r--x11/py-gnome2-extras/Makefile4
-rw-r--r--x11/py-gnome2/Makefile4
-rw-r--r--x11/py-gtk2/Makefile5
-rw-r--r--x11/py-wxWidgets/Makefile5
-rw-r--r--x11/startup-notification/Makefile4
-rw-r--r--x11/vte/Makefile5
-rw-r--r--x11/wxGTK/Makefile.common4
-rw-r--r--x11/wxGTK24/Makefile.common4
-rw-r--r--x11/xcompmgr/Makefile4
-rw-r--r--x11/xcursor/Makefile4
-rw-r--r--x11/xscreensaver-demo/Makefile5
-rw-r--r--x11/zenity/Makefile5
366 files changed, 802 insertions, 981 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index dd327f2f49b..c2916b2925c 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/07/21 16:29:42 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2005/08/10 20:56:10 jlam Exp $
#
DISTNAME= file-roller-2.10.2
@@ -18,7 +18,7 @@ DEPENDS+= zip>=2.3nb2:../../archivers/zip
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl pkg-config
USE_PKGLOCALEDIR= yes
GCONF2_SCHEMAS= file-roller.schemas
@@ -46,7 +46,6 @@ BUILDLINK_DEPENDS.libglade2+= libglade2>=2.4.0
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../sysutils/nautilus/buildlink3.mk"
diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index 816d2316e73..938e4e698ae 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/08/08 09:00:00 adam Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/10 20:56:10 jlam Exp $
DISTNAME= libcomprex-0.3.3
CATEGORIES= archivers
@@ -11,6 +11,7 @@ COMMENT= Library to handle (de)compression of files
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE= libcomprex.pc.in
GNU_CONFIGURE= yes
@@ -18,6 +19,5 @@ CONFIGURE_ENV+= ac_cv_lib_curl_curl_formparse=yes
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 5dc2c70232b..4424984033c 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/21 16:29:42 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/10 20:56:10 jlam Exp $
DISTNAME= amarok-1.2.4
CATEGORIES= audio kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://amarok.kde.org/
COMMENT= KDE audio player
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
@@ -29,7 +29,6 @@ BUILDLINK_DEPENDS.arts+= arts>=1.2
.include "../../audio/taglib/buildlink3.mk"
.include "../../audio/tunepimp/buildlink3.mk"
.include "../../audio/xmms/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../meta-pkgs/kde3/kde3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
.include "../../multimedia/gst-plugins/buildlink3.mk"
diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index a47a61214f9..226ed071d6d 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/07/30 10:56:13 markd Exp $
+# $NetBSD: Makefile,v 1.46 2005/08/10 20:56:10 jlam Exp $
DISTNAME= arts-1.4.2
CATEGORIES= audio
@@ -9,7 +9,7 @@ COMMENT= Analog Real-Time Synthesizer
CONFLICTS+= kdelibs-2*
-USE_TOOLS+= perl
+USE_TOOLS+= perl pkg-config
# Ensure we export symbols in the linked shared object.
LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
@@ -22,7 +22,6 @@ _IN_ARTS_BUILD= yes
.include "../../audio/libmad/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
diff --git a/audio/aumix-gtk/Makefile b/audio/aumix-gtk/Makefile
index a13e7691228..23d639ad646 100644
--- a/audio/aumix-gtk/Makefile
+++ b/audio/aumix-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/08/10 20:56:10 jlam Exp $
.include "../../audio/aumix/Makefile.common"
@@ -8,8 +8,9 @@ COMMENT+= (ncurses and GTK+ 2.0 interfaces)
CONFLICTS= aumix-[0-9]*
+USE_TOOLS+= pkg-config
+
CONFIGURE_ARGS:= ${CONFIGURE_ARGS:S/^--without-gtk$//}
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/bmp-musepack/Makefile b/audio/bmp-musepack/Makefile
index b802ad3fe10..a1e89c7eb9a 100644
--- a/audio/bmp-musepack/Makefile
+++ b/audio/bmp-musepack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/08/10 20:56:11 jlam Exp $
#
DISTNAME= bmp-musepack-1.1
@@ -10,9 +10,9 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.musepack.net/
COMMENT= BMP plugin for Musepack (mpc) files
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
.include "../../audio/bmp/buildlink3.mk"
.include "../../audio/libmusepack/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common
index 1614bea0b7d..4c9a2108069 100644
--- a/audio/bmp/Makefile.common
+++ b/audio/bmp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2005/08/01 00:09:35 rillig Exp $
+# $NetBSD: Makefile.common,v 1.14 2005/08/10 20:56:11 jlam Exp $
#
DISTNAME= bmp-0.9.7
@@ -17,6 +17,7 @@ GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
+USE_TOOLS+= pkg-config
CONFIGURE_ARGS+= --disable-alsa
CONFIGURE_ARGS+= --disable-esd
@@ -77,7 +78,6 @@ post-patch:
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
diff --git a/audio/gkrellm-volume/Makefile b/audio/gkrellm-volume/Makefile
index 666fadedee8..29b0c18b409 100644
--- a/audio/gkrellm-volume/Makefile
+++ b/audio/gkrellm-volume/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:11 jlam Exp $
DISTNAME= gkrellm-volume-2.1.13
CATEGORIES= audio
@@ -10,14 +10,13 @@ COMMENT= Gkrellm2 volume mixer plugin
BUILD_USES_MSGFMT= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= YES
WRKSRC= ${WRKDIR}/gkrellm-volume
MAKE_ENV+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale \
enable_nls=1
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gkrellm/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
diff --git a/audio/gkrellm-xmms/Makefile b/audio/gkrellm-xmms/Makefile
index 9e41760aab9..85a79231de0 100644
--- a/audio/gkrellm-xmms/Makefile
+++ b/audio/gkrellm-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:11 jlam Exp $
#
DISTNAME= gkrellmms-2.1.20
@@ -11,7 +11,7 @@ MAINTAINER= cube@NetBSD.org
HOMEPAGE= http://gkrellm.luon.net/gkrellmms.phtml
COMMENT= GKrellM2 plugin to remotely control XMMS
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= YES
BUILD_USES_MSGFMT= YES
@@ -21,7 +21,6 @@ WRKSRC= ${WRKDIR}/gkrellmms
MAKE_ENV+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale \
enable_nls=1
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gkrellm/buildlink3.mk"
.include "../../audio/xmms/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gmpc/Makefile b/audio/gmpc/Makefile
index adcc02c3b6d..5534e74816e 100644
--- a/audio/gmpc/Makefile
+++ b/audio/gmpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:11 jlam Exp $
#
DISTNAME= gmpc-0.11.2
@@ -11,10 +11,10 @@ COMMENT= GNOME client for the Music Player Daemon
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
+USE_TOOLS+= pkg-config
USE_DIRS+= xdg-1.1
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/audio/gnome-speech/Makefile b/audio/gnome-speech/Makefile
index d84e4e0fa76..382a3f59cf0 100644
--- a/audio/gnome-speech/Makefile
+++ b/audio/gnome-speech/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:11 jlam Exp $
#
DISTNAME= gnome-speech-0.3.6
@@ -14,7 +14,7 @@ DIST_SUBDIR= gnome-speech-0.3.6v2
BUILD_USES_MSGFMT= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -28,7 +28,6 @@ PKGCONFIG_OVERRIDE+= gnome-speech-1.0.pc.in
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/goom/Makefile b/audio/goom/Makefile
index 66fa821b9a9..36184aa450b 100644
--- a/audio/goom/Makefile
+++ b/audio/goom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:11 jlam Exp $
#
DISTNAME= goom-2k4-0-src
@@ -16,7 +16,7 @@ USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgoom2.pc.in
GNU_CONFIGURE= yes
GCC_REQD+= 3.3
+USE_TOOLS+= pkg-config
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 4b21e68d0f3..5bcdedd73f5 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:11 jlam Exp $
DISTNAME= gqmpeg-0.91.1
PKGREVISION= 2
@@ -14,6 +14,7 @@ DEPENDS+= mpg123{,-esound,-nas}>=0.59.18:../../audio/mpg123
DEPENDS+= vorbis-tools>=1.0.0.6:../../audio/vorbis-tools
DEPENDS+= xmp>=2.0.2:../../audio/xmp
+USE_TOOLS+= pkg-config
USE_DIRS+= gnome2-1.5
USE_DIRS+= xdg-1.2
USE_PKGINSTALL= YES
@@ -28,7 +29,6 @@ DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
.include "options.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libao/Makefile.common b/audio/libao/Makefile.common
index 4e3cf68b1d5..2936eb7a9c6 100644
--- a/audio/libao/Makefile.common
+++ b/audio/libao/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile.common,v 1.24 2005/08/10 20:56:11 jlam Exp $
DISTNAME= libao-0.8.6
CATEGORIES= audio devel
@@ -12,7 +12,7 @@ DISTINFO_FILE= ${.CURDIR}/../../audio/libao/distinfo
PATCHDIR= ${.CURDIR}/../../audio/libao/patches
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= ao.pc.in
@@ -32,6 +32,5 @@ CONFIGURE_ARGS+= ENABLE_SOLARIS=no
MAKE_ENV+= DLLIB=${BUILDLINK_LDADD.dl}
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index 0fefeaad618..8416864b339 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:11 jlam Exp $
DISTNAME= libcdaudio-0.99.12
PKGREVISION= 1
@@ -11,9 +11,9 @@ COMMENT= Multi-platform CD player development library
PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_TOOLS+= pkg-config
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
PKGCONFIG_OVERRIDE= libcdaudio.pc.in
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libcddb/Makefile b/audio/libcddb/Makefile
index 54adc331c1c..8bb666ff543 100644
--- a/audio/libcddb/Makefile
+++ b/audio/libcddb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/08/08 08:41:44 adam Exp $
+# $NetBSD: Makefile,v 1.21 2005/08/10 20:56:11 jlam Exp $
DISTNAME= libcddb-1.2.1
CATEGORIES= audio
@@ -17,9 +17,9 @@ PKGCONFIG_OVERRIDE+= libcddb.pc.in
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-cdio
GCC_REQD+= 2.95
+USE_TOOLS+= pkg-config
TEST_TARGET= check
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libid3tag/Makefile b/audio/libid3tag/Makefile
index 53d34999011..c8dac1b1764 100644
--- a/audio/libid3tag/Makefile
+++ b/audio/libid3tag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/08/10 20:56:11 jlam Exp $
#
DISTNAME= libid3tag-0.15.1b
@@ -17,6 +17,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
+USE_TOOLS+= pkg-config
# Avoid an ICE in gcc2 on sparc64
CONFIGURE_ENV+= F77=${FALSE}
@@ -31,6 +32,5 @@ post-build:
post-install:
${INSTALL_DATA} ${WRKDIR}/id3tag.pc ${PREFIX}/lib/pkgconfig
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile
index d6b748b1d40..6014e43a698 100644
--- a/audio/libmad/Makefile
+++ b/audio/libmad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:11 jlam Exp $
#
DISTNAME= libmad-0.15.1b
@@ -17,6 +17,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
+USE_TOOLS+= pkg-config
# Avoid an ICE in gcc2 on sparc64
CONFIGURE_ENV+= F77=${FALSE}
@@ -31,5 +32,4 @@ post-build:
post-install:
${INSTALL_DATA} ${WRKDIR}/mad.pc ${PREFIX}/lib/pkgconfig
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libopendaap/Makefile b/audio/libopendaap/Makefile
index e481a1d29b8..eecb0124274 100644
--- a/audio/libopendaap/Makefile
+++ b/audio/libopendaap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/08/05 12:53:08 tonio Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:11 jlam Exp $
DISTNAME= libopendaap-0.4.0
CATEGORIES= audio
@@ -12,8 +12,7 @@ COMMENT= DAAP client library
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
-.include "../../devel/pkg-config/buildlink3.mk"
+USE_TOOLS+= pkg-config
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libvisual-bmp/Makefile b/audio/libvisual-bmp/Makefile
index 750232a2924..6017a1360fe 100644
--- a/audio/libvisual-bmp/Makefile
+++ b/audio/libvisual-bmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= libvisual-bmp-0.2.0
@@ -13,6 +13,7 @@ COMMENT= Libvisual Beep Media Player plugin
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
+USE_TOOLS+= pkg-config
post-extract:
${MV} ${WRKSRC}/pixmaps/libvisual-xmms-vis.bmp \
@@ -23,7 +24,6 @@ post-extract:
.include "../../audio/bmp/buildlink3.mk"
.include "../../audio/libvisual/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
diff --git a/audio/libvisual-plugins/Makefile b/audio/libvisual-plugins/Makefile
index 327fbc6641a..ba47939a1ba 100644
--- a/audio/libvisual-plugins/Makefile
+++ b/audio/libvisual-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= libvisual-plugins-0.2.0
@@ -15,12 +15,12 @@ CONFLICTS= libvisual-nebulus-[0-9]* libvisual-gforce-[0-9]*
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
+USE_TOOLS+= pkg-config
# sigsegfaults in 0.2.0 because of:
# sorry, but the bug with strtof has come, please report..
CONFIGURE_ARGS+= --disable-dancingparticles
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../audio/goom/buildlink3.mk"
.include "../../audio/libvisual/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
diff --git a/audio/libvisual-xmms/Makefile b/audio/libvisual-xmms/Makefile
index 7fcf019d75a..dbb86c75a73 100644
--- a/audio/libvisual-xmms/Makefile
+++ b/audio/libvisual-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= libvisual-xmms-0.2.0
@@ -13,11 +13,11 @@ COMMENT= XMMS plugin for libvisual
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
+USE_TOOLS+= pkg-config
.include "../../audio/libvisual/buildlink3.mk"
.include "../../audio/xmms/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
diff --git a/audio/libvisual/Makefile b/audio/libvisual/Makefile
index 2ea5d1b1439..d22e07881ed 100644
--- a/audio/libvisual/Makefile
+++ b/audio/libvisual/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:43 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:11 jlam Exp $
#
DISTNAME= libvisual-0.2.0
@@ -12,7 +12,7 @@ COMMENT= Abstraction library between applications and audio visualisation plugi
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libvisual.pc.in
GNU_CONFIGURE= yes
+USE_TOOLS+= pkg-config
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index dcf92dbde30..8ba923dc02b 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:12 jlam Exp $
DISTNAME= liteamp-0.2.4.2
PKGREVISION= 1
@@ -11,7 +11,7 @@ COMMENT= Light-weight Music Player for GNOME2
USE_DIRS+= gnome2-1.5
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake 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 "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 851fedb6e88..0a76bf8ab66 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= MuSE-0.9
@@ -13,8 +13,8 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://muse.dyne.org/
COMMENT= Multiple Streaming Engine
-GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+GNU_CONFIGURE= yes
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
CONFIGURE_ARGS+= --disable-ncurses
@@ -33,7 +33,6 @@ SUBST_MESSAGE.dsp= "Fixing hardcoded audio device."
.include "../../audio/lame/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
diff --git a/audio/musicbrainz/Makefile b/audio/musicbrainz/Makefile
index 241f042eafa..59616554f48 100644
--- a/audio/musicbrainz/Makefile
+++ b/audio/musicbrainz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:12 jlam Exp $
DISTNAME= libmusicbrainz-2.1.1
PKGNAME= ${DISTNAME:S/lib//}
@@ -12,7 +12,7 @@ COMMENT= Second generation incarnation of the CD Index
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
@@ -21,5 +21,4 @@ PKGCONFIG_OVERRIDE= libmusicbrainz.pc.in
CONFIGURE_ARGS+= --enable-cpp-headers
.include "../../textproc/expat/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile
index eba29c2d575..9b9ccb09d48 100644
--- a/audio/ncmpc/Makefile
+++ b/audio/ncmpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:12 jlam Exp $
DISTNAME= ncmpc-0.11.1
CATEGORIES= audio
@@ -12,12 +12,11 @@ COMMENT= Curses client for Music Player Daemon
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
INCOMPAT_CURSES= NetBSD-1.4*-* NetBSD-1.5*-*
INCOMPAT_CURSES+= NetBSD-1.6.*-* NetBSD-1.6_*-*
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 16100db760f..4d05b4a5ef9 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= rhythmbox-0.8.8
@@ -21,7 +21,7 @@ BUILDLINK_DEPENDS.gst-plugins+= gst-plugins>=0.8.1
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
@@ -37,7 +37,6 @@ GCONF2_SCHEMAS= rhythmbox.schemas
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../multimedia/gstreamer/buildlink3.mk"
.include "../../multimedia/gst-plugins/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index 8acdfcc4e4b..c31f41df9d0 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= speex-1.0.5
@@ -12,6 +12,7 @@ COMMENT= Open-source, patent-free voice codec
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
PKGCONFIG_OVERRIDE= speex.pc.in
+USE_TOOLS+= pkg-config
# previous versions of the package were called Speex
CONFLICTS= Speex-[0-9]*
@@ -24,7 +25,6 @@ CONFIGURE_ENV+= F77=${FALSE}
BUILDLINK_TRANSFORM+= l:gnugetopt:getopt
.include "../../devel/libgetopt/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 28391bd5e0e..43ece1018f1 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= streamtuner-0.99
@@ -15,7 +15,7 @@ BUILD_DEPENDS+= hicolor-icon-theme-[0-9]*:../../graphics/hicolor-icon-theme
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -23,7 +23,6 @@ GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE= extras/streamtuner.pc.in
.include "../../audio/taglib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../lang/python/pyversion.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 6badb5994da..58f8db80f3e 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= sweep-0.8.3
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
USE_DIRS+= gnome1-1.5
USE_LIBTOOL= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
@@ -32,7 +32,6 @@ MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS}
.include "../../converters/libiconv/buildlink3.mk"
.include "../../databases/tdb/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile
index fe277ebe2f6..82f0749b455 100644
--- a/audio/tunesbrowser/Makefile
+++ b/audio/tunesbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/08/05 12:58:49 tonio Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= tunesbrowser-0.3.0
@@ -13,6 +13,7 @@ COMMENT= Front-end for DAAP client
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+USE_TOOLS+= pkg-config
CONFIGURE_ARGS+= --datadir=${PREFIX}/share/tunesbrowser
DEPENDS+= gst-plugins-esound>=0.8.1:../../audio/gst-plugins-esound
@@ -23,7 +24,6 @@ BUILDLINK_DEPENDS.libopendaap+= libopendaap>=0.4.0
.include "../../multimedia/gst-plugins/buildlink3.mk"
.include "../../audio/libopendaap/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../multimedia/gstreamer/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../sysutils/gst-plugins-gnomevfs/buildlink3.mk"
diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile
index 549d57af8ad..8cc1923b88f 100644
--- a/audio/xmms-faad/Makefile
+++ b/audio/xmms-faad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/08/10 20:56:12 jlam Exp $
DISTNAME= faad2-2.0
PKGNAME= xmms-faad-2.0
@@ -14,7 +14,7 @@ COMMENT= XMMS plugin for faad
#NO_BIN_ON_CDROM= ${RESTRICTED}
WRKSRC= ${WRKDIR}/faad2
-USE_TOOLS+= automake14 gmake
+USE_TOOLS+= automake14 gmake pkg-config
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
SHLIBTOOL_OVERRIDE= libtool
@@ -49,6 +49,5 @@ do-install:
.include "../../audio/faad2/buildlink3.mk"
.include "../../audio/id3lib/buildlink3.mk"
.include "../../audio/xmms/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile
index 575d92b106f..cf4b08daedb 100644
--- a/audio/xmms-mad/Makefile
+++ b/audio/xmms-mad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= xmms-mad-0.5.5
@@ -11,12 +11,12 @@ HOMEPAGE= http://sourceforge.net/projects/xmms-mad/
COMMENT= Input plugin for XMMS that uses libmad
GNU_CONFIGURE= YES
+USE_TOOLS+= pkg-config
CPPFLAGS.NetBSD+= -DHAVE_NANOSLEEP=1
BUILDLINK_DEPENDS.libmad= libmad>=0.15.0bnb1
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../audio/libid3tag/buildlink3.mk"
.include "../../audio/libmad/buildlink3.mk"
.include "../../audio/xmms/buildlink3.mk"
diff --git a/audio/xmms-modplug/Makefile b/audio/xmms-modplug/Makefile
index 7f43381e1e1..bf62e132874 100644
--- a/audio/xmms-modplug/Makefile
+++ b/audio/xmms-modplug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= modplugxmms-2.05
@@ -17,6 +17,7 @@ LDFLAGS+= -lm ${LIBOSSAUDIO}
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
SHLIBTOOL_OVERRIDE= libtool-disable-static
+USE_TOOLS+= pkg-config
CFLAGS+= -DDEVICE_NAME="\"${DEVOSSSOUND}\""
USE_LANGUAGES= c c++
@@ -25,7 +26,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
.include "../../audio/libmodplug/buildlink3.mk"
.include "../../audio/xmms/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-musepack/Makefile b/audio/xmms-musepack/Makefile
index 752d06b29c3..4999b012487 100644
--- a/audio/xmms-musepack/Makefile
+++ b/audio/xmms-musepack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= xmms-musepack-1.1
@@ -12,10 +12,10 @@ COMMENT= XMMS plugin for musepack (mpc) files
USE_LANGUAGES= c++
GNU_CONFIGURE= yes
+USE_TOOLS+= pkg-config
.include "../../audio/libmusepack/buildlink3.mk"
.include "../../audio/xmms/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/gattrib/Makefile b/cad/gattrib/Makefile
index 092e94cd96a..df9688a0991 100644
--- a/cad/gattrib/Makefile
+++ b/cad/gattrib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:12 jlam Exp $
DISTNAME= geda-gattrib-${PKGVERSION}
PKGNAME= gattrib-${PKGVERSION}
@@ -12,9 +12,9 @@ COMMENT= Attribute editor for gEDA
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
+USE_TOOLS+= pkg-config
.include "../../x11/gtk2/buildlink3.mk"
.include "../../cad/libgeda/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index 124b919cd91..fabf954c4b6 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= geda-utils-${PKGVERSION}
@@ -20,7 +20,7 @@ CONFLICTS+= gEDA<19991011
.include "../../cad/geda/Makefile.common"
GNU_CONFIGURE= YES
-USE_TOOLS+= perl:run
+USE_TOOLS+= perl:run pkg-config
# let (f)lex rebuild this file. The distributed one doesn't
# always work.
@@ -42,5 +42,4 @@ REPLACE_PERL+= scripts/pads_backannotate \
scripts/sarlacc_sym
.include "../../cad/libgeda/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index b1af1127d5a..5dcfa1e7b51 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= geda-${PKGVERSION}
@@ -20,11 +20,11 @@ DEPENDS+= geda-examples-${PKGVERSION}{,nb[0-9]*}:../../cad/geda-examples
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
+USE_TOOLS+= pkg-config
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
.include "../../cad/libgeda/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 072a29c164a..ccf7eeef17c 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= geda-gnetlist-${PKGVERSION}
@@ -11,7 +11,7 @@ COMMENT= Netlist generation program
DEPENDS+= geda-symbols-${PKGVERSION}:../../cad/geda-symbols
# needs GNU m4 for the PCBboard netlister
-USE_TOOLS+= gm4:run
+USE_TOOLS+= gm4:run pkg-config
.include "../../cad/geda/Makefile.common"
@@ -19,7 +19,7 @@ CONFLICTS+= gEDA<19991011
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
EVAL_PREFIX+= PCBDIR=pcb
@@ -35,5 +35,4 @@ post-patch:
.endfor
.include "../../cad/libgeda/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/gschem/Makefile b/cad/gschem/Makefile
index bdc34031473..c8a36c453b1 100644
--- a/cad/gschem/Makefile
+++ b/cad/gschem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= geda-gschem-${PKGVERSION}
@@ -16,6 +16,7 @@ CONFLICTS+= gEDA<19991011
.include "../../cad/geda/Makefile.common"
GNU_CONFIGURE= YES
+USE_TOOLS+= pkg-config
USE_PKGLOCALEDIR= YES
USE_MAKEINFO= YES
INFO_FILES= gschemdoc.info
@@ -23,5 +24,4 @@ INFO_FILES= gschemdoc.info
.include "../../cad/libgeda/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libstroke/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/gsmc/Makefile b/cad/gsmc/Makefile
index c91cc5b51d4..deac87627e2 100644
--- a/cad/gsmc/Makefile
+++ b/cad/gsmc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= gsmc-1.1
@@ -13,9 +13,8 @@ COMMENT= Smith charting program
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
# The following were just links in the distfile so
diff --git a/cad/gsymcheck/Makefile b/cad/gsymcheck/Makefile
index 8b1ecda9c47..db8efb1f091 100644
--- a/cad/gsymcheck/Makefile
+++ b/cad/gsymcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/08/10 20:56:12 jlam Exp $
#
DISTNAME= geda-gsymcheck-${PKGVERSION}
@@ -18,7 +18,7 @@ CONFLICTS+= gEDA<19991011
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
+USE_TOOLS+= pkg-config
.include "../../cad/libgeda/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index bac98bc9316..7cdd28dbd38 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2005/08/10 20:56:13 jlam Exp $
#
DISTNAME= libgeda-${PKGVERSION}
@@ -14,10 +14,10 @@ CONFLICTS+= gEDA<19991011
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
+USE_TOOLS+= pkg-config
INFO_FILES= libgedadoc.info
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libgdgeda/buildlink3.mk"
.include "../../lang/guile/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/cad/transcalc/Makefile b/cad/transcalc/Makefile
index 6d3e06647ed..cba2b044f29 100644
--- a/cad/transcalc/Makefile
+++ b/cad/transcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:44 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:13 jlam Exp $
#
DISTNAME= transcalc-0.14
@@ -11,9 +11,8 @@ HOMEPAGE= http://transcalc.sourceforge.net/
COMMENT= Transmission line analysis/synthesis
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
#.include "../../graphics/imlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile
index 12aa8997e0d..0151792901e 100644
--- a/chat/bitlbee/Makefile
+++ b/chat/bitlbee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/08/02 15:22:30 tonio Exp $
+# $NetBSD: Makefile,v 1.23 2005/08/10 20:56:13 jlam Exp $
#
DISTNAME= bitlbee-0.92
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.bitlbee.org/
COMMENT= IRC to other chat networks gateway
HAS_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGINSTALL= yes
CONFIGURE_ARGS+= --prefix=${PREFIX}
@@ -58,6 +58,5 @@ CONFIGURE_ARGS+= --ipv6=1
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/ekg/Makefile b/chat/ekg/Makefile
index a488899e462..6220081b412 100644
--- a/chat/ekg/Makefile
+++ b/chat/ekg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2005/08/10 20:56:13 jlam Exp $
DISTNAME= ekg-1.6rc3
PKGNAME= ekg-1.6
@@ -14,7 +14,7 @@ COMMENT= Experimental Gadu-Gadu Client (Polish instant messaging system)
USE_GNU_READLINE= yes
USE_LIBTOOL= yes
USE_NCURSES= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE= lib/libgadu.pc.in
CONFIGURE_ARGS+= --enable-ui-ncurses
@@ -30,7 +30,6 @@ CONFIGURE_ARGS+= --with-pthread
.endif
.include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index 7d4b5fae442..4c0457e2d68 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2005/08/10 16:13:33 salo Exp $
+# $NetBSD: Makefile,v 1.95 2005/08/10 20:56:13 jlam Exp $
DISTNAME= gaim-1.4.0
PKGREVISION= 2
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes
CONFLICTS+= gaim-gnome-[0-9]*
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -47,7 +47,6 @@ CONFIGURE_ARGS+= --disable-screensaver
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/nss/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/silc-toolkit/buildlink3.mk"
.include "../../textproc/gtkspell/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/chat/gg2/Makefile b/chat/gg2/Makefile
index a533e175d8a..7f6e8c77373 100644
--- a/chat/gg2/Makefile
+++ b/chat/gg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:13 jlam Exp $
DISTNAME= gg2-2.2.6
CATEGORIES= chat
@@ -10,7 +10,7 @@ COMMENT= Instant messenger software for Poland; Jabber plugin included
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
LIBS+= -lm
PKGCONFIG_OVERRIDE+= lib/gg2_core.pc.in
@@ -26,7 +26,6 @@ CONFIGURE_ARGS+= --without-update
.include "../../chat/ekg/buildlink3.mk"
.include "../../chat/libtlen/buildlink3.mk"
.include "../../chat/loudmouth/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index 2a7f09ac6a5..f3a5b699000 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2005/08/10 20:56:13 jlam Exp $
DISTNAME= gnomeicu-0.99.5
CATEGORIES= chat gnome
@@ -11,7 +11,7 @@ COMMENT= GNOME ICQ client
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
@@ -29,7 +29,6 @@ GCONF2_SCHEMAS= gnomeicu.schemas
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/gtkspell/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile
index 90109378983..05d0bb2bb65 100644
--- a/chat/gossip/Makefile
+++ b/chat/gossip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2005/08/10 20:56:13 jlam Exp $
#
DISTNAME= gossip-0.8
@@ -14,7 +14,7 @@ BUILD_DEPENDS= p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -26,6 +26,5 @@ GCONF2_SCHEMAS= gossip.schemas
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/irssi/Makefile b/chat/irssi/Makefile
index e2bcdb86334..71a5a9852da 100644
--- a/chat/irssi/Makefile
+++ b/chat/irssi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/08/06 06:19:04 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2005/08/10 20:56:13 jlam Exp $
DISTNAME= ${IRSSI_DISTNAME}
PKGREVISION= 6
@@ -15,6 +15,7 @@ COMMENT= Secure and modular IRC client with text mode user interf
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
+USE_TOOLS+= pkg-config
CONFIGURE_ARGS+= --with-terminfo \
--with-proxy \
@@ -30,7 +31,6 @@ CONF_FILES= ${EGDIR}/irssi.conf ${PKG_SYSCONFDIR}/irssi.conf
.include "options.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
post-install:
${INSTALL_DATA} ${WRKSRC}/config.h ${IRSSI_CONFIG_H}
diff --git a/chat/loudmouth/Makefile b/chat/loudmouth/Makefile
index 56f7536e4e0..dc129f96ee6 100644
--- a/chat/loudmouth/Makefile
+++ b/chat/loudmouth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:13 jlam Exp $
DISTNAME= loudmouth-0.17.2
PKGREVISION= 1
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://loudmouth.imendio.org/
COMMENT= Lightweight Jabber client library
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -24,6 +24,5 @@ BUILDLINK_DEPENDS.gnutls+= gnutls>=1.2.0
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../security/gnutls/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/mu-conference/Makefile b/chat/mu-conference/Makefile
index c0aea4777b6..05c2ae2cb8d 100644
--- a/chat/mu-conference/Makefile
+++ b/chat/mu-conference/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/10 20:56:13 jlam Exp $
#
DISTNAME= mu-conference-0.6.0
@@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/jcr-0.1.2
SUBWRKSRC= ${WRKSRC}/${DISTNAME}/src
XMLCONFIG= ${WRKDIR}/${DISTNAME}/muc-jcr.xml
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGINSTALL= yes
PKG_SYSCONFSUBDIR= jabberd
@@ -55,6 +55,5 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/${DISTNAME}/muc-jcr.xml ${EGDIR}
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/xchat-systray-integration/Makefile b/chat/xchat-systray-integration/Makefile
index 5fa5ff0042c..ed0ace539e9 100644
--- a/chat/xchat-systray-integration/Makefile
+++ b/chat/xchat-systray-integration/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:13 jlam Exp $
DISTNAME= xchat-systray-integration-2.4.5-src
PKGNAME= ${DISTNAME:S/-src//}
@@ -12,13 +12,12 @@ COMMENT= Systray icon plugin for X-Chat
DEPENDS= xchat>=2.0:../../chat/xchat
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
# We build a shared object, so ensure that the object files are PIC.
CFLAGS+= -fPIC
MAKE_ENV+= prefix=${PREFIX}
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
index 8cce2f012f9..36896f6f730 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile.common,v 1.43 2005/08/10 20:56:13 jlam Exp $
#
# Please do not merge this file into "Makefile" because it is used by
# packages in "pkgsrc-wip".
@@ -15,7 +15,6 @@ DISTINFO_FILE= ${.CURDIR}/../../chat/xchat/distinfo
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile
index 1c80219c0d4..8e11c14e600 100644
--- a/comms/jpilot-syncmal/Makefile
+++ b/comms/jpilot-syncmal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2005/08/10 20:56:13 jlam Exp $
DISTNAME= jpilot-syncmal_0.71.2
PKGNAME= jpilot-syncmal-0.71.2
@@ -12,7 +12,7 @@ COMMENT= MAL synchronization plugin for J-Pilot
BUILDLINK_DEPMETHOD.jpilot= full
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= # defined
SHLIBTOOL_OVERRIDE= libtool
@@ -29,6 +29,5 @@ PLIST_SUBST+= PLUGINSDIR=${PLUGINSDIR:S/${PREFIX}\///}
.include "../../comms/jpilot/buildlink3.mk"
.include "../../comms/pilot-link-libs/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile
index f250e6a7017..fa96927ae71 100644
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2005/08/10 20:56:13 jlam Exp $
#
DISTNAME= jpilot-0.99.5
@@ -16,6 +16,7 @@ CONFLICTS+= jpilot-libplugin-[0-9]*
USE_DIRS+= gnome1-1.0
USE_LIBTOOL= YES
+USE_TOOLS+= pkg-config
USE_PKGLOCALEDIR= YES
USE_OLD_DES_API= YES
@@ -33,7 +34,6 @@ PLUGINSDIR= ${PREFIX}/lib/jpilot/plugins
.include "../../comms/pilot-link-libs/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/converters/fribidi/Makefile b/converters/fribidi/Makefile
index f2563a372f7..0c7815cbae1 100644
--- a/converters/fribidi/Makefile
+++ b/converters/fribidi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:13 jlam Exp $
#
DISTNAME= fribidi-0.10.4
@@ -13,10 +13,10 @@ COMMENT= Free Implementation of the Unicode Bidirectional Algorithm
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
+USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE= fribidi.pc.in
TEST_TARGET= check
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/converters/wv/Makefile b/converters/wv/Makefile
index 81f6024f494..7224c5d40ac 100644
--- a/converters/wv/Makefile
+++ b/converters/wv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2005/08/10 20:56:13 jlam Exp $
DISTNAME= wv-1.0.3
PKGREVISION= 2
@@ -9,7 +9,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://wvware.sourceforge.net/
COMMENT= Library and executables to access Microsoft Word files
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -27,7 +27,6 @@ CONFIGURE_ARGS+= --with-png=${BUILDLINK_PREFIX.png}
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/libwmf/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
diff --git a/converters/wv2/Makefile b/converters/wv2/Makefile
index b97008ef816..4afb613b331 100644
--- a/converters/wv2/Makefile
+++ b/converters/wv2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:13 jlam Exp $
#
DISTNAME= wv2-0.2.2
@@ -15,6 +15,7 @@ USE_GNU_ICONV= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
+USE_TOOLS+= pkg-config
CONFIGURE_ARGS+= --disable-debug
CONFIGURE_ARGS+= ${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
@@ -23,5 +24,4 @@ CONFIGURE_ARGS.gnu-iconv= --with-libiconv=${BUILDLINK_PREFIX.iconv}
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/libgsf/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/dbh/Makefile b/databases/dbh/Makefile
index a385026a488..d53d6a79cc7 100644
--- a/databases/dbh/Makefile
+++ b/databases/dbh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:13 jlam Exp $
DISTNAME= dbh-1.0.24
CATEGORIES= databases
@@ -10,6 +10,7 @@ COMMENT= Library to create disk based Hashtables
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
+USE_TOOLS+= pkg-config
# Avoid an ICE in gcc2 on sparc64
CONFIGURE_ENV+= F77=${FALSE}
@@ -22,5 +23,4 @@ post-install:
cd ${WRKSRC} && ${INSTALL_DATA} doc/dbh-hash-tables.html \
${PREFIX}/share/doc/dbh/html
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/gq/Makefile b/databases/gq/Makefile
index a555f562bcf..d7bd2fd7c7a 100644
--- a/databases/gq/Makefile
+++ b/databases/gq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2005/08/10 20:56:13 jlam Exp $
#
DISTNAME= gq-1.0beta1
@@ -13,6 +13,7 @@ COMMENT= GTK-based LDAP client
USE_DIRS+= gnome2-1.5
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
+USE_TOOLS+= pkg-config
CONFIGURE_ARGS+= --enable-browser-dnd
CONFIGURE_ARGS+= --with-ssl-prefix=${BUILDLINK_PREFIX.openssl}
@@ -20,7 +21,6 @@ CONFIGURE_ARGS+= --enable-cache
.include "../../security/openssl/buildlink3.mk"
.include "../../databases/openldap/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/gramps/Makefile b/databases/gramps/Makefile
index b1d697ab346..66c560a3f7f 100644
--- a/databases/gramps/Makefile
+++ b/databases/gramps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:13 jlam Exp $
#
DISTNAME= gramps-1.0.11
@@ -18,6 +18,7 @@ BUILD_DEPENDS+= gettext>=0.10.35nb1:../../devel/gettext
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
+USE_TOOLS+= pkg-config
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
# i18n support with other python versions appears to not work
@@ -25,7 +26,6 @@ PYTHON_VERSION_REQD= 23
MESSAGE_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../graphics/py-imaging/buildlink3.mk"
diff --git a/databases/gramps2/Makefile b/databases/gramps2/Makefile
index 44f662b4dbb..d8b1957b155 100644
--- a/databases/gramps2/Makefile
+++ b/databases/gramps2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:45 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/08/10 20:56:14 jlam Exp $
#
DISTNAME= gramps-2.0.5
@@ -16,6 +16,7 @@ BUILD_DEPENDS+= gettext>=0.10.35nb1:../../devel/gettext
.endif
#BUILD_USES_MSGFMT= yes
+USE_TOOLS+= pkg-config
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
# disable gconf schema and mime type processing
@@ -28,7 +29,6 @@ PYTHON_VERSIONS_ACCEPTED= 24 23
MESSAGE_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
GCONF2_SCHEMAS+= gramps.schemas
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../databases/py-bsddb3/buildlink3.mk"
diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common
index 01967445a24..5685a6897d8 100644
--- a/databases/libgda/Makefile.common
+++ b/databases/libgda/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2005/07/21 16:29:46 wiz Exp $
+# $NetBSD: Makefile.common,v 1.33 2005/08/10 20:56:14 jlam Exp $
#
DISTNAME= libgda-1.2.2
@@ -13,7 +13,7 @@ COMMENT= GNU database access library
DISTINFO_FILE= ${.CURDIR}/../../databases/libgda/distinfo
PATCHDIR= ${.CURDIR}/../../databases/libgda/patches
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
@@ -45,7 +45,6 @@ SUBST_SED.libs+= -e 's|$$(top_builddir)/libgda/libgda-2.la|${BUILDLINK_PREFIX.li
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 5f0e38769ea..808b319733c 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/07/21 16:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2005/08/10 20:56:14 jlam Exp $
#
DISTNAME= libgnomedb-1.2.2
@@ -12,7 +12,7 @@ COMMENT= GNOME2 database library
BUILD_USES_MSGFMT= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake 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 "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index 3b9e755ce2b..602a4dadd99 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/07/21 16:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2005/08/10 20:56:14 jlam Exp $
#
DISTNAME= mergeant-0.52
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnome-db.org/
COMMENT= GNOME2 GNOME-DB database front-end
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl pkg-config
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --disable-gtk-doc
@@ -24,7 +24,6 @@ USE_LIBTOOL= YES
.include "../../devel/libbonoboui/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 4e4423a9932..a7ae0f2a2bf 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/08/08 18:13:13 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/08/10 20:56:14 jlam Exp $
#
DISTNAME= rrdtool-1.2.11
@@ -15,7 +15,7 @@ NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \
NetBSD-1.5.*-alpha NetBSD-1.5[A-U]-alpha
USE_LIBTOOL= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
PTHREAD_OPTS+= require
@@ -32,7 +32,6 @@ RRDDOCDIR= ${PREFIX}/share/doc/rrdtool
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
.include "../../www/cgilib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../lang/perl5/module.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/shared-mime-info/Makefile b/databases/shared-mime-info/Makefile
index 0e911b8193e..d5835d8476b 100644
--- a/databases/shared-mime-info/Makefile
+++ b/databases/shared-mime-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/21 16:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/10 20:56:14 jlam Exp $
#
DISTNAME= shared-mime-info-0.16
@@ -15,6 +15,7 @@ GNU_CONFIGURE= YES
USE_LIBTOOL= YES
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
+USE_TOOLS+= pkg-config
CONFIGURE_ARGS+= --disable-update-mimedb
@@ -33,7 +34,6 @@ PRINT_PLIST_AWK+= /^@dirrm share\/mime/ { next; }
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/ArX/Makefile b/devel/ArX/Makefile
index 86debc557c6..e7b251a345b 100644
--- a/devel/ArX/Makefile
+++ b/devel/ArX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:14 jlam Exp $
#
DISTNAME= ArX-1.0.20
@@ -15,6 +15,7 @@ DEPENDS+= diffutils-[0-9]*:../../devel/diffutils
DEPENDS+= gtar-base-[0-9]*:../../archivers/gtar-base
BUILD_DEPENDS+= scons-[0-9]*:../../devel/scons
+USE_TOOLS+= pkg-config
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
@@ -40,7 +41,6 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCDIR}
.endfor
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/ArX2/Makefile b/devel/ArX2/Makefile
index a35bc4d0f28..b3f8166596d 100644
--- a/devel/ArX2/Makefile
+++ b/devel/ArX2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/24 08:47:42 recht Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:14 jlam Exp $
#
DISTNAME= ArX-2.2.3
@@ -14,6 +14,7 @@ DEPENDS+= diffutils-[0-9]*:../../devel/diffutils
DEPENDS+= gtar-base-[0-9]*:../../archivers/gtar-base
BUILD_DEPENDS+= scons-[0-9]*:../../devel/scons
+USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -41,6 +42,5 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCDIR}
.endfor
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common
index 17e3435ea99..eecf356bb77 100644
--- a/devel/GConf2/Makefile.common
+++ b/devel/GConf2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2005/07/27 17:11:08 drochner Exp $
+# $NetBSD: Makefile.common,v 1.32 2005/08/10 20:56:14 jlam Exp $
#
DISTNAME= GConf-2.10.1
@@ -22,7 +22,7 @@ PATCHDIR= ${.CURDIR}/../GConf2/patches
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl pkg-config
PKGCONFIG_OVERRIDE= gconf-2.0.pc.in
@@ -33,5 +33,3 @@ CONFIGURE_ARGS+= --with-sysconfsubdir=
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ARGS+= --disable-gtk-doc
CONFIGURE_ARGS+= --enable-gconf-source=xml::${PKG_SYSCONFDIR}/gconf.xml.defaults
-
-.include "../../devel/pkg-config/buildlink3.mk"
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index d08d8fd31ef..d3e2b17e152 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/08/01 17:17:14 drochner Exp $
+# $NetBSD: Makefile,v 1.33 2005/08/10 20:56:14 jlam Exp $
DISTNAME= anjuta-1.2.3
PKGREVISION= 1
@@ -16,12 +16,11 @@ DEPENDS+= glade2>=2.6.0:../../devel/glade2
DEPENDS+= gnome2-terminal>=2.4.2:../../x11/gnome2-terminal
DEPENDS+= libtool>=1.5.2:../../devel/libtool
DEPENDS+= yelp>=2.4.2:../../misc/yelp
-BUILDLINK_DEPMETHOD.pkg-config= full
USE_DIRS+= gnome2-1.5
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake:run
+USE_TOOLS+= gmake:run pkg-config:run
GNU_CONFIGURE= yes
SUBST_CLASSES+= make
@@ -43,7 +42,6 @@ SUBST_SED.unused= -e 's/__unused__/_exctags_unused_/g'
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/vte/buildlink3.mk"
diff --git a/devel/at-spi/Makefile b/devel/at-spi/Makefile
index 9e75d49d447..000f1b4c5c2 100644
--- a/devel/at-spi/Makefile
+++ b/devel/at-spi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:14 jlam Exp $
#
DISTNAME= at-spi-1.6.3
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Assistive Technology Service Provider Interface
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -24,7 +24,6 @@ PKGCONFIG_OVERRIDE+= libspi-1.0.pc.in
.include "../../devel/atk/buildlink3.mk"
.include "../../devel/gail/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index dcb8f03943d..1633e815348 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/07/21 16:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2005/08/10 20:56:14 jlam Exp $
#
DISTNAME= atk-1.10.1
@@ -12,7 +12,7 @@ COMMENT= Set of interfaces for accessibility
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
@@ -31,6 +31,5 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.3
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/blib/Makefile b/devel/blib/Makefile
index c4a12a7e9d2..4a6f090cca0 100644
--- a/devel/blib/Makefile
+++ b/devel/blib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:14 jlam Exp $
#
DISTNAME= blib-1.0.2
@@ -10,6 +10,7 @@ MAINTAINER= salo@NetBSD.org
HOMEPAGE= http://www.blinkenlights.de/
COMMENT= Blinkenlights library
+USE_TOOLS+= pkg-config
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
@@ -27,7 +28,5 @@ CONFIGURE_ARGS+= --disable-directfb
post-extract:
${TOUCH} ${WRKSRC}/modules/libtool
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile
index 7938fb2c08a..28bd448d523 100644
--- a/devel/coconut/Makefile
+++ b/devel/coconut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:14 jlam Exp $
#
DISTNAME= coconut-0.3.0
@@ -13,6 +13,7 @@ COMMENT= Objective-C library for Unix-like systems
BUILD_DEPENDS+= papaya>=0.1.7:../../devel/papaya
+USE_TOOLS+= pkg-config
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
CPPFLAGS+= -I${PREFIX}/include/libxml2/libxml -DGL_GLEXT_LEGACY
@@ -23,7 +24,6 @@ MAKE_ENV+= AM_MAKEFLAGS="am__depfiles_maybe="
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../net/gnet1/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 428c8825b1c..3862c7fce55 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:14 jlam Exp $
DISTNAME= devhelp-0.7
PKGREVISION= 11
@@ -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
+USE_TOOLS+= gmake perl pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
@@ -25,7 +25,6 @@ BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../www/libgtkhtml/buildlink3.mk"
diff --git a/devel/eel2/Makefile b/devel/eel2/Makefile
index 65dfc0108db..8271c6e06dd 100644
--- a/devel/eel2/Makefile
+++ b/devel/eel2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/07/21 16:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2005/08/10 20:56:14 jlam Exp $
DISTNAME= eel-2.10.1
PKGNAME= ${DISTNAME:S/-/2-/}
@@ -13,7 +13,7 @@ COMMENT= Eazel Extensions Library for GNOME2
BUILD_USES_MSGFMT= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
@@ -27,7 +27,6 @@ PKGCONFIG_OVERRIDE= eel-2.0.pc.in
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
.include "../../sysutils/gnome-menus/buildlink3.mk"
diff --git a/devel/eet/Makefile b/devel/eet/Makefile
index c2fa4f4752f..823d0428303 100644
--- a/devel/eet/Makefile
+++ b/devel/eet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:14 jlam Exp $
#
DISTNAME= eet-0.9.9
@@ -11,12 +11,12 @@ COMMENT= Library for speedy storage, retrieval, and compression
PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= eet.pc.in
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index b243239e0b1..4778fafe34c 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/08/10 19:01:23 gdt Exp $
+# $NetBSD: Makefile,v 1.40 2005/08/10 20:56:14 jlam Exp $
DISTNAME= g-wrap-1.9.6
CATEGORIES= devel
@@ -12,7 +12,7 @@ DEPENDS+= guile-lib>=0.1.2:../../devel/guile-lib
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
TEST_TARGET= check
@@ -23,6 +23,5 @@ pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/guile/site/g-wrap/guile/ws
.include "../../devel/glib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../lang/guile/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/gail/Makefile b/devel/gail/Makefile
index ce60610e845..22109bc7695 100644
--- a/devel/gail/Makefile
+++ b/devel/gail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2005/08/10 20:56:14 jlam Exp $
#
DISTNAME= gail-1.8.4
@@ -11,7 +11,7 @@ HOMEPAGE= http://developer.gnome.org/projects/gap/
COMMENT= GNOME Accessibility Implementation Library
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
@@ -22,7 +22,6 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
.include "../../devel/atk/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/gal2/Makefile b/devel/gal2/Makefile
index 1b85accd407..c595a2b366f 100644
--- a/devel/gal2/Makefile
+++ b/devel/gal2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/07/27 17:46:52 drochner Exp $
+# $NetBSD: Makefile,v 1.40 2005/08/10 20:56:14 jlam Exp $
#
# Check the API before updating this package! gal-2.5 and above should
# get their own gal26 package!
@@ -14,7 +14,7 @@ MAINTAINER= recht@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Library functions that came from Gnumeric and Evolution (gal-2.4 API)
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -29,7 +29,6 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/devel/gal20/Makefile b/devel/gal20/Makefile
index 340523a4f73..57e2fec227d 100644
--- a/devel/gal20/Makefile
+++ b/devel/gal20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:46 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:14 jlam Exp $
#
DISTNAME= gal-1.99.11
@@ -12,7 +12,7 @@ MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Library functions that came from Gnumeric and Evolution
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
BUILD_USES_MSGFMT= yes
USE_LIBTOOL= yes
@@ -22,7 +22,6 @@ CONFIGURE_ARGS= --enable-gtk-doc=no
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index efb69a38e58..c01a2734b6b 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/22 21:25:59 adam Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:14 jlam Exp $
DISTNAME= gconfmm-2.10.0
CATEGORIES= devel
@@ -12,11 +12,10 @@ COMMENT= C++ bindings for gconf
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
PKGCONFIG_OVERRIDE+= ${WRKSRC}/gconf/gconfmm-2.6.pc.in
GNU_CONFIGURE= yes
.include "../../devel/GConf2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtkmm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/glade2/Makefile.common b/devel/glade2/Makefile.common
index ad61851d79d..44bcab84b62 100644
--- a/devel/glade2/Makefile.common
+++ b/devel/glade2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2005/07/21 16:29:46 wiz Exp $
+# $NetBSD: Makefile.common,v 1.7 2005/08/10 20:56:15 jlam Exp $
DISTNAME= glade-2.10.0
PKGNAME= ${DISTNAME:S/-/2-/}
@@ -16,12 +16,11 @@ PLIST_SRC= ${.CURDIR}/../../devel/glade2/PLIST
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 70a87cead01..093b7973660 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2005/08/09 22:20:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.79 2005/08/10 20:56:15 jlam Exp $
DISTNAME= glib-2.6.6
PKGNAME= ${DISTNAME:S/glib/glib2/}
@@ -18,7 +18,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
BUILD_USES_MSGFMT= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake perl:run
+USE_TOOLS+= gmake perl:run pkg-config
USE_LIBTOOL= yes
TEST_TARGET= check
@@ -74,7 +74,6 @@ PRINT_PLIST_AWK+= /^@dirrm include\/glib$$/ \
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index e8739a0f51f..bf69057d9c5 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/07/22 21:12:21 adam Exp $
+# $NetBSD: Makefile,v 1.2 2005/08/10 20:56:15 jlam Exp $
DISTNAME= glibmm-2.6.1
CATEGORIES= devel
@@ -12,11 +12,10 @@ COMMENT= C++ bindings for glib
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
PKGCONFIG_OVERRIDE+= ${WRKSRC}/glib/glibmm-2.4.pc.in
GNU_CONFIGURE= yes
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libsigc++2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/gnome2-libole2/Makefile b/devel/gnome2-libole2/Makefile
index 379d221e8b8..77b69f42fc1 100644
--- a/devel/gnome2-libole2/Makefile
+++ b/devel/gnome2-libole2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:47 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:15 jlam Exp $
#
DISTNAME= libole2-2.2.8
@@ -16,9 +16,9 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
+USE_TOOLS+= pkg-config
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile
index 5bbf7aa69ba..62db8e8806f 100644
--- a/devel/gob2/Makefile
+++ b/devel/gob2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:47 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/08/10 20:56:15 jlam Exp $
#
DISTNAME= gob2-2.0.11
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.5z.com/jirka/gob.html
COMMENT= GNOME object builder for glib2
GNU_CONFIGURE= YES
+USE_TOOLS+= pkg-config
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 63d3136c624..9d91e89dfc9 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/08/05 21:52:36 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2005/08/10 20:56:15 jlam Exp $
DISTNAME= libbonobo-2.10.0
CATEGORIES= devel gnome
@@ -15,7 +15,7 @@ GNU_CONFIGURE= YES
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
-USE_TOOLS+= bison gmake perl:run
+USE_TOOLS+= bison gmake perl:run pkg-config
PKGCONFIG_OVERRIDE= bonobo/libbonobo-2.0.pc.in
PKGCONFIG_OVERRIDE+= bonobo-activation/bonobo-activation-2.0.pc.in
@@ -36,7 +36,6 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/(bonobo|bonobo\/monikers)$$/ \
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index d5ff93a7b11..219e917951e 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/07/27 17:23:51 drochner Exp $
+# $NetBSD: Makefile,v 1.43 2005/08/10 20:56:15 jlam Exp $
#
DISTNAME= libbonoboui-2.10.0
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE= bonobo/libbonoboui-2.0.pc.in
@@ -31,7 +31,6 @@ BUILDLINK_DEPENDS.libbonobo+= libbonobo>=2.8.1
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/devel/libgail-gnome/Makefile b/devel/libgail-gnome/Makefile
index 39a09201fe6..716ec584c1d 100644
--- a/devel/libgail-gnome/Makefile
+++ b/devel/libgail-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:47 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:15 jlam Exp $
#
DISTNAME= libgail-gnome-1.1.1
@@ -12,6 +12,7 @@ COMMENT= GNOME Accessibility Implementation Library
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
+USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE= libgail-gnome.pc.in
@@ -20,7 +21,6 @@ PKGCONFIG_OVERRIDE= libgail-gnome.pc.in
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libbonoboui/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 68452471560..cec1a3bf2dd 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/07/21 16:29:48 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2005/08/10 20:56:15 jlam Exp $
#
DISTNAME= libglade-2.5.1
@@ -13,7 +13,7 @@ COMMENT= Runtime interpreter for GLADE GUI files (v2)
BUILD_USES_MSGFMT= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= libglade-2.0.pc.in
@@ -33,7 +33,6 @@ post-install:
.include "../../devel/atk/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/xmlcatmgr/catalogs.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/devel/libglademm/Makefile b/devel/libglademm/Makefile
index 137b6310117..5f563468847 100644
--- a/devel/libglademm/Makefile
+++ b/devel/libglademm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/07/22 21:31:33 adam Exp $
+# $NetBSD: Makefile,v 1.2 2005/08/10 20:56:15 jlam Exp $
DISTNAME= libglademm-2.6.0
CATEGORIES= devel
@@ -12,11 +12,10 @@ COMMENT= C++ bindings for libglade
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libglade/libglademm-2.4.pc.in
GNU_CONFIGURE= yes
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtkmm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index c836406b16e..4444816eb06 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/07/27 17:20:49 drochner Exp $
+# $NetBSD: Makefile,v 1.41 2005/08/10 20:56:15 jlam Exp $
#
DISTNAME= libgnome-2.10.1
@@ -16,7 +16,7 @@ BUILD_USES_MSGFMT= YES
BUILDLINK_DEPENDS.esound+= esound>=0.2.26
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_PKGINSTALL= YES
@@ -58,7 +58,6 @@ GCONF2_SCHEMAS+= desktop_gnome_typing_break.schemas
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/devel/libgnomemm/Makefile b/devel/libgnomemm/Makefile
index 3223f501779..6298aabc096 100644
--- a/devel/libgnomemm/Makefile
+++ b/devel/libgnomemm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/07/22 22:00:24 adam Exp $
+# $NetBSD: Makefile,v 1.2 2005/08/10 20:56:15 jlam Exp $
DISTNAME= libgnomemm-2.10.0
CATEGORIES= devel
@@ -12,11 +12,10 @@ COMMENT= C++ bindings for libgnome
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgnome/libgnomemm-2.6.pc.in
GNU_CONFIGURE= yes
.include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtkmm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index da910dec4f5..d8287fabbed 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/07/27 17:25:02 drochner Exp $
+# $NetBSD: Makefile,v 1.47 2005/08/10 20:56:15 jlam Exp $
#
DISTNAME= libgnomeui-2.10.1
@@ -17,7 +17,7 @@ CONFLICTS+= gnome-libs<=1.4.2nb1
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl pkg-config
USE_LIBTOOL= yes
CONFIGURE_ARGS+= --disable-gtk-doc
@@ -45,7 +45,6 @@ post-configure:
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../security/gnome-keyring/buildlink3.mk"
diff --git a/devel/libgnomeuimm/Makefile b/devel/libgnomeuimm/Makefile
index a9c96fbd14f..fdc7ea3b6f5 100644
--- a/devel/libgnomeuimm/Makefile
+++ b/devel/libgnomeuimm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/07/22 22:05:31 adam Exp $
+# $NetBSD: Makefile,v 1.2 2005/08/10 20:56:15 jlam Exp $
DISTNAME= libgnomeuimm-2.10.0
CATEGORIES= devel
@@ -12,7 +12,7 @@ COMMENT= C++ bindings for libgnomeui
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgnomeui/libgnomeuimm-2.6.pc.in
GNU_CONFIGURE= yes
@@ -20,7 +20,6 @@ GNU_CONFIGURE= yes
.include "../../devel/libglademm/buildlink3.mk"
.include "../../devel/libgnomemm/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libgnomecanvasmm/buildlink3.mk"
.include "../../sysutils/gnome-vfsmm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile
index 8e9789d3a2e..6e4c088d432 100644
--- a/devel/libgphoto2/Makefile
+++ b/devel/libgphoto2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:48 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:15 jlam Exp $
#
DISTNAME= libgphoto2-2.1.6
@@ -11,6 +11,7 @@ COMMENT= Digital camera access library
CONFLICTS+= gphoto<2.1.1
+USE_TOOLS+= pkg-config
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE+= libgphoto2/libgphoto2.pc.in
USE_PKGLOCALEDIR= YES
@@ -26,6 +27,5 @@ PLIST_SUBST+= HAVE_LIBUSB="@comment"
.include "../../devel/libusb/buildlink3.mk"
PLIST_SUBST+= HAVE_LIBUSB=""
.endif
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 4b2f138fb78..32352aec964 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/07/21 16:29:48 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2005/08/10 20:56:15 jlam Exp $
#
DISTNAME= libgsf-1.12.1
@@ -10,6 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= GNOME2 structured file library
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
@@ -22,7 +23,6 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/libgsf
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile
index 97af51899be..5a06220f818 100644
--- a/devel/libidn/Makefile
+++ b/devel/libidn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/22 23:41:42 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:15 jlam Exp $
#
DISTNAME= libidn-0.5.18
@@ -15,6 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
TEST_TARGET= check
USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE+= libidn.pc.in
@@ -22,6 +23,5 @@ INFO_FILES= libidn.info
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/libgetopt/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libmatchbox/Makefile b/devel/libmatchbox/Makefile
index 602ffad56e0..55463ab89cd 100644
--- a/devel/libmatchbox/Makefile
+++ b/devel/libmatchbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:48 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:15 jlam Exp $
#
DISTNAME= libmatchbox-1.6
@@ -12,8 +12,8 @@ COMMENT= Library for matchbox window manager for computers with small displays
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
+USE_TOOLS+= pkg-config
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../graphics/xpm/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
diff --git a/devel/libntlm/Makefile b/devel/libntlm/Makefile
index e7123551358..842fbe39b1c 100644
--- a/devel/libntlm/Makefile
+++ b/devel/libntlm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/22 23:45:22 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/08/10 20:56:15 jlam Exp $
#
DISTNAME= libntlm-0.3.7
@@ -9,11 +9,11 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://josefsson.org/libntlm/
COMMENT= Library that implement Microsoft's NTLM authentication
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
TEST_TARGET= check
PKGCONFIG_OVERRIDE+= libntlm.pc.in
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libstatgrab/Makefile b/devel/libstatgrab/Makefile
index 562d9756a83..ade07dda34e 100644
--- a/devel/libstatgrab/Makefile
+++ b/devel/libstatgrab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:48 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:15 jlam Exp $
DISTNAME= libstatgrab-0.11
CATEGORIES= devel
@@ -16,6 +16,7 @@ COMMENT= Provides a useful interface to system statistics
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
+USE_TOOLS+= pkg-config
PKGCONFIG_OVERRIDE= libstatgrab.pc.in
CONFIGURE_ARGS+= --disable-examples
@@ -40,5 +41,4 @@ PLIST_SUBST+= SAIDAR=""
.include "../../devel/ncurses/buildlink3.mk"
.endif
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libwnck/Makefile b/devel/libwnck/Makefile
index 1caab4f6696..49a25b2a2eb 100644
--- a/devel/libwnck/Makefile
+++ b/devel/libwnck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/07/27 17:13:16 drochner Exp $
+# $NetBSD: Makefile,v 1.29 2005/08/10 20:56:15 jlam Exp $
#
DISTNAME= libwnck-2.10.2
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE= libwnck-1.0.pc.in
@@ -24,7 +24,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 "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/ogre/Makefile b/devel/ogre/Makefile
index f37e206343f..50053006e62 100644
--- a/devel/ogre/Makefile
+++ b/devel/ogre/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/21 16:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/10 20:56:15 jlam Exp $
#
DISTNAME= ogre-v0-12-1
@@ -14,7 +14,7 @@ COMMENT= Object-Oriented Graphics Rendering Engine
WRKSRC= ${WRKDIR}/ogrenew
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
CONFIGURE_ARGS+= --with-platform=SDL
@@ -23,7 +23,6 @@ PKGCONFIG_OVERRIDE+= OGRE.pc.in
.include "../../devel/devIL/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-ExtUtils-PkgConfig/Makefile b/devel/p5-ExtUtils-PkgConfig/Makefile
index d311921de76..5f7591c08f3 100644
--- a/devel/p5-ExtUtils-PkgConfig/Makefile
+++ b/devel/p5-ExtUtils-PkgConfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/08/06 06:19:10 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/10 20:56:15 jlam Exp $
#
DISTNAME= ExtUtils-PkgConfig-1.06
@@ -14,7 +14,7 @@ COMMENT= Simplistic perl interface to pkg-config
PKG_INSTALLATION_TYPES= overwrite pkgviews
PERL5_PACKLIST= auto/ExtUtils/PkgConfig/.packlist
+USE_TOOLS= pkg-config
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/p5-glib2/Makefile b/devel/p5-glib2/Makefile
index c3dddb119ea..a82006652cc 100644
--- a/devel/p5-glib2/Makefile
+++ b/devel/p5-glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/08/06 06:19:18 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:16 jlam Exp $
#
DISTNAME= Glib-${DIST_VERSION}
@@ -16,7 +16,7 @@ DEPENDS+= p5-ExtUtils-PkgConfig>=1.03:../../devel/p5-ExtUtils-PkgConfig
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
MAKE_PARAMS+= disable-threadsafe
DIST_VERSION= 1.040
@@ -24,6 +24,5 @@ DIST_VERSION= 1.040
PERL5_PACKLIST= auto/Glib/.packlist
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../lang/perl5/module.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 8f344fc8a2e..d5133f3520e 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2005/07/28 11:04:13 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2005/08/10 20:56:16 jlam Exp $
#
DISTNAME= pango-1.8.2
@@ -15,7 +15,7 @@ COMMENT= Library for layout and rendering of text
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_PKGINSTALL= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
TEST_TARGET= check
USE_LIBTOOL= yes
@@ -38,7 +38,6 @@ BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8
BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
diff --git a/devel/pkg-config/buildlink3.mk b/devel/pkg-config/buildlink3.mk
deleted file mode 100644
index 27454a79c42..00000000000
--- a/devel/pkg-config/buildlink3.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.2 2005/07/22 01:57:02 grant Exp $
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
-PKG_CONFIG_BUILDLINK3_MK:= ${PKG_CONFIG_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+= pkg-config
-.endif
-
-BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Npkg-config}
-BUILDLINK_PACKAGES+= pkg-config
-
-.if !empty(PKG_CONFIG_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pkg-config+= pkg{,-}config>=0.15.0
-BUILDLINK_PKGSRCDIR.pkg-config?= ../../devel/pkg-config
-BUILDLINK_DEPMETHOD.pkg-config?= build
-
-PKG_CONFIG_LIBDIR?= ${BUILDLINK_DIR}/lib/pkgconfig
-CONFIGURE_ENV+= PKG_CONFIG=${BUILDLINK_PREFIX.pkg-config}/bin/pkg-config
-CONFIGURE_ENV+= PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q}
-MAKE_ENV+= PKG_CONFIG=${BUILDLINK_PREFIX.pkg-config}/bin/pkg-config
-MAKE_ENV+= PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q}
-
-.endif # PKG_CONFIG_BUILDLINK3_MK
-
-BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common
index 01ae524a643..e3eb0fe307f 100644
--- a/editors/abiword/Makefile.common
+++ b/editors/abiword/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2005/07/28 15:22:07 adam Exp $
+# $NetBSD: Makefile.common,v 1.24 2005/08/10 20:56:16 jlam Exp $
# Be sure to update PLIST and distinfo for editors/abiword-plugins when updating
ABIWORD_VERSION= 2.2.9
@@ -17,13 +17,12 @@ BUILD_USES_MSGFMT= yes
MAKEFILE= GNUmakefile
USE_DIRS+= xdg-1.1
USE_LIBTOOL= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-libpng=${BUILDLINK_PREFIX.png}
.include "../../converters/fribidi/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index cb421487e8c..2442a8369a0 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/07/21 16:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2005/08/10 20:56:16 jlam Exp $
#
DISTNAME= conglomerate-0.9.0
@@ -16,7 +16,7 @@ DEPENDS+= docbook-xml>=4.2nb6:../../textproc/docbook-xml
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_LIBTOOL= yes
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl pkg-config
USE_PKGLOCALEDIR= yes
CONFIGURE_ARGS+= --enable-printing
@@ -31,7 +31,6 @@ GCONF2_SCHEMAS= conglomerate.schemas
.include "../../devel/libbonoboui/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
.include "../../textproc/enchant/buildlink3.mk"
diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index 76369fff128..e8b6af7238e 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/21 16:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/10 20:56:16 jlam Exp $
#
DISTNAME= dasher-3.2.15
@@ -12,7 +12,7 @@ COMMENT= Easy typing without using keyboard
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
.include "../../audio/gnome-speech/buildlink3.mk"
@@ -27,7 +27,6 @@ USE_PKGLOCALEDIR= yes
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libwnck/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index 310f79c0b57..ad5ec6e062d 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/07/21 16:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2005/08/10 20:56:16 jlam Exp $
#
DISTNAME= gconf-editor-2.10.0
@@ -16,7 +16,7 @@ GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1 gnome2-1.5
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
CONFIGURE_ARGS+= --with-gconf-defaults-source=${GCONF2_CONFIG_SOURCE}
CONFIGURE_ARGS+= --with-gconf-mandatory-source=${GCONF2_CONFIG_SOURCE:S/gconf.xml.defaults/gconf.xml.mandatory/g}
@@ -30,7 +30,6 @@ BUILDLINK_DEPENDS.GConf2+= GConf2>=2.10.0
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index ab84c65a2ad..a07f8f0189d 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/07/21 16:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2005/08/10 20:56:16 jlam Exp $
#
DISTNAME= gedit-2.10.3
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl pkg-config
USE_LIBTOOL= YES
USE_MSGFMT_PLURALS= YES
GNU_CONFIGURE= YES
@@ -35,7 +35,6 @@ BUILDLINK_DEPENDS.libglade2+= libglade2>=2.4.0
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/editors/gice/Makefile b/editors/gice/Makefile
index 96dc4b94ab6..e0ce84540f8 100644
--- a/editors/gice/Makefile
+++ b/editors/gice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/07/21 16:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2005/08/10 20:56:16 jlam Exp $
#
DISTNAME= gice-0.6.2
@@ -11,13 +11,12 @@ HOMEPAGE= http://gice.sourceforge.net/
COMMENT= Powerful C text editor with advanced features
WRKSRC= ${WRKDIR}/gice
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= YES
BUILD_TARGET= gice
INSTALLATION_DIRS= bin
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
do-install:
diff --git a/editors/gtranslator/Makefile b/editors/gtranslator/Makefile
index 547d1be8e68..586a2b4f0eb 100644
--- a/editors/gtranslator/Makefile
+++ b/editors/gtranslator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:16 jlam Exp $
DISTNAME= gtranslator-1.0.2
CATEGORIES= editors
@@ -11,7 +11,7 @@ COMMENT= Gettext po file editor for the GNOME2 desktop environment
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
MANCOMPRESSED= yes
@@ -24,7 +24,6 @@ CONFIGURE_ARGS+= --disable-debug
.include "../../devel/libbonoboui/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index a469475be9a..096b9ddb9e5 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:16 jlam Exp $
#
DISTNAME= leafpad-0.7.8
@@ -9,12 +9,12 @@ MAINTAINER= jmmv@NetBSD.org
HOMEPAGE= http://tarot.freeshell.org/leafpad/
COMMENT= Simple and light text editor using GTK+
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= YES
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index c7138fc41ea..9686d3fc8bd 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:16 jlam Exp $
#
DISTNAME= mlview-0.7.0
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
@@ -28,7 +28,6 @@ GCONF2_SCHEMAS= mlview.schemas
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../textproc/libcroco/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/emulators/blinkensim/Makefile b/emulators/blinkensim/Makefile
index 8021a486a98..b394be42481 100644
--- a/emulators/blinkensim/Makefile
+++ b/emulators/blinkensim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:16 jlam Exp $
#
DISTNAME= blinkensim-2.2
@@ -13,11 +13,11 @@ COMMENT= Blinkenlights graphics simulator
DEPENDS+= blinkenthemes>=0.8:../../graphics/blinkenthemes
GNU_CONFIGURE= YES
+USE_TOOLS+= pkg-config
post-install:
cd ${PREFIX}/bin && ${LN} -s blinkensim-gtk blinkensim
.include "../../devel/blib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/ckmame/Makefile b/emulators/ckmame/Makefile
index 86736185948..64b7de409e8 100644
--- a/emulators/ckmame/Makefile
+++ b/emulators/ckmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:49 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/08/10 20:56:16 jlam Exp $
#
DISTNAME= ckmame-0.6
@@ -10,11 +10,11 @@ MAINTAINER= dillo@NetBSD.org
HOMEPAGE= http://www.nih.at/ckmame/
COMMENT= Check ROM sets for MAME
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
TEST_TARGET= check
.include "../../archivers/libzip/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/db1.builtin.mk"
diff --git a/emulators/fuse/Makefile b/emulators/fuse/Makefile
index d18144e47d3..75ff8ff587f 100644
--- a/emulators/fuse/Makefile
+++ b/emulators/fuse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/10 20:56:16 jlam Exp $
DISTNAME= fuse-0.7.0
PKGREVISION= 1
@@ -9,12 +9,11 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://fuse-emulator.sourceforge.net/
COMMENT= ZX Spectrum Emulator
-USE_TOOLS+= perl
+USE_TOOLS+= perl pkg-config
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-gtk2
LIBS+= ${LIBOSSAUDIO}
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../emulators/libspectrum/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/finance/gkrellm-stock/Makefile b/finance/gkrellm-stock/Makefile
index 5cff09db6fe..616a20a97df 100644
--- a/finance/gkrellm-stock/Makefile
+++ b/finance/gkrellm-stock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/08/10 20:56:16 jlam Exp $
#
DISTNAME= gkrellstock-0.5.1
@@ -13,6 +13,7 @@ COMMENT= GKrellM2 stock ticker plugin
DEPENDS+= p5-finance-quote>=1.08:../../finance/p5-finance-quote
+USE_TOOLS+= pkg-config
WRKSRC= ${WRKDIR}/gkrellStock-0.5.1
BUILD_TARGET= gkrellstock.so
REPLACE_PERL= ${WRKSRC}/GetQuote2
@@ -22,6 +23,5 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/gkrellstock.so ${PREFIX}/lib/gkrellm2/plugins
${INSTALL_SCRIPT} ${WRKSRC}/GetQuote2 ${PREFIX}/bin
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gkrellm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index e3e983d145e..e1e699b57dc 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2005/08/06 06:19:18 jlam Exp $
+# $NetBSD: Makefile,v 1.90 2005/08/10 20:56:16 jlam Exp $
DISTNAME= gnucash-1.8.11
PKGREVISION= 3
@@ -17,7 +17,7 @@ DEPENDS+= p5-finance-quote>=1.06:../../finance/p5-finance-quote
BUILD_DEPENDS+= bison>=1.28:../../devel/bison
USE_DIRS+= gnome1-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
@@ -42,7 +42,6 @@ INFO_FILES= gnucash-design.info
.include "../../print/gnome-print/buildlink3.mk"
.include "../../devel/g-wrap/buildlink3.mk"
.include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../devel/swig/buildlink3.mk"
.include "../../graphics/gdk-pixbuf/buildlink3.mk"
diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile
index 085577c20ec..0d69bbde116 100644
--- a/fonts/Xft2/Makefile
+++ b/fonts/Xft2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2005/08/10 20:56:16 jlam Exp $
DISTNAME= libXft-2.1.6
PKGNAME= Xft2-2.1.6
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
PKGCONFIG_OVERRIDE= xft.pc.in
MAKE_ENV+= EGREP="${EGREP}"
@@ -23,7 +23,6 @@ MAKE_ENV+= EGREP="${EGREP}"
BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8.2
BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.2
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile
index 2ea10c65864..d7f1811a6c7 100644
--- a/fonts/gucharmap/Makefile
+++ b/fonts/gucharmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/08/10 20:56:16 jlam Exp $
#
DISTNAME= gucharmap-1.4.3
@@ -13,7 +13,7 @@ COMMENT= Unicode/ISO10646 character map and font viewer
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -27,7 +27,6 @@ GTK2_IMMODULES= yes
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
diff --git a/games/asc/Makefile b/games/asc/Makefile
index 7d8214edca5..1e1bcd6a0ab 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/22 11:25:02 adam Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:16 jlam Exp $
DISTNAME= asc-source+music-1.16.1.0
PKGNAME= ${DISTNAME:S/-source+music//}
@@ -13,7 +13,7 @@ COMMENT= Turn based strategy game
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
CPPFLAGS.NetBSD+= -D_UNICODE_BROKEN_
@@ -25,7 +25,6 @@ UNLIMIT_RESOURCES= datasize
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../devel/SDLmm/buildlink3.mk"
.include "../../devel/libsigc++/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/SDL_image/buildlink3.mk"
.include "../../multimedia/smpeg/buildlink3.mk"
.include "../../x11/paragui/buildlink3.mk"
diff --git a/games/ccgo/Makefile b/games/ccgo/Makefile
index 8412fe384c8..5e7e407148f 100644
--- a/games/ccgo/Makefile
+++ b/games/ccgo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/22 22:13:25 adam Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:16 jlam Exp $
DISTNAME= ccgo-0.3.6.2
CATEGORIES= games
@@ -11,6 +11,7 @@ COMMENT= Go board with IGS and gnugo interface
DEPENDS+= gnugo>=3.4:../../games/gnugo
BUILD_USES_MSGFMT= yes
+USE_TOOLS+= pkg-config
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -28,5 +29,4 @@ PREFIX.gnugo_DEFAULT= ${LOCALBASE}
.include "../../devel/gconfmm/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/crack-attack/Makefile b/games/crack-attack/Makefile
index f325e8de733..0fd69e22650 100644
--- a/games/crack-attack/Makefile
+++ b/games/crack-attack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:16 jlam Exp $
DISTNAME= crack-attack-1.1.14
CATEGORIES= games
@@ -10,13 +10,13 @@ COMMENT= Tetris Attack inspired game
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
+USE_TOOLS+= pkg-config
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/html/${PKGBASE}
${INSTALL_DATA} ${WRKSRC}/doc/*.jpg ${PREFIX}/share/doc/html/${PKGBASE}
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/Mesa/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/games/freeciv-client-gtk2/Makefile b/games/freeciv-client-gtk2/Makefile
index f5b61eea558..2f4dd938668 100644
--- a/games/freeciv-client-gtk2/Makefile
+++ b/games/freeciv-client-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:17 jlam Exp $
PKGNAME= ${DISTNAME:S/-/-client-gtk2-/}
COMMENT= Freeciv client with GTK+ interface
@@ -6,6 +6,7 @@ COMMENT= Freeciv client with GTK+ interface
DEPENDS+= freeciv-share>=${FC_VERS}:../../games/freeciv-share
DEPENDS+= freeciv-sounds>=2.0:../../games/freeciv-sounds
+USE_TOOLS+= pkg-config
CONFIGURE_ARGS+= --disable-server --disable-make-data
CONFIGURE_ARGS+= --enable-client=gtk2
@@ -18,7 +19,6 @@ do-install:
${MAKE_PROGRAM} ${MAKE_FLAGS} ${INSTALL_TARGET}
.include "../../audio/esound/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/games/gnocatan/Makefile b/games/gnocatan/Makefile
index a9f433c43d6..1acad86395e 100644
--- a/games/gnocatan/Makefile
+++ b/games/gnocatan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2005/08/10 20:56:17 jlam Exp $
#
DISTNAME= gnocatan-0.8.1.16
@@ -12,12 +12,11 @@ COMMENT= GNOME version of the Settlers of Catan board game
GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile
index 2eb582b0c3d..f8d3a962fc8 100644
--- a/games/gnome2-games/Makefile
+++ b/games/gnome2-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2005/08/10 20:56:17 jlam Exp $
DISTNAME= gnome-games-2.10.1
CATEGORIES= games gnome
@@ -17,7 +17,7 @@ BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_CONFIG_WRAPPER= yes
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
@@ -74,7 +74,6 @@ BUILDLINK_DEPENDS.libgnome+= libgnome>=2.10.0
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/librsvg2/buildlink3.mk"
.include "../../lang/guile/buildlink3.mk"
.include "../../lang/python/application.mk"
diff --git a/games/grhino/Makefile b/games/grhino/Makefile
index dbef48ca3d6..2440a24e6f4 100644
--- a/games/grhino/Makefile
+++ b/games/grhino/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/10 20:56:17 jlam Exp $
#
DISTNAME= grhino-0.15.0
@@ -9,12 +9,12 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://rhino.sourceforge.net/
COMMENT= Othello (Reversi) engine
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index c2712cfbc08..73e96606605 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2005/08/10 20:56:17 jlam Exp $
#
DISTNAME= gtetrinet-0.7.7
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= YES
BUILD_DEFS+= USE_INET6
@@ -33,6 +33,5 @@ GCONF2_SCHEMAS= gtetrinet.schemas
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/gtkmagnetic/Makefile b/games/gtkmagnetic/Makefile
index 4bcacf6446e..a2d162a66a0 100644
--- a/games/gtkmagnetic/Makefile
+++ b/games/gtkmagnetic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/08/10 20:56:17 jlam Exp $
#
DISTNAME= Magnetic22Src
@@ -12,7 +12,7 @@ MAINTAINER= dillo@NetBSD.org
HOMEPAGE= http://www.if-legends.org/~msmemorial/magnetic.htm
COMMENT= Interpreter for text adventures from Magnetic Scrolls
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
BUILD_TARGET= gtkmagnetic
WRKSRC= ${WRKDIR}/Gtk
@@ -24,7 +24,6 @@ LIBS.SunOS+= -lCrun
INSTALLATION_DIRS= bin
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../multimedia/smpeg/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index 0021262d37b..7b1f8a1c158 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:17 jlam Exp $
#
DISTNAME= gturing-0.1.1
@@ -15,14 +15,13 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
BUILDLINK_TRANSFORM+= rm:-D.*_DISABLE_DEPRECATED
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/sirius/Makefile b/games/sirius/Makefile
index 8658d5578a6..7a40a15c840 100644
--- a/games/sirius/Makefile
+++ b/games/sirius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2005/08/10 20:56:17 jlam Exp $
#
DISTNAME= sirius-0.8.0
@@ -14,14 +14,13 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
.include "../../devel/GConf2/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile
index 27e9ae4e201..8fe02753bab 100644
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/08/09 16:26:52 adam Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/10 20:56:17 jlam Exp $
DISTNAME= wesnoth-0.9.5
CATEGORIES= games
@@ -8,6 +8,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.wesnoth.org/
COMMENT= Fantasy turn-based strategy game
+USE_TOOLS+= pkg-config
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --prefix=${PREFIX}
@@ -22,7 +23,6 @@ BUILDLINK_DEPENDS.SDL_mixer= SDL_mixer>=1.2.5nb3
# use included SDL_ttf library
#.include "../../devel/SDL_ttf/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/SDL_image/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/blinkenthemes/Makefile b/graphics/blinkenthemes/Makefile
index 21498446324..09e3cf58faf 100644
--- a/graphics/blinkenthemes/Makefile
+++ b/graphics/blinkenthemes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:17 jlam Exp $
#
DISTNAME= blinkenthemes-0.8
@@ -11,8 +11,7 @@ HOMEPAGE= http://www.blinkenlights.de/
COMMENT= Blinkenlights simulator themes
GNU_CONFIGURE= YES
+USE_TOOLS+= pkg-config
.include "../../devel/blib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/blinkentools/Makefile b/graphics/blinkentools/Makefile
index a938b5e8db3..7cf220ea82f 100644
--- a/graphics/blinkentools/Makefile
+++ b/graphics/blinkentools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:17 jlam Exp $
#
DISTNAME= blinkentools-2.2
@@ -10,12 +10,12 @@ MAINTAINER= salo@NetBSD.org
HOMEPAGE= http://www.blinkenlights.de/
COMMENT= Blinkenlights movies tools collection
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-oldtools
.include "../../devel/blib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/mng/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index e7e43e6d4b3..9e2b3ac494f 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:17 jlam Exp $
DISTNAME= cairo-0.5.1
CATEGORIES= graphics
@@ -8,6 +8,7 @@ MAINTAINER= recht@NetBSD.org
HOMEPAGE= http://cairographics.org/
COMMENT= Vector graphics library with cross-device output support
+USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -20,7 +21,6 @@ BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.5
BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1.2
BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
diff --git a/graphics/dia/Makefile.common b/graphics/dia/Makefile.common
index e1d214a876a..f7ba7b61269 100644
--- a/graphics/dia/Makefile.common
+++ b/graphics/dia/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2005/07/21 16:29:50 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/08/10 20:56:17 jlam Exp $
#
DISTNAME= dia-0.94
@@ -14,7 +14,7 @@ DISTINFO_FILE= ${.CURDIR}/../../graphics/dia/distinfo
PATCHDIR= ${.CURDIR}/../../graphics/dia/patches
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
@@ -45,7 +45,6 @@ BUILDLINK_DEPMETHOD.gtk2+= build
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index 67036822d06..9cc082d63fb 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/08/10 20:56:17 jlam Exp $
DISTNAME= digikam-0.7.2
CATEGORIES= graphics kde
@@ -10,13 +10,12 @@ HOMEPAGE= http://digikam.sourceforge.net/
COMMENT= KDE frontend to gphoto2
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
.include "../../databases/gdbm/buildlink3.mk"
.include "../../devel/libgphoto2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/imlib2/buildlink3.mk"
.include "../../graphics/libkexif/buildlink3.mk"
.include "../../graphics/libkipi/buildlink3.mk"
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index 2f7cc6fc4c4..45cf81310a3 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2005/08/10 20:56:17 jlam Exp $
#
DISTNAME= eog-2.10.2
@@ -13,7 +13,7 @@ COMMENT= Eye of GNOME: an image viewing and cataloging program
BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
@@ -28,7 +28,6 @@ BUILDLINK_DEPENDS.libart2+= libart2>=2.3.16
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
diff --git a/graphics/exif/Makefile b/graphics/exif/Makefile
index 11df9471143..f47cf4d656a 100644
--- a/graphics/exif/Makefile
+++ b/graphics/exif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/10 20:56:17 jlam Exp $
#
DISTNAME= exif-0.6.9
@@ -12,6 +12,7 @@ COMMENT= Grab Exif information from digital camera images
PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
@@ -20,7 +21,6 @@ LIBS+= ${BUILDLINK_LDADD.iconv}
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile
index 6d2497f864a..816ff02561e 100644
--- a/graphics/gfract/Makefile
+++ b/graphics/gfract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:17 jlam Exp $
#
DISTNAME= gfract-0.30
@@ -10,7 +10,7 @@ MAINTAINER= ben@NetBSD.org
HOMEPAGE= http://www.cs.Helsinki.FI/u/salerma/gfract/
COMMENT= Gtk-based fractal program
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
BUILD_TARGET= gfract
PKG_INSTALLATION_TYPES= overwrite pkgviews
@@ -23,7 +23,6 @@ SUBST_SED.prefix= -e "s,/usr/local,${PREFIX},g"
INSTALLATION_DIRS= bin
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index b0961b1bb53..2f01e0d8ce0 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2005/08/10 20:56:17 jlam Exp $
DISTNAME= gimageview-0.2.27
CATEGORIES= graphics
@@ -13,7 +13,7 @@ USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
CONFIGURE_ARGS+= --disable-xinetest
CONFIGURE_ARGS+= --with-gtk2
@@ -26,7 +26,6 @@ LDFLAGS.NetBSD+= ${PTHREAD_LDFLAGS}
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/librsvg2/buildlink3.mk"
.include "../../graphics/libwmf/buildlink3.mk"
diff --git a/graphics/gimp-ufraw/Makefile b/graphics/gimp-ufraw/Makefile
index 705885be4cc..8a37429c373 100644
--- a/graphics/gimp-ufraw/Makefile
+++ b/graphics/gimp-ufraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/08/10 19:01:24 gdt Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:17 jlam Exp $
#
DISTNAME= ufraw-0.4
@@ -10,13 +10,12 @@ MAINTAINER= gdt@NetBSD.org
HOMEPAGE= http://ufraw.sourceforge.net/
COMMENT= GIMP plug-in for raw digicam import
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
BUILD_TARGET= build
INSTALL_TARGET= install-admin
BUILDLINK_TRANSFORM+= rm:-std=gnu99
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/gimp/buildlink3.mk"
.include "../../graphics/lcms/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index c970d7937ed..003cf8d2e4f 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.124 2005/08/02 09:54:52 tron Exp $
+# $NetBSD: Makefile,v 1.125 2005/08/10 20:56:17 jlam Exp $
DISTNAME= gimp-2.2.8
PKGREVISION= 1
@@ -21,7 +21,7 @@ CONFLICTS+= gimp<=1.2.3
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
PKG_SYSCONFSUBDIR= gimp/2.0
@@ -57,7 +57,6 @@ LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/aalib/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index f08619043fc..faa960e7ba5 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2005/08/10 20:56:17 jlam Exp $
DISTNAME= gphoto2-2.1.6
CATEGORIES= graphics
@@ -10,6 +10,7 @@ COMMENT= Digital camera access command line client
CONFLICTS= gphoto-[0-9]*
+USE_TOOLS+= pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
@@ -29,7 +30,6 @@ CONFIGURE_ARGS+= --without-readline
.include "../../devel/cdk/buildlink3.mk"
.include "../../devel/libgphoto2/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../graphics/aalib/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 8a560e7560f..090f996a741 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2005/08/10 20:56:17 jlam Exp $
DISTNAME= gqview-2.0.1
CATEGORIES= graphics x11
@@ -10,12 +10,12 @@ COMMENT= GTK2-based graphic file viewer
BUILD_USES_MSGFMT= # defined
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= # defined
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= # defined
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 8456ba84cc5..5033496193a 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2005/08/10 20:56:18 jlam Exp $
#
DISTNAME= graphviz-2.2.1
@@ -15,6 +15,7 @@ DIST_SUBDIR= ${PKGNAME_NOREV}
PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
XAW_TYPE= standard
@@ -40,7 +41,6 @@ pre-build:
${TOUCH} ${WRKSRC}/Makefile
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 30b94073b01..9b9df2d1b4d 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/10 20:56:18 jlam Exp $
DISTNAME= gthumb-2.6.6
CATEGORIES= graphics
@@ -8,6 +8,7 @@ MAINTAINER= minskim@NetBSD.org
HOMEPAGE= http://gthumb.sourceforge.net/
COMMENT= Image viewer and browser for the GNOME Desktop
+USE_TOOLS+= pkg-config
USE_DIRS+= xdg-1.1 gnome2-1.5
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
@@ -24,7 +25,6 @@ GCONF2_SCHEMAS+= gthumb.schemas
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libgphoto2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile
index c02c1cef3e4..eb319da4b51 100644
--- a/graphics/gtkglext/Makefile
+++ b/graphics/gtkglext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:18 jlam Exp $
DISTNAME= gtkglext-1.0.6
CATEGORIES= graphics
@@ -10,7 +10,7 @@ HOMEPAGE= http://gtkglext.sourceforge.net/
COMMENT= OpenGL extension to GTK
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl pkg-config
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE= gdkglext.pc.in
@@ -20,7 +20,6 @@ LIBS+= -lm
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html
CONFIGURE_ARGS+= --enable-gtk-doc=no
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/glu/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index c5932c69764..c9528b55970 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2005/08/10 20:56:18 jlam Exp $
DISTNAME= imlib2-1.2.0
PKGREVISION= 3
@@ -9,6 +9,7 @@ MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.enlightenment.org/pages/imlib2.html
COMMENT= Image manipulation library
+USE_TOOLS+= pkg-config
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
@@ -20,7 +21,6 @@ LIBS.SunOS= -lm
.include "../../archivers/bzip2/buildlink3.mk"
.include "../../devel/libltdl/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/libungif/buildlink3.mk"
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index c4488326536..f61f67a257e 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/28 13:52:10 adam Exp $
+# $NetBSD: Makefile,v 1.12 2005/08/10 20:56:18 jlam Exp $
DISTNAME= inkscape-0.42
CATEGORIES= graphics
@@ -18,14 +18,13 @@ USE_DIRS+= xdg-1.1
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
BUILDLINK_DEPENDS.boehm-gc+= boehm-gc>=6.4
.include "../../devel/boehm-gc/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index f76463156a1..1d7c0755781 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:18 jlam Exp $
DISTNAME= kipi-plugins-0.1.0-beta2
PKGNAME= kipi-plugins-0.1.0beta2
@@ -14,7 +14,7 @@ DEPENDS+= dcraw-[0-9]*:../../graphics/dcraw
DEPENDS+= bash-[0-9]*:../../shells/bash2
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
@@ -30,7 +30,6 @@ pre-build:
.include "../../meta-pkgs/kde3/kde3.mk"
.include "../../devel/libgphoto2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/ImageMagick/buildlink3.mk"
.include "../../graphics/imlib2/buildlink3.mk"
.include "../../graphics/libkexif/buildlink3.mk"
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index 494a9c44646..7db0fcc033d 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:18 jlam Exp $
DISTNAME= libexif-gtk-0.3.5
PKGREVISION= 1
@@ -10,13 +10,13 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://libexif.sourceforge.net/
COMMENT= EXIF file library (GTK2 interface)
+USE_TOOLS+= pkg-config
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= libexif-gtk/libexif-gtk.pc.in
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile
index 325f5a39694..d6af09c3f69 100644
--- a/graphics/libgdiplus/Makefile
+++ b/graphics/libgdiplus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/07/31 19:23:00 recht Exp $
+# $NetBSD: Makefile,v 1.22 2005/08/10 20:56:18 jlam Exp $
#
DISTNAME= libgdiplus-1.1.8
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.mono-project.com/
COMMENT= Implementation of the GDI+ API
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= autoconf gmake
+USE_TOOLS+= autoconf gmake pkg-config
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= libgdiplus.pc.in
GNU_CONFIGURE= yes
@@ -25,7 +25,6 @@ BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8
BUILDLINK_TRANSFORM+= rm:-Werror
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 04b2c9f22d1..be1bd6b60d8 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2005/08/10 20:56:18 jlam Exp $
#
DISTNAME= libgnomecanvas-2.10.2
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE= libgnomecanvas/libgnomecanvas-2.0.pc.in
@@ -25,7 +25,6 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgnomecanvasmm/Makefile b/graphics/libgnomecanvasmm/Makefile
index 4b6a7717c64..6754974f340 100644
--- a/graphics/libgnomecanvasmm/Makefile
+++ b/graphics/libgnomecanvasmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/07/22 21:54:06 adam Exp $
+# $NetBSD: Makefile,v 1.2 2005/08/10 20:56:18 jlam Exp $
DISTNAME= libgnomecanvasmm-2.10.0
CATEGORIES= graphics
@@ -12,11 +12,10 @@ COMMENT= C++ bindings for libgnomecanvas
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgnomecanvas/libgnomecanvasmm-2.6.pc.in
GNU_CONFIGURE= yes
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../x11/gtkmm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libkexif/Makefile b/graphics/libkexif/Makefile
index 825095c6102..ffc7ed430b0 100644
--- a/graphics/libkexif/Makefile
+++ b/graphics/libkexif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/21 16:29:51 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/08/10 20:56:18 jlam Exp $
DISTNAME= libkexif-0.2.1
CATEGORIES= graphics
@@ -10,14 +10,13 @@ HOMEPAGE= http://digikam.sourceforge.net/
COMMENT= Image EXIF information library manipulation
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
SHLIBTOOL_OVERRIDE= libtool
.include "../../meta-pkgs/kde3/kde3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
.include "../../x11/kdelibs3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/librsvg2/Makefile.common b/graphics/librsvg2/Makefile.common
index be93e8e6db6..e70a437dca7 100644
--- a/graphics/librsvg2/Makefile.common
+++ b/graphics/librsvg2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile.common,v 1.13 2005/08/10 20:56:18 jlam Exp $
#
DISTNAME= librsvg-2.9.5
@@ -13,6 +13,7 @@ COMMENT= SVG library for GNOME2
DISTINFO_FILE= ${.CURDIR}/../../graphics/librsvg2/distinfo
PATCHDIR= ${.CURDIR}/../../graphics/librsvg2/patches
+USE_TOOLS+= pkg-config
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
PKGCONFIG_OVERRIDE= librsvg-2.0.pc.in
@@ -23,5 +24,4 @@ CONFIGURE_ARGS+= --with-gimp=no
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/librsvg2
CONFIGURE_ARGS+= --with-tags=
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/showimg/Makefile b/graphics/showimg/Makefile
index cecbca8e7d6..5a66fcc7b16 100644
--- a/graphics/showimg/Makefile
+++ b/graphics/showimg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:18 jlam Exp $
#
DISTNAME= showimg-0.9.4-1
@@ -11,14 +11,13 @@ MAINTAINER= ianzag@mail.ru
HOMEPAGE= http://www.jalix.org/projects/showimg/
COMMENT= Feature-rich image viewer for KDE including an image management system
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LANGUAGE= c c++
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
.include "../../meta-pkgs/kde3/kde3.mk"
.include "../../x11/kdebase3/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
.include "../../graphics/libkexif/buildlink3.mk"
.include "../../graphics/libkipi/buildlink3.mk"
diff --git a/ham/gmfsk/Makefile b/ham/gmfsk/Makefile
index 3efe2cb7ce1..49bc80b9059 100644
--- a/ham/gmfsk/Makefile
+++ b/ham/gmfsk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:18 jlam Exp $
#
DISTNAME= gmfsk-0.6
@@ -9,14 +9,13 @@ MAINTAINER= wulf@NetBSD.org
HOMEPAGE= http://gmfsk.connect.fi/
COMMENT= Multimode HF terminal program
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
GCONF2_SCHEMAS+=gmfsk.schemas
CONFIGURE_ARGS+=--enable-hamlib
.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../math/fftw2/buildlink3.mk"
.include "../../ham/hamlib/buildlink3.mk"
diff --git a/ham/xdx/Makefile b/ham/xdx/Makefile
index 69a0d03969c..8bf48071ac7 100644
--- a/ham/xdx/Makefile
+++ b/ham/xdx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:18 jlam Exp $
#
DISTNAME= xdx-1.2
@@ -9,12 +9,11 @@ MAINTAINER= wulf@NetBSD.org
HOMEPAGE= http://www.qsl.net/pg4i/linux/xdx.html
COMMENT= Amateur Radio tcp/ip DX-cluster client
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR=yes
BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/ham/xlog/Makefile b/ham/xlog/Makefile
index 221f8939a86..067e506c91f 100644
--- a/ham/xlog/Makefile
+++ b/ham/xlog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/10 20:56:18 jlam Exp $
#
DISTNAME= xlog-1.0
@@ -11,11 +11,10 @@ COMMENT= Amateur Radio logging program
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR=yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
CONFIGURE_ARGS= --enable-hamlib
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../ham/hamlib/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
diff --git a/inputmethod/imhangul/Makefile b/inputmethod/imhangul/Makefile
index 57dd4922ae0..a15b02102d0 100644
--- a/inputmethod/imhangul/Makefile
+++ b/inputmethod/imhangul/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/10 20:56:18 jlam Exp $
DISTNAME= imhangul-0.9.11
PKGREVISION= 1
@@ -10,12 +10,12 @@ MAINTAINER= minskim@NetBSD.org
HOMEPAGE= http://imhangul.kldp.net/
COMMENT= GTK+-2.0 Hangul Input Module
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
SHLIBTOOL_OVERRIDE= libtool
USE_PKGLOCALEDIR= YES
GTK2_IMMODULES= YES
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/modules.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/imhangul_status_applet/Makefile b/inputmethod/imhangul_status_applet/Makefile
index 7ce37f97d9d..db70785b2db 100644
--- a/inputmethod/imhangul_status_applet/Makefile
+++ b/inputmethod/imhangul_status_applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:18 jlam Exp $
#
DISTNAME= imhangul_status_applet-0.2
@@ -15,13 +15,12 @@ DEPENDS= imhangul>=0.9.6:../../inputmethod/imhangul
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
GCONF2_SCHEMAS= imhangul_status.schemas
.include "../../devel/GConf2/schemas.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/nabi/Makefile b/inputmethod/nabi/Makefile
index 8d557fba283..c6ebba4f480 100644
--- a/inputmethod/nabi/Makefile
+++ b/inputmethod/nabi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:18 jlam Exp $
#
DISTNAME= nabi-0.15
@@ -9,11 +9,11 @@ MAINTAINER= minskim@NetBSD.org
HOMEPAGE= http://nabi.kldp.net/
COMMENT= X Input Method for Korean
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index de93d8e8463..8a24b714b9f 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/08/10 20:56:18 jlam Exp $
#
DISTNAME= uim-0.4.6
@@ -12,7 +12,7 @@ COMMENT= Multilingual input method library
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
USE_NCURSES= # clear_screen, clr_eos
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
PKGCONFIG_OVERRIDE+= ${WRKSRC}/uim.pc.in
GNU_CONFIGURE= YES
GTK2_IMMODULES= YES
@@ -36,7 +36,6 @@ post-install:
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/ncurses/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/classpath-gui/Makefile b/lang/classpath-gui/Makefile
index 37134304c8e..c911970acdd 100644
--- a/lang/classpath-gui/Makefile
+++ b/lang/classpath-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:18 jlam Exp $
.include "../../lang/classpath/Makefile.common"
@@ -7,6 +7,8 @@ COMMENT+= (GUI libraries)
DEPENDS+= classpath>=0.12:../../lang/classpath
+USE_TOOLS+= pkg-config
+
BUILD_DIRS= ${WRKSRC}/native/jni/classpath
BUILD_DIRS+= ${WRKSRC}/native/jni/gtk-peer
INSTALL_DIRS= ${WRKSRC}/native/jni/gtk-peer
@@ -15,7 +17,6 @@ BUILDLINK_FILES.libart2+= bin/libart2-config
BUILDLINK_TRANSFORM.libart2+= -e 's|/libart2-config|/libart-config|g'
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 4bf27d92813..055e49e946e 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/08/06 06:19:21 jlam Exp $
+# $NetBSD: Makefile,v 1.42 2005/08/10 20:56:18 jlam Exp $
DISTNAME= mono-1.1.8.3
PKGREVISION= 1
@@ -21,7 +21,7 @@ NOT_FOR_PLATFORM+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[AB]-*
# LP64 problems
NOT_FOR_PLATFORM+= *-*-alpha *-*-sparc64
-USE_TOOLS+= bison gmake gtar perl:run
+USE_TOOLS+= bison gmake gtar perl:run pkg-config
USE_PKGINSTALL= yes
USE_LIBTOOL= yes
EXTRACT_USING= gtar
@@ -60,7 +60,6 @@ TEST_TARGET= check
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
diff --git a/lang/sablevm-classpath-gui/Makefile b/lang/sablevm-classpath-gui/Makefile
index 6815ead4c2a..2d4d87fef03 100644
--- a/lang/sablevm-classpath-gui/Makefile
+++ b/lang/sablevm-classpath-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:18 jlam Exp $
#
.include "../../lang/sablevm-classpath/Makefile.common"
@@ -9,6 +9,8 @@ COMMENT+= (GUI libraries)
DEPENDS+= sablevm-classpath>=1.1.3nb1:../../lang/sablevm-classpath
+USE_TOOLS+= pkg-config
+
BUILD_DIRS= ${WRKSRC}/native/jni/classpath
BUILD_DIRS+= ${WRKSRC}/native/jni/gtk-peer
INSTALL_DIRS= ${WRKSRC}/native/jni/gtk-peer
@@ -18,7 +20,6 @@ PRINT_PLIST_AWK+= \
{ print "@comment in sablevm-classpath: "$$0; next; }
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/java-env.mk"
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index d7de5857d55..0e3a0585b1c 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2005/08/10 20:56:19 jlam Exp $
DISTNAME= balsa-2.2.6
PKGREVISION= 2
@@ -18,7 +18,7 @@ USE_PKGINSTALL= yes
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl pkg-config
CONFIGURE_ARGS= --with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config
CONFIGURE_ARGS+= --disable-more-warnings
@@ -48,7 +48,6 @@ BUILDLINK_DEPENDS.gmime+= gmime>=2.1.9
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libltdl/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mail/gmime/buildlink3.mk"
.include "../../mail/libesmtp/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index c5d9590c796..2dd67dbb936 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/08/08 11:10:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.38 2005/08/10 20:56:19 jlam Exp $
DISTNAME= dspam-3.4.9
CATEGORIES= mail
@@ -11,7 +11,7 @@ COMMENT= Extremely scalable, statistical-hybrid anti-spam filter
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_TOOLS+= perl:run
+USE_TOOLS+= perl:run pkg-config
REPLACE_PERL= tools/dspam_genaliases.in \
tools/dspam_corpus.in \
cgi/*.cgi cgi/configure.pl.in
@@ -67,7 +67,6 @@ CONFIGURE_ARGS+= --with-dspam-home=${DSPAM_HOME} \
--sysconfdir=${PKG_SYSCONFDIR}
.include "options.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
DOCDIR= ${PREFIX}/share/doc/dspam
diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index 7b79b261078..55b58e88e5a 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2005/08/10 20:56:19 jlam Exp $
#
DISTNAME= evolution-data-server-1.2.3
@@ -17,7 +17,7 @@ BUILDLINK_DEPENDS.libsoup-devel+= libsoup-devel>=2.2.3
GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
-USE_TOOLS+= bison gmake
+USE_TOOLS+= bison gmake pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
@@ -68,7 +68,6 @@ BUILDLINK_TRANSFORM+= rm:-ldl
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/nss/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../net/libsoup-devel/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 2611d123f1b..0b3b8c68ed0 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.86 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2005/08/10 20:56:19 jlam Exp $
DISTNAME= evolution-2.2.2
PKGREVISION= 1
@@ -29,7 +29,7 @@ PKG_FAIL_REASON= "Kerberos support conflicts with SSL"
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= bison gmake
+USE_TOOLS+= bison gmake pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
@@ -121,7 +121,6 @@ LDFLAGS+= -lsemaphore
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../mail/evolution-data-server/buildlink3.mk"
diff --git a/mail/evolution14/Makefile b/mail/evolution14/Makefile
index 582b493f2a5..8c93115f579 100644
--- a/mail/evolution14/Makefile
+++ b/mail/evolution14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:19 jlam Exp $
DISTNAME= evolution-1.4.6
PKGNAME= ${DISTNAME:S/evolution/evolution14/}
@@ -28,7 +28,7 @@ BUILDLINK_DEPENDS.db3= db3-3.11.2{,nb*}
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= bison gmake
+USE_TOOLS+= bison gmake pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
@@ -50,7 +50,6 @@ CONFIGURE_ARGS+= --enable-openssl=yes
CONFIGURE_ARGS+= --with-krb5=/usr --with-krb4=/usr
CONFIGURE_ARGS+= --with-db3-includes=${LOCALBASE}/include/db3
CONFIGURE_ARGS+= --with-db3-libs=${LOCALBASE}/lib
-CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig"
PKGCONFIG_OVERRIDE= camel.pc.in
PKGCONFIG_OVERRIDE+= evolution-shell.pc.in
@@ -78,7 +77,6 @@ LDFLAGS+= -lsemaphore
.include "../../devel/libbonoboui/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index 8fdc3776553..4f095f61033 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:19 jlam Exp $
#
DISTNAME= gmime-2.1.9
@@ -11,7 +11,7 @@ COMMENT= Library for the creation and parsing of MIME messages
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-gtk-doc=no
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
@@ -21,6 +21,5 @@ PKGCONFIG_OVERRIDE+= gmime-2.0.pc.in
.include "options.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 67851966780..2bb299eeccf 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:19 jlam Exp $
#
DISTNAME= mail-notification-1.0
@@ -12,7 +12,7 @@ COMMENT= Status icon that provides new mail notifications
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
@@ -57,7 +57,6 @@ CONFIGURE_ARGS+= --disable-ssl
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../net/libsoup/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/mail/sylpheed-claws-ghostscript-viewer/Makefile b/mail/sylpheed-claws-ghostscript-viewer/Makefile
index 973443f6c60..8b404b4c0d4 100644
--- a/mail/sylpheed-claws-ghostscript-viewer/Makefile
+++ b/mail/sylpheed-claws-ghostscript-viewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:19 jlam Exp $
#
DISTNAME= ghostscript-viewer-0.6
@@ -12,6 +12,7 @@ MAINTAINER= cube@NetBSD.org
HOMEPAGE= http://reboot.animeirc.de/sylpheed/ghostscript_viewer/
COMMENT= Plugin to make Sylpheed-claws display PostScript and PDF attachments
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
@@ -19,7 +20,6 @@ PLIST_SRC= ${.CURDIR}/../../mail/sylpheed-claws/PLIST.plugins
PLIST_SUBST+= PLUGIN_NAME=ghostscript_viewer
MESSAGE_SRC+= ${.CURDIR}/../../mail/sylpheed-claws/MESSAGE.plugins
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mail/sylpheed-claws/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
diff --git a/mail/ximian-connector/Makefile b/mail/ximian-connector/Makefile
index 0ae283f41a8..d32adb1ebe5 100644
--- a/mail/ximian-connector/Makefile
+++ b/mail/ximian-connector/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:19 jlam Exp $
#
DISTNAME= ximian-connector-2.2.2
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.novell.com/products/evolution/
COMMENT= Adds support for Microsoft Exchange 2000 and 2003 to Evolution
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
@@ -25,7 +25,6 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/ximian-connector
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mail/evolution-data-server/buildlink3.mk"
.include "../../mail/evolution/buildlink3.mk"
.include "../../net/libsoup-devel/buildlink3.mk"
diff --git a/math/calcoo/Makefile b/math/calcoo/Makefile
index 6d796aa4aa1..f2caabad779 100644
--- a/math/calcoo/Makefile
+++ b/math/calcoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/07/21 16:29:52 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/08/10 20:56:19 jlam Exp $
#
DISTNAME= calcoo-1.3.16
@@ -10,7 +10,7 @@ HOMEPAGE= http://calcoo.sourceforge.net/
COMMENT= Scientific calculator
GNU_CONFIGURE= yes
+USE_TOOLS+= pkg-config
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/cln/Makefile b/math/cln/Makefile
index 880739381ee..3a438f0970d 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:19 jlam Exp $
DISTNAME= cln-1.1.9
CATEGORIES= math
@@ -11,7 +11,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://www.ginac.de/CLN/
COMMENT= CLN Class Library for Numbers
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
@@ -19,5 +19,4 @@ PKGCONFIG_OVERRIDE= ${WRKSRC}/cln.pc.in
INFO_FILES= cln.info
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/galculator/Makefile b/math/galculator/Makefile
index 34fb43ab866..d4c881db7d7 100644
--- a/math/galculator/Makefile
+++ b/math/galculator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/08/10 20:56:19 jlam Exp $
#
DISTNAME= galculator-1.2.5
@@ -11,9 +11,8 @@ COMMENT= Desktop calculator with scientific / RPN modes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 82ed254dfa3..9da8e10470c 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2005/08/10 20:56:19 jlam Exp $
#
DISTNAME= gcalctool-5.5.42
@@ -16,7 +16,7 @@ GNU_CONFIGURE= YES
CONFIGURE_ENV+= HAVE_YACC=yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= bison gmake
+USE_TOOLS+= bison gmake pkg-config
USE_PKGLOCALEDIR= yes
GCONF2_SCHEMAS= gcalctool.schemas
@@ -34,7 +34,6 @@ post-wrapper:
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/math/gnumeric14/Makefile b/math/gnumeric14/Makefile
index 305ccbe68de..7b8e429e722 100644
--- a/math/gnumeric14/Makefile
+++ b/math/gnumeric14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/08/10 20:56:19 jlam Exp $
#
DISTNAME= gnumeric-1.4.3
@@ -13,7 +13,7 @@ COMMENT= Spreadsheet program from the GNOME project
BUILD_USES_MSGFMT= YES
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake perl:run
+USE_TOOLS+= gmake perl:run pkg-config
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
@@ -40,7 +40,6 @@ BUILDLINK_DEPENDS.libgsf+= libgsf>=1.11.1
.include "../../devel/libbonoboui/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
# guile is currently not supported in gnumeric
#.include "../../lang/guile/buildlink3.mk"
diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common
index 28ceeb7f80a..b6e6f953230 100644
--- a/meta-pkgs/xfce4/Makefile.common
+++ b/meta-pkgs/xfce4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile.common,v 1.26 2005/08/10 20:56:19 jlam Exp $
MASTER_SITES= http://www.xfce.org/archive/xfce-4.2.2/src/ \
http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-4.2.2/src/ \
@@ -14,18 +14,15 @@ XFCE4_VERSION= 4.2.2
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
.if ${MACHINE_ARCH} == "alpha"
GCC_REQD+= 3.0
.endif
-PKG_CONFIG_PATH= ${BUILDLINK_DIR}/lib/pkgconfig
-
XFCE4_EGBASE= ${PREFIX}/share/examples/xfce4
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
## # Use the latest GNU tar when the native tar is buggy
diff --git a/misc/blccc/Makefile b/misc/blccc/Makefile
index 0540f59b1cd..3aada1a8911 100644
--- a/misc/blccc/Makefile
+++ b/misc/blccc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:19 jlam Exp $
#
DISTNAME= blccc-1.99
@@ -10,6 +10,7 @@ MAINTAINER= salo@NetBSD.org
HOMEPAGE= http://www.blinkenlights.de/
COMMENT= Blinkenlights Chaos Control Center
+USE_TOOLS+= pkg-config
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
SHLIBTOOL_OVERRIDE= libtool
@@ -17,7 +18,6 @@ SHLIBTOOL_OVERRIDE= libtool
EGDIR= ${PREFIX}/share/examples/blccc
.include "../../devel/blib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
post-install:
${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/misc/gkrellm-flynn/Makefile b/misc/gkrellm-flynn/Makefile
index e09fbb586fa..03b22c935fc 100644
--- a/misc/gkrellm-flynn/Makefile
+++ b/misc/gkrellm-flynn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:19 jlam Exp $
#
DISTNAME= gkrellflynn-0.8
@@ -11,10 +11,9 @@ MAINTAINER= cube@NetBSD.org
HOMEPAGE= http://horus.comlab.uni-rostock.de/flynn/
COMMENT= GKrellM2 plugin that shows system load with a DooM marine
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
BUILD_TARGET= gkrellm2
INSTALL_TARGET= installgkrellm2
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gkrellm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/gkrellm-launch/Makefile b/misc/gkrellm-launch/Makefile
index f93ac243f7c..ae45d158eb8 100644
--- a/misc/gkrellm-launch/Makefile
+++ b/misc/gkrellm-launch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:19 jlam Exp $
#
DISTNAME= gkrellmlaunch-0.5
@@ -13,11 +13,11 @@ COMMENT= GKrellM plugin to allow quick launch of applications
BUILD_TARGET= gkrellmlaunch.so
+USE_TOOLS+= pkg-config
INSTALLATION_DIRS= lib/gkrellm2/plugins
do-install:
${INSTALL_DATA} ${WRKSRC}/gkrellmlaunch.so ${PREFIX}/lib/gkrellm2/plugins
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gkrellm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/gkrellm-leds/Makefile b/misc/gkrellm-leds/Makefile
index 710cacd7d97..e0045aed5cc 100644
--- a/misc/gkrellm-leds/Makefile
+++ b/misc/gkrellm-leds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:19 jlam Exp $
#
DISTNAME= gkleds-0.8.2
@@ -10,11 +10,11 @@ MAINTAINER= cube@NetBSD.org
HOMEPAGE= http://heim.ifi.uio.no/~oyvinha/gkleds/
COMMENT= GKrellM plugin that monitors CapsLock, NumLock and ScrollLock keys
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/gkrellm2/plugins
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gkrellm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/gkrellm-moon/Makefile b/misc/gkrellm-moon/Makefile
index 44715dbc7df..cdb255380a0 100644
--- a/misc/gkrellm-moon/Makefile
+++ b/misc/gkrellm-moon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/10 20:56:19 jlam Exp $
#
DISTNAME= gkrellmoon-0.6
@@ -11,8 +11,8 @@ MAINTAINER= cube@NetBSD.org
HOMEPAGE= http://gkrellmoon.sourceforge.net/
COMMENT= GKrellM2 moonclock plugin
+USE_TOOLS+= pkg-config
BUILD_TARGET= gkrellmoon.so
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gkrellm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/gkrellm-weather/Makefile b/misc/gkrellm-weather/Makefile
index 8a9bb642289..e16202c4c58 100644
--- a/misc/gkrellm-weather/Makefile
+++ b/misc/gkrellm-weather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:19 jlam Exp $
DISTNAME= gkrellweather-2.0.6
PKGNAME= gkrellm-weather-2.0.6
@@ -14,7 +14,7 @@ COMMENT= Gkrellm2 weather plugin
DEPENDS+= wget>=1.8:../../net/wget
BUILD_USES_MSGFMT= YES
-USE_TOOLS+= gmake perl:run
+USE_TOOLS+= gmake perl:run pkg-config
USE_PKGLOCALEDIR= YES
BUILD_TARGET= gkrellweather.so
@@ -30,7 +30,6 @@ pre-build:
${WRKSRC}/GrabWeather.orig > ${WRKSRC}/GrabWeather
.include "../../sysutils/gkrellm/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index 9b9ab5d99c4..3bcdab40028 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2005/08/10 20:56:19 jlam Exp $
#
DISTNAME= gnome-utils-2.10.1
@@ -12,7 +12,7 @@ COMMENT= Set of useful GNOME2 utilities and applications
BUILD_USES_MSGFMT= yes
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl pkg-config
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -34,7 +34,6 @@ BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.8.4
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../lang/guile/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/misc/gok/Makefile b/misc/gok/Makefile
index 4bc6b6792e5..826cb891762 100644
--- a/misc/gok/Makefile
+++ b/misc/gok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2005/08/10 20:56:20 jlam Exp $
#
DISTNAME= gok-1.0.3
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= GNOME On-Screen Keyboard
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -34,7 +34,6 @@ GCONF2_SCHEMAS= gok.schemas
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libwnck/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile
index fb4e1085086..9e2f0bdba6e 100644
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2005/08/10 20:56:20 jlam Exp $
DISTNAME= gperiodic-2.0.8
CATEGORIES= misc x11
@@ -12,7 +12,7 @@ BUILD_USES_MSGFMT= # defined
USE_DIRS+= gnome1-1.5
USE_PKGLOCALEDIR= # defined
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED
BUILDLINK_TRANSFORM+= rm:-DGDK_DISABLE_DEPRECATED
@@ -23,6 +23,5 @@ MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
BUILD_TARGET= gperiodic
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/gxmame/Makefile b/misc/gxmame/Makefile
index 5c45ab9191e..3bdc4f3b996 100644
--- a/misc/gxmame/Makefile
+++ b/misc/gxmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/10 20:56:20 jlam Exp $
#
DISTNAME= gxmame-0.35beta1
@@ -15,11 +15,10 @@ DEPENDS+= p5-XML-Parser>=2.34:../../textproc/p5-XML-Parser
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/kanjipad/Makefile b/misc/kanjipad/Makefile
index 5e12c53aa86..1a7ea4a5b6f 100644
--- a/misc/kanjipad/Makefile
+++ b/misc/kanjipad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:20 jlam Exp $
#
DISTNAME= kanjipad-2.0.0
@@ -10,9 +10,8 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://fishsoup.net/software/kanjipad/
COMMENT= Japanese handwriting recognition
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl pkg-config
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
post-install:
diff --git a/misc/kdeaccessibility3/Makefile b/misc/kdeaccessibility3/Makefile
index 374e469ef78..80a9f1c8cbd 100644
--- a/misc/kdeaccessibility3/Makefile
+++ b/misc/kdeaccessibility3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:20 jlam Exp $
DISTNAME= kdeaccessibility-${_KDE_VERSION}
CATEGORIES= misc
@@ -6,6 +6,7 @@ COMMENT= Accessibility support for the KDE integrated X11 desktop
.include "../../meta-pkgs/kde3/Makefile.kde3"
+USE_TOOLS+= pkg-config
.include "../../mk/bsd.prefs.mk"
@@ -23,7 +24,6 @@ PLIST_SUBST+= HAVE_GST="@comment "
.endif
.include "../../meta-pkgs/kde3/kde3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/kdebase3/buildlink3.mk"
.include "../../x11/kdelibs3/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/libcdio/Makefile b/misc/libcdio/Makefile
index ca4480185f5..5f54a042546 100644
--- a/misc/libcdio/Makefile
+++ b/misc/libcdio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/08/09 12:56:18 adam Exp $
+# $NetBSD: Makefile,v 1.24 2005/08/10 20:56:20 jlam Exp $
DISTNAME= libcdio-0.75
CATEGORIES= misc
@@ -12,7 +12,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-USE_TOOLS+= perl:run
+USE_TOOLS+= perl:run pkg-config
PKGCONFIG_OVERRIDE+= libcdio.pc.in
PKGCONFIG_OVERRIDE+= libcdio_cdda.pc.in
PKGCONFIG_OVERRIDE+= libcdio_paranoia.pc.in
@@ -30,7 +30,6 @@ pre-patch:
${CP} ${FILESDIR}/_cdio_netbsd.c ${WRKSRC}/lib/driver/FreeBSD/freebsd.c
.endif
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../audio/libcddb/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 29da7eac09d..123a1ce1163 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2005/08/10 20:56:20 jlam Exp $
#
DISTNAME= yelp-2.10.0
@@ -16,7 +16,7 @@ BUILD_USES_MSGFMT= yes
BUILDLINK_DEPENDS.libxslt+= libxslt>=1.1.4
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -35,7 +35,6 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.yelp
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/mk/tools/bsd.tools.mk b/mk/tools/bsd.tools.mk
index aa6e2855b5a..f12695bcb9a 100644
--- a/mk/tools/bsd.tools.mk
+++ b/mk/tools/bsd.tools.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.tools.mk,v 1.31 2005/07/17 23:19:04 jlam Exp $
+# $NetBSD: bsd.tools.mk,v 1.32 2005/08/10 20:56:20 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -117,6 +117,7 @@ USE_TOOLS?= # empty
.include "../../mk/tools/imake.mk"
.include "../../mk/tools/replace.mk"
.include "../../mk/tools/perl.mk"
+.include "../../mk/tools/pkg-config.mk"
.include "../../mk/tools/make.mk"
######################################################################
diff --git a/mk/tools/pkg-config.mk b/mk/tools/pkg-config.mk
new file mode 100644
index 00000000000..5c1d512c030
--- /dev/null
+++ b/mk/tools/pkg-config.mk
@@ -0,0 +1,50 @@
+# $NetBSD: pkg-config.mk,v 1.1 2005/08/10 20:56:20 jlam Exp $
+#
+# Copyright (c) 2005 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Johnny C. Lam.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+# must display the following acknowledgement:
+# This product includes software developed by the NetBSD
+# Foundation, Inc. and its contributors.
+# 4. Neither the name of The NetBSD Foundation nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# Override the location where pkg-config searches for *.pc files in the
+# pkg-config wrapper script.
+#
+PKG_CONFIG_LIBDIR?= ${BUILDLINK_DIR}/lib/pkgconfig
+
+TOOLS_SCRIPT.pkg-config= \
+ PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q} ${TOOLS_SCRIPT_DFLT.pkg-config}
+
+CONFIGURE_ENV+= PKG_CONFIG=${TOOLS_CMD.pkg-config:Q}
+CONFIGURE_ENV+= PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q}
+MAKE_ENV+= PKG_CONFIG=${TOOLS_CMD.pkg-config:Q}
+MAKE_ENV+= PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:Q}
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 559867d145a..f6186c0b418 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.124 2005/08/10 06:08:48 jlam Exp $
+# $NetBSD: replace.mk,v 1.125 2005/08/10 20:56:20 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -868,6 +868,17 @@ TOOLS_PATH.perl= ${TOOLS_PREFIX.perl}/bin/perl
. endif
.endif
+.if !defined(TOOLS_IGNORE.pkg-config) && !empty(_USE_TOOLS:Mpkg-config)
+. if !empty(PKGPATH:Mdevel/pkg-config)
+MAKEFLAGS+= TOOLS_IGNORE.pkg-config=
+. elif !empty(_TOOLS_USE_PKGSRC.pkg-config:M[yY][eE][sS])
+TOOLS_DEPENDS.pkg-config?= pkg-config>=0.19:../../devel/pkg-config
+TOOLS_CREATE+= pkg-config
+TOOLS_FIND_PREFIX+= TOOLS_PREFIX.pkg-config=pkg-config
+TOOLS_PATH.pkg-config= ${TOOLS_PREFIX.pkg-config}/bin/pkg-config
+. endif
+.endif
+
.if !defined(TOOLS_IGNORE.pod2man) && !empty(_USE_TOOLS:Mpod2man)
. if !empty(PKGPATH:Mlang/perl5)
MAKEFLAGS+= TOOLS_IGNORE.pod2man=
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index 2756e1b3840..59b1d58d589 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:20 jlam Exp $
#
DISTNAME= avidemux-2.0.40
@@ -13,7 +13,7 @@ GCC_REQD= 3.0
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
LDFLAGS+= ${LIBOSSAUDIO}
@@ -46,7 +46,6 @@ post-configure:
.include "../../audio/libmad/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../multimedia/mjpegtools/buildlink3.mk"
.include "../../multimedia/xvidcore/buildlink3.mk"
diff --git a/multimedia/dirac/Makefile b/multimedia/dirac/Makefile
index 73a5927aed0..837e2cb680c 100644
--- a/multimedia/dirac/Makefile
+++ b/multimedia/dirac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/08/10 20:56:20 jlam Exp $
#
DISTNAME= Dirac-0.2.0
@@ -10,10 +10,10 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://dirac.sourceforge.net/
COMMENT= Open-source video codec designed at the BBC
+USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= dirac.pc.in
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index 5e1f4cd573b..299fdf0ddda 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/10 20:56:20 jlam Exp $
#
DISTNAME= gmencoder-0.1.0
@@ -17,7 +17,7 @@ DEPENDS+= mplayer>=0.90:../../multimedia/mplayer
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
@@ -36,6 +36,5 @@ post-install:
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
index c4b8c448251..5482ea8d444 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome2-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:53 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:20 jlam Exp $
DISTNAME= gnome-media-2.10.2
CATEGORIES= multimedia gnome
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl pkg-config
CONFIGURE_ARGS+= --enable-gtk-doc=no
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
@@ -44,7 +44,6 @@ GCONF2_SCHEMAS+= gnome-sound-recorder.schemas
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../multimedia/gst-plugins/buildlink3.mk"
.include "../../multimedia/gstreamer/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
diff --git a/multimedia/gst-plugins/Makefile.common b/multimedia/gst-plugins/Makefile.common
index d6694ad6a39..41f9bc8e0ca 100644
--- a/multimedia/gst-plugins/Makefile.common
+++ b/multimedia/gst-plugins/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/08/10 20:56:20 jlam Exp $
#
DISTNAME= gst-plugins-0.8.9
@@ -18,7 +18,7 @@ PATCHDIR= ${.CURDIR}/../../multimedia/gst-plugins/patches
BUILD_DEPENDS+= nasm>=0.98.38:../../devel/nasm
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
@@ -166,5 +166,4 @@ BUILDLINK_DEPENDS.gstreamer+= gstreamer>=0.8.9.1
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../multimedia/gstreamer/plugins.mk"
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index caccc72669e..214f3b3a4b9 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2005/08/10 20:56:20 jlam Exp $
#
DISTNAME= gstreamer-0.8.10
@@ -16,7 +16,7 @@ GNU_CONFIGURE= yes
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl pkg-config
CONFIGURE_ARGS+= --disable-plugin-builddir
CONFIGURE_ARGS+= --localstatedir=${PREFIX}/libdata/gstreamer-0.8
@@ -42,7 +42,6 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.4.0nb1
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../lang/python/application.mk"
_GSTREAMER_NO_DEPEND= # defined
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 10c33ec536f..de93226325e 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2005/08/10 20:56:20 jlam Exp $
DISTNAME= kdemultimedia-${_KDE_VERSION}
CATEGORIES= multimedia
@@ -8,6 +8,7 @@ COMMENT= Multimedia tools for the KDE integrated X11 desktop
DEPENDS+= xine-arts>=1rc0a:../../audio/xine-arts
+USE_TOOLS+= pkg-config
USE_DIRS+= xdg-1.2
USE_PKGINSTALL= YES
@@ -52,7 +53,6 @@ UNLIMIT_RESOURCES+= datasize
.include "../../audio/musicbrainz/buildlink3.mk"
.include "../../audio/tunepimp/buildlink3.mk"
.include "../../audio/taglib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../multimedia/xine-lib/buildlink3.mk"
.include "../../x11/kdebase3/buildlink3.mk"
.include "../../x11/kdelibs3/buildlink3.mk"
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index d930e22cf75..228c2d526a8 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/25 12:49:08 markd Exp $
+# $NetBSD: Makefile,v 1.21 2005/08/10 20:56:20 jlam Exp $
#
DISTNAME= kmplayer-0.9.0a
@@ -16,7 +16,7 @@ DEPENDS+= mencoder>=1.0rc3:../../multimedia/mencoder
DEPENDS+= xine-arts>=1rc0a:../../audio/xine-arts
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl pkg-config
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
@@ -30,7 +30,6 @@ SUBST_STAGE.desktop= pre-configure
SUBST_FILES.desktop= src/kmplayer.desktop
SUBST_SED.desktop= -e 's|@PREFIX@|${PREFIX}|g'
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
diff --git a/multimedia/libassetml/Makefile b/multimedia/libassetml/Makefile
index 010b89b882d..746ee68b953 100644
--- a/multimedia/libassetml/Makefile
+++ b/multimedia/libassetml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:20 jlam Exp $
#
DISTNAME= libassetml-1.2.1
@@ -12,7 +12,7 @@ COMMENT= Library for sharing image and audio files between projects
BUILD_DEPENDS+= texi2html-[0-9]*:../../textproc/texi2html
USE_DIRS+= gnome2-1.5 # share/gnome/help
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
@@ -21,7 +21,6 @@ GNU_CONFIGURE= yes
INFO_FILES= libassetml.info
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdv/Makefile.common b/multimedia/libdv/Makefile.common
index 0da05f145ba..7bae949de61 100644
--- a/multimedia/libdv/Makefile.common
+++ b/multimedia/libdv/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/08/10 20:56:20 jlam Exp $
DISTNAME= libdv-0.104
CATEGORIES= multimedia
@@ -11,6 +11,7 @@ COMMENT= DV video codec library
DISTINFO_FILE= ${.CURDIR}/../../multimedia/libdv/distinfo
PATCHDIR= ${.CURDIR}/../../multimedia/libdv/patches
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
@@ -32,7 +33,6 @@ LIBS+= ${LIBOSSAUDIO}
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index c496ee8e583..096f7e8a2bb 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:20 jlam Exp $
DISTNAME= mpeg2dec-0.4.0b
PKGNAME= libmpeg2-0.4.0b
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/mpeg2dec-0.4.0
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= libmpeg2/convert/libmpeg2convert.pc.in
@@ -25,5 +25,4 @@ PKGCONFIG_OVERRIDE+= libmpeg2/libmpeg2.pc.in
CONFIGURE_ARGS+= --enable-shared
.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libogg/Makefile b/multimedia/libogg/Makefile
index 14afba5705c..4048807f1d3 100644
--- a/multimedia/libogg/Makefile
+++ b/multimedia/libogg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:20 jlam Exp $
#
DISTNAME= libogg-1.1.2
@@ -12,6 +12,7 @@ COMMENT= Ogg project codecs library
PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
@@ -23,6 +24,5 @@ PKGCONFIG_OVERRIDE+= ogg.pc.in
TEST_TARGET= check
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mplayer-plugin-firefox/Makefile.common b/multimedia/mplayer-plugin-firefox/Makefile.common
index 643307b43a9..c9ce766aeda 100644
--- a/multimedia/mplayer-plugin-firefox/Makefile.common
+++ b/multimedia/mplayer-plugin-firefox/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/08/10 20:56:20 jlam Exp $
#
DISTNAME= mplayerplug-in-2.70
@@ -14,7 +14,7 @@ DEPENDS+= mplayer>=0.92:../../multimedia/mplayer
WRKSRC= ${WRKDIR}/mplayerplug-in
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LANGUAGES+= c++
USE_PKGINSTALL= yes
@@ -65,6 +65,5 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.xpt \
${PREFIX}/lib/${BROWSER}/plugins
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile
index e19e265afd8..6d8fc19f78d 100644
--- a/multimedia/openquicktime/Makefile
+++ b/multimedia/openquicktime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:20 jlam Exp $
#
DISTNAME= ${PKGNAME_NOREV}-src
@@ -13,7 +13,7 @@ HOMEPAGE= http://www.openquicktime.org/
COMMENT= Portable library for handling QuickTime(TM) media files
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
CONFIGURE_ENV+= my_cv_comment=""
@@ -25,6 +25,5 @@ pre-configure:
${CHMOD} +x ${BUILDLINK_DIR}/bin/glib-config-2.0
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/swfdec/Makefile.common b/multimedia/swfdec/Makefile.common
index 095e114e322..cded6a94a66 100644
--- a/multimedia/swfdec/Makefile.common
+++ b/multimedia/swfdec/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/08/10 20:56:21 jlam Exp $
#
DISTNAME= swfdec-0.2.2
@@ -12,6 +12,7 @@ COMMENT= Library for rendering Flash(R) animations and games
DISTINFO_FILE= ${.CURDIR}/../../multimedia/swfdec/distinfo
PATCHDIR= ${.CURDIR}/../../multimedia/swfdec/patches
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
@@ -24,4 +25,3 @@ BUILDLINK_TRANSFORM+= rm:-Werror
pre-install:
${ECHO} "install:" >${WRKSRC}/plugin/Makefile
-.include "../../devel/pkg-config/buildlink3.mk"
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index edc070f4928..9456f715e8a 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/08/10 20:56:21 jlam Exp $
#
DISTNAME= totem-1.0.2
@@ -15,7 +15,7 @@ PLIST_SRC= ${.CURDIR}/../../multimedia/totem/PLIST
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
@@ -32,7 +32,6 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.3
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/nautilus/buildlink3.mk"
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 403595e6276..f99685a2f20 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2005/07/29 16:09:11 drochner Exp $
+# $NetBSD: Makefile.common,v 1.25 2005/08/10 20:56:21 jlam Exp $
#
DISTNAME= xine-lib-1.0.2
@@ -20,7 +20,7 @@ USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= libtool libtool-nofpic
PKGCONFIG_OVERRIDE= misc/libxine.pc.in
-USE_TOOLS+= autoconf gmake
+USE_TOOLS+= autoconf gmake pkg-config
CONFIGURE_ARGS+= --with-w32-path='${PREFIX}/lib/win32'
CONFIGURE_ARGS+= --without-external-ffmpeg --disable-ffmpegtest
@@ -42,7 +42,6 @@ pre-configure:
cd ${WRKSRC} && autoconf
.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/multimedia/xvid4conf/Makefile b/multimedia/xvid4conf/Makefile
index 47559b21ee1..67626a249c7 100644
--- a/multimedia/xvid4conf/Makefile
+++ b/multimedia/xvid4conf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:21 jlam Exp $
DISTNAME= xvid4conf-1.12
PKGREVISION= 1
@@ -9,8 +9,8 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://zebra.fh-weingarten.de/~transcode/
COMMENT= XviD Configuration Panel
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile
index 90c1e63f852..478ef2a30cb 100644
--- a/net/ORBit2/Makefile
+++ b/net/ORBit2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2005/08/10 20:56:21 jlam Exp $
#
DISTNAME= ORBit2-2.12.2
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
CONFLICTS= linc>=1.1
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
@@ -33,7 +33,6 @@ PRINT_PLIST_AWK+= /^@dirrm share\/idl$$/ \
" 2>/dev/null || $${TRUE}"; next; }
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../net/libIDL/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/amule/Makefile b/net/amule/Makefile
index c70721de8ed..5151d86a293 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/08/07 11:30:49 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2005/08/10 20:56:21 jlam Exp $
#
DISTNAME= aMule-1.2.8
@@ -17,7 +17,7 @@ BUILD_USES_MSGFMT= yes
CONFLICTS= xmule-[0-9]*
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -28,7 +28,6 @@ LIBS+= -lm
UNLIMIT_RESOURCES+= datasize
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index 60b4274c10e..691eeca25e4 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2005/08/10 20:56:21 jlam Exp $
#
DISTNAME= bug-buddy-2.10.0
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
GCONF2_SCHEMAS= bug-buddy.schemas
@@ -29,7 +29,6 @@ GCONF2_SCHEMAS= bug-buddy.schemas
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/gnome-menus/buildlink3.mk"
diff --git a/net/dc_gui2/Makefile b/net/dc_gui2/Makefile
index 4bbba28e2b5..9ed935c81ca 100644
--- a/net/dc_gui2/Makefile
+++ b/net/dc_gui2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2005/08/10 20:56:21 jlam Exp $
#
DISTNAME= dc_gui2-0.75
@@ -17,7 +17,7 @@ GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= YES
CONFIGURE_ARGS+= --enable-manual-db-detect
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
UNLIMIT_RESOURCES+= datasize
@@ -35,5 +35,4 @@ post-configure:
.include "../../databases/db4/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/ed2k-gtk-gui/Makefile b/net/ed2k-gtk-gui/Makefile
index 005209dec7d..bda29b4e47f 100644
--- a/net/ed2k-gtk-gui/Makefile
+++ b/net/ed2k-gtk-gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:21 jlam Exp $
DISTNAME= ed2k-gtk-gui-0.6.3
PKGREVISION= 1
@@ -9,6 +9,7 @@ MAINTAINER= minskim@NetBSD.org
HOMEPAGE= http://ed2k-gtk-gui.sourceforge.net/
COMMENT= GUI for the eDonkey2000 and Overnet
+USE_TOOLS+= pkg-config
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -23,7 +24,6 @@ SUBST_SED.shell= -e 's,/bin/bash,/bin/sh,g'
BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../net/gnet/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index ad445bb6033..dc1cf5039ec 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/07/21 16:29:54 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2005/08/10 20:56:21 jlam Exp $
DISTNAME= etherape-0.9.1
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= damon@NetBSD.org
HOMEPAGE= http://etherape.sourceforge.net/
COMMENT= Graphical network monitor
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_DIRS+= xdg-1.1
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
@@ -32,5 +32,4 @@ post-install:
.include "../../net/libpcap/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index d40a3b5021d..1d58e2fa4cf 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2005/07/27 16:44:43 drochner Exp $
+# $NetBSD: Makefile,v 1.114 2005/08/10 20:56:21 jlam Exp $
DISTNAME= ethereal-0.10.12
CATEGORIES= net
@@ -21,7 +21,7 @@ MAINTAINER= frueauf@NetBSD.org
HOMEPAGE= http://www.ethereal.com/
COMMENT= Network protocol analyzer
-USE_TOOLS+= perl
+USE_TOOLS+= perl pkg-config
USE_LIBTOOL= YES
SHLIBTOOL_OVERRIDE= libtool
@@ -52,7 +52,6 @@ pre-build:
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../net/libpcap/buildlink3.mk"
.include "../../net/net-snmp/buildlink3.mk"
diff --git a/net/gift/Makefile b/net/gift/Makefile
index 9c84beec965..2bca37727a8 100644
--- a/net/gift/Makefile
+++ b/net/gift/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:21 jlam Exp $
#
DISTNAME= gift-0.11.8.1
@@ -10,6 +10,7 @@ MAINTAINER= alex@catbull.com
HOMEPAGE= http://gift.sourceforge.net/
COMMENT= Modular daemon that abstracts filesharing protocols
+USE_TOOLS+= pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -19,6 +20,5 @@ PKGCONFIG_OVERRIDE+= ${WRKSRC}/lib/libgift.pc.in
.include "../../devel/libltdl/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/gkrellm-multiping/Makefile b/net/gkrellm-multiping/Makefile
index 88156ed6e4a..dbeb1050083 100644
--- a/net/gkrellm-multiping/Makefile
+++ b/net/gkrellm-multiping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:21 jlam Exp $
#
DISTNAME= gkrellm-multiping-2.0.8
@@ -14,6 +14,8 @@ COMMENT= Pings several machines and prints out stats
USE_PKGINSTALL= YES
SPECIAL_PERMS+= ${PREFIX}/lib/gkrellm2/plugins/pinger ${SETUID_ROOT_PERMS}
+USE_TOOLS+= pkg-config
+
PTHREAD_OPTS= require
PTHREAD_AUTO_VARS= yes
@@ -21,7 +23,6 @@ post-patch:
${SED} -e s,@@PREFIX@@,${PREFIX}, ${WRKSRC}/multiping.c > ${WRKSRC}/multiping.c.sed
${CP} ${WRKSRC}/multiping.c.sed ${WRKSRC}/multiping.c
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gkrellm/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/gkrellm-snmp/Makefile b/net/gkrellm-snmp/Makefile
index 8e04e57c926..9f062400913 100644
--- a/net/gkrellm-snmp/Makefile
+++ b/net/gkrellm-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:21 jlam Exp $
#
DISTNAME= gkrellm_snmp-0.21
@@ -11,8 +11,8 @@ MAINTAINER= cube@NetBSD.org
HOMEPAGE= http://triq.net/gkrellm_snmp.html
COMMENT= GKrellM plugin to display values collected from a SNMP agent
+USE_TOOLS+= pkg-config
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../sysutils/gkrellm/buildlink3.mk"
.include "../../net/net-snmp/buildlink3.mk"
diff --git a/net/gkrellm-wireless/Makefile b/net/gkrellm-wireless/Makefile
index bf3a8d132de..5a8846d95e2 100644
--- a/net/gkrellm-wireless/Makefile
+++ b/net/gkrellm-wireless/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/10 20:56:22 jlam Exp $
DISTNAME= gkrellmwireless-2.0.3
PKGNAME= ${DISTNAME:S/gkrellm/gkrellm-/}
@@ -13,9 +13,8 @@ COMMENT= Wavelan signal strength monitor for gkrellm
ONLY_FOR_PLATFORM= *BSD-*-* Linux-*-*
WRKSRC= ${WRKDIR}/gkrellmwireless
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gkrellm/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index cd590fa2de3..ddef1db46bf 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2005/08/10 20:56:22 jlam Exp $
#
DISTNAME= gnet-2.0.7
@@ -10,6 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.gnetlibrary.org/
COMMENT= Simple network library
+USE_TOOLS+= pkg-config
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= gnet-2.0.pc.in
GNU_CONFIGURE= YES
@@ -18,5 +19,4 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
TEST_TARGET= check
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/gnet1/Makefile b/net/gnet1/Makefile
index 3248b7b3bfd..a4aa1eec523 100644
--- a/net/gnet1/Makefile
+++ b/net/gnet1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/08/10 20:56:22 jlam Exp $
#
DISTNAME= gnet-1.1.8
@@ -13,6 +13,7 @@ COMMENT= Simple network library (older version)
CONFLICTS= gnet<=1.1.8
+USE_TOOLS+= pkg-config
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= gnet.pc.in
GNU_CONFIGURE= YES
@@ -20,5 +21,4 @@ CONFIGURE_ARGS= --enable-glib2
TEST_TARGET= check
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 828db220e6c..6d83b3762d8 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/10 20:56:22 jlam Exp $
#
DISTNAME= gnome-netstatus-2.10.0
@@ -12,7 +12,7 @@ COMMENT= Network status applet for the GNOME panel
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
@@ -23,7 +23,6 @@ GCONF2_SCHEMAS= netstatus.schemas
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
diff --git a/net/howl/Makefile b/net/howl/Makefile
index 43640bf1fb0..ad80c406065 100644
--- a/net/howl/Makefile
+++ b/net/howl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:22 jlam Exp $
DISTNAME= howl-0.9.10
CATEGORIES= net
@@ -8,6 +8,7 @@ MAINTAINER= nathanw@NetBSD.org
HOMEPAGE= http://www.porchdogsoft.com/products/howl/
COMMENT= Zeroconf (Rendezvous) implementation
+USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
@@ -17,6 +18,5 @@ RCD_SCRIPTS= howl
PKG_GROUPS+= howl
PKG_USERS+= howl:howl::Zeroconf\\ user
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/jigdo/Makefile b/net/jigdo/Makefile
index ce44e364fee..4acabe40f34 100644
--- a/net/jigdo/Makefile
+++ b/net/jigdo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:22 jlam Exp $
DISTNAME= jigdo-0.7.1
CATEGORIES= net
@@ -9,13 +9,13 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://atterer.net/jigdo/
COMMENT= Tool to ease downloading of large files from the Internet
-CONFIGURE_ARGS+= --without-libdb
-GNU_CONFIGURE= yes
+USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --without-libdb
#.include "../../databases/db3/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../www/libwww/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/net/libIDL/Makefile b/net/libIDL/Makefile
index 75689301f3d..ed5a84dc633 100644
--- a/net/libIDL/Makefile
+++ b/net/libIDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2005/08/10 20:56:22 jlam Exp $
#
DISTNAME= libIDL-0.8.5
@@ -13,7 +13,7 @@ COMMENT= CORBA Interface Definition Language parser
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
-USE_TOOLS+= bison flex
+USE_TOOLS+= bison flex pkg-config
CONFIGURE_ENV+= HAVE_YACC=yes
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= libIDL-2.0.pc.in
@@ -30,7 +30,6 @@ CONFIGURE_ENV.SunOS+= CPP=/usr/lib/cpp
CONFIGURE_ENV+= F77=${FALSE}
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/libsoup-devel/Makefile b/net/libsoup-devel/Makefile
index 74311a7a282..f2e57b735b7 100644
--- a/net/libsoup-devel/Makefile
+++ b/net/libsoup-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:22 jlam Exp $
#
DISTNAME= libsoup-2.2.3
@@ -11,6 +11,7 @@ MAINTAINER= recht@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= HTTP library implementation in C (dev. Version)
+USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-gtk-doc=no
@@ -20,7 +21,6 @@ PKGCONFIG_OVERRIDE+= libsoup-2.2.pc.in
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../security/gnutls/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/net/libsoup/Makefile b/net/libsoup/Makefile
index 963ed55465e..6afecd4eb07 100644
--- a/net/libsoup/Makefile
+++ b/net/libsoup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:22 jlam Exp $
#
DISTNAME= libsoup-1.99.28
@@ -11,6 +11,7 @@ MAINTAINER= recht@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= HTTP library implementation in C
+USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -19,7 +20,6 @@ PKGCONFIG_OVERRIDE+= soup-2.0.pc.in
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/net/linc/Makefile b/net/linc/Makefile
index 9fc19d086bb..2985c126680 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/08/10 20:56:22 jlam Exp $
#
DISTNAME= linc-1.1.1
@@ -13,6 +13,7 @@ COMMENT= Network client/server library
CONFLICTS= ORBit2>=2.8
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
@@ -23,7 +24,6 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html
CONFIGURE_ARGS+= --with-openssl
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile
index d3d8c69c19f..14c6e00bbcd 100644
--- a/net/py-ORBit/Makefile
+++ b/net/py-ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:22 jlam Exp $
#
DISTNAME= pyorbit-2.0.1
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= Python bindings for ORBit2
PY_PATCHPLIST= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE+= pyorbit-2.pc.in
GNU_CONFIGURE= YES
@@ -21,7 +21,6 @@ CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
PYTHON_VERSIONS_ACCEPTED= 24 23 22
BUILDLINK_DEPENDS.python22= python22>=2.2.2nb2
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../lang/python/extension.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index baf64045882..5f5de7cd461 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:22 jlam Exp $
#
DISTNAME= tsclient-0.132
@@ -15,12 +15,11 @@ DEPENDS+= vncviewer-[0-9]*:../../net/vncviewer
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake perl:run
+USE_TOOLS+= gmake perl:run pkg-config
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/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 d3cbf4ffeb5..0e10e8bd2a8 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:22 jlam Exp $
#
DISTNAME= vino-2.10.0
@@ -12,7 +12,7 @@ COMMENT= VNC server for GNOME
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
@@ -25,7 +25,6 @@ GCONF2_SCHEMAS= vino-server.schemas
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
diff --git a/net/wistumbler2-gtk/Makefile b/net/wistumbler2-gtk/Makefile
index b138dcb22b0..da4b9de0129 100644
--- a/net/wistumbler2-gtk/Makefile
+++ b/net/wistumbler2-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/08/10 20:56:22 jlam Exp $
#
.include "../../net/wistumbler2/Makefile.common"
@@ -7,6 +7,7 @@ PKGNAME= ${DISTNAME:S/wistumbler2-/wistumbler2-gtk-/}
CONFLICTS+= wistumbler2-[0-9]*
-.include "../../devel/pkg-config/buildlink3.mk"
+USE_TOOLS+= pkg-config
+
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/news/pan/Makefile b/news/pan/Makefile
index 5b2d0e7ebc9..eef7ee43a7c 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2005/08/10 20:56:22 jlam Exp $
#
DISTNAME= pan-0.14.2
@@ -13,7 +13,7 @@ COMMENT= Newsreader for GTK2
BUILD_USES_MSGFMT= YES
-USE_TOOLS+= perl
+USE_TOOLS+= perl pkg-config
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
@@ -25,7 +25,6 @@ LIBS+= -lcompat
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../net/gnet/buildlink3.mk"
.include "../../textproc/gtkspell/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/parallel/linda/Makefile b/parallel/linda/Makefile
index b9f4f7316eb..f6a677a2048 100644
--- a/parallel/linda/Makefile
+++ b/parallel/linda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:22 jlam Exp $
#
DISTNAME= linda-0.1.1
@@ -10,9 +10,9 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://sourceforge.net/projects/linda/
COMMENT= Parallel distributed database environment
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= # defined
USE_LIBTOOL= # defined
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 8bfe9cd0903..acd3d5ed485 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2005/08/10 20:56:22 jlam Exp $
#
DISTNAME= ggv-2.8.4
@@ -16,7 +16,7 @@ GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
GCONF2_SCHEMAS= ggv.schemas
@@ -24,7 +24,6 @@ GCONF2_SCHEMAS= ggv.schemas
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../textproc/intltool/buildlink3.mk"
diff --git a/print/glabels/Makefile b/print/glabels/Makefile
index 676eed77d68..231193b1e12 100644
--- a/print/glabels/Makefile
+++ b/print/glabels/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:55 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= glabels-2.0.2
@@ -13,12 +13,11 @@ USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_DIRS+= gnome2-1.5
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
.include "../../databases/shared-mime-info/mimedb.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/print/gpdf/Makefile b/print/gpdf/Makefile
index 9680d303a54..8d6f0cd54a2 100644
--- a/print/gpdf/Makefile
+++ b/print/gpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= gpdf-2.10.0
@@ -13,7 +13,7 @@ COMMENT= GNOME 2 version of xpdf
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
@@ -27,7 +27,6 @@ GCONF2_SCHEMAS= gpdf.schemas
.include "../../devel/libbonoboui/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../print/libgnomeprintui/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/print/imposter/Makefile b/print/imposter/Makefile
index 1478404ba89..bbf9d3842ef 100644
--- a/print/imposter/Makefile
+++ b/print/imposter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= imposter-0.2
@@ -13,10 +13,9 @@ COMMENT= Standalone OpenOffice presentations viewer using GTK2
BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/libgnomecups/Makefile b/print/libgnomecups/Makefile
index 6c476a93b1f..b686d69ab95 100644
--- a/print/libgnomecups/Makefile
+++ b/print/libgnomecups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= libgnomecups-0.2.0
@@ -9,6 +9,7 @@ MAINTAINER= jmmv@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= GNOME interface to CUPS
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
@@ -16,7 +17,6 @@ PKGCONFIG_OVERRIDE= libgnomecups-1.0.pc.in
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/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 9e84fb99ea4..5969082117f 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= libgnomeprint-2.10.3
@@ -12,7 +12,7 @@ COMMENT= Library for the GNOME2 Printing Architecture
BUILD_USES_MSGFMT= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
@@ -52,7 +52,6 @@ PRINT_PLIST_AWK+= /cups/ { print "$${USE_CUPS}" $$0; next; }
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index df8783ce4ab..dce6fbdf46e 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= libgnomeprintui-2.10.2
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= libgnomeprintui/libgnomeprintui-2.2.pc.in
@@ -28,7 +28,6 @@ BUILDLINK_DEPENDS.libgnomeprint+= libgnomeprint>=2.10.2
.include "../../devel/GConf2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index 646cc89b243..b57c811b47f 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/27 17:30:14 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= gnome-keyring-0.4.3
@@ -12,6 +12,7 @@ COMMENT= GNOME password and secret manager
BUILD_USES_MSGFMT= YES
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
@@ -20,6 +21,5 @@ PKGCONFIG_OVERRIDE= ${WRKSRC}/gnome-keyring-1.pc.in
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/gpa/Makefile b/security/gpa/Makefile
index 576af17b77a..f32e5d4180b 100644
--- a/security/gpa/Makefile
+++ b/security/gpa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= gpa-0.7.0
@@ -10,10 +10,10 @@ MAINTAINER= pr@alles.prima.de
HOMEPAGE= http://www.gnupg.org/gpa.html
COMMENT= GUI frontend to gnupg
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../security/gpgme/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/gpass/Makefile b/security/gpass/Makefile
index b6ee0bc4615..c1189724d52 100644
--- a/security/gpass/Makefile
+++ b/security/gpass/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= gpass-0.4.4
@@ -10,6 +10,7 @@ MAINTAINER= jmmv@NetBSD.org
HOMEPAGE= http://gpass.sourceforge.net/
COMMENT= GNOME Password Manager
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
USE_LIBTOOL= YES
@@ -18,7 +19,6 @@ USE_PKGLOCALEDIR= YES
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index 571fe678732..f32051beeae 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:23 jlam Exp $
DISTNAME= gsasl-0.2.5
CATEGORIES= security
@@ -11,6 +11,7 @@ COMMENT= GNU implementation of the Simple Authentication and Security Layer
BUILD_USES_MSGFMT= yes
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
@@ -26,7 +27,6 @@ PKGCONFIG_OVERRIDE+= libgsasl.pc.in
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libidn/buildlink3.mk"
.include "../../devel/libntlm/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../security/gss/buildlink3.mk"
.include "../../security/libgcrypt/buildlink3.mk"
diff --git a/security/gss/Makefile b/security/gss/Makefile
index a00ec63bd08..20e78008b1b 100644
--- a/security/gss/Makefile
+++ b/security/gss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= gss-0.0.15
@@ -12,6 +12,7 @@ COMMENT= GNU Generic Security Service Library
PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
@@ -19,5 +20,4 @@ PKGCONFIG_OVERRIDE+= gss.pc.in
INFO_FILES= gss.info
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/security/hydra/Makefile b/security/hydra/Makefile
index 2110dd82cbd..301083d93ca 100644
--- a/security/hydra/Makefile
+++ b/security/hydra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= ${PKGNAME}-src
@@ -12,6 +12,7 @@ COMMENT= Login password cracker
.include "../../mk/bsd.prefs.mk"
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
BUILD_TARGET= all ssl
WRKSRC= ${WRKDIR}/${DISTNAME}
@@ -42,7 +43,6 @@ PKG_SUPPORTED_OPTIONS= gtkfe
.if !empty(PKG_OPTIONS:Mgtkfe)
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
post-configure:
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 2c52e5b86d9..00081961d12 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2005/08/10 20:56:23 jlam Exp $
DISTNAME= seahorse-0.7.8
CATEGORIES= security
@@ -14,7 +14,7 @@ DEPENDS+= gnupg>=1.2.1:../../security/gnupg
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
@@ -32,7 +32,6 @@ BUILDLINK_DEPENDS.gpgme+= gpgme>=1.0.1nb2
.include "../../devel/libbonoboui/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../net/libsoup-devel/buildlink3.mk"
.include "../../security/gpgme/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/security/xmlsec1/Makefile b/security/xmlsec1/Makefile
index a8ec12faad4..75d38f59564 100644
--- a/security/xmlsec1/Makefile
+++ b/security/xmlsec1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= xmlsec1-1.2.6
@@ -10,6 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.aleksey.com/xmlsec/
COMMENT= XML signature and encryption library
+USE_TOOLS+= pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
@@ -21,7 +22,6 @@ GNU_CONFIGURE= yes
#CONFIGURE_ARGS+= --without-openssl
CONFIGURE_ARGS+= --without-gnutls
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
#.include "../../security/gnutls/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/sysutils/dbus/Makefile.common b/sysutils/dbus/Makefile.common
index 50251bcf3e8..9cdcfd5cfdd 100644
--- a/sysutils/dbus/Makefile.common
+++ b/sysutils/dbus/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/08/10 20:56:23 jlam Exp $
#
# XXX Do not update to 0.30 or above yet. The API in the 0.2x series is
@@ -18,7 +18,7 @@ DISTINFO_FILE= ${.CURDIR}/../../sysutils/dbus/distinfo
PATCHDIR= ${.CURDIR}/../../sysutils/dbus/patches
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
USE_PKGINSTALL= YES
@@ -78,5 +78,4 @@ BUILDLINK_DEPENDS.dbus+= dbus>=${DBUS_VERSION}
. include "../../sysutils/dbus/buildlink3.mk"
.endif
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
diff --git a/sysutils/desktop-file-utils/Makefile b/sysutils/desktop-file-utils/Makefile
index 97b189a61da..5c677865ed1 100644
--- a/sysutils/desktop-file-utils/Makefile
+++ b/sysutils/desktop-file-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:56 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= desktop-file-utils-0.10
@@ -9,6 +9,7 @@ MAINTAINER= jmmv@NetBSD.org
HOMEPAGE= http://www.freedesktop.org/Software/desktop-file-utils
COMMENT= Utilities to manage desktop entries
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
USE_LIBTOOL= YES
@@ -29,6 +30,5 @@ PRINT_PLIST_AWK+= /^share\/applications\/mimeinfo.cache$$/ \
next; }
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gkrellm-server/Makefile b/sysutils/gkrellm-server/Makefile
index 96b8e95de5a..d615d126bc5 100644
--- a/sysutils/gkrellm-server/Makefile
+++ b/sysutils/gkrellm-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:23 jlam Exp $
.include "../../sysutils/gkrellm/Makefile.common"
PKGREVISION= # empty1
@@ -7,6 +7,7 @@ GKRELLM_PKGBASE= gkrellm-server
COMMENT= Monitoring daemon remotely accessible by a GKrellM client
DEPENDS+= gkrellm-share-${GKRELLM_VERSION}:../../sysutils/gkrellm-share
+USE_TOOLS+= pkg-config
USE_PKGINSTALL= YES
PTHREAD_OPTS= require
RCD_SCRIPTS= gkrellmd
@@ -43,6 +44,5 @@ MAKE_ENV+= USE_GLIB12=yes
.else
.include "../../devel/glib2/buildlink3.mk"
.endif
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 6d163dd696b..6455a72d385 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2005/08/10 20:56:23 jlam Exp $
.include "Makefile.common"
PKGREVISION= # empty1
@@ -11,6 +11,7 @@ COMMENT= GTK2 based system monitor
DEPENDS+= gkrellm-share-${GKRELLM_VERSION}:../../sysutils/gkrellm-share
USE_PKGINSTALL= YES
+USE_TOOLS+= pkg-config
.include "../../mk/bsd.prefs.mk"
@@ -35,7 +36,6 @@ post-install:
.include "../../x11/gtk2/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile
index b8ca0ac9414..12530a5cfc8 100644
--- a/sysutils/gnome-menus/Makefile
+++ b/sysutils/gnome-menus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= gnome-menus-2.10.1
@@ -13,7 +13,7 @@ COMMENT= Implementation of the desktop menu specification for GNOME
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.2
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
@@ -41,7 +41,6 @@ BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.10.0
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index f0f5c580614..3ee1765d1b7 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= gnome-pkgview-1.0.6
@@ -12,6 +12,7 @@ COMMENT= Displays the version of GNOME components installed
BUILD_USES_MSGFMT= yes
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
@@ -22,7 +23,6 @@ GCONF2_SCHEMAS= gnome-pkgview.schemas
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index e655cfd840a..db36c981791 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2005/08/10 20:56:23 jlam Exp $
DISTNAME= gnome-vfs-1.0.5
PKGREVISION= 8
@@ -14,7 +14,7 @@ BUILDLINK_DEPENDS.gnome-mime-data= gnome-mime-data>=2.0.1
USE_PKGLOCALEDIR= YES
USE_X11BASE= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
@@ -27,7 +27,6 @@ CONFIGURE_ARGS.gnu-iconv= --with-libiconv=yes
.include "../../converters/libiconv/buildlink3.mk"
.include "../../databases/gnome-mime-data/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/GConf/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common
index 3861588d9b3..dca88d4b603 100644
--- a/sysutils/gnome-vfs2/Makefile.common
+++ b/sysutils/gnome-vfs2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/08/10 20:56:23 jlam Exp $
#
DISTNAME= gnome-vfs-2.10.1
@@ -19,7 +19,7 @@ PATCHDIR= ${.CURDIR}/../../sysutils/gnome-vfs2/patches
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
USE_PKGINSTALL= YES
@@ -88,5 +88,4 @@ do-install:
${PREFIX}/lib/gnome-vfs-2.0/modules
.endif
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
diff --git a/sysutils/gnome-vfsmm/Makefile b/sysutils/gnome-vfsmm/Makefile
index 3ca827e8e14..9fb1e0ffb56 100644
--- a/sysutils/gnome-vfsmm/Makefile
+++ b/sysutils/gnome-vfsmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/07/22 21:47:36 adam Exp $
+# $NetBSD: Makefile,v 1.2 2005/08/10 20:56:24 jlam Exp $
DISTNAME= gnome-vfsmm-2.10.0
CATEGORIES= sysutils
@@ -12,11 +12,10 @@ COMMENT= C++ bindings for gnome-vfs
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgnomevfs/gnome-vfsmm-2.6.pc.in
GNU_CONFIGURE= yes
.include "../../devel/glibmm/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome2-system-monitor/Makefile b/sysutils/gnome2-system-monitor/Makefile
index 3ac27089a97..921d1a579f2 100644
--- a/sysutils/gnome2-system-monitor/Makefile
+++ b/sysutils/gnome2-system-monitor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2005/08/10 20:56:24 jlam Exp $
#
DISTNAME= gnome-system-monitor-2.10.1
@@ -16,7 +16,7 @@ BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= autoconf gmake
+USE_TOOLS+= autoconf gmake pkg-config
LIBS+= -lutil
GCONF2_SCHEMAS+= gnome-system-monitor.schemas
@@ -30,7 +30,6 @@ pre-configure:
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libwnck/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../sysutils/libgtop2/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
diff --git a/sysutils/gtk-send-pr/Makefile b/sysutils/gtk-send-pr/Makefile
index 03171910a9c..badabff29b3 100644
--- a/sysutils/gtk-send-pr/Makefile
+++ b/sysutils/gtk-send-pr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/08/10 20:56:24 jlam Exp $
#
DISTNAME= gtk-send-pr-0.4.5
@@ -10,8 +10,8 @@ MAINTAINER= flynn@energyhq.es.eu.org
HOMEPAGE= http://www.energyhq.es.eu.org/gtk-send-pr.html
COMMENT= GTK+ based problem report tool
+USE_TOOLS+= pkg-config
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mail/libesmtp/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/idesk/Makefile b/sysutils/idesk/Makefile
index 14549562bb7..2871778f3ef 100644
--- a/sysutils/idesk/Makefile
+++ b/sysutils/idesk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:24 jlam Exp $
#
DISTNAME= idesk-0.7.2
@@ -11,7 +11,7 @@ COMMENT= Lightweight desktop icons handler
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
CONFIGURE_ARGS+= --enable-libsn
@@ -19,7 +19,6 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/idesk
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/idesk
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../graphics/imlib2/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
diff --git a/sysutils/libgtop2/Makefile b/sysutils/libgtop2/Makefile
index 114f61b0a19..9f8094bf876 100644
--- a/sysutils/libgtop2/Makefile
+++ b/sysutils/libgtop2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2005/08/10 20:56:24 jlam Exp $
DISTNAME= libgtop-2.10.1
PKGNAME= ${DISTNAME:S/-/2-/}
@@ -16,7 +16,7 @@ OSVERSION_SPECIFIC= YES
USE_MSGFMT_PLURALS= YES
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl pkg-config
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= libgtop-2.0.pc.in
PKGCONFIG_OVERRIDE+= support/gnome-support-2.0.pc.in
@@ -98,6 +98,5 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index 0a4a050af81..33b166f9398 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2005/08/04 21:11:48 rillig Exp $
+# $NetBSD: Makefile,v 1.63 2005/08/10 20:56:24 jlam Exp $
DISTNAME= mc-4.6.1
CATEGORIES= sysutils
@@ -9,6 +9,7 @@ MAINTAINER= pavel.arnost@clnet.cz
HOMEPAGE= http://www.ibiblio.org/mc/
COMMENT= User-friendly file manager and visual shell
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
@@ -39,5 +40,4 @@ PLIST_SRC+= ${PKGDIR}/PLIST
PLIST_SRC+= ${PKGDIR}/PLIST.end
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index c2d47765f95..52a0cf8729c 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:24 jlam Exp $
#
DISTNAME= nautilus-cd-burner-2.10.1
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes
USE_MSGFMT_PLURALS= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
@@ -42,7 +42,6 @@ GCONF2_SCHEMAS= ncb.schemas
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../sysutils/nautilus/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index 9b975694b9a..7298437ffec 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2005/08/10 20:56:24 jlam Exp $
#
DISTNAME= nautilus-2.10.1
@@ -12,7 +12,7 @@ COMMENT= Nautilus file manager for GNOME2
USE_PKGLOCALEDIR= yes
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
@@ -37,7 +37,6 @@ BUILDLINK_DEPENDS.startup-notification+= startup-notification>=0.8
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libgsf/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../graphics/libart2/buildlink3.mk"
.include "../../graphics/libexif/buildlink3.mk"
diff --git a/sysutils/rox-session/Makefile b/sysutils/rox-session/Makefile
index 5f7a4e824a3..faaa420ff6f 100644
--- a/sysutils/rox-session/Makefile
+++ b/sysutils/rox-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2005/08/10 20:56:24 jlam Exp $
#
DISTNAME= ROX-Session-0.1.14
@@ -17,11 +17,11 @@ DEPENDS+= rox>=1.2.0nb2:../../sysutils/rox
WRKSRC= ${WRKDIR}/${DISTNAME}/ROX-Session/src
DIST_SUBDIR= rox
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
INSTALLATION_DIRS= libexec/rox share/rox
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/sysutils/rox/Makefile b/sysutils/rox/Makefile
index cbc0086b092..47e971535d0 100644
--- a/sysutils/rox/Makefile
+++ b/sysutils/rox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/21 16:29:57 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:24 jlam Exp $
#
DISTNAME= rox-2.2.0
@@ -17,6 +17,7 @@ CONFLICTS= rox-base-[0-9]*
WRKSRC= ${WRKDIR}/${DISTNAME}/ROX-Filer/src
DIST_SUBDIR= rox
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
CONFIGURE_ENV+= APP_DIR=${WRKDIR}/${DISTNAME}/ROX-Filer
CONFIGURE_ARGS+= --enable-rox --with-platform=${OPSYS}-${MACHINE_ARCH}
@@ -52,7 +53,6 @@ do-install:
${PREFIX}/share/mime/packages
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/sysutils/vcdimager-devel/Makefile b/sysutils/vcdimager-devel/Makefile
index 50be338cec1..0a8ef8c0e8f 100644
--- a/sysutils/vcdimager-devel/Makefile
+++ b/sysutils/vcdimager-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2005/08/10 20:56:24 jlam Exp $
#
DISTNAME= vcdimager-0.7.22
@@ -9,7 +9,7 @@ MAINTAINER= ben@NetBSD.org
HOMEPAGE= http://www.vcdimager.org/
COMMENT= Mastering suite for Video CDs
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= YES
USE_LIBTOOL= yes
INFO_FILES= vcd-info.info vcdimager.info vcdxrip.info
@@ -22,7 +22,6 @@ BUILDLINK_TRANSFORM+= rm:-Wl,--version-script=libvcdinfo.la.ver
.endif
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../misc/libcdio/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 5e49e00d500..197b0753080 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2005/08/10 20:56:24 jlam Exp $
DISTNAME= xcdroast-0.98alpha15
PKGNAME= xcdroast-0.98a15
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
DEPENDS+= cdrecord-xcdroast-0.98a15.*:../../sysutils/cdrecord-xcdroast
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
@@ -51,7 +51,6 @@ post-install:
done)
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index 86335d49a59..1f40b764563 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:24 jlam Exp $
#
DISTNAME= enchant-1.1.6
@@ -9,6 +9,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.abisource.com/enchant/
COMMENT= Generic spell checking library
+USE_TOOLS+= pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= enchant.pc.in
@@ -16,6 +17,5 @@ GNU_CONFIGURE= yes
CFLAGS.SunOS+= -D__EXTENSIONS__
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/aspell/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index fed9f85b02d..81a2cd26b13 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/08/10 20:56:24 jlam Exp $
#
DISTNAME= gnome-doc-utils-0.2.0
@@ -13,6 +13,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
GNU_CONFIGURE= YES
USE_LANGUAGES= # empty
USE_PKGLOCALEDIR= YES
@@ -30,7 +31,6 @@ PYTHON_PATCH_SCRIPTS+= xml2po/xml2po.py
BUILDLINK_DEPMETHOD.libxslt?= build
BUILDLINK_DEPMETHOD.libxml2?= build
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../lang/python/application.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index 390cb00fc44..9f1d5dbd175 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:24 jlam Exp $
DISTNAME= gnome-spell-1.0.6
CATEGORIES= textproc gnome
@@ -12,7 +12,7 @@ COMMENT= Spell checking as you type like gtkspell
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.3
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
BUILDLINK_DEPENDS.libgnomeui+= libgnomeui>=2.8.0nb3
@@ -22,7 +22,6 @@ BUILDLINK_DEPENDS.libgnomeui+= libgnomeui>=2.8.0nb3
.include "../../devel/libbonoboui/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../textproc/aspell/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index d3e6b83dab7..e717c1cbb38 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/07/28 12:43:13 adam Exp $
+# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:24 jlam Exp $
DISTNAME= gtkspell-2.0.11
CATEGORIES= textproc devel
@@ -8,6 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://gtkspell.sourceforge.net/
COMMENT= Spell checking GtkTextView widget
+USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -20,7 +21,6 @@ SUBST_FILES.subdir= Makefile.in
SUBST_SED.subdir= -e 's|SUBDIRS = gtkspell examples docs|SUBDIRS = gtkspell|'
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/aspell/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index 0ccc5aba200..eb921d1434c 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:24 jlam Exp $
#
DISTNAME= libcroco-0.6.0
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.freespiders.org/projects/libcroco/
COMMENT= Toolkit to parse and manipulate CSS (Cascading Style Sheets)
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -23,6 +23,5 @@ CONFIGURE_ARGS+= --enable-layeng=yes
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/time/evolution-webcal/Makefile b/time/evolution-webcal/Makefile
index 2ff17d17b2b..155e9a67c77 100644
--- a/time/evolution-webcal/Makefile
+++ b/time/evolution-webcal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:24 jlam Exp $
#
DISTNAME= evolution-webcal-2.2.1
@@ -12,7 +12,7 @@ COMMENT= GNOME URL handler for web-published iCal calendar files
GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= YES
GCONF2_SCHEMAS= evolution-webcal.schemas
@@ -20,7 +20,6 @@ GCONF2_SCHEMAS= evolution-webcal.schemas
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mail/evolution-data-server/buildlink3.mk"
.include "../../net/libsoup-devel/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
diff --git a/time/gnotime/Makefile b/time/gnotime/Makefile
index 6eac6cfa9b2..a6c7745cf67 100644
--- a/time/gnotime/Makefile
+++ b/time/gnotime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:24 jlam Exp $
DISTNAME= gnotime-2.2.1
PKGREVISION= 1
@@ -11,7 +11,7 @@ COMMENT= Time tracker for GNOME2
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
@@ -23,7 +23,6 @@ GCONF2_SCHEMAS= gnotime.schemas
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../lang/guile/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/time/gtodo-applet/Makefile b/time/gtodo-applet/Makefile
index b1f4369472e..aab62a244e1 100644
--- a/time/gtodo-applet/Makefile
+++ b/time/gtodo-applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:24 jlam Exp $
#
DISTNAME= gtodo-applet-0.1
@@ -12,6 +12,7 @@ COMMENT= GNOME applet for the gtodo application
DEPENDS+= gtodo>=0.14:../../time/gtodo
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
USE_LIBTOOL= YES
@@ -19,6 +20,5 @@ USE_LIBTOOL= YES
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/time/gtodo/Makefile b/time/gtodo/Makefile
index 6625edf54be..af8fb59aa48 100644
--- a/time/gtodo/Makefile
+++ b/time/gtodo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:24 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
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= YES
GCONF2_SCHEMAS= gtodo.schemas
@@ -20,7 +20,6 @@ GCONF2_SCHEMAS= gtodo.schemas
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/wm/e16menuedit2/Makefile b/wm/e16menuedit2/Makefile
index 5a544deba8a..a8256136549 100644
--- a/wm/e16menuedit2/Makefile
+++ b/wm/e16menuedit2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:24 jlam Exp $
#
DISTNAME= e16menuedit2-0.0.1
@@ -14,7 +14,7 @@ DEPENDS+= enlightenment-0.16.*:../../wm/enlightenment
BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= automake
+USE_TOOLS+= automake pkg-config
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
@@ -23,7 +23,6 @@ pre-configure:
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/wm/matchbox/Makefile b/wm/matchbox/Makefile
index 470be170f4a..b6c4c5e2a38 100644
--- a/wm/matchbox/Makefile
+++ b/wm/matchbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/08/10 20:56:25 jlam Exp $
#
DISTNAME= matchbox-window-manager-0.9.3
@@ -10,6 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://projects.o-hand.com/matchbox/
COMMENT= Window manager designed for computers with small displays
+USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
@@ -25,7 +26,6 @@ post-install:
${PREFIX}/share/examples/matchbox/
.include "../../devel/libmatchbox/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/xpm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index c1f5f4c2abb..f6ed740d944 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2005/08/10 20:56:25 jlam Exp $
#
DISTNAME= metacity-2.10.2
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
USE_DIRS+= gnome2-1.5 theme-1.0
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
@@ -31,7 +31,6 @@ CONFIGURE_ARGS+= --disable-xinerama
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/wm/obconf/Makefile b/wm/obconf/Makefile
index a8f94cfd9de..ecaccc0c49d 100644
--- a/wm/obconf/Makefile
+++ b/wm/obconf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:25 jlam Exp $
DISTNAME= obconf-1.5
PKGREVISION= 5
@@ -9,6 +9,7 @@ MAINTAINER= snj@NetBSD.org
HOMEPAGE= http://www.openbox.org/obconf/
COMMENT= Tool for configuring the Openbox window manager
+USE_TOOLS+= pkg-config
USE_DIRS+= xdg-1.1
GNU_CONFIGURE= YES
@@ -16,6 +17,5 @@ GNU_CONFIGURE= YES
.include "../../wm/openbox/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile
index fc7b264ec17..d52eeef2792 100644
--- a/wm/openbox/Makefile
+++ b/wm/openbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:25 jlam Exp $
DISTNAME= openbox-3.2
PKGREVISION= 1
@@ -14,7 +14,7 @@ DEPENDS+= vera-ttf>=1.10:../../fonts/vera-ttf
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
@@ -32,7 +32,6 @@ CONF_FILES+= ${EGDIR}/rc.xml ${PKG_SYSCONFDIR}/openbox/rc.xml
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/startup-notification/buildlink3.mk"
diff --git a/wm/openbox2/Makefile b/wm/openbox2/Makefile
index 2624695b87b..e576d85a9bf 100644
--- a/wm/openbox2/Makefile
+++ b/wm/openbox2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:25 jlam Exp $
#
DISTNAME= openbox-2.2.3
@@ -12,11 +12,11 @@ COMMENT= Window manager based on Blackbox (2.x branch)
DEPENDS= bsetroot>=0.1nb1:../../wm/bsetroot
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
CPPFLAGS+= -DHAVE_STRFTIME=1
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/selectwm/Makefile b/wm/selectwm/Makefile
index e041f4ccc20..c337fc2359b 100644
--- a/wm/selectwm/Makefile
+++ b/wm/selectwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/08/10 20:56:25 jlam Exp $
#
DISTNAME= selectwm-0.4.1
@@ -9,9 +9,9 @@ MAINTAINER= reilles@loria.fr
HOMEPAGE= http://ordiluc.net/selectwm/
COMMENT= Simple GTK2 application to select window manager
-USE_PKGLOCALEDIR= yes
-GNU_CONFIGURE= yes
+USE_TOOLS+= pkg-config
+USE_PKGLOCALEDIR= yes
+GNU_CONFIGURE= yes
.include "../../x11/gtk2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/skippy/Makefile b/wm/skippy/Makefile
index d5810a823d7..a320ddd08bf 100644
--- a/wm/skippy/Makefile
+++ b/wm/skippy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/08/10 20:56:25 jlam Exp $
#
DISTNAME= skippy-0.5.0
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://thegraveyard.org/skippy.php
COMMENT= Fullscreen task switcher for X11
-
+USE_TOOLS+= pkg-config
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
INSTALLATION_DIRS= share/examples/${PKGBASE}
@@ -18,7 +18,6 @@ INSTALLATION_DIRS= share/examples/${PKGBASE}
post-install:
${INSTALL_DATA} ${WRKSRC}/skippyrc-default ${EGDIR}/skippyrc
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../graphics/imlib2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/waimea/Makefile b/wm/waimea/Makefile
index 11f4d189ed1..7ed4a00623c 100644
--- a/wm/waimea/Makefile
+++ b/wm/waimea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2005/08/10 20:56:25 jlam Exp $
#
DISTNAME= waimea-0.4.0
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.waimea.org/
COMMENT= Fast and highly customizable virtual window manager
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake perl:run
+USE_TOOLS+= gmake perl:run pkg-config
.include "../../mk/bsd.prefs.mk"
@@ -34,7 +34,6 @@ REPLACE_PERL = \
data/scripts/procinfo.pl \
data/scripts/stylesdir.pl.in
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/imlib2/buildlink3.mk"
diff --git a/wm/windowlab/Makefile b/wm/windowlab/Makefile
index 429387eaa32..55d9b512f0f 100644
--- a/wm/windowlab/Makefile
+++ b/wm/windowlab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:25 jlam Exp $
#
DISTNAME= windowlab-1.12
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.nickgravgaard.com/windowlab/
COMMENT= Small and simple window manager
USE_PKGINSTALL= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
PKG_SYSCONFSUBDIR= windowlab
@@ -23,7 +23,6 @@ post-install:
${INSTALL_DATA_DIR} ${EGDIR}
${INSTALL_DATA} ${WRKSRC}/menurc.sample ${EGDIR}/menurc.default
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/wm/wmctrl/Makefile b/wm/wmctrl/Makefile
index 65a6b81bca2..1d9572f80aa 100644
--- a/wm/wmctrl/Makefile
+++ b/wm/wmctrl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:25 jlam Exp $
DISTNAME= wmctrl-1.05
PKGREVISION= 1
@@ -9,11 +9,11 @@ MAINTAINER= snj@NetBSD.org
HOMEPAGE= http://sweb.cz/tripie/utils/wmctrl/
COMMENT= Command line interface to an EWMH-compliant WM
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap2-transform/Makefile b/www/ap2-transform/Makefile
index 9e573a9a60c..d83514c30af 100644
--- a/www/ap2-transform/Makefile
+++ b/www/ap2-transform/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:59 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:25 jlam Exp $
#
DISTNAME= mod_transform-0.4.0
@@ -11,12 +11,12 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.outoforder.cc/projects/apache/mod_transform/
COMMENT= Filter module for Apache 2.0 to do dynamic XSL transformations
+USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-apxs=${APXS}
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/libxslt/buildlink3.mk"
.include "../../www/apache2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index c83b2759b3d..44f57343163 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2005/08/10 12:05:52 adam Exp $
+# $NetBSD: Makefile,v 1.57 2005/08/10 20:56:25 jlam Exp $
DISTNAME= bluefish-1.0.2
CATEGORIES= www
@@ -17,7 +17,7 @@ DEPENDS+= weblint-[0-9]*:../../www/weblint
BUILD_USES_MSGFMT= yes
USE_DIRS+= xdg-1.1
-USE_TOOLS+= find gmake grep
+USE_TOOLS+= find gmake grep pkg-config
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-icon-path=${PREFIX}/share/pixmaps
@@ -29,7 +29,6 @@ CONFIGURE_ENV+= EXTERNAL_FIND="${TOOLS_FIND}"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../textproc/aspell/buildlink3.mk"
diff --git a/www/drivel/Makefile b/www/drivel/Makefile
index 3e96a2822ab..40978c18262 100644
--- a/www/drivel/Makefile
+++ b/www/drivel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/21 16:29:59 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/08/10 20:56:25 jlam Exp $
#
DISTNAME= drivel-2.0.1
@@ -12,7 +12,7 @@ COMMENT= LiveJournal client for the GNOME Desktop
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= YES
GCONF2_SCHEMAS= drivel.schemas
@@ -27,7 +27,6 @@ BUILDLINK_DEPENDS.curl+= curl>=7.14.0nb1
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 121acd27990..d9d27dc7ebd 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/22 14:12:22 dillo Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/10 20:56:25 jlam Exp $
#
DISTNAME= epiphany-extensions-1.6.4
@@ -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
+USE_TOOLS= gmake pkg-config
USE_LIBTOOL= YES
USE_MSGFMT_PLURALS= YES
USE_PKGLOCALEDIR= YES
@@ -41,7 +41,6 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/opensp/buildlink3.mk"
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 7df4e74f9db..ae8ce945888 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/07/21 16:29:59 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2005/08/10 20:56:25 jlam Exp $
#
DISTNAME= epiphany-1.6.4
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
USE_MSGFMT_PLURALS= YES
USE_PKGLOCALEDIR= YES
@@ -59,7 +59,6 @@ BUILDLINK_DEPENDS.pango+= pango>=1.8.0
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 36fd7a536e0..43d3c0d5940 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2005/07/21 16:29:59 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2005/08/10 20:56:25 jlam Exp $
#
DISTNAME= galeon-1.3.21
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes
CONFLICTS+= galeon-devel-[0-9]*
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
@@ -43,7 +43,6 @@ CONF_FILES= ${EGDIR}/sound/events/galeon.soundlist \
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
diff --git a/www/gtkhtml30/Makefile b/www/gtkhtml30/Makefile
index 389d08ef5fc..bd3cff19659 100644
--- a/www/gtkhtml30/Makefile
+++ b/www/gtkhtml30/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/21 16:29:59 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:25 jlam Exp $
#
DISTNAME= gtkhtml-3.0.10
@@ -12,7 +12,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Lightweight HTML rendering/printing/editing engine
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= src/libgtkhtml.pc.in
@@ -21,7 +21,6 @@ GNU_CONFIGURE= yes
.include "../../devel/gail/buildlink3.mk"
.include "../../devel/gal20/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../net/libsoup/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/gtkhtml36/Makefile b/www/gtkhtml36/Makefile
index a5320717f4c..d59d5923784 100644
--- a/www/gtkhtml36/Makefile
+++ b/www/gtkhtml36/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:29:59 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:25 jlam Exp $
#
DISTNAME= gtkhtml-3.6.2
@@ -11,7 +11,7 @@ MAINTAINER= recht@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Lightweight HTML rendering/printing/editing engine
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= src/libgtkhtml.pc.in
@@ -25,7 +25,6 @@ GNU_CONFIGURE= yes
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 1e6358d6634..0860921824b 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/07/21 16:29:59 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2005/08/10 20:56:25 jlam Exp $
#
DISTNAME= libgtkhtml-2.6.3
@@ -13,13 +13,12 @@ COMMENT= Lightweight HTML rendering GTK2 widget
BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE= libgtkhtml-2.0.pc.in
.include "../../devel/gail/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/www/liferea/Makefile b/www/liferea/Makefile
index c631cd7c59b..d07aa8a089e 100644
--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/21 16:29:59 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/08/10 20:56:25 jlam Exp $
DISTNAME= liferea-0.6.4
CATEGORIES= www
@@ -10,7 +10,7 @@ COMMENT= Simple FeedReader clone for reading RSS/RDF feeds
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
@@ -21,7 +21,6 @@ GCONF2_SCHEMAS= liferea.schemas
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../www/libgtkhtml/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 65e0e3d9113..68b88ba4d1b 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.61 2005/07/25 15:47:20 adam Exp $
+# $NetBSD: Makefile.common,v 1.62 2005/08/10 20:56:25 jlam Exp $
MOZ_DIST_VER?= ${MOZ_VER}
DISTNAME?= mozilla-${MOZ_DIST_VER}-source
@@ -15,7 +15,7 @@ BUILD_DEPENDS+= zip>=2.3:../../archivers/zip
WRKSRC= ${WRKDIR}/mozilla
USE_LANGUAGES= c c++
-USE_TOOLS+= autoconf213 gmake perl
+USE_TOOLS+= autoconf213 gmake perl pkg-config
GNU_CONFIGURE= yes
CONFIG_GUESS_OVERRIDE= build/autoconf/config.guess
@@ -54,7 +54,6 @@ UNLIMIT_RESOURCES= datasize memorysize stacksize
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.ifdef _MOZILLA_USE_GTK2
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../net/libIDL/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 --disable-gnomevfs
@@ -186,7 +185,6 @@ CONFIGURE_ARGS+= --with-pthreads
.if ${MOZILLA_USE_XFT} == "YES" && exists(${X11BASE}/include/X11/Xdefs.h)
CONFIGURE_ARGS+= --enable-xft
# pkgconfig defaults to a "build" dependency, which is what we want.
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
.endif
diff --git a/x11/Xcomposite/Makefile b/x11/Xcomposite/Makefile
index 55d3f6af21a..2ff10e6b553 100644
--- a/x11/Xcomposite/Makefile
+++ b/x11/Xcomposite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/21 16:29:59 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:25 jlam Exp $
#
DISTNAME= libXcomposite-1.0.1
@@ -12,6 +12,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://freedesktop.org/
COMMENT= Xcomposite extension (library)
+USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -20,5 +21,4 @@ PKGCONFIG_OVERRIDE+= xcomposite.pc.in
.include "../../x11/Xfixes/buildlink3.mk"
.include "../../x11/compositeext/buildlink3.mk"
.include "../../x11/fixesext/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xfixes/Makefile b/x11/Xfixes/Makefile
index 4a86d8899f5..bacefaa48f6 100644
--- a/x11/Xfixes/Makefile
+++ b/x11/Xfixes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:59 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:25 jlam Exp $
#
DISTNAME= libXfixes-2.0.1
@@ -14,12 +14,12 @@ COMMENT= X Fixes extension of X RandR
PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= xfixes.pc.in
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/fixesext/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xrandr-mixedcase/Makefile b/x11/Xrandr-mixedcase/Makefile
index fdf8d13bc2f..f3bff411ded 100644
--- a/x11/Xrandr-mixedcase/Makefile
+++ b/x11/Xrandr-mixedcase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:29:59 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:26 jlam Exp $
#
DISTNAME= libXrandr-1.0.2
@@ -14,6 +14,7 @@ COMMENT= X RandR extension (Library)
PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_TOOLS+= pkg-config
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -25,6 +26,5 @@ BUILDLINK_DEPENDS.randrext+= randrext>=1.0
.include "../../x11/Xrender/buildlink3.mk"
.include "../../x11/randrext/buildlink3.mk"
.include "../../x11/xextensions/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xrender/Makefile b/x11/Xrender/Makefile
index 1989f814c09..b4919ee529a 100644
--- a/x11/Xrender/Makefile
+++ b/x11/Xrender/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/07/21 16:29:59 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:26 jlam Exp $
DISTNAME= libXrender-0.8.4
PKGNAME= ${DISTNAME:S/lib//}
@@ -13,13 +13,13 @@ COMMENT= Client library for the X Rendering Extension protocol
PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_TOOLS+= pkg-config
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
PKGCONFIG_OVERRIDE= xrender.pc.in
BUILDLINK_DEPENDS.render+= render>=0.8
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/render/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/compositeext/Makefile b/x11/compositeext/Makefile
index 931b79ecfd9..57032328f02 100644
--- a/x11/compositeext/Makefile
+++ b/x11/compositeext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/07/21 16:29:59 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/08/10 20:56:26 jlam Exp $
#
DISTNAME= compositeext-2.0
@@ -12,11 +12,11 @@ COMMENT= Headers and specification for X Composite extension
PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= compositeext.pc.in
.include "../../x11/fixesext/buildlink3.mk"
.include "../../x11/xextensions/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/devilspie/Makefile b/x11/devilspie/Makefile
index 949acbc9265..fc7addebb70 100644
--- a/x11/devilspie/Makefile
+++ b/x11/devilspie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/21 16:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:26 jlam Exp $
DISTNAME= devilspie-0.10
CATEGORIES= x11
@@ -10,6 +10,7 @@ COMMENT= Window-matching utility to customize window behavior
BUILD_DEPENDS+= libxslt>=1.0:../../textproc/libxslt
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
@@ -23,7 +24,6 @@ post-install:
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../devel/libwnck/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index 65f2f1be0c0..fd3435d0696 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:26 jlam Exp $
#
DISTNAME= fbdesk-1.2.1
@@ -10,6 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://fluxbox.sourceforge.net/fbdesk/
COMMENT= Application that creates and manage icons on your desktop
+USE_TOOLS+= pkg-config
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
@@ -20,5 +21,4 @@ post-install:
.include "../../converters/libiconv/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/fixesext/Makefile b/x11/fixesext/Makefile
index 773f5bf9d17..336348a843b 100644
--- a/x11/fixesext/Makefile
+++ b/x11/fixesext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/21 16:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/08/10 20:56:26 jlam Exp $
#
DISTNAME= fixesext-2.0.1
@@ -12,10 +12,10 @@ COMMENT= X Fixes extension headers and specification
PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= fixesext.pc.in
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index c8ddc9d73a2..4fe794c9b09 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2005/07/21 16:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2005/08/10 20:56:26 jlam Exp $
#
DISTNAME= gdm-2.8.0.0
@@ -25,7 +25,7 @@ USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
PKG_OPTIONS_VAR= PKG_OPTIONS.gdm
PKG_SUPPORTED_OPTIONS= inet6 pam
@@ -121,7 +121,6 @@ post-install:
${INSTALL_DATA} ${DISTDIR}/Daemon.png ${PREFIX}/share/pixmaps
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 7b5858479a6..11371b4fd14 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/07/21 16:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2005/08/10 20:56:26 jlam Exp $
#
DISTNAME= gnome-desktop-2.10.2
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake perl:run
+USE_TOOLS+= gmake perl:run pkg-config
USE_LIBTOOL= yes
BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
@@ -23,7 +23,6 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../graphics/gnome2-pixmaps/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile
index 03a5be54144..97059bcb540 100644
--- a/x11/gnome-mag/Makefile
+++ b/x11/gnome-mag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/07/21 16:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:26 jlam Exp $
#
DISTNAME= gnome-mag-0.12.0
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= GNOME screen magnifier
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -22,7 +22,6 @@ PKGCONFIG_OVERRIDE+= gnome-mag-1.0.pc.in
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 62a8df4c04c..5e588529260 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2005/07/21 16:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2005/08/10 20:56:26 jlam Exp $
#
DISTNAME= gnome-panel-2.10.2
@@ -12,7 +12,7 @@ COMMENT= GNOME2 panel application
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake perl:run
+USE_TOOLS+= gmake perl:run pkg-config
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= libpanel-applet/libpanelapplet-2.0.pc.in
@@ -44,7 +44,6 @@ BUILDLINK_DEPENDS.libglade2+= libglade2>=2.5.0
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libwnck/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/gnome-icon-theme/buildlink3.mk"
.include "../../mail/evolution-data-server/buildlink3.mk"
.include "../../net/ORBit2/buildlink3.mk"
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 75ea6d71148..21d7aee8065 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2005/07/21 16:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2005/08/10 20:56:26 jlam Exp $
#
DISTNAME= gnome-session-2.10.0
@@ -18,7 +18,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl pkg-config
USE_LIBTOOL= yes
MAKE_ENV+= REAL_GCONFTOOL="${GCONFTOOL2}"
@@ -40,7 +40,6 @@ BUILDLINK_DEPENDS.gnome-vfs2+= gnome-vfs2>=2.8.3nb1
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../security/gnome-keyring/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/scrollkeeper/buildlink3.mk"
diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile
index 0d8c628c6ce..34b2983f83e 100644
--- a/x11/gnome-themes-extras/Makefile
+++ b/x11/gnome-themes-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:26 jlam Exp $
#
DISTNAME= gnome-themes-extras-0.8.1
@@ -20,14 +20,13 @@ USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED
BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/gtk2-engines/buildlink3.mk"
diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile
index 3c440989cd3..aee1295e3b7 100644
--- a/x11/gnome-themes/Makefile
+++ b/x11/gnome-themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/07/21 16:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2005/08/10 20:56:26 jlam Exp $
#
DISTNAME= gnome-themes-2.10.1
@@ -13,14 +13,13 @@ COMMENT= Collection of themes and icons for GNOME 2
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5 theme-1.0
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../wm/metacity/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index 9eb2b5fdabd..240ac7eb8a4 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/07/21 16:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2005/08/10 20:56:26 jlam Exp $
#
DISTNAME= gnome-applets-2.10.1
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
@@ -80,7 +80,6 @@ BUILDLINK_DEPENDS.libglade2+= libglade2>=2.4.0
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/libwnck/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../fonts/gucharmap/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../multimedia/gstreamer/buildlink3.mk"
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index b148f2c1ced..631c40b5b87 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/07/21 16:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2005/08/10 20:56:26 jlam Exp $
#
DISTNAME= control-center-2.10.1
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
CONFIGURE_ARGS+= --disable-alsa
@@ -51,7 +51,6 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile
index 8eb0a69e1b1..d3e3df571bd 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/07/21 16:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2005/08/10 20:56:26 jlam Exp $
#
DISTNAME= gnome-terminal-2.10.0
@@ -18,7 +18,7 @@ CONFLICTS= gnome-core-[0-9]*
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl pkg-config
USE_LIBTOOL= YES
GCONF2_SCHEMAS= gnome-terminal.schemas
@@ -29,7 +29,6 @@ BUILDLINK_DEPENDS.startup-notification+= startup-notification>=0.8
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../sysutils/gnome-vfs2/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index 8f6e4bc7093..5114462ce32 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/07/21 16:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2005/08/10 20:56:26 jlam Exp $
#
DISTNAME= gnopernicus-0.10.6
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= Collection of accessibility apps for GNOME 2
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
@@ -59,7 +59,6 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.4.1
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../textproc/scrollkeeper/omf.mk"
diff --git a/x11/gnustep-back/Makefile b/x11/gnustep-back/Makefile
index 2fef66b732a..54c7d85f957 100644
--- a/x11/gnustep-back/Makefile
+++ b/x11/gnustep-back/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/07/29 12:59:50 adam Exp $
+# $NetBSD: Makefile,v 1.28 2005/08/10 20:56:26 jlam Exp $
DISTNAME= gnustep-back-0.10.0
CATEGORIES= x11 gnustep
@@ -8,12 +8,12 @@ MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.gnustep.org/
COMMENT= X11 AppKit backend for GNUstep
+USE_TOOLS+= pkg-config
CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/libexec/GNUstep
pre-install:
${INSTALL_DATA_DIR} ${GNUSTEP_SYSTEM_ROOT}/Library/Fonts
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/glitz/buildlink3.mk"
diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile
index 50b21b75397..31c6f7716bd 100644
--- a/x11/gromit/Makefile
+++ b/x11/gromit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/07/21 16:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/08/10 20:56:26 jlam Exp $
#
DISTNAME= gromit-20041213
@@ -9,6 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.home.unix-ag.org/simon/gromit/
COMMENT= Text marker tool for the X11 screen
+USE_TOOLS+= pkg-config
INSTALLATION_DIRS= bin
do-install:
@@ -16,6 +17,5 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gromit
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gromit
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk-thinice-engine/Makefile b/x11/gtk-thinice-engine/Makefile
index f267ce771a5..36e1c51c93e 100644
--- a/x11/gtk-thinice-engine/Makefile
+++ b/x11/gtk-thinice-engine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/21 16:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/10 20:56:29 jlam Exp $
#
DISTNAME= gtk-thinice-engine-2.0.2
@@ -14,7 +14,7 @@ COMMENT= Simple, clean theme engine
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
@@ -22,7 +22,6 @@ GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE= gtk-thinice-engine-2.pc.in
.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk2-chtheme/Makefile b/x11/gtk2-chtheme/Makefile
index ef91ff70310..501531979da 100644
--- a/x11/gtk2-chtheme/Makefile
+++ b/x11/gtk2-chtheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/21 16:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:29 jlam Exp $
#
DISTNAME= gtk-chtheme-0.3.1
@@ -11,9 +11,8 @@ MAINTAINER= kirtai@users.sourceforge.net
HOMEPAGE= http://plasmasturm.org/programs/gtk-chtheme/
COMMENT= GTK+2 theme changer with preview
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl pkg-config
REPLACE_PERL= replace
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk2-engines-bluecurve/Makefile b/x11/gtk2-engines-bluecurve/Makefile
index cd0bd576e6e..427a111422f 100644
--- a/x11/gtk2-engines-bluecurve/Makefile
+++ b/x11/gtk2-engines-bluecurve/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/27 16:21:17 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:29 jlam Exp $
#
DISTNAME= GTK2-Wonderland-Engine-1.0
@@ -14,12 +14,11 @@ COMMENT= Port of famous Bluecurve theme for GTK2+
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
WRKSRC= ${WRKDIR}/Bluecurve
SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile
index 84ae368d843..ac66b9bbce8 100644
--- a/x11/gtk2-engines/Makefile
+++ b/x11/gtk2-engines/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/07/21 16:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2005/08/10 20:56:29 jlam Exp $
DISTNAME= gtk-engines-2.6.3
PKGNAME= ${DISTNAME:S/gtk/gtk2/}
@@ -17,12 +17,12 @@ CONFLICTS+= gnome-themes-extras<0.8
BUILDLINK_DEPENDS.gtk2+= gtk2+>=2.6.4
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
USE_DIRS+= theme-1.1 xdg-1.1
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE= gtk-engines-2.pc.in
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk2-theme-switch/Makefile b/x11/gtk2-theme-switch/Makefile
index dac91e877ec..d9fe1d66ac7 100644
--- a/x11/gtk2-theme-switch/Makefile
+++ b/x11/gtk2-theme-switch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/07/27 16:21:17 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/10 20:56:29 jlam Exp $
#
DISTNAME= gtk-theme-switch-2.0.0rc2
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.muhri.net/
COMMENT= Allows quick & easy switching of GTK+ 2.x themes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
INSTALLATION_DIRS= bin man/man1
@@ -22,6 +22,5 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/switch.1 \
${PREFIX}/man/man1/gtk2-theme-switch.1
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 4a04a217caa..0e2eb1d8107 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2005/08/03 19:42:20 xtraeme Exp $
+# $NetBSD: Makefile,v 1.89 2005/08/10 20:56:29 jlam Exp $
#
DISTNAME= gtk+-2.6.9
@@ -24,7 +24,7 @@ BUILDLINK_DEPENDS.Xft2+= Xft2>=2.1.2nb2
USE_DIRS+= xdg-1.1
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= yes
PTHREAD_AUTO_VARS= yes
@@ -76,7 +76,6 @@ _BUILDING_GTK2= yes
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
diff --git a/x11/gtkglarea2/Makefile b/x11/gtkglarea2/Makefile
index a6bc3a5a281..8ccf01d132e 100644
--- a/x11/gtkglarea2/Makefile
+++ b/x11/gtkglarea2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/07/21 16:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/08/10 20:56:29 jlam Exp $
#
DISTNAME= gtkglarea-1.99.0
@@ -12,14 +12,14 @@ MAINTAINER= recht@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= OpenGL widget for the GTK+2 GUI toolkit
-USE_LIBTOOL= YES
+USE_TOOLS+= pkg-config
+USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= gtkgl-2.0.pc.in
-GNU_CONFIGURE= YES
+GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-lib-GL
CONFIGURE_ARGS+= --with-GL-prefix=${BUILDLINK_PREFIX.MesaLib}
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/Mesa/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index 59035054663..a3b5563dc1f 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/07/28 12:29:43 adam Exp $
+# $NetBSD: Makefile,v 1.29 2005/08/10 20:56:29 jlam Exp $
DISTNAME= gtkmm-2.6.4
CATEGORIES= x11
@@ -11,7 +11,7 @@ COMMENT= C++ interface to Gtk+ v2
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
-USE_TOOLS+= gmake perl:run
+USE_TOOLS+= gmake perl:run pkg-config
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE= atk/atkmm-1.6.pc.in
@@ -20,6 +20,5 @@ PKGCONFIG_OVERRIDE+= gtk/gtkmm-2.4.pc.in
PKGCONFIG_OVERRIDE+= pango/pangomm-1.4.pc.in
.include "../../devel/glibmm/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile
index c087961cc29..e44ab3e5ff1 100644
--- a/x11/gtksourceview/Makefile
+++ b/x11/gtksourceview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/07/21 16:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:29 jlam Exp $
#
DISTNAME= gtksourceview-1.2.0
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_TOOLS+= gmake perl
+USE_TOOLS+= gmake perl pkg-config
PKGCONFIG_OVERRIDE= gtksourceview-1.0.pc.in
@@ -25,7 +25,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 "../../devel/pkg-config/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
diff --git a/x11/gtkterm2/Makefile b/x11/gtkterm2/Makefile
index c4aa56c55c5..1836e34dd5a 100644
--- a/x11/gtkterm2/Makefile
+++ b/x11/gtkterm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:29 jlam Exp $
DISTNAME= gtkterm2-0.2.3
CATEGORIES= x11
@@ -8,11 +8,11 @@ MAINTAINER= yui@yui.pe.kr
HOMEPAGE= http://gtkterm.feige.net/
COMMENT= Simple GTK-2 terminal with tabs
+USE_TOOLS+= pkg-config
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/vte/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index cdea14d6871..0eaefc32793 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2005/07/30 11:10:08 markd Exp $
+# $NetBSD: Makefile,v 1.86 2005/08/10 20:56:29 jlam Exp $
DISTNAME= kdebase-${_KDE_VERSION}
CATEGORIES= x11
@@ -14,6 +14,7 @@ SITES_NetBSD-flag.png= http://www.NetBSD.org/images/
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
+USE_TOOLS+= pkg-config
USE_DIRS+= xdg-1.2
USE_PKGINSTALL= YES
@@ -155,7 +156,6 @@ CONFIGURE_ENV+= kde_cv_path_fontconfig_config='NONE'
.if ${OPSYS} != "SunOS"
.include "../../devel/libusb/buildlink3.mk"
.endif
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
.include "../../graphics/openexr/buildlink3.mk"
diff --git a/x11/lablgtk2/Makefile b/x11/lablgtk2/Makefile
index ba75f68e2ba..cbbd8f50396 100644
--- a/x11/lablgtk2/Makefile
+++ b/x11/lablgtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/21 16:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/10 20:56:29 jlam Exp $
#
DISTNAME= lablgtk-2.4.0
@@ -11,13 +11,12 @@ HOMEPAGE= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/
COMMENT= GTK+ 2.x bindings for Objective Caml
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
BUILDLINK_DEPMETHOD.ocaml= full
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../graphics/librsvg2/buildlink3.mk"
.include "../../lang/ocaml/buildlink3.mk"
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index ccee65127b2..af165e61853 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/21 16:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:29 jlam Exp $
#
DISTNAME= libxklavier-2.0
@@ -11,6 +11,7 @@ COMMENT= High-level API for the X Keyboard Extension (XKB)
PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
@@ -21,7 +22,6 @@ CONFIGURE_ARGS+= --enable-xmm-support
BUILDLINK_TRANSFORM+= rm:-Werror
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/libzvt/Makefile b/x11/libzvt/Makefile
index 2e623c18a8a..7fe5407eed4 100644
--- a/x11/libzvt/Makefile
+++ b/x11/libzvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/21 16:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/08/10 20:56:29 jlam Exp $
#
DISTNAME= libzvt-2.0.1
@@ -12,12 +12,11 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= Virtual Terminal Widget Library for GNOME2
GNU_CONFIGURE= YES
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= libzvt/libzvt-2.0.pc.in
.include "../../graphics/libart2/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 044ad89af8c..ce7a466f94b 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/07/21 16:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2005/08/10 20:56:29 jlam Exp $
DISTNAME= mlterm-2.9.2
PKGREVISION= 1
@@ -12,6 +12,7 @@ COMMENT= Multilingual terminal emulator
# CODESET is only supported on NetBSD in 1.5T and later - see <langinfo.h>
NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-* NetBSD-1.5[A-S]-*
+USE_TOOLS+= pkg-config
USE_PKGINSTALL= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -46,7 +47,6 @@ SUBST_SED.link= -e 's|(LIBTOOL_LINK).*(LIBS)|& -R${X11BASE}/lib|g' \
-e 's|/usr/local/|${PREFIX}/|g' \
-e 's|/usr/X11R6/|${X11BASE}/|g'
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/x11/py-gnome2-extras/Makefile b/x11/py-gnome2-extras/Makefile
index 0a89952f74e..debbd871b3c 100644
--- a/x11/py-gnome2-extras/Makefile
+++ b/x11/py-gnome2-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/07/21 16:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/08/10 20:56:29 jlam Exp $
#
DISTNAME= gnome-python-extras-2.10.1
@@ -16,13 +16,13 @@ USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE+= gnome-python-extras-2.0.pc.in
GNU_CONFIGURE= YES
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
+USE_TOOLS+= pkg-config
PYTHON_VERSIONS_ACCEPTED= 24 23
.include "../../lang/python/extension.mk"
.include "../../lang/python/application.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/gnome-panel/buildlink3.mk"
.include "../../www/libgtkhtml/buildlink3.mk"
.include "../../print/libgnomeprint/buildlink3.mk"
diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile
index bf8dc561491..2f08ff58937 100644
--- a/x11/py-gnome2/Makefile
+++ b/x11/py-gnome2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/21 16:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/08/10 20:56:29 jlam Exp $
#
DISTNAME= gnome-python-2.10.0
@@ -16,6 +16,7 @@ USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE+= gnome-python-2.0.pc.in
GNU_CONFIGURE= YES
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
+USE_TOOLS+= pkg-config
PYTHON_VERSIONS_ACCEPTED= 24 23
@@ -28,7 +29,6 @@ BUILDLINK_DEPENDS.GConf2+= GConf2>=2.9.0
.include "../../devel/libbonoboui/buildlink3.mk"
.include "../../devel/libgnome/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
BUILDLINK_DEPENDS.pyorbit+= ${PYPKGPREFIX}-ORBit>=2.0.1
.include "../../net/py-ORBit/buildlink3.mk"
diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index 7487d3139b5..892802afca4 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/07/21 16:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/08/10 20:56:29 jlam Exp $
#
DISTNAME= pygtk-2.6.2
@@ -18,12 +18,11 @@ USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE+= pygtk-2.0.pc.in pygobject-2.0.pc.in
GNU_CONFIGURE= YES
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
PYTHON_VERSIONS_ACCEPTED= 24 23
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../lang/python/extension.mk"
.include "../../lang/python/application.mk"
.include "../../math/py-Numeric/buildlink3.mk"
diff --git a/x11/py-wxWidgets/Makefile b/x11/py-wxWidgets/Makefile
index 08e60eea896..e9b01dd2a67 100644
--- a/x11/py-wxWidgets/Makefile
+++ b/x11/py-wxWidgets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/08/07 11:31:32 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:29 jlam Exp $
#
DISTNAME= wxPythonSrc-2.4.2.4
@@ -12,7 +12,7 @@ HOMEPAGE= http://wxpython.org/
COMMENT= wxPython: Python bindings for wxWidgets
WRKSRC= ${WRKDIR}/wxPythonSrc-2.4.2.4/wxPython
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
# previous name of the package
CONFLICTS+= ${PYPKGPREFIX}-wxWindows-[0-9]*
@@ -30,7 +30,6 @@ PYSETUPBUILDARGS= NO_SCRIPTS=1 ${WXARG}
PYSETUPINSTALLARGS= NO_SCRIPTS=1 ${WXARG}
PYBINMODULE= yes
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/wxGTK24/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../lang/python/extension.mk"
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index 9a92b16a026..91bb1edabb4 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:30 jlam Exp $
DISTNAME= startup-notification-0.8
CATEGORIES= x11 gnome
@@ -11,6 +11,7 @@ COMMENT= X11 application startup notification library
PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
@@ -22,6 +23,5 @@ post-install:
doc/startup-notification.txt \
${PREFIX}/share/doc/startup-notification/
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../mk/x11.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index 47356b8f5e4..c2022514ba9 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/07/21 16:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2005/08/10 20:56:30 jlam Exp $
#
DISTNAME= vte-0.11.13
@@ -17,7 +17,7 @@ USE_DIRS+= gnome2-1.2
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
CONFIGURE_ARGS+= --disable-gtk-doc
CONFIGURE_ARGS+= --disable-python
@@ -31,7 +31,6 @@ BUILDLINK_DEPENDS.fontconfig+= fontconfig>=2.1.93
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../fonts/Xft2/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
.include "../../graphics/freetype2/buildlink3.mk"
diff --git a/x11/wxGTK/Makefile.common b/x11/wxGTK/Makefile.common
index 2fbc848c69c..53c5f5b673b 100644
--- a/x11/wxGTK/Makefile.common
+++ b/x11/wxGTK/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2005/08/07 11:26:17 wiz Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/08/10 20:56:30 jlam Exp $
#
DISTNAME= wxGTK-2.6.1
@@ -12,6 +12,7 @@ HOMEPAGE= http://www.wxwidgets.org/
PATCHDIR= ${.CURDIR}/../../x11/wxGTK/patches
DISTINFO_FILE= ${.CURDIR}/../../x11/wxGTK/distinfo
+USE_TOOLS+= pkg-config
USE_PKGLOCALEDIR= YES
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
@@ -28,7 +29,6 @@ CPPFLAGS+= -Dunix=1 # src/common/unzip.c needs this
DOCDIR= ${PREFIX}/share/doc/wxGTK
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
diff --git a/x11/wxGTK24/Makefile.common b/x11/wxGTK24/Makefile.common
index ce8210c72ed..497e18f82ad 100644
--- a/x11/wxGTK24/Makefile.common
+++ b/x11/wxGTK24/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2005/08/07 11:27:28 wiz Exp $
+# $NetBSD: Makefile.common,v 1.2 2005/08/10 20:56:30 jlam Exp $
#
DISTNAME= wxGTK-2.4.2
@@ -13,6 +13,7 @@ HOMEPAGE= http://www.wxwidgets.org/
PATCHDIR= ${.CURDIR}/../../x11/wxGTK24/patches
DISTINFO_FILE= ${.CURDIR}/../../x11/wxGTK24/distinfo
+USE_TOOLS+= pkg-config
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
USE_LANGUAGES= c c++
@@ -37,7 +38,6 @@ CONFIGURE_ARGS+= --with-gtk
CONFIGURE_ARGS+= --enable-gtk2
PLIST_SUBST+= GTKVER=2
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
diff --git a/x11/xcompmgr/Makefile b/x11/xcompmgr/Makefile
index 1185907e7c1..6755171f9b0 100644
--- a/x11/xcompmgr/Makefile
+++ b/x11/xcompmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/21 16:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/10 20:56:30 jlam Exp $
#
DISTNAME= xcompmgr-1.1.1
@@ -9,6 +9,7 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://www.freedesktop.org/
COMMENT= Sample compositing manager for X.org >= 6.8.0
+USE_TOOLS+= pkg-config
GNU_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
@@ -18,7 +19,6 @@ GNU_CONFIGURE= yes
PKG_SKIP_REASON+= "This package is exclusively for X.org."
.endif
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/Xcomposite/buildlink3.mk"
.include "../../x11/Xrender/buildlink3.mk"
.include "../../x11/compositeext/buildlink3.mk"
diff --git a/x11/xcursor/Makefile b/x11/xcursor/Makefile
index acf8e952b2d..c8cbfde18a0 100644
--- a/x11/xcursor/Makefile
+++ b/x11/xcursor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/21 16:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:30 jlam Exp $
#
DISTNAME= libXcursor-1.1.2
@@ -13,6 +13,7 @@ COMMENT= Client-side cursor loading library for X
PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_TOOLS+= pkg-config
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
@@ -21,7 +22,6 @@ PKGCONFIG_OVERRIDE+= xcursor.pc.in
BUILDLINK_DEPENDS.Xrender+= Xrender>=0.8
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../x11/Xfixes/buildlink3.mk"
.include "../../x11/Xrender/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xscreensaver-demo/Makefile b/x11/xscreensaver-demo/Makefile
index 89f6b12fb22..10399a5f3a1 100644
--- a/x11/xscreensaver-demo/Makefile
+++ b/x11/xscreensaver-demo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/21 16:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:30 jlam Exp $
#
PKGNAME= ${DISTNAME:S/-/-demo-/}
@@ -10,6 +10,8 @@ USE_DIRS+= xdg-1.1
.include "../../x11/xscreensaver/Makefile.common"
+USE_TOOLS+= pkg-config
+
CONFIGURE_ARGS+= --with-gtk=${BUILDLINK_PREFIX.gtk2}
CONFIGURE_ARGS+= --with-xml=${BUILDLINK_PREFIX.libxml2}
CONFIGURE_ARGS+= --with-configdir=${PREFIX}/libexec/xscreensaver/config
@@ -24,7 +26,6 @@ post-install:
${PREFIX}/man/man1/xscreensaver-demo.1
.include "../../devel/libglade2/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../textproc/libxml2/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/xscreensaver/buildlink3.mk"
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 42b7e239726..4c807e867dc 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/07/21 16:30:01 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2005/08/10 20:56:30 jlam Exp $
#
DISTNAME= zenity-2.10.0
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_TOOLS+= gmake
+USE_TOOLS+= gmake pkg-config
BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
@@ -24,7 +24,6 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/libglade2/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
-.include "../../devel/pkg-config/buildlink3.mk"
.include "../../devel/popt/buildlink3.mk"
.include "../../graphics/libgnomecanvas/buildlink3.mk"
.include "../../textproc/intltool/buildlink3.mk"