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@

5 files changed, 36 insertions, 39 deletions

diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 26465d7be7ef..d4f3d27dbdec 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -3,10 +3,10 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/devel/devhelp/Makefile,v 1.1 2010/06/23 12:12:25 kwm Exp $
+#   $MCom: ports/devel/devhelp/Makefile,v 1.38 2010/09/28 09:09:20 kwm Exp $
 
 PORTNAME=	devhelp
-PORTVERSION=	2.30.1
+PORTVERSION=	2.32.0
 PORTEPOCH=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
@@ -51,8 +51,4 @@ post-patch:
 		${WRKSRC}/src/Makefile.in
 .endif
 
-post-install:
-	@${MKDIR} ${PREFIX}/etc/gconf/schemas
-	@${CP} ${WRKSRC}/data/devhelp.schemas ${PREFIX}/etc/gconf/schemas
-
 .include <bsd.port.post.mk>
diff --git a/devel/devhelp/distinfo b/devel/devhelp/distinfo
index 00752246c60c..a132abcb5340 100644
--- a/devel/devhelp/distinfo
+++ b/devel/devhelp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/devhelp-2.30.1.tar.bz2) = 447413a54d3bec2480e9a290e261703d
-SHA256 (gnome2/devhelp-2.30.1.tar.bz2) = a72d75fae489bc957f15ef203a6bf8fc9cf80f2730444912dc568476018d5335
-SIZE (gnome2/devhelp-2.30.1.tar.bz2) = 489222
+MD5 (gnome2/devhelp-2.32.0.tar.bz2) = c6690a45609caa00ecd9cd92f7d28915
+SHA256 (gnome2/devhelp-2.32.0.tar.bz2) = 61b342cbaf27379be9baa5df1f34c9464916601ec4378fa7e1c76fcc686553e4
+SIZE (gnome2/devhelp-2.32.0.tar.bz2) = 503689
diff --git a/devel/devhelp/files/patch-src_dh-base.c b/devel/devhelp/files/patch-src_dh-base.c
deleted file mode 100644
index 3dbf1c71cf4e..000000000000
--- a/devel/devhelp/files/patch-src_dh-base.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/dh-base.c.orig	2008-10-11 00:00:18.000000000 +0200
-+++ src/dh-base.c	2009-01-09 23:10:12.000000000 +0100
-@@ -214,6 +214,11 @@ base_add_books_in_data_dir (DhBase      
-         dir = g_build_filename (data_dir, "devhelp", "books", NULL);
-         base_add_books (base, dir);
-         g_free (dir);
-+
-+        dir = g_build_filename (data_dir, "doc", NULL);
-+        base_add_books (base, dir);
-+        g_free (dir);
-+
- }
- 
- static void
diff --git a/devel/devhelp/files/patch-src_dh-book-manager.c b/devel/devhelp/files/patch-src_dh-book-manager.c
new file mode 100644
index 000000000000..a9d8640db7d8
--- /dev/null
+++ b/devel/devhelp/files/patch-src_dh-book-manager.c
@@ -0,0 +1,13 @@
+--- src/dh-book-manager.c.orig	2010-09-01 11:30:01.000000000 +0200
++++ src/dh-book-manager.c	2010-09-01 11:31:03.000000000 +0200
+@@ -149,6 +149,10 @@ book_manager_add_books_in_data_dir (DhBo
+         dir = g_build_filename (data_dir, "devhelp", "books", NULL);
+         book_manager_add_from_dir (book_manager, dir);
+         g_free (dir);
++
++        dir = g_build_filename (data_dir, "doc", NULL);
++        book_manager_add_from_dir (book_manager, dir);
++        g_free (dir);
+ }
+ 
+ void
diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist
index 963290b7ae3f..4297730748eb 100644
--- a/devel/devhelp/pkg-plist
+++ b/devel/devhelp/pkg-plist
@@ -1,13 +1,15 @@
 bin/devhelp
-include/devhelp-1.0/devhelp/dh-assistant-view.h
-include/devhelp-1.0/devhelp/dh-assistant.h
-include/devhelp-1.0/devhelp/dh-base.h
-include/devhelp-1.0/devhelp/dh-book-tree.h
-include/devhelp-1.0/devhelp/dh-error.h
-include/devhelp-1.0/devhelp/dh-keyword-model.h
-include/devhelp-1.0/devhelp/dh-link.h
-include/devhelp-1.0/devhelp/dh-search.h
-include/devhelp-1.0/devhelp/dh-window.h
+include/devhelp-2.0/devhelp/dh-assistant-view.h
+include/devhelp-2.0/devhelp/dh-assistant.h
+include/devhelp-2.0/devhelp/dh-base.h
+include/devhelp-2.0/devhelp/dh-book-manager.h
+include/devhelp-2.0/devhelp/dh-book-tree.h
+include/devhelp-2.0/devhelp/dh-book.h
+include/devhelp-2.0/devhelp/dh-error.h
+include/devhelp-2.0/devhelp/dh-keyword-model.h
+include/devhelp-2.0/devhelp/dh-link.h
+include/devhelp-2.0/devhelp/dh-search.h
+include/devhelp-2.0/devhelp/dh-window.h
 %%GEDIT%%lib/gedit-2/plugins/devhelp.gedit-plugin
 %%GEDIT%%lib/gedit-2/plugins/devhelp/__init__.py
 %%GEDIT%%lib/gedit-2/plugins/devhelp/__init__.pyc
@@ -15,11 +17,11 @@ include/devhelp-1.0/devhelp/dh-window.h
 %%GEDIT%%lib/gedit-2/plugins/devhelp/devhelp.py
 %%GEDIT%%lib/gedit-2/plugins/devhelp/devhelp.pyc
 %%GEDIT%%lib/gedit-2/plugins/devhelp/devhelp.pyo
-lib/libdevhelp-1.a
-lib/libdevhelp-1.la
-lib/libdevhelp-1.so
-lib/libdevhelp-1.so.1
-libdata/pkgconfig/libdevhelp-1.0.pc
+lib/libdevhelp-2.a
+lib/libdevhelp-2.la
+lib/libdevhelp-2.so
+lib/libdevhelp-2.so.1
+libdata/pkgconfig/libdevhelp-2.0.pc
 share/applications/devhelp.desktop
 share/devhelp/assistant/assistant.css
 share/devhelp/assistant/assistant.js
@@ -110,8 +112,8 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
 @dirrm share/devhelp/dtd
 @dirrm share/devhelp/assistant
 @dirrm share/devhelp
-@dirrm include/devhelp-1.0/devhelp
-@dirrm include/devhelp-1.0
+@dirrm include/devhelp-2.0/devhelp
+@dirrm include/devhelp-2.0
 @dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK