3 files changed, 26 insertions, 13 deletions

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 2b60476174a2..000dabff4eb1 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -7,12 +7,11 @@
 #
 
 PORTNAME=	cairo
-PORTVERSION=	1.10.2
-PORTREVISION=	3
+PORTVERSION=	1.12.2
+PORTREVISION=	0
 PORTEPOCH?=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
-#MASTER_SITES=	http://cairographics.org/snapshots/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Vector graphics library with cross-device output support
@@ -24,6 +23,7 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
 		pixman-1.9:${PORTSDIR}/x11/pixman
 
+USE_XZ=		yes
 CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
 		--disable-directfb \
 		--enable-tee \
@@ -78,13 +78,16 @@ PLIST_SUB+=	GLIB="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e '/test/s/==/=/g' \
-		-e '/LIBS/s/-lrt//' \
-		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/test/s/==/=/g ; /LIBS/s/-lrt// ; \
+		/LIBS/s|-ldld||g ; /LIBS/s|-ldl||g' \
+			${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-lcairo|-lcairo ${PTHREAD_LIBS}|' \
 		${WRKSRC}/src/*.pc.in
 	@${REINPLACE_CMD} -e '/@CAIRO_HAS_PNG_FUNCTIONS_TRUE@.*=/d' \
 		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|-ldl||g' \
+		${WRKSRC}/util/*/Makefile.in \
+		${WRKSRC}/boilerplate/Makefile.in
 .if defined(WITH_GL)
 	@${REINPLACE_CMD} 's|@CAIRO_CFLAGS@|-I$$(top_srcdir)/src/glew &|' \
 		${WRKSRC}/src/Makefile.in
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 695495df3aa8..1b4df717ba50 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cairo-1.10.2.tar.gz) = 32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41
-SIZE (cairo-1.10.2.tar.gz) = 23558405
+SHA256 (cairo-1.12.2.tar.xz) = b786bc4a70542bcb09f2d9d13e5e6a0c86408cbf6d1edde5f0de807eecf93f96
+SIZE (cairo-1.12.2.tar.xz) = 42051584
diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist
index cd023384c8a2..6d3e9e03605c 100644
--- a/graphics/cairo/pkg-plist
+++ b/graphics/cairo/pkg-plist
@@ -1,3 +1,4 @@
+bin/cairo-sphinx
 bin/cairo-trace
 include/cairo/cairo-deprecated.h
 include/cairo/cairo-features.h
@@ -7,6 +8,7 @@ include/cairo/cairo-ft.h
 include/cairo/cairo-pdf.h
 include/cairo/cairo-ps.h
 include/cairo/cairo-script-interpreter.h
+include/cairo/cairo-script.h
 include/cairo/cairo-svg.h
 include/cairo/cairo-tee.h
 include/cairo/cairo-version.h
@@ -14,6 +16,14 @@ include/cairo/cairo-version.h
 %%X11%%include/cairo/cairo-xlib-xrender.h
 %%X11%%include/cairo/cairo-xlib.h
 include/cairo/cairo.h
+lib/cairo/cairo-fdr.a
+lib/cairo/cairo-fdr.la
+lib/cairo/cairo-fdr.so
+lib/cairo/cairo-fdr.so.0
+lib/cairo/cairo-sphinx.a
+lib/cairo/cairo-sphinx.la
+lib/cairo/cairo-sphinx.so
+lib/cairo/cairo-sphinx.so.0
 lib/cairo/libcairo-trace.a
 lib/cairo/libcairo-trace.la
 lib/cairo/libcairo-trace.so
@@ -30,7 +40,6 @@ lib/libcairo.a
 lib/libcairo.la
 lib/libcairo.so
 lib/libcairo.so.2
-libdata/pkgconfig/cairo.pc
 libdata/pkgconfig/cairo-fc.pc
 libdata/pkgconfig/cairo-ft.pc
 %%GL%%libdata/pkgconfig/cairo-gl.pc
@@ -39,12 +48,13 @@ libdata/pkgconfig/cairo-ft.pc
 libdata/pkgconfig/cairo-pdf.pc
 libdata/pkgconfig/cairo-png.pc
 libdata/pkgconfig/cairo-ps.pc
+libdata/pkgconfig/cairo-script.pc
 libdata/pkgconfig/cairo-svg.pc
 libdata/pkgconfig/cairo-tee.pc
-%%XCB%%libdata/pkgconfig/cairo-xcb.pc
 %%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc
-%%X11%%libdata/pkgconfig/cairo-xlib.pc
-@comment %%X11%%%%XCB%%libdata/pkgconfig/cairo-xlib-xcb.pc
+%%XCB%%libdata/pkgconfig/cairo-xcb.pc
 %%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
-@dirrm include/cairo
+%%X11%%libdata/pkgconfig/cairo-xlib.pc
+libdata/pkgconfig/cairo.pc
 @dirrm lib/cairo
+@dirrm include/cairo