Presenting GNOME 2.26 for FreeBSD. See

http://library.gnome.org/misc/release-notes/2.26/ for a list of what's new.
On the FreeBSD front, we introduced a port of libxul 1.9 as an alternative
for Firefox 2.0 as a Gecko provider.  Almost all of the Gecko consumers
can make use of this provider by setting:

WITH_GECKO=libxul

The GNOME 2.26 port was done by ahze, kwm, marcus, and mezz with
contributions by Joseph S. Atkinson, Peter Wemm, Eric L. Chen,
Martin Matuska, Craig Butler, and Pawel Worach.

4 files changed, 30 insertions, 31 deletions

diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 1aea54eb0fca..8b68d782cc2b 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -3,10 +3,10 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/devhelp/Makefile,v 1.10 2009/01/09 22:20:28 kwm Exp $
+#   $MCom: ports/devel/devhelp/Makefile,v 1.12 2009/01/11 18:03:38 marcus Exp $
 
 PORTNAME=	devhelp
-PORTVERSION=	0.21
+PORTVERSION=	0.22
 PORTEPOCH=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
@@ -15,10 +15,11 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Developer help browser for GNOME 2
 
+LIB_DEPENDS=	webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
+
 USE_BZIP2=	yes
 USE_XORG=	x11
 USE_GETTEXT=	yes
-USE_GECKO=	firefox xulrunner
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui libwnck
 USE_AUTOTOOLS=	libtool:15
@@ -28,12 +29,10 @@ USE_LDCONFIG=	yes
 GCONF_SCHEMAS=	devhelp.schemas
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-gecko=${GECKO}
 
 OPTIONS=		GEDIT "Enable GEdit plug-in support" off
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
 
 .if defined(WITH_GEDIT)
 BUILD_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
diff --git a/devel/devhelp/distinfo b/devel/devhelp/distinfo
index 406da7173b39..8c21dd82e15f 100644
--- a/devel/devhelp/distinfo
+++ b/devel/devhelp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/devhelp-0.21.tar.bz2) = 24ad71080dde0778cb42c30575b5aca6
-SHA256 (gnome2/devhelp-0.21.tar.bz2) = f2f76e1804afcad248216d494ebc331b670851ccf701dacd295baf87f1273c20
-SIZE (gnome2/devhelp-0.21.tar.bz2) = 549576
+MD5 (gnome2/devhelp-0.22.tar.bz2) = 7cdd0688dba0184b6dd2688532af24cb
+SHA256 (gnome2/devhelp-0.22.tar.bz2) = 1fa4b69c99b10de0e27374e18eea7988e3e8f9243020a22a47f79c9ccad92947
+SIZE (gnome2/devhelp-0.22.tar.bz2) = 517581
diff --git a/devel/devhelp/files/patch-src_dh-base.c b/devel/devhelp/files/patch-src_dh-base.c
index ffa3c3b54602..3dbf1c71cf4e 100644
--- a/devel/devhelp/files/patch-src_dh-base.c
+++ b/devel/devhelp/files/patch-src_dh-base.c
@@ -1,13 +1,14 @@
---- src/dh-base.c.orig	Tue May 15 13:00:24 2007
-+++ src/dh-base.c	Sun Jul  8 03:48:13 2007
-@@ -233,6 +233,10 @@ base_add_books_in_data_dir (DhBase *base
- 	dir = g_build_filename (data_dir, "devhelp", "books", NULL);
- 	base_add_books (base, dir);
- 	g_free (dir);
+--- 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);
 +
-+	dir = g_build_filename (data_dir, "doc", NULL);
-+	base_add_books (base, dir);
-+	g_free (dir);
  }
  
  static void
diff --git a/devel/devhelp/pkg-plist b/devel/devhelp/pkg-plist
index e657eb546eff..83649fae27a5 100644
--- a/devel/devhelp/pkg-plist
+++ b/devel/devhelp/pkg-plist
@@ -1,16 +1,13 @@
 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-html.h
 include/devhelp-1.0/devhelp/dh-keyword-model.h
 include/devhelp-1.0/devhelp/dh-link.h
-include/devhelp-1.0/devhelp/dh-parser.h
-include/devhelp-1.0/devhelp/dh-preferences.h
 include/devhelp-1.0/devhelp/dh-search.h
-include/devhelp-1.0/devhelp/dh-util.h
 include/devhelp-1.0/devhelp/dh-window.h
-include/devhelp-1.0/devhelp/eggfindbar.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
@@ -24,12 +21,11 @@ lib/libdevhelp-1.so
 lib/libdevhelp-1.so.0
 libdata/pkgconfig/libdevhelp-1.0.pc
 share/applications/devhelp.desktop
-share/devhelp/default-prefs.js
-share/devhelp/devhelp.glade
+share/devhelp/assistant/assistant.css
+share/devhelp/assistant/assistant.js
+share/devhelp/devhelp.defaults
 share/devhelp/dtd/devhelp-1.dtd
-share/devhelp/images/book_closed.png
-share/devhelp/images/book_open.png
-share/devhelp/images/helpdoc.png
+share/devhelp/ui/devhelp.builder
 share/devhelp/ui/window.ui
 share/icons/hicolor/16x16/apps/devhelp.png
 share/icons/hicolor/22x22/apps/devhelp.png
@@ -72,7 +68,6 @@ share/locale/lt/LC_MESSAGES/devhelp.mo
 share/locale/lv/LC_MESSAGES/devhelp.mo
 share/locale/mk/LC_MESSAGES/devhelp.mo
 share/locale/ml/LC_MESSAGES/devhelp.mo
-share/locale/mr/LC_MESSAGES/devhelp.mo
 share/locale/ms/LC_MESSAGES/devhelp.mo
 share/locale/nb/LC_MESSAGES/devhelp.mo
 share/locale/ne/LC_MESSAGES/devhelp.mo
@@ -82,6 +77,7 @@ share/locale/oc/LC_MESSAGES/devhelp.mo
 share/locale/or/LC_MESSAGES/devhelp.mo
 share/locale/pa/LC_MESSAGES/devhelp.mo
 share/locale/pl/LC_MESSAGES/devhelp.mo
+share/locale/ps/LC_MESSAGES/devhelp.mo
 share/locale/pt/LC_MESSAGES/devhelp.mo
 share/locale/pt_BR/LC_MESSAGES/devhelp.mo
 share/locale/ru/LC_MESSAGES/devhelp.mo
@@ -90,7 +86,7 @@ share/locale/sk/LC_MESSAGES/devhelp.mo
 share/locale/sl/LC_MESSAGES/devhelp.mo
 share/locale/sq/LC_MESSAGES/devhelp.mo
 share/locale/sr/LC_MESSAGES/devhelp.mo
-share/locale/sr@latin/LC_MESSAGES/devhelp.mo
+share/locale/sr@Latn/LC_MESSAGES/devhelp.mo
 share/locale/sv/LC_MESSAGES/devhelp.mo
 share/locale/ta/LC_MESSAGES/devhelp.mo
 share/locale/te/LC_MESSAGES/devhelp.mo
@@ -104,6 +100,7 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
 @dirrm share/devhelp/ui
 @dirrm share/devhelp/images
 @dirrm share/devhelp/dtd
+@dirrm share/devhelp/assistant
 @dirrm share/devhelp
 @dirrm include/devhelp-1.0/devhelp
 @dirrm include/devhelp-1.0
@@ -111,10 +108,12 @@ share/locale/zh_TW/LC_MESSAGES/devhelp.mo
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/sr@Latn/LC_MESSAGES
+@dirrmtry share/locale/sr@Latn
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES