diff options
| author | joerg <joerg> | 2007-02-04 15:26:34 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2007-02-04 15:26:34 +0000 |
| commit | 1317812eebdc6c8cfee076c2bb4741e02619a236 (patch) | |
| tree | 53180fbb6a5c3978fb5155427385f824cf5ff86d /graphics | |
| parent | f126ab26b17d3ed88673910f49a7b0f2ab50b0ba (diff) | |
| download | pkgsrc-1317812eebdc6c8cfee076c2bb4741e02619a236.tar.gz | |
Modular Xorg support.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/libggi/Makefile | 15 | ||||
| -rw-r--r-- | graphics/libggi/buildlink3.mk | 10 |
2 files changed, 21 insertions, 4 deletions
diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile index e9339e53d16..c568beaa7ff 100644 --- a/graphics/libggi/Makefile +++ b/graphics/libggi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2007/01/29 21:22:08 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2007/02/04 15:26:34 joerg Exp $ # DISTNAME= libggi-2.1.1.src @@ -43,13 +43,22 @@ PLIST_SUBST+= COND_LIBVGL="" PLIST_SUBST+= COND_LIBVGL="@comment " .endif -.if exists(${X11BASE}/include/X11/extensions/xf86dga.h) +.if ${X11_TYPE} == "modular" +.include "../../x11/libXxf86dga/buildlink3.mk" +.include "../../x11/libXxf86vm/buildlink3.mk" +PLIST_SUBST+= COND_XF86DGA="" +.elif exists(${X11BASE}/include/X11/extensions/xf86dga.h) PLIST_SUBST+= COND_XF86DGA="" .else PLIST_SUBST+= COND_XF86DGA="@comment " .endif +BUILDLINK_DEPMETHOD.libXt?= build + .include "../../devel/ncurses/buildlink3.mk" .include "../../graphics/libgii/buildlink3.mk" - +.include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libggi/buildlink3.mk b/graphics/libggi/buildlink3.mk index a34c41047f7..ceafd241f05 100644 --- a/graphics/libggi/buildlink3.mk +++ b/graphics/libggi/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:52 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2007/02/04 15:26:34 joerg Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ LIBGGI_BUILDLINK3_MK:= ${LIBGGI_BUILDLINK3_MK}+ @@ -17,7 +17,15 @@ BUILDLINK_ABI_DEPENDS.libggi?= libggi>=2.1.1nb1 BUILDLINK_PKGSRCDIR.libggi?= ../../graphics/libggi .endif # LIBGGI_BUILDLINK3_MK +.include "../../mk/bsd.fast.prefs.mk" + +.if ${X11_TYPE} == "modular" +.include "../../x11/libXxf86vm/buildlink3.mk" +.endif + .include "../../devel/ncurses/buildlink3.mk" .include "../../graphics/libgii/buildlink3.mk" +.include "../../x11/libXext/buildlink3.mk" +.include "../../x11/xextproto/buildlink3.mk" BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} |