Permalink
Browse files

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.
  • Loading branch information...
1 parent e1b2feb commit bd27c342b2c3b677f34aede7cc599bb43cfa813f jlam committed Aug 10, 2005
Showing 366 changed files with 802 additions and 981 deletions.
@@ -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"
@@ -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,13 +11,13 @@ 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
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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
View
@@ -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"
@@ -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"
View
@@ -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"
@@ -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"
@@ -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"
@@ -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"
View
@@ -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"
View
@@ -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"
View
@@ -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"
@@ -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"
Oops, something went wrong.

0 comments on commit bd27c34

Please sign in to comment.