svn commit: r374361 - in head/graphics/cairo: . files

[Koop Mast]

Author: kwm
Date: Tue Dec  9 10:54:35 2014
New Revision: 374361
URL: https://svnweb.freebsd.org/changeset/ports/374361
QAT: https://qat.redports.org/buildarchive/r374361/

Log:
  Update to 1.12.18.
  
  Don't depend on libX11 when X11 option is disabled. [1]
  
  PR:		195569 [1]
  Submitted by:	madpilot@ [1]

Deleted:
  head/graphics/cairo/files/patch-src_cairo-wideint-type-private.h
  head/graphics/cairo/files/patch-src_cairo-xcb-surface-render.c
  head/graphics/cairo/files/patch-src_cairoint.h
Modified:
  head/graphics/cairo/Makefile
  head/graphics/cairo/distinfo
  head/graphics/cairo/pkg-plist

Modified: head/graphics/cairo/Makefile
==============================================================================
--- head/graphics/cairo/Makefile	Tue Dec  9 10:40:44 2014	(r374360)
+++ head/graphics/cairo/Makefile	Tue Dec  9 10:54:35 2014	(r374361)
@@ -3,8 +3,7 @@
 #   $MCom: ports/trunk/graphics/cairo/Makefile 18928 2013-11-30 02:00:25Z marcus $
 
 PORTNAME=	cairo
-PORTVERSION=	1.12.16
-PORTREVISION=	1
+PORTVERSION=	1.12.18
 PORTEPOCH=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
@@ -26,8 +25,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
 		--disable-directfb \
 		--enable-tee
-USES+=		libtool:keepla pathfix pkgconfig
-USE_XORG=	pixman xext
+USES+=		libtool pathfix pkgconfig
+USE_XORG=	pixman
 USE_GNOME=	referencehack
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
@@ -45,7 +44,7 @@ OPTIONS_DEFAULT=XCB GLIB X11
 XCB_DESC=	Enable XCB (X C-language Binding) Support
 GLIB_DESC=	Enable GObject Functions Feature
 OPTIONS_SUB=	yes
-X11_USE=	xorg=xrender
+X11_USE=	xorg=xrender,xext
 X11_CONFIGURE_ENABLE=xlib
 OPENGL_USE=	gl=gl xorg=glproto:both,dri2proto:both
 OPENGL_CONFIGURE_ENABLE=gl
@@ -56,7 +55,7 @@ XCB_RUN_DEPENDS=	${LOCALBASE}/libdata/pk
 XCB_CONFIGURE_ENABLE=	xcb
 # this has another option --enable-xlib-xcb=auto but it is buggy.
 
-PLIST_SUB+=	LIBVER=2.11200.16
+PLIST_SUB+=	LIBVER=2.11200.18
 
 .include <bsd.port.options.mk>
 

Modified: head/graphics/cairo/distinfo
==============================================================================
--- head/graphics/cairo/distinfo	Tue Dec  9 10:40:44 2014	(r374360)
+++ head/graphics/cairo/distinfo	Tue Dec  9 10:54:35 2014	(r374361)
@@ -1,2 +1,2 @@
-SHA256 (cairo-1.12.16.tar.xz) = 2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846
-SIZE (cairo-1.12.16.tar.xz) = 35889824
+SHA256 (cairo-1.12.18.tar.xz) = dc59f0b7ac945ce4e138a03c227a29260915a8b05a4226c1f6f1be586ba7f5b6
+SIZE (cairo-1.12.18.tar.xz) = 38276736

Modified: head/graphics/cairo/pkg-plist
==============================================================================
--- head/graphics/cairo/pkg-plist	Tue Dec  9 10:40:44 2014	(r374360)
+++ head/graphics/cairo/pkg-plist	Tue Dec  9 10:54:35 2014	(r374361)
@@ -17,32 +17,26 @@ include/cairo/cairo-version.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-fdr.so.0.0.0
 lib/cairo/cairo-sphinx.a
-lib/cairo/cairo-sphinx.la
 lib/cairo/cairo-sphinx.so
 lib/cairo/cairo-sphinx.so.0
 lib/cairo/cairo-sphinx.so.0.0.0
 lib/cairo/libcairo-trace.a
-lib/cairo/libcairo-trace.la
 lib/cairo/libcairo-trace.so
 lib/cairo/libcairo-trace.so.0
 lib/cairo/libcairo-trace.so.0.0.0
 %%GLIB%%lib/libcairo-gobject.a
-%%GLIB%%lib/libcairo-gobject.la
 %%GLIB%%lib/libcairo-gobject.so
 %%GLIB%%lib/libcairo-gobject.so.2
 %%GLIB%%lib/libcairo-gobject.so.%%LIBVER%%
 lib/libcairo-script-interpreter.a
-lib/libcairo-script-interpreter.la
 lib/libcairo-script-interpreter.so
 lib/libcairo-script-interpreter.so.2
 lib/libcairo-script-interpreter.so.%%LIBVER%%
 lib/libcairo.a
-lib/libcairo.la
 lib/libcairo.so
 lib/libcairo.so.2
 lib/libcairo.so.%%LIBVER%%