Update to 1.10.0.

PR:	ports/150350


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14765 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 62 insertions, 32 deletions

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 12e50d248..6ed2b8f2b 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -2,17 +2,16 @@
 # Date created:		2004-10-06
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
-# $FreeBSD$
-#   $MCom: ports/graphics/cairo/Makefile,v 1.96 2010/07/12 15:32:41 kwm Exp $
+# $FreeBSD: ports/graphics/cairo/Makefile,v 1.47 2010/06/03 12:35:42 pav Exp $
+#   $MCom: ports/graphics/cairo/Makefile,v 1.93 2010/04/03 05:40:01 marcus Exp $
 #
 
 PORTNAME=	cairo
-PORTVERSION=	1.9.12
-PORTREVISION?=	1
+PORTVERSION=	1.10.0
 PORTEPOCH?=	1
 CATEGORIES=	graphics
-#MASTER_SITES=	http://cairographics.org/releases/
-MASTER_SITES=	http://cairographics.org/snapshots/
+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,18 +23,16 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
 		pixman-1.9:${PORTSDIR}/x11/pixman
 
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
-		--disable-directfb \
-		--enable-pdf \
-		--enable-ps
-USE_GNOME=	gnomehack ltverhack referencehack
+		--enable-gobject
+USE_GNOME=	glib20 gnomehack ltverhack referencehack
 USE_AUTOTOOLS=	libtool:22
-USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/cairo
-#USE_LDCONFIG=	yes
+USE_LDCONFIG=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
-		LDFLAGS="${PTHREAD_LIBS}" \
-		png_REQUIRES="libpng"
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=--disable-xlib
@@ -45,14 +42,34 @@ USE_XORG+=	xrender
 PLIST_SUB+=	X11=""
 .endif
 
-OPTIONS+=	XCB "Enable XCB (X C-language Binding) Support" On
+OPTIONS+=	DIRECTFB "Enable DirectFB Support" Off \
+		GL "Enable OpenGL Support" Off \
+		XCB "Enable XCB (X C-language Binding) Support" On
 
 .include <bsd.port.pre.mk>
 
