--- graphics/cairo/Makefile	2015-07-19 03:20:21.000000000 +0200
+++ graphics/cairo/Makefile	2015-07-19 03:22:06.000000000 +0200
@@ -4,7 +4,7 @@ 
 
 PORTNAME=	cairo
 PORTVERSION=	1.12.18
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
@@ -12,11 +12,14 @@ 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Vector graphics library with cross-device output support
 
+LICENSE=	LGPL21 MPL
+LICENSE_COMB=	multi
+
 USES=		tar:xz
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
+LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 
@@ -41,7 +44,7 @@ 
 		--disable-egl \
 		--enable-tee
 
-OPTIONS_DEFINE=	OPENGL XCB GLIB X11 
+OPTIONS_DEFINE=	OPENGL XCB GLIB X11
 OPTIONS_DEFAULT=XCB GLIB X11
 XCB_DESC=	Enable XCB (X C-language Binding) Support
 GLIB_DESC=	Enable GObject Functions Feature
@@ -61,6 +64,10 @@ 
 
 .include <bsd.port.options.mk>
 
+.if ${ARCH} == "mips"
+CONFIGURE_ARGS+=	--disable-atomic
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e '/test/s/==/=/g' \
 		-e '/LIBS/s/-lrt//'  -e '/LIBS/s|-ldld||' \
@@ -77,7 +84,6 @@ 
 	@${REINPLACE_CMD} 's|@CAIRO_CFLAGS@|-I$$(top_srcdir)/src/glew &|' \
 		${WRKSRC}/src/Makefile.in
 .endif
+.endif
 
 .include <bsd.port.mk>
-
-.endif
--- graphics/cairo/files/patch-src_cairo-xlib-display.c	2015-07-19 03:20:21.000000000 +0200
+++ graphics/cairo/files/patch-src_cairo-xlib-display.c	2015-07-18 21:45:05.000000000 +0200
@@ -1,6 +1,6 @@ 
---- src/cairo-xlib-display.c.orig	2010-11-21 14:41:31.000000000 -0500
-+++ src/cairo-xlib-display.c	2010-11-21 14:42:12.000000000 -0500
-@@ -353,11 +353,7 @@ _cairo_xlib_device_create (Display *dpy)
+--- src/cairo-xlib-display.c.orig	2014-11-06 21:35:30 UTC
++++ src/cairo-xlib-display.c
+@@ -263,11 +263,7 @@ _cairo_xlib_device_create (Display *dpy)
      /* Prior to Render 0.10, there is no protocol support for gradients and
       * we call function stubs instead, which would silently consume the drawing.
       */
--- graphics/cairo/files/patch-util_cairo-sphinx_sphinx.c	2015-07-19 03:20:21.000000000 +0200
+++ graphics/cairo/files/patch-util_cairo-sphinx_sphinx.c	2015-07-18 21:45:05.000000000 +0200
@@ -1,5 +1,5 @@ 
---- util/cairo-sphinx/sphinx.c.orig	2014-10-06 15:22:24.000000000 -0400
-+++ util/cairo-sphinx/sphinx.c	2014-10-06 15:23:04.000000000 -0400
+--- util/cairo-sphinx/sphinx.c.orig	2014-11-06 21:35:30 UTC
++++ util/cairo-sphinx/sphinx.c
 @@ -1325,7 +1325,7 @@ client_shm (const char *shm_path)
  
      base = mmap (NULL, DATA_SIZE,
--- graphics/cairo/pkg-descr	2015-07-19 03:20:21.000000000 +0200
+++ graphics/cairo/pkg-descr	2015-07-18 21:47:24.000000000 +0200
@@ -10,4 +10,4 @@ 
 and filling Bezier cubic splines, transforming and compositing translucent
 images, and antialiased text rendering.
 
-WWW:	http://www.cairographics.org
+WWW: http://www.cairographics.org