Presenting GNOME 2.32.1 for FreeBSD. The offical release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.32/

This will be the last release of the GNOME 2.x series, mainly a bugfix and
bridge release to the first release of the GNOME 3.x series.

This release features commits by avl, marcus, mezz and myself.

The FreeBSD GNOME Team would like to thank the following contributors and
testers for there help with this release:

Zane C.B. <vvelox@vvelox.net>
romain@
Olaf Seibert <O.Seibert@cs.ru.nl>
DomiX
Bapt <baptiste.daroussin@gmail.com>
jsa@
miwi@
Sergio de Almeida Lenzi <lenzi.sergio@gmail.com>
Maxim Samsonov <xors@mne.ru>
Kris Moore

And pav@ for 2 exp-runs

PR:		ports/152255
		ports/143260
		ports/141033
		ports/149629
		ports/150350
		ports/151523
With hat:	gnome@

4 files changed, 63 insertions, 27 deletions

diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 0f748c619795..ddc7f2b1809e 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/cairo/Makefile,v 1.93 2010/04/03 05:40:01 marcus Exp $
+#   $MCom: ports/graphics/cairo/Makefile,v 1.101 2010/10/29 15:40:04 kwm Exp $
 #
 
 PORTNAME=	cairo
-PORTVERSION=	1.8.10
-PORTREVISION?=	1
+PORTVERSION=	1.10.0
+PORTREVISION=	2
 PORTEPOCH?=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
@@ -24,17 +24,17 @@ 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=	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
@@ -44,24 +44,25 @@ USE_XORG+=	xrender
 PLIST_SUB+=	X11=""
 .endif
 
-OPTIONS+=	GLITZ "Enable Glitz OpenGL Support" Off \
+OPTIONS+=	GL "Enable OpenGL Support" Off \
 		XCB "Enable XCB (X C-language Binding) Support" On
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_GLITZ)
-LIB_DEPENDS+=	glitz-glx.1:${PORTSDIR}/graphics/glitz
-CONFIGURE_ARGS+=	--enable-glitz
-PLIST_SUB+=	GLITZ=""
+.if defined(WITH_GL)
+USE_GL=		gl
+CONFIGURE_ARGS+=	--enable-gl
+PLIST_SUB+=	GL=""
 .else
-CONFIGURE_ARGS+=	--disable-glitz
-PLIST_SUB+=	GLITZ="@comment "
+CONFIGURE_ARGS+=	--disable-gl
+PLIST_SUB+=	GL="@comment "
 .endif
 
-.ifdef(WITH_XCB)
+.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
+# this option exposes a bug --enable-xlib-xcb=auto
 PLIST_SUB+=		XCB=""
 .else
 CONFIGURE_ARGS+=	--disable-xcb
@@ -69,13 +70,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
+.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 4d008ca43cd3..10a0e78cde6c 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,3 +1,3 @@
-MD5 (cairo-1.8.10.tar.gz) = b60a82f405f9400bbfdcf850b1728d25
-SHA256 (cairo-1.8.10.tar.gz) = 572bada15596ec8708392db1af8b93a1af75ca47690348154e2841f3a6f08439
-SIZE (cairo-1.8.10.tar.gz) = 7102657
+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/files/patch-src_cairo.h b/graphics/cairo/files/patch-src_cairo.h
new file mode 100644
index 000000000000..5e12601a0509
--- /dev/null
+++ b/graphics/cairo/files/patch-src_cairo.h
@@ -0,0 +1,11 @@
+--- src/cairo.h.orig	2010-10-29 16:27:48.000000000 +0200
++++ src/cairo.h	2010-10-29 16:28:07.000000000 +0200
+@@ -1973,7 +1973,7 @@ typedef enum _cairo_device_type {
+     CAIRO_DEVICE_TYPE_SCRIPT,
+     CAIRO_DEVICE_TYPE_XCB,
+     CAIRO_DEVICE_TYPE_XLIB,
+-    CAIRO_DEVICE_TYPE_XML,
++    CAIRO_DEVICE_TYPE_XML
+ } cairo_device_type_t;
+ 
+ cairo_public cairo_device_type_t
diff --git a/graphics/cairo/pkg-plist b/graphics/cairo/pkg-plist
index ec0206e6a37d..9271bf93e961 100644
--- a/graphics/cairo/pkg-plist
+++ b/graphics/cairo/pkg-plist
@@ -1,28 +1,48 @@
+bin/cairo-trace
 include/cairo/cairo-deprecated.h
 include/cairo/cairo-features.h
 include/cairo/cairo-ft.h
-%%GLITZ%%include/cairo/cairo-glitz.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
 include/cairo/cairo-svg.h
 include/cairo/cairo-version.h
-%%XCB%%include/cairo/cairo-xcb-xrender.h
 %%XCB%%include/cairo/cairo-xcb.h
 %%X11%%include/cairo/cairo-xlib-xrender.h
 %%X11%%include/cairo/cairo-xlib.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-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
+libdata/pkgconfig/cairo-fc.pc
 libdata/pkgconfig/cairo-ft.pc
-%%GLITZ%%libdata/pkgconfig/cairo-glitz.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
 libdata/pkgconfig/cairo-svg.pc
 %%XCB%%libdata/pkgconfig/cairo-xcb.pc
+%%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc
 %%X11%%libdata/pkgconfig/cairo-xlib.pc
+@comment %%X11%%%%XCB%%libdata/pkgconfig/cairo-xlib-xcb.pc
 %%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
 @dirrm include/cairo
+@dirrm lib/cairo