From 6a7b453074acca0d90b51a7f908ad53a1a0fad02 Mon Sep 17 00:00:00 2001 From: jmc Date: Sat, 29 Mar 2003 19:11:06 +0000 Subject: One more pass to make sure freetype versions get included correctly when also using Xft2/fontconfig --- fonts/Xft2/buildlink2.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'fonts/Xft2') diff --git a/fonts/Xft2/buildlink2.mk b/fonts/Xft2/buildlink2.mk index 3742816556a..6abbb0c1bd0 100644 --- a/fonts/Xft2/buildlink2.mk +++ b/fonts/Xft2/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.7 2003/03/29 19:00:19 jmc Exp $ +# $NetBSD: buildlink2.mk,v 1.8 2003/03/29 19:11:07 jmc Exp $ # # This Makefile fragment is included by packages that use Xft2. # @@ -18,11 +18,8 @@ BUILDLINK_FILES.Xft2+= include/X11/Xft/* BUILDLINK_FILES.Xft2+= lib/libXft.* BUILDLINK_FILES.Xft2+= lib/pkgconfig/xft.pc -# Make sure to include the right version of freetype2 -BUILDLINK_DEPENDS.freetype2= freetype2>=2.0.9 - -.include "../../graphics/freetype2/buildlink2.mk" .include "../../fonts/fontconfig/buildlink2.mk" +.include "../../graphics/freetype2/buildlink2.mk" .include "../../x11/Xrender/buildlink2.mk" BUILDLINK_TARGETS+= Xft2-buildlink -- cgit v1.2.3