[Midnightbsd-cvs] mports [19409] trunk/graphics/cairo: force X11 support in cairo

[laffer1 at midnightbsd.org]

Revision: 19409
          http://svnweb.midnightbsd.org/mports/?rev=19409
Author:   laffer1
Date:     2015-06-09 21:04:22 -0400 (Tue, 09 Jun 2015)
Log Message:
-----------
force X11 support in cairo

Modified Paths:
--------------
    trunk/graphics/cairo/Makefile
    trunk/graphics/cairo/pkg-plist

Modified: trunk/graphics/cairo/Makefile
===================================================================
--- trunk/graphics/cairo/Makefile	2015-06-10 00:58:21 UTC (rev 19408)
+++ trunk/graphics/cairo/Makefile	2015-06-10 01:04:22 UTC (rev 19409)
@@ -2,7 +2,7 @@
 
 PORTNAME=	cairo
 PORTVERSION=	1.12.18
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH?=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
@@ -21,11 +21,9 @@
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
-		--disable-directfb \
-		--enable-tee
-USES+=		libtool pathfix pkgconfig
-USE_XORG=	pixman
+USES+=		cpe libtool pathfix pkgconfig
+CPE_VENDOR=	cairographics
+USE_XORG=	pixman xrender xext
 USE_GNOME=	referencehack glib20
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
@@ -37,14 +35,13 @@
 		--disable-wgl \
 		--disable-egl \
 		--enable-tee \
-		--enable-gobject
+		--enable-gobject \
+		--enable-xlib
 
-OPTIONS_DEFINE=	OPENGL XCB X11 
-OPTIONS_DEFAULT=XCB X11
+OPTIONS_DEFINE=	OPENGL XCB
+OPTIONS_DEFAULT=XCB
 XCB_DESC=	Enable XCB (X C-language Binding) Support
 OPTIONS_SUB=	yes
-X11_USE=	xorg=xrender,xext
-X11_CONFIGURE_ENABLE=xlib
 OPENGL_USE=	gl=gl xorg=glproto:both,dri2proto:both
 OPENGL_CONFIGURE_ENABLE=gl
 XCB_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil
@@ -61,7 +58,7 @@
 		-e '/LIBS/s/-lrt//'  -e '/LIBS/s|-ldld||' \
 		-e '/LIBS/s|-ldl||' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|-lcairo|-lcairo ${PTHREAD_LIBS}|' \
+	@${REINPLACE_CMD} -e 's|-lcairo|-lcairo -pthread|' \
 		${WRKSRC}/src/*.pc.in
 	@${REINPLACE_CMD} -e '/@CAIRO_HAS_PNG_FUNCTIONS_TRUE at .*=/d' \
 		${WRKSRC}/Makefile.in

Modified: trunk/graphics/cairo/pkg-plist
===================================================================
--- trunk/graphics/cairo/pkg-plist	2015-06-10 00:58:21 UTC (rev 19408)
+++ trunk/graphics/cairo/pkg-plist	2015-06-10 01:04:22 UTC (rev 19409)
@@ -13,8 +13,8 @@
 include/cairo/cairo-tee.h
 include/cairo/cairo-version.h
 %%XCB%%include/cairo/cairo-xcb.h
-%%X11%%include/cairo/cairo-xlib-xrender.h
-%%X11%%include/cairo/cairo-xlib.h
+include/cairo/cairo-xlib-xrender.h
+include/cairo/cairo-xlib.h
 include/cairo/cairo.h
 lib/cairo/cairo-fdr.a
 lib/cairo/cairo-fdr.so
@@ -54,6 +54,6 @@
 libdata/pkgconfig/cairo-tee.pc
 %%XCB%%libdata/pkgconfig/cairo-xcb.pc
 %%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc
-%%X11%%libdata/pkgconfig/cairo-xlib.pc
- at comment %%X11%%%%XCB%%libdata/pkgconfig/cairo-xlib-xcb.pc
-%%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
+libdata/pkgconfig/cairo-xlib.pc
+ at comment %%XCB%%libdata/pkgconfig/cairo-xlib-xcb.pc
+libdata/pkgconfig/cairo-xlib-xrender.pc