summaryrefslogtreecommitdiff
path: root/fonts/Xft2/Makefile
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
commitb1f207194f3f2d4cb73651c67948873344bf1d1f (patch)
tree4d8a0ec4125811389b8272e1e14bc12417f9448c /fonts/Xft2/Makefile
parent05aabdaad3c4d3e4d043bc1a2aaafaf17d881208 (diff)
downloadpkgsrc-b1f207194f3f2d4cb73651c67948873344bf1d1f.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/Xft2/Makefile')
-rw-r--r--fonts/Xft2/Makefile5
1 files changed, 2 insertions, 3 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"