diff options
| author | joerg <joerg@pkgsrc.org> | 2006-11-06 09:46:41 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-11-06 09:46:41 +0000 |
| commit | b6de04a22f2d5753fcbf45b626e213641e83c980 (patch) | |
| tree | 60f94037d9e9f8e77d669aed71d424a3afccb384 /graphics | |
| parent | 8ad6c5b122f4493401fa1a1953dffcc457bbc5ab (diff) | |
| download | pkgsrc-b6de04a22f2d5753fcbf45b626e213641e83c980.tar.gz | |
Convert to modular Xorg buildlinks.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/cairo/buildlink3.mk | 4 | ||||
| -rw-r--r-- | graphics/cairo/options.mk | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk index 3246b7f85b7..b1fb292fca5 100644 --- a/graphics/cairo/buildlink3.mk +++ b/graphics/cairo/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.23 2006/08/10 13:50:37 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2006/11/06 09:46:41 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ CAIRO_BUILDLINK3_MK:= ${CAIRO_BUILDLINK3_MK}+ @@ -30,7 +30,7 @@ MAKEFLAGS+= PKG_BUILD_OPTIONS.cairo=${PKG_BUILD_OPTIONS.cairo:Q} MAKEVARS+= PKG_BUILD_OPTIONS.cairo .if !empty(PKG_BUILD_OPTIONS.cairo:Mx11) -.include "../../x11/Xrender/buildlink3.mk" +.include "../../x11/libXrender/buildlink3.mk" .endif .include "../../fonts/fontconfig/buildlink3.mk" diff --git a/graphics/cairo/options.mk b/graphics/cairo/options.mk index ef1780684f4..47dd5baefeb 100644 --- a/graphics/cairo/options.mk +++ b/graphics/cairo/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2006/07/23 04:07:34 minskim Exp $ +# $NetBSD: options.mk,v 1.2 2006/11/06 09:46:41 joerg Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cairo PKG_SUPPORTED_OPTIONS= x11 @@ -12,11 +12,11 @@ PKG_SUGGESTED_OPTIONS= x11 .if !empty(PKG_OPTIONS:Mx11) CONFIGURE_ARGS+= --enable-xlib --enable-xlib-xrender PLIST_SUBST+= X11="" -BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2 -BUILDLINK_API_DEPENDS.Xrender+= Xrender>=0.8 -.include "../../fonts/Xft2/buildlink3.mk" -.include "../../x11/Xrender/buildlink3.mk" -.include "../../mk/x11.buildlink3.mk" +.include "../../x11/libXft/buildlink3.mk" +.include "../../x11/libXrender/buildlink3.mk" +.include "../../x11/libX11/buildlink3.mk" +BUILDLINK_DEPMETHOD.libXt?= build # only for configure +.include "../../x11/libXt/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-xlib --disable-xlib-xrender PLIST_SUBST+= X11="@comment " |