Support the x11 option to enable/disable xlib and xlib-xrender backends.

4 files changed, 46 insertions, 13 deletions

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 1c21a090d91..17567578721 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2006/07/23 01:51:56 minskim Exp $
+# $NetBSD: Makefile,v 1.40 2006/07/23 04:07:34 minskim Exp $
 
 DISTNAME=	cairo-1.2.0
 PKGREVISION=	1
@@ -28,8 +28,8 @@ PLIST_SUBST+=		QUARTZ=
 PLIST_SUBST+=		QUARTZ="@comment "
 .endif
 
-BUILDLINK_API_DEPENDS.Xft2+=	Xft2>=2.1.2
-BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
+.include "options.mk"
+
 BUILDLINK_API_DEPENDS.glitz+=	glitz>=0.5.1
 BUILDLINK_API_DEPENDS.libpixman+=	libpixman>=0.1.5
 
@@ -42,12 +42,9 @@ CFLAGS+=			-c99
 TEST_TARGET=			check
 
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glitz/buildlink3.mk"
 .include "../../graphics/libpixman/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cairo/PLIST b/graphics/cairo/PLIST
index 01b3ad128fb..61f77859db0 100644
--- a/graphics/cairo/PLIST
+++ b/graphics/cairo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2006/07/05 09:39:11 tron Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/07/23 04:07:34 minskim Exp $
 include/cairo/cairo-features.h
 include/cairo/cairo-ft.h
 include/cairo/cairo-glitz.h
@@ -6,8 +6,8 @@ include/cairo/cairo-pdf.h
 include/cairo/cairo-ps.h
 ${QUARTZ}include/cairo/cairo-quartz.h
 include/cairo/cairo-svg.h
-include/cairo/cairo-xlib-xrender.h
-include/cairo/cairo-xlib.h
+${X11}include/cairo/cairo-xlib-xrender.h
+${X11}include/cairo/cairo-xlib.h
 include/cairo/cairo.h
 lib/libcairo.la
 lib/pkgconfig/cairo-ft.pc
@@ -17,8 +17,8 @@ lib/pkgconfig/cairo-png.pc
 lib/pkgconfig/cairo-ps.pc
 ${QUARTZ}lib/pkgconfig/cairo-quartz.pc
 lib/pkgconfig/cairo-svg.pc
-lib/pkgconfig/cairo-xlib-xrender.pc
-lib/pkgconfig/cairo-xlib.pc
+${X11}lib/pkgconfig/cairo-xlib-xrender.pc
+${X11}lib/pkgconfig/cairo-xlib.pc
 lib/pkgconfig/cairo.pc
 share/doc/cairo/Drawing.html
 share/doc/cairo/Fonts.html
diff --git a/graphics/cairo/buildlink3.mk b/graphics/cairo/buildlink3.mk
index 0c4ebcf69d6..d1b9c97d7ff 100644
--- a/graphics/cairo/buildlink3.mk
+++ b/graphics/cairo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2006/07/23 02:55:59 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2006/07/23 04:07:34 minskim Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 CAIRO_BUILDLINK3_MK:=	${CAIRO_BUILDLINK3_MK}+
@@ -19,10 +19,23 @@ BUILDLINK_PKGSRCDIR.cairo?=	../../graphics/cairo
 BUILDLINK_API_DEPENDS.Xrender+=	Xrender>=0.8
 .endif	# CAIRO_BUILDLINK3_MK
 
+.include "../../mk/bsd.prefs.mk"
+
+.if !defined(PKG_BUILD_OPTIONS.cairo)
+PKG_BUILD_OPTIONS.cairo!= \
+	cd ${BUILDLINK_PKGSRCDIR.cairo} && \
+	${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS
+MAKEFLAGS+=	PKG_BUILD_OPTIONS.cairo=${PKG_BUILD_OPTIONS.cairo:Q}
+.endif
+MAKEVARS+=	PKG_BUILD_OPTIONS.cairo
+
+.if !empty(PKG_BUILD_OPTIONS.cairo:Mx11)
+.include "../../x11/Xrender/buildlink3.mk"
+.endif
+
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glitz/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../x11/Xrender/buildlink3.mk"
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/graphics/cairo/options.mk b/graphics/cairo/options.mk
new file mode 100644
index 00000000000..ef1780684f4
--- /dev/null
+++ b/graphics/cairo/options.mk
@@ -0,0 +1,23 @@
+# $NetBSD: options.mk,v 1.1 2006/07/23 04:07:34 minskim Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.cairo
+PKG_SUPPORTED_OPTIONS=	x11
+PKG_SUGGESTED_OPTIONS=	x11
+
+.include "../../mk/bsd.options.mk"
+
+###
+### X11 support
+###
+.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"
+.else
+CONFIGURE_ARGS+=	--disable-xlib --disable-xlib-xrender
+PLIST_SUBST+=		X11="@comment "
+.endif