[pkgsrc/trunk]: pkgsrc/graphics/cairo Convert to modular Xorg buildlinks.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8f1f2c7bc0c6
branches:  trunk
changeset: 521169:8f1f2c7bc0c6
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Nov 06 09:46:41 2006 +0000

description:
Convert to modular Xorg buildlinks.

diffstat:

 graphics/cairo/buildlink3.mk |   4 ++--
 graphics/cairo/options.mk    |  12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diffs (44 lines):

diff -r fbe901722f72 -r 8f1f2c7bc0c6 graphics/cairo/buildlink3.mk
--- a/graphics/cairo/buildlink3.mk      Mon Nov 06 09:19:03 2006 +0000
+++ b/graphics/cairo/buildlink3.mk      Mon Nov 06 09:46:41 2006 +0000
@@ -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 @@
 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 -r fbe901722f72 -r 8f1f2c7bc0c6 graphics/cairo/options.mk
--- a/graphics/cairo/options.mk Mon Nov 06 09:19:03 2006 +0000
+++ b/graphics/cairo/options.mk Mon Nov 06 09:46:41 2006 +0000
@@ -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 @@
 .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 "