pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Remove the abuse of buildlink that was pkg-config/buil...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bdb4b4e8e063
branches:  trunk
changeset: 498039:bdb4b4e8e063
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Aug 10 20:56:10 2005 +0000

description:
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.

diffstat:

 archivers/file-roller/Makefile                    |   5 +-
 archivers/libcomprex/Makefile                     |   4 +-
 audio/amarok/Makefile                             |   5 +-
 audio/arts/Makefile                               |   5 +-
 audio/aumix-gtk/Makefile                          |   5 +-
 audio/bmp-musepack/Makefile                       |   4 +-
 audio/bmp/Makefile.common                         |   4 +-
 audio/gkrellm-volume/Makefile                     |   5 +-
 audio/gkrellm-xmms/Makefile                       |   5 +-
 audio/gmpc/Makefile                               |   4 +-
 audio/gnome-speech/Makefile                       |   5 +-
 audio/goom/Makefile                               |   4 +-
 audio/gqmpeg-devel/Makefile                       |   4 +-
 audio/libao/Makefile.common                       |   5 +-
 audio/libcdaudio/Makefile                         |   4 +-
 audio/libcddb/Makefile                            |   4 +-
 audio/libid3tag/Makefile                          |   4 +-
 audio/libmad/Makefile                             |   4 +-
 audio/libopendaap/Makefile                        |   5 +-
 audio/libvisual-bmp/Makefile                      |   4 +-
 audio/libvisual-plugins/Makefile                  |   4 +-
 audio/libvisual-xmms/Makefile                     |   4 +-
 audio/libvisual/Makefile                          |   4 +-
 audio/liteamp/Makefile                            |   5 +-
 audio/muse/Makefile                               |   7 +-
 audio/musicbrainz/Makefile                        |   5 +-
 audio/ncmpc/Makefile                              |   5 +-
 audio/rhythmbox/Makefile                          |   5 +-
 audio/speex/Makefile                              |   4 +-
 audio/streamtuner/Makefile                        |   5 +-
 audio/sweep/Makefile                              |   5 +-
 audio/tunesbrowser/Makefile                       |   4 +-
 audio/xmms-faad/Makefile                          |   5 +-
 audio/xmms-mad/Makefile                           |   4 +-
 audio/xmms-modplug/Makefile                       |   4 +-
 audio/xmms-musepack/Makefile                      |   4 +-
 cad/gattrib/Makefile                              |   4 +-
 cad/geda-utils/Makefile                           |   5 +-
 cad/geda/Makefile                                 |   4 +-
 cad/gnetlist/Makefile                             |   7 +-
 cad/gschem/Makefile                               |   4 +-
 cad/gsmc/Makefile                                 |   5 +-
 cad/gsymcheck/Makefile                            |   4 +-
 cad/libgeda/Makefile                              |   4 +-
 cad/transcalc/Makefile                            |   5 +-
 chat/bitlbee/Makefile                             |   5 +-
 chat/ekg/Makefile                                 |   5 +-
 chat/gaim/Makefile                                |   5 +-
 chat/gg2/Makefile                                 |   5 +-
 chat/gnomeicu/Makefile                            |   5 +-
 chat/gossip/Makefile                              |   5 +-
 chat/irssi/Makefile                               |   4 +-
 chat/loudmouth/Makefile                           |   5 +-
 chat/mu-conference/Makefile                       |   5 +-
 chat/xchat-systray-integration/Makefile           |   5 +-
 chat/xchat/Makefile.common                        |   5 +-
 comms/jpilot-syncmal/Makefile                     |   5 +-
 comms/jpilot/Makefile                             |   4 +-
 converters/fribidi/Makefile                       |   4 +-
 converters/wv/Makefile                            |   5 +-
 converters/wv2/Makefile                           |   4 +-
 databases/dbh/Makefile                            |   4 +-
 databases/gq/Makefile                             |   4 +-
 databases/gramps/Makefile                         |   4 +-
 databases/gramps2/Makefile                        |   4 +-
 databases/libgda/Makefile.common                  |   5 +-
 databases/libgnomedb/Makefile                     |   5 +-
 databases/mergeant/Makefile                       |   5 +-
 databases/rrdtool/Makefile                        |   5 +-
 databases/shared-mime-info/Makefile               |   4 +-
 devel/ArX/Makefile                                |   4 +-
 devel/ArX2/Makefile                               |   4 +-
 devel/GConf2/Makefile.common                      |   6 +-
 devel/anjuta/Makefile                             |   6 +-
 devel/at-spi/Makefile                             |   5 +-
 devel/atk/Makefile                                |   5 +-
 devel/blib/Makefile                               |   5 +-
 devel/coconut/Makefile                            |   4 +-
 devel/devhelp/Makefile                            |   5 +-
 devel/eel2/Makefile                               |   5 +-
 devel/eet/Makefile                                |   4 +-
 devel/g-wrap/Makefile                             |   5 +-
 devel/gail/Makefile                               |   5 +-
 devel/gal2/Makefile                               |   5 +-
 devel/gal20/Makefile                              |   5 +-
 devel/gconfmm/Makefile                            |   5 +-
 devel/glade2/Makefile.common                      |   5 +-
 devel/glib2/Makefile                              |   5 +-
 devel/glibmm/Makefile                             |   5 +-
 devel/gnome2-libole2/Makefile                     |   4 +-
 devel/gob2/Makefile                               |   4 +-
 devel/libbonobo/Makefile                          |   5 +-
 devel/libbonoboui/Makefile                        |   5 +-
 devel/libgail-gnome/Makefile                      |   4 +-
 devel/libglade2/Makefile                          |   5 +-
 devel/libglademm/Makefile                         |   5 +-
 devel/libgnome/Makefile                           |   5 +-
 devel/libgnomemm/Makefile                         |   5 +-
 devel/libgnomeui/Makefile                         |   5 +-
 devel/libgnomeuimm/Makefile                       |   5 +-
 devel/libgphoto2/Makefile                         |   4 +-
 devel/libgsf/Makefile                             |   4 +-
 devel/libidn/Makefile                             |   4 +-
 devel/libmatchbox/Makefile                        |   4 +-
 devel/libntlm/Makefile                            |   4 +-
 devel/libstatgrab/Makefile                        |   4 +-
 devel/libwnck/Makefile                            |   5 +-
 devel/ogre/Makefile                               |   5 +-
 devel/p5-ExtUtils-PkgConfig/Makefile              |   4 +-
 devel/p5-glib2/Makefile                           |   5 +-
 devel/pango/Makefile                              |   5 +-
 devel/pkg-config/buildlink3.mk                    |  26 -----------
 editors/abiword/Makefile.common                   |   5 +-
 editors/conglomerate/Makefile                     |   5 +-
 editors/dasher/Makefile                           |   5 +-
 editors/gconf-editor/Makefile                     |   5 +-
 editors/gedit/Makefile                            |   5 +-
 editors/gice/Makefile                             |   5 +-
 editors/gtranslator/Makefile                      |   5 +-
 editors/leafpad/Makefile                          |   4 +-
 editors/mlview/Makefile                           |   5 +-
 emulators/blinkensim/Makefile                     |   4 +-
 emulators/ckmame/Makefile                         |   4 +-
 emulators/fuse/Makefile                           |   5 +-
 finance/gkrellm-stock/Makefile                    |   4 +-
 finance/gnucash/Makefile                          |   5 +-
 fonts/Xft2/Makefile                               |   5 +-
 fonts/gucharmap/Makefile                          |   5 +-
 games/asc/Makefile                                |   5 +-
 games/ccgo/Makefile                               |   4 +-
 games/crack-attack/Makefile                       |   4 +-
 games/freeciv-client-gtk2/Makefile                |   4 +-
 games/gnocatan/Makefile                           |   5 +-
 games/gnome2-games/Makefile                       |   5 +-
 games/grhino/Makefile                             |   4 +-
 games/gtetrinet/Makefile                          |   5 +-
 games/gtkmagnetic/Makefile                        |   5 +-
 games/gturing/Makefile                            |   5 +-
 games/sirius/Makefile                             |   5 +-
 games/wesnoth/Makefile                            |   4 +-
 graphics/blinkenthemes/Makefile                   |   5 +-
 graphics/blinkentools/Makefile                    |   4 +-
 graphics/cairo/Makefile                           |   4 +-
 graphics/dia/Makefile.common                      |   5 +-
 graphics/digikam/Makefile                         |   5 +-
 graphics/eog2/Makefile                            |   5 +-
 graphics/exif/Makefile                            |   4 +-
 graphics/gfract/Makefile                          |   5 +-
 graphics/gimageview/Makefile                      |   5 +-
 graphics/gimp-ufraw/Makefile                      |   5 +-
 graphics/gimp/Makefile                            |   5 +-
 graphics/gphoto2/Makefile                         |   4 +-
 graphics/gqview/Makefile                          |   4 +-
 graphics/graphviz/Makefile                        |   4 +-
 graphics/gthumb/Makefile                          |   4 +-
 graphics/gtkglext/Makefile                        |   5 +-
 graphics/imlib2/Makefile                          |   4 +-
 graphics/inkscape/Makefile                        |   5 +-
 graphics/kipi-plugins/Makefile                    |   5 +-
 graphics/libexif-gtk/Makefile                     |   4 +-
 graphics/libgdiplus/Makefile                      |   5 +-
 graphics/libgnomecanvas/Makefile                  |   5 +-
 graphics/libgnomecanvasmm/Makefile                |   5 +-
 graphics/libkexif/Makefile                        |   5 +-
 graphics/librsvg2/Makefile.common                 |   4 +-
 graphics/showimg/Makefile                         |   5 +-
 ham/gmfsk/Makefile                                |   5 +-
 ham/xdx/Makefile                                  |   5 +-
 ham/xlog/Makefile                                 |   5 +-
 inputmethod/imhangul/Makefile                     |   4 +-
 inputmethod/imhangul_status_applet/Makefile       |   5 +-
 inputmethod/nabi/Makefile                         |   4 +-
 inputmethod/uim/Makefile                          |   5 +-
 lang/classpath-gui/Makefile                       |   5 +-
 lang/mono/Makefile                                |   5 +-
 lang/sablevm-classpath-gui/Makefile               |   5 +-
 mail/balsa2/Makefile                              |   5 +-
 mail/dspam/Makefile                               |   5 +-
 mail/evolution-data-server/Makefile               |   5 +-
 mail/evolution/Makefile                           |   5 +-
 mail/evolution14/Makefile                         |   6 +-
 mail/gmime/Makefile                               |   5 +-
 mail/mail-notification/Makefile                   |   5 +-
 mail/sylpheed-claws-ghostscript-viewer/Makefile   |   4 +-
 mail/ximian-connector/Makefile                    |   5 +-
 math/calcoo/Makefile                              |   4 +-
 math/cln/Makefile                                 |   5 +-
 math/galculator/Makefile                          |   5 +-
 math/gcalctool/Makefile                           |   5 +-
 math/gnumeric14/Makefile                          |   5 +-
 meta-pkgs/xfce4/Makefile.common                   |   7 +--
 misc/blccc/Makefile                               |   4 +-
 misc/gkrellm-flynn/Makefile                       |   5 +-
 misc/gkrellm-launch/Makefile                      |   4 +-
 misc/gkrellm-leds/Makefile                        |   4 +-
 misc/gkrellm-moon/Makefile                        |   4 +-
 misc/gkrellm-weather/Makefile                     |   5 +-
 misc/gnome2-utils/Makefile                        |   5 +-
 misc/gok/Makefile                                 |   5 +-
 misc/gperiodic/Makefile                           |   5 +-
 misc/gxmame/Makefile                              |   5 +-
 misc/kanjipad/Makefile                            |   5 +-
 misc/kdeaccessibility3/Makefile                   |   4 +-
 misc/libcdio/Makefile                             |   5 +-
 misc/yelp/Makefile                                |   5 +-
 mk/tools/bsd.tools.mk                             |   3 +-
 mk/tools/pkg-config.mk                            |  50 +++++++++++++++++++++++
 mk/tools/replace.mk                               |  13 +++++-
 multimedia/avidemux/Makefile                      |   5 +-
 multimedia/dirac/Makefile                         |   4 +-
 multimedia/gmencoder/Makefile                     |   5 +-
 multimedia/gnome2-media/Makefile                  |   5 +-
 multimedia/gst-plugins/Makefile.common            |   5 +-
 multimedia/gstreamer/Makefile                     |   5 +-
 multimedia/kdemultimedia3/Makefile                |   4 +-
 multimedia/kmplayer/Makefile                      |   5 +-
 multimedia/libassetml/Makefile                    |   5 +-
 multimedia/libdv/Makefile.common                  |   4 +-
 multimedia/libmpeg2/Makefile                      |   5 +-
 multimedia/libogg/Makefile                        |   4 +-
 multimedia/mplayer-plugin-firefox/Makefile.common |   5 +-
 multimedia/openquicktime/Makefile                 |   5 +-
 multimedia/swfdec/Makefile.common                 |   4 +-
 multimedia/totem/Makefile.common                  |   5 +-
 multimedia/xine-lib/Makefile.common               |   5 +-
 multimedia/xvid4conf/Makefile                     |   4 +-
 net/ORBit2/Makefile                               |   5 +-
 net/amule/Makefile                                |   5 +-
 net/bug-buddy/Makefile                            |   5 +-
 net/dc_gui2/Makefile                              |   5 +-
 net/ed2k-gtk-gui/Makefile                         |   4 +-
 net/etherape/Makefile                             |   5 +-
 net/ethereal/Makefile                             |   5 +-
 net/gift/Makefile                                 |   4 +-
 net/gkrellm-multiping/Makefile                    |   5 +-
 net/gkrellm-snmp/Makefile                         |   4 +-
 net/gkrellm-wireless/Makefile                     |   5 +-
 net/gnet/Makefile                                 |   4 +-
 net/gnet1/Makefile                                |   4 +-
 net/gnome-netstatus/Makefile                      |   5 +-
 net/howl/Makefile                                 |   4 +-
 net/jigdo/Makefile                                |   8 +-
 net/libIDL/Makefile                               |   5 +-
 net/libsoup-devel/Makefile                        |   4 +-
 net/libsoup/Makefile                              |   4 +-
 net/linc/Makefile                                 |   4 +-
 net/py-ORBit/Makefile                             |   5 +-
 net/tsclient/Makefile                             |   5 +-
 net/vino/Makefile                                 |   5 +-
 net/wistumbler2-gtk/Makefile                      |   5 +-
 news/pan/Makefile                                 |   5 +-
 parallel/linda/Makefile                           |   4 +-
 print/ggv2/Makefile                               |   5 +-
 print/glabels/Makefile                            |   5 +-
 print/gpdf/Makefile                               |   5 +-
 print/imposter/Makefile                           |   5 +-
 print/libgnomecups/Makefile                       |   4 +-
 print/libgnomeprint/Makefile                      |   5 +-
 print/libgnomeprintui/Makefile                    |   5 +-
 security/gnome-keyring/Makefile                   |   4 +-
 security/gpa/Makefile                             |   4 +-
 security/gpass/Makefile                           |   4 +-
 security/gsasl/Makefile                           |   4 +-
 security/gss/Makefile                             |   4 +-
 security/hydra/Makefile                           |   4 +-
 security/seahorse/Makefile                        |   5 +-
 security/xmlsec1/Makefile                         |   4 +-
 sysutils/dbus/Makefile.common                     |   5 +-
 sysutils/desktop-file-utils/Makefile              |   4 +-
 sysutils/gkrellm-server/Makefile                  |   4 +-
 sysutils/gkrellm/Makefile                         |   4 +-
 sysutils/gnome-menus/Makefile                     |   5 +-
 sysutils/gnome-pkgview/Makefile                   |   4 +-
 sysutils/gnome-vfs/Makefile                       |   5 +-
 sysutils/gnome-vfs2/Makefile.common               |   5 +-
 sysutils/gnome-vfsmm/Makefile                     |   5 +-
 sysutils/gnome2-system-monitor/Makefile           |   5 +-
 sysutils/gtk-send-pr/Makefile                     |   4 +-
 sysutils/idesk/Makefile                           |   5 +-
 sysutils/libgtop2/Makefile                        |   5 +-
 sysutils/mc/Makefile                              |   4 +-
 sysutils/nautilus-cd-burner/Makefile              |   5 +-
 sysutils/nautilus/Makefile                        |   5 +-
 sysutils/rox-session/Makefile                     |   4 +-
 sysutils/rox/Makefile                             |   4 +-
 sysutils/vcdimager-devel/Makefile                 |   5 +-
 sysutils/xcdroast/Makefile                        |   5 +-
 textproc/enchant/Makefile                         |   4 +-
 textproc/gnome-doc-utils/Makefile                 |   4 +-
 textproc/gnome-spell/Makefile                     |   5 +-
 textproc/gtkspell/Makefile                        |   4 +-
 textproc/libcroco/Makefile                        |   5 +-
 time/evolution-webcal/Makefile                    |   5 +-
 time/gnotime/Makefile                             |   5 +-
 time/gtodo-applet/Makefile                        |   4 +-
 time/gtodo/Makefile                               |   5 +-
 wm/e16menuedit2/Makefile                          |   5 +-
 wm/matchbox/Makefile                              |   4 +-
 wm/metacity/Makefile                              |   5 +-
 wm/obconf/Makefile                                |   4 +-
 wm/openbox/Makefile                               |   5 +-
 wm/openbox2/Makefile                              |   4 +-
 wm/selectwm/Makefile                              |   8 +-
 wm/skippy/Makefile                                |   5 +-
 wm/waimea/Makefile                                |   5 +-
 wm/windowlab/Makefile                             |   5 +-
 wm/wmctrl/Makefile                                |   4 +-
 www/ap2-transform/Makefile                        |   4 +-
 www/bluefish/Makefile                             |   5 +-
 www/drivel/Makefile                               |   5 +-
 www/epiphany-extensions/Makefile                  |   5 +-
 www/epiphany/Makefile                             |   5 +-
 www/galeon/Makefile                               |   5 +-
 www/gtkhtml30/Makefile                            |   5 +-
 www/gtkhtml36/Makefile                            |   5 +-
 www/libgtkhtml/Makefile                           |   5 +-
 www/liferea/Makefile                              |   5 +-
 www/mozilla/Makefile.common                       |   6 +-
 x11/Xcomposite/Makefile                           |   4 +-
 x11/Xfixes/Makefile                               |   4 +-
 x11/Xrandr-mixedcase/Makefile                     |   4 +-
 x11/Xrender/Makefile                              |   4 +-
 x11/compositeext/Makefile                         |   4 +-
 x11/devilspie/Makefile                            |   4 +-
 x11/fbdesk/Makefile                               |   4 +-
 x11/fixesext/Makefile                             |   4 +-
 x11/gdm/Makefile                                  |   5 +-
 x11/gnome-desktop/Makefile                        |   5 +-
 x11/gnome-mag/Makefile                            |   5 +-
 x11/gnome-panel/Makefile                          |   5 +-
 x11/gnome-session/Makefile                        |   5 +-
 x11/gnome-themes-extras/Makefile                  |   5 +-
 x11/gnome-themes/Makefile                         |   5 +-
 x11/gnome2-applets/Makefile                       |   5 +-
 x11/gnome2-control-center/Makefile                |   5 +-
 x11/gnome2-terminal/Makefile                      |   5 +-
 x11/gnopernicus/Makefile                          |   5 +-
 x11/gnustep-back/Makefile                         |   4 +-
 x11/gromit/Makefile                               |   4 +-
 x11/gtk-thinice-engine/Makefile                   |   5 +-
 x11/gtk2-chtheme/Makefile                         |   5 +-
 x11/gtk2-engines-bluecurve/Makefile               |   5 +-
 x11/gtk2-engines/Makefile                         |   4 +-
 x11/gtk2-theme-switch/Makefile                    |   5 +-
 x11/gtk2/Makefile                                 |   5 +-
 x11/gtkglarea2/Makefile                           |   8 +-
 x11/gtkmm/Makefile                                |   5 +-
 x11/gtksourceview/Makefile                        |   5 +-
 x11/gtkterm2/Makefile                             |   4 +-
 x11/kdebase3/Makefile                             |   4 +-
 x11/lablgtk2/Makefile                             |   5 +-
 x11/libxklavier/Makefile                          |   4 +-
 x11/libzvt/Makefile                               |   5 +-
 x11/mlterm/Makefile                               |   4 +-
 x11/py-gnome2-extras/Makefile                     |   4 +-
 x11/py-gnome2/Makefile                            |   4 +-
 x11/py-gtk2/Makefile                              |   5 +-
 x11/py-wxWidgets/Makefile                         |   5 +-
 x11/startup-notification/Makefile                 |   4 +-
 x11/vte/Makefile                                  |   5 +-
 x11/wxGTK/Makefile.common                         |   4 +-
 x11/wxGTK24/Makefile.common                       |   4 +-
 x11/xcompmgr/Makefile                             |   4 +-
 x11/xcursor/Makefile                              |   4 +-
 x11/xscreensaver-demo/Makefile                    |   5 +-
 x11/zenity/Makefile                               |   5 +-
 366 files changed, 802 insertions(+), 981 deletions(-)

