aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Messenger <mezz@FreeBSD.org>2008-10-19 16:02:22 +0000
committerJeremy Messenger <mezz@FreeBSD.org>2008-10-19 16:02:22 +0000
commit73e672e2451432c92d4459fea5c6ff11e5de999d (patch)
tree8cf09731eb8cb5e5de0b7e746eb69c488c90234e
parentc3afa705b2d6e87b7a9180093e1313878c7a6bef (diff)
downloadports-73e672e2451432c92d4459fea5c6ff11e5de999d.tar.gz
ports-73e672e2451432c92d4459fea5c6ff11e5de999d.zip
Notes
-rw-r--r--graphics/cairo/Makefile15
-rw-r--r--graphics/cairo/pkg-plist3
2 files changed, 16 insertions, 2 deletions
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 7a9eeb3730ad..ce601fe7a4b9 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -8,7 +8,7 @@
PORTNAME= cairo
PORTVERSION= 1.6.4
-PORTREVISION?= 2
+PORTREVISION?= 3
PORTEPOCH?= 1
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/
@@ -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" On
.include <bsd.port.pre.mk>
@@ -55,6 +56,16 @@ CONFIGURE_ARGS+= --disable-glitz
PLIST_SUB+= GLITZ="@comment "
.endif
+.ifdef(WITH_XCB)
+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 c81b6e936df0..d1b67967143d 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