-.ifdef(WITH_XCB)
+.if defined(WITH_DIRECTFB)
+LIB_DEPENDS+=	directfb-1.4.3:${PORTSDIR}/devel/directfb
+CONFIGURE_ARGS+=	--enable-directfb
+PLIST_SUB+=	DIRECTFB=""
+.else
+CONFIGURE_ARGS+=	--disable-directfb
+PLIST_SUB+=	DIRECTFB="@comment "
+.endif
+
+.if defined(WITH_GL)
+USE_GL=		gl
+CONFIGURE_ARGS+=	--enable-gl
+PLIST_SUB+=	GL=""
+.else
+CONFIGURE_ARGS+=	--disable-gl
+PLIST_SUB+=	GL="@comment "
+.endif
+
+.if defined(WITH_XCB)
 BUILD_DEPENDS+= 	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util
 RUN_DEPENDS+=		${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:${PORTSDIR}/x11/xcb-util
-CONFIGURE_ARGS+=	--enable-xcb
+CONFIGURE_ARGS+=	--enable-xcb --enable-xlib-xcb=auto
 PLIST_SUB+=		XCB=""
 .else
 CONFIGURE_ARGS+=	--disable-xcb
@@ -60,14 +77,17 @@ PLIST_SUB+=		XCB="@comment "
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \
-		${WRKSRC}/test/Makefile.in
+	@${REINPLACE_CMD} -e '/test/s/==/=/g' \
+		-e '/LIBS/s/-lrt//' \
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-lcairo|-lcairo ${PTHREAD_LIBS}|' \
 		${WRKSRC}/src/*.pc.in
-	@${REINPLACE_CMD} -e 's|src test doc|src doc|; \
-		s|@CAIRO_HAS_PNG_FUNCTIONS_TRUE@am__append_1 = test||' \
+	@${REINPLACE_CMD} -e '/@CAIRO_HAS_PNG_FUNCTIONS_TRUE@.*=/d' \
 		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|" == "|" = "|g' ${WRKSRC}/configure
+.if defined(WITH_GL)
+	@${REINPLACE_CMD} 's|@CAIRO_CFLAGS@|-I$$(top_srcdir)/src/glew &|' \
+		${WRKSRC}/src/Makefile.in
+.endif
 
 .include <bsd.port.post.mk>
 
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 5425797a1..10a0e78cd 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,3 +1,3 @@
-MD5 (cairo-1.9.12.tar.gz) = 0a264bb080af8346f7ae25581f59f661
-SHA256 (cairo-1.9.12.tar.gz) = 61879cb8d5e0f785251bd663b825a52754017f53eef3a25fbbf7799d19b765ba
-SIZE (cairo-1.9.12.tar.gz) = 23402463
+MD5 (cairo-1.10.0.tar.gz) = 70a2ece66cf473d976e2db0f75bf199e
+SHA256 (cairo-1.10.0.tar.gz) = 0f2ce4cc4615594088d74eb8b5360bad7c3cc3c3da9b61af9bfd979ed1ed94b2
+SIZE (cairo-1.10.0.tar.gz) = 24022822
diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist
index 64eea45d5..61e06f222 100644
--- a/graphics/cairo/pkg-plist
+++ b/graphics/cairo/pkg-plist
@@ -1,7 +1,10 @@
 bin/cairo-trace
 include/cairo/cairo-deprecated.h
+%%DIRECTFB%%include/cairo/cairo-directfb.h
 include/cairo/cairo-features.h
 include/cairo/cairo-ft.h
+%%GL%%include/cairo/cairo-gl.h
+include/cairo/cairo-gobject.h
 include/cairo/cairo-pdf.h
 include/cairo/cairo-ps.h
 include/cairo/cairo-script-interpreter.h
@@ -10,23 +13,30 @@ 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-xml.h
 include/cairo/cairo.h
 lib/cairo/libcairo-trace.a
 lib/cairo/libcairo-trace.la
 lib/cairo/libcairo-trace.so
 lib/cairo/libcairo-trace.so.0
-lib/libcairo.a
-lib/libcairo.la
-lib/libcairo.so
-lib/libcairo.so.2
+lib/libcairo-gobject.a
+lib/libcairo-gobject.la
+lib/libcairo-gobject.so
+lib/libcairo-gobject.so.2
 lib/libcairo-script-interpreter.a
 lib/libcairo-script-interpreter.la
 lib/libcairo-script-interpreter.so
 lib/libcairo-script-interpreter.so.2
+lib/libcairo.a
+lib/libcairo.la
+lib/libcairo.so
+lib/libcairo.so.2
 libdata/pkgconfig/cairo.pc
+%%DIRECTFB%%libdata/pkgconfig/cairo-directfb.pc
 libdata/pkgconfig/cairo-fc.pc
 libdata/pkgconfig/cairo-ft.pc
+%%GL%%libdata/pkgconfig/cairo-gl.pc
+%%GL%%libdata/pkgconfig/cairo-glx.pc
+libdata/pkgconfig/cairo-gobject.pc
 libdata/pkgconfig/cairo-pdf.pc
 libdata/pkgconfig/cairo-png.pc
 libdata/pkgconfig/cairo-ps.pc
@@ -34,7 +44,7 @@ libdata/pkgconfig/cairo-svg.pc
 %%XCB%%libdata/pkgconfig/cairo-xcb.pc
 %%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc
 %%X11%%libdata/pkgconfig/cairo-xlib.pc
+%%X11%%%%XCB%%libdata/pkgconfig/cairo-xlib-xcb.pc
 %%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
-libdata/pkgconfig/cairo-xml.pc
 @dirrm include/cairo
 @dirrm lib/cairo