diffs (truncated from 8978 to 300 lines):

diff -r 588ee156c864 -r bdb4b4e8e063 archivers/file-roller/Makefile
--- a/archivers/file-roller/Makefile    Wed Aug 10 20:40:56 2005 +0000
+++ b/archivers/file-roller/Makefile    Wed Aug 10 20:56:10 2005 +0000
@@ -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 @@
 
 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 @@
 .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 -r 588ee156c864 -r bdb4b4e8e063 archivers/libcomprex/Makefile
--- a/archivers/libcomprex/Makefile     Wed Aug 10 20:40:56 2005 +0000
+++ b/archivers/libcomprex/Makefile     Wed Aug 10 20:56:10 2005 +0000
@@ -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 @@
 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 @@
 
 .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 -r 588ee156c864 -r bdb4b4e8e063 audio/amarok/Makefile
--- a/audio/amarok/Makefile     Wed Aug 10 20:40:56 2005 +0000
+++ b/audio/amarok/Makefile     Wed Aug 10 20:56:10 2005 +0000
@@ -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 @@
 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 @@
 .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 -r 588ee156c864 -r bdb4b4e8e063 audio/arts/Makefile
--- a/audio/arts/Makefile       Wed Aug 10 20:40:56 2005 +0000
+++ b/audio/arts/Makefile       Wed Aug 10 20:56:10 2005 +0000
@@ -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 @@
 
 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 @@
 .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 -r 588ee156c864 -r bdb4b4e8e063 audio/aumix-gtk/Makefile
