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, 25 insertions, 20 deletions

diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile
index 9eb449539161..bf8813740064 100644
--- a/graphics/cairomm/Makefile
+++ b/graphics/cairomm/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/graphics/cairomm/Makefile,v 1.4 2008/06/16 22:38:50 mezz Exp $
+#   $MCom: ports/graphics/cairomm/Makefile,v 1.16 2010/10/26 09:42:43 kwm Exp $
 #
 
 PORTNAME=	cairomm
-PORTVERSION=	1.8.4
-PORTREVISION=	1
+PORTVERSION=	1.9.6
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 
@@ -18,6 +17,8 @@ COMMENT=	C++ interface to cairo
 LIB_DEPENDS=	xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26 \
 		cairo.2:${PORTSDIR}/graphics/cairo
 
+LICENSE=	LGPL20
+LICENSE_FILE=	${WRKSRC}/COPYING
 USE_AUTOTOOLS=	libtool:22
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
diff --git a/graphics/cairomm/distinfo b/graphics/cairomm/distinfo
index 6fb127edd744..15193e34ba0f 100644
--- a/graphics/cairomm/distinfo
+++ b/graphics/cairomm/distinfo
@@ -1,3 +1,3 @@
-MD5 (cairomm-1.8.4.tar.gz) = 559afbc47484ba3fad265e38a3dafe90
-SHA256 (cairomm-1.8.4.tar.gz) = a28ec6d9af8f93d09076f32cd77de35f9d74a517def5dea12cb8cc2ce3a6c8f1
-SIZE (cairomm-1.8.4.tar.gz) = 906632
+MD5 (cairomm-1.9.6.tar.gz) = f0c0b03142b67d798e781e3f40dea456
+SHA256 (cairomm-1.9.6.tar.gz) = b7a377273b5369118a72f2802f4fd58419db45dae89bd7d0cf2e657e220765f3
+SIZE (cairomm-1.9.6.tar.gz) = 878676
diff --git a/graphics/cairomm/files/patch-cairomm_fontface.cc b/graphics/cairomm/files/patch-cairomm_fontface.cc
deleted file mode 100644
index 18d7fc85b9d3..000000000000
--- a/graphics/cairomm/files/patch-cairomm_fontface.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- cairomm/fontface.cc.orig	2009-02-24 02:40:24.000000000 -0500
-+++ cairomm/fontface.cc	2009-02-24 02:49:31.000000000 -0500
-@@ -309,7 +309,7 @@ UserFontFace::text_to_glyphs(const RefPt
-   // bool value in the user_data, which we can read back in the
-   // text_to_glyphs_cb and used as a signal to return -1 for the num_glyphs
-   // parameter.
--  cairo_font_face_set_user_data(cobj(), &USER_DATA_KEY_DEFAULT_TEXT_TO_GLYPHS, reinterpret_cast<void*>(true), NULL);
-+  cairo_font_face_set_user_data(cobj(), &USER_DATA_KEY_DEFAULT_TEXT_TO_GLYPHS, (void *) (true), NULL);
-   return CAIRO_STATUS_SUCCESS;
- }
- 
diff --git a/graphics/cairomm/pkg-plist b/graphics/cairomm/pkg-plist
index 83d49b33573d..fb7e7566525b 100644
--- a/graphics/cairomm/pkg-plist
+++ b/graphics/cairomm/pkg-plist
@@ -1,5 +1,6 @@
 include/cairomm-1.0/cairomm/cairomm.h
 include/cairomm-1.0/cairomm/context.h
+include/cairomm-1.0/cairomm/device.h
 include/cairomm-1.0/cairomm/enums.h
 include/cairomm-1.0/cairomm/exception.h
 include/cairomm-1.0/cairomm/fontface.h
@@ -10,6 +11,7 @@ include/cairomm-1.0/cairomm/pattern.h
 include/cairomm-1.0/cairomm/quartz_font.h
 include/cairomm-1.0/cairomm/quartz_surface.h
 include/cairomm-1.0/cairomm/refptr.h
+include/cairomm-1.0/cairomm/region.h
 include/cairomm-1.0/cairomm/scaledfont.h
 include/cairomm-1.0/cairomm/surface.h
 include/cairomm-1.0/cairomm/types.h
@@ -28,12 +30,16 @@ libdata/pkgconfig/cairomm-png-1.0.pc
 libdata/pkgconfig/cairomm-ps-1.0.pc
 libdata/pkgconfig/cairomm-svg-1.0.pc
 libdata/pkgconfig/cairomm-xlib-1.0.pc
+libdata/pkgconfig/cairomm-xlib-xrender-1.0.pc
 %%PORTDOCS%%share/devhelp/books/cairomm-1.0/cairomm-1.0.devhelp2
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/cairomm-1.0.tag
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/annotated.html
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/bc_s.png
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/cairomm.css
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1Context-members.html
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1Context.html
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1Device-members.html
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1Device.html
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1FontFace-members.html
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1FontFace.html
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1FontOptions-members.html
@@ -68,6 +74,8 @@ libdata/pkgconfig/cairomm-xlib-1.0.pc
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1RadialGradient.html
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1RefPtr-members.html
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1RefPtr.html
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1Region-members.html
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1Region.html
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1ScaledFont-members.html
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1ScaledFont.html
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1SolidPattern-members.html
@@ -96,6 +104,7 @@ libdata/pkgconfig/cairomm-xlib-1.0.pc
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classCairo_1_1logic__error.html
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classcairo__matrix__t.html
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/classes.html
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/closed.png
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/deprecated.html
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/doxygen.png
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/examples.html
@@ -153,6 +162,8 @@ libdata/pkgconfig/cairomm-xlib-1.0.pc
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__0.png
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__1.png
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__10.png
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__11.png
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__12.png
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__2.png
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__3.png
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/inherit__graph__4.png
@@ -168,15 +179,19 @@ libdata/pkgconfig/cairomm-xlib-1.0.pc
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/namespacemembers_eval.html
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/namespacemembers_type.html
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/namespaces.html
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/nav_f.png
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/nav_h.png
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/open.png
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/pages.html
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/pdf-surface_8cc-example.html
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/ps-surface_8cc-example.html
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/structCairo_1_1ColorStop-members.html
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/structCairo_1_1ColorStop.html
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/svg-surface_8cc-example.html
-%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_b.gif
-%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_l.gif
-%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_r.gif
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_a.png
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_b.png
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_h.png
+%%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tab_s.png
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/tabs.css
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/toy-text_8cc-example.html
 %%PORTDOCS%%share/doc/cairomm-1.0/reference/html/user-font_8cc-example.html