[Midnightbsd-cvs] mports [18925] trunk/graphics/cairo: force glib

[laffer1 at midnightbsd.org]

Revision: 18925
          http://svnweb.midnightbsd.org/mports/?rev=18925
Author:   laffer1
Date:     2015-05-12 12:07:24 -0400 (Tue, 12 May 2015)
Log Message:
-----------
force glib

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

Modified: trunk/graphics/cairo/Makefile
===================================================================
--- trunk/graphics/cairo/Makefile	2015-05-11 13:18:24 UTC (rev 18924)
+++ trunk/graphics/cairo/Makefile	2015-05-12 16:07:24 UTC (rev 18925)
@@ -2,7 +2,7 @@
 
 PORTNAME=	cairo
 PORTVERSION=	1.12.18
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH?=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
@@ -26,7 +26,7 @@
 		--enable-tee
 USES+=		libtool pathfix pkgconfig
 USE_XORG=	pixman
-USE_GNOME=	referencehack
+USE_GNOME=	referencehack glib20
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
@@ -36,19 +36,17 @@
 		--disable-glesv2 \
 		--disable-wgl \
 		--disable-egl \
-		--enable-tee
+		--enable-tee \	
+		--enable-gobject
 
-OPTIONS_DEFINE=	OPENGL XCB GLIB X11 
-OPTIONS_DEFAULT=XCB GLIB X11
+OPTIONS_DEFINE=	OPENGL XCB X11 
+OPTIONS_DEFAULT=XCB X11
 XCB_DESC=	Enable XCB (X C-language Binding) Support
-GLIB_DESC=	Enable GObject Functions Feature
 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
-GLIB_USE=	gnome=glib20
-GLIB_CONFIGURE_ENABLE=	gobject
 XCB_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil
 XCB_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util-renderutil
 XCB_CONFIGURE_ENABLE=	xcb

Modified: trunk/graphics/cairo/pkg-plist
===================================================================
--- trunk/graphics/cairo/pkg-plist	2015-05-11 13:18:24 UTC (rev 18924)
+++ trunk/graphics/cairo/pkg-plist	2015-05-12 16:07:24 UTC (rev 18925)
@@ -4,7 +4,7 @@
 include/cairo/cairo-features.h
 include/cairo/cairo-ft.h
 %%OPENGL%%include/cairo/cairo-gl.h
-%%GLIB%%include/cairo/cairo-gobject.h
+include/cairo/cairo-gobject.h
 include/cairo/cairo-pdf.h
 include/cairo/cairo-ps.h
 include/cairo/cairo-script-interpreter.h
@@ -28,10 +28,10 @@
 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.so
-%%GLIB%%lib/libcairo-gobject.so.2
-%%GLIB%%lib/libcairo-gobject.so.%%LIBVER%%
+lib/libcairo-gobject.a
+lib/libcairo-gobject.so
+lib/libcairo-gobject.so.2
+lib/libcairo-gobject.so.%%LIBVER%%
 lib/libcairo-script-interpreter.a
 lib/libcairo-script-interpreter.so
 lib/libcairo-script-interpreter.so.2
@@ -45,7 +45,7 @@
 libdata/pkgconfig/cairo-ft.pc
 %%OPENGL%%libdata/pkgconfig/cairo-gl.pc
 %%OPENGL%%libdata/pkgconfig/cairo-glx.pc
-%%GLIB%%libdata/pkgconfig/cairo-gobject.pc
+libdata/pkgconfig/cairo-gobject.pc
 libdata/pkgconfig/cairo-pdf.pc
 libdata/pkgconfig/cairo-png.pc
 libdata/pkgconfig/cairo-ps.pc