--- a/audio/aumix-gtk/Makefile  Wed Aug 10 20:40:56 2005 +0000
+++ b/audio/aumix-gtk/Makefile  Wed Aug 10 20:56:10 2005 +0000
@@ -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 @@
 
 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 -r 588ee156c864 -r bdb4b4e8e063 audio/bmp-musepack/Makefile
--- a/audio/bmp-musepack/Makefile       Wed Aug 10 20:40:56 2005 +0000
+++ b/audio/bmp-musepack/Makefile       Wed Aug 10 20:56:10 2005 +0000
@@ -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 @@
 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 -r 588ee156c864 -r bdb4b4e8e063 audio/bmp/Makefile.common
--- a/audio/bmp/Makefile.common Wed Aug 10 20:40:56 2005 +0000
+++ b/audio/bmp/Makefile.common Wed Aug 10 20:56:10 2005 +0000
@@ -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 @@
 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 @@
 .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 -r 588ee156c864 -r bdb4b4e8e063 audio/gkrellm-volume/Makefile
--- a/audio/gkrellm-volume/Makefile     Wed Aug 10 20:40:56 2005 +0000
+++ b/audio/gkrellm-volume/Makefile     Wed Aug 10 20:56:10 2005 +0000
@@ -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 @@
 
 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 -r 588ee156c864 -r bdb4b4e8e063 audio/gkrellm-xmms/Makefile
