diff options
| author | jmc <jmc> | 2003-03-29 19:11:06 +0000 |
|---|---|---|
| committer | jmc <jmc> | 2003-03-29 19:11:06 +0000 |
| commit | 8656a6b28d8afabb224f402210ac8f9e4a92dab2 (patch) | |
| tree | 65d9e97a5fa50c9e9d72f2ad307108ed961d4264 | |
| parent | 036a14efd6ca075e7a241ec8c65b739efad59dbc (diff) | |
| download | pkgsrc-8656a6b28d8afabb224f402210ac8f9e4a92dab2.tar.gz | |
One more pass to make sure freetype versions get included correctly when
also using Xft2/fontconfig
| -rw-r--r-- | fonts/Xft2/buildlink2.mk | 7 | ||||
| -rw-r--r-- | www/mozilla-stable/buildlink2.mk | 6 |
2 files changed, 5 insertions, 8 deletions
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 diff --git a/www/mozilla-stable/buildlink2.mk b/www/mozilla-stable/buildlink2.mk index 62332c7288b..7d704a41cd6 100644 --- a/www/mozilla-stable/buildlink2.mk +++ b/www/mozilla-stable/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.1 2003/01/10 19:14:36 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.2 2003/03/29 19:11:06 jmc Exp $ # .if !defined(MOZILLA_STABLE_BUILDLINK2_MK) @@ -699,14 +699,14 @@ BUILDLINK_FILES.mozilla-stable+= lib/mozilla-stable/xpidl BUILDLINK_FILES.mozilla-stable+= lib/mozilla-stable/xpt_dump BUILDLINK_FILES.mozilla-stable+= lib/mozilla-stable/xpt_link +.include "../../fonts/Xft2/buildlink2.mk" .include "../../graphics/freetype2/buildlink2.mk" .include "../../graphics/gdk-pixbuf/buildlink2.mk" .include "../../graphics/jpeg/buildlink2.mk" .include "../../graphics/png/buildlink2.mk" .include "../../net/ORBit/buildlink2.mk" .include "../../x11/gtk/buildlink2.mk" -.include "../../devel/pkgconfig/buildlink2.mk" -.include "../../fonts/Xft2/buildlink2.mk" +.include "../../devel/pkgconfig/buildlink2.mk" BUILDLINK_TARGETS+= mozilla-stable-buildlink |