summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--graphics/cairo/Makefile20
-rw-r--r--graphics/cairo/pkg-plist3
2 files changed, 20 insertions, 3 deletions
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 406b224d2..3d5b06144 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -2,8 +2,8 @@
# Date created: 2004-10-06
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
-# $FreeBSD: ports/graphics/cairo/Makefile,v 1.37 2008/06/30 20:16:18 mezz Exp $
-# $MCom: ports/graphics/cairo/Makefile,v 1.80 2008/08/12 05:21:00 marcus Exp $
+# $FreeBSD$
+# $MCom: ports/graphics/cairo/Makefile,v 1.81 2008/08/21 21:52:58 mezz Exp $
#
PORTNAME= cairo
@@ -42,7 +42,8 @@ USE_XORG+= xrender
PLIST_SUB+= X11=""
.endif
-OPTIONS+= GLITZ "Enable Glitz OpenGL Support" Off
+OPTIONS+= GLITZ "Enable Glitz OpenGL Support" Off \
+ XCB "Enable XCB (X C-language Binding) Support" Off
.include <bsd.port.pre.mk>
@@ -55,6 +56,19 @@ CONFIGURE_ARGS+= --disable-glitz
PLIST_SUB+= GLITZ="@comment "
.endif
+.ifdef(WITH_XCB)
+.ifdef(WITHOUT_X11)
+IGNORE=option WITH_XCB requires X11
+.endif
+BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util
+RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util
+CONFIGURE_ARGS+= --enable-xcb
+PLIST_SUB+= XCB=""
+.else
+CONFIGURE_ARGS+= --disable-xcb
+PLIST_SUB+= XCB="@comment "
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
${WRKSRC}/test/Makefile.in
diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist
index c81b6e936..d1b679671 100644
--- a/graphics/cairo/pkg-plist
+++ b/graphics/cairo/pkg-plist
@@ -5,6 +5,8 @@ include/cairo/cairo-ft.h
include/cairo/cairo-pdf.h
include/cairo/cairo-ps.h
include/cairo/cairo-svg.h
+%%XCB%%include/cairo/cairo-xcb-xrender.h
+%%XCB%%include/cairo/cairo-xcb.h
%%X11%%include/cairo/cairo-xlib-xrender.h
%%X11%%include/cairo/cairo-xlib.h
include/cairo/cairo.h
@@ -19,6 +21,7 @@ libdata/pkgconfig/cairo-pdf.pc
libdata/pkgconfig/cairo-png.pc
libdata/pkgconfig/cairo-ps.pc
libdata/pkgconfig/cairo-svg.pc
+%%XCB%%libdata/pkgconfig/cairo-xcb.pc
%%X11%%libdata/pkgconfig/cairo-xlib.pc
%%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
@dirrm include/cairo