--- a/audio/gkrellm-xmms/Makefile       Wed Aug 10 20:40:56 2005 +0000
+++ b/audio/gkrellm-xmms/Makefile       Wed Aug 10 20:56:10 2005 +0000
@@ -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 @@
 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 @@
 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 -r 588ee156c864 -r bdb4b4e8e063 audio/gmpc/Makefile
--- a/audio/gmpc/Makefile       Wed Aug 10 20:40:56 2005 +0000
+++ b/audio/gmpc/Makefile       Wed Aug 10 20:56:10 2005 +0000
@@ -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 @@
 
 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 -r 588ee156c864 -r bdb4b4e8e063 audio/gnome-speech/Makefile
--- a/audio/gnome-speech/Makefile       Wed Aug 10 20:40:56 2005 +0000
+++ b/audio/gnome-speech/Makefile       Wed Aug 10 20:56:10 2005 +0000
@@ -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 @@
 
 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 @@
 
 .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 -r 588ee156c864 -r bdb4b4e8e063 audio/goom/Makefile
--- a/audio/goom/Makefile       Wed Aug 10 20:40:56 2005 +0000
+++ b/audio/goom/Makefile       Wed Aug 10 20:56:10 2005 +0000
@@ -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 @@
 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 -r 588ee156c864 -r bdb4b4e8e063 audio/gqmpeg-devel/Makefile
--- a/audio/gqmpeg-devel/Makefile       Wed Aug 10 20:40:56 2005 +0000
+++ b/audio/gqmpeg-devel/Makefile       Wed Aug 10 20:56:10 2005 +0000
@@ -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+=              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



Home | Main Index | Thread Index | Old Index