diff options
| author | jlam <jlam@pkgsrc.org> | 2005-08-10 20:56:10 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-08-10 20:56:10 +0000 |
| commit | 7820875fff0afd6ebe69c1b4bdbb85e3952a0f1f (patch) | |
| tree | 4d8a0ec4125811389b8272e1e14bc12417f9448c /fonts | |
| parent | 50dfb1eae01aa73de001b1546218ed750ef35575 (diff) | |
| download | pkgsrc-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.
Diffstat (limited to 'fonts')
| -rw-r--r-- | fonts/Xft2/Makefile | 5 | ||||
| -rw-r--r-- | fonts/gucharmap/Makefile | 5 |
2 files changed, 4 insertions, 6 deletions
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" |