Presenting GNOME 2.10 for FreeBSD!

The release notes can be found at
http://www.gnome.org/start/2.10/notes/rnwhatsnew.html, and will give you a
good idea of what has gone into this release overall.  However, a lot of
FreeBSD specific additions and fixes have been made.  For example, this
release offers fixed ACPI support as well as new CPU freqeuncy monitoring
support.  See the FreeBSD GNOME 2.10 upgrade page at
http://www.FreeBSD.org/gnome/docs/faq210.html for the entire list as well
as a list of known issues and upgrade instructions.

GNOME 2.10, as well as all of our releases, would not be possible without
the great team that goes into porting and testign each and every component.
Thanks definitely goes out to ahze, adamw, bland, kwm, mezz, and pav for all
their work.  We would also like to thank our adventurous users that chose to
ride the walrus.  We'd especially like to thank the following users that
provided patches for GNOME 2.10:

ade
Yasuda Keisuke
Franz Klammer
Khairil Yusof
Radek Kozlowsk

And anyone else I may have accidentally omitted.

As with GNOME 2.8, 2.10 comes with a brand-spankin' new splashscreen
courtesy of Franz Klammer.  However, unlike GNOME 2.8, we've included all
of the FreeBSD GNOME splashscreen entries with gnomesession.  You can
use the deskutils/splashsetter port to choose the one you like best.

As always, GNOME users should _not_ use portupgrade alone to upgrade to
2.10.  Instead, get the gnome_upgrade.sh script from
http://www.FreeBSD.org/gnome/gnome_upgrade.sh.

Enjoy!

5 files changed, 31 insertions, 11 deletions

diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index c121c5312d17..e44a89101dae 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gtkhtml3
-PORTVERSION=	3.2.5
+PORTVERSION=	3.6.0
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.6
 DISTNAME=	${PORTNAME:S/3$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -27,10 +27,6 @@ USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-PLIST_SUB=	VERSION="3.1"
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|@mkdir_p@|${MKDIR}|g' \
-		${WRKSRC}/po/Makefile.in.in
+PLIST_SUB=	VERSION="3.6"
 
 .include <bsd.port.mk>
diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo
index 1ecf07b8d8cc..3809c42806f5 100644
--- a/www/gtkhtml38/distinfo
+++ b/www/gtkhtml38/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gtkhtml-3.2.5.tar.bz2) = 86e1ce32fed536bce5b2d6e8d41b0c65
-SIZE (gnome2/gtkhtml-3.2.5.tar.bz2) = 1315567
+MD5 (gnome2/gtkhtml-3.6.0.tar.bz2) = a53378f57544ef2e2e7b40616dc237a1
+SIZE (gnome2/gtkhtml-3.6.0.tar.bz2) = 1348975
diff --git a/www/gtkhtml38/files/patch-po_Makefile.in.in b/www/gtkhtml38/files/patch-po_Makefile.in.in
new file mode 100644
index 000000000000..df4fac948548
--- /dev/null
+++ b/www/gtkhtml38/files/patch-po_Makefile.in.in
@@ -0,0 +1,10 @@
+--- po/Makefile.in.in.orig	Tue Nov 23 17:53:53 2004
++++ po/Makefile.in.in	Tue Nov 23 17:58:38 2004
+@@ -31,6 +31,7 @@
+ localedir = $(libdir)/locale
+ gnulocaledir = $(datadir)/locale
+ gettextsrcdir = $(datadir)/glib-2.0/gettext/po
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ subdir = po
+ 
+ INSTALL = @INSTALL@
diff --git a/www/gtkhtml38/files/patch-src_htmltext.c b/www/gtkhtml38/files/patch-src_htmltext.c
new file mode 100644
index 000000000000..f970e5b654c2
--- /dev/null
+++ b/www/gtkhtml38/files/patch-src_htmltext.c
@@ -0,0 +1,15 @@
+--- src/htmltext.c.orig	Wed Dec  8 01:45:57 2004
++++ src/htmltext.c	Wed Dec  8 01:46:10 2004
+@@ -2433,10 +2433,11 @@
+ gsize
+ html_text_sanitize (const gchar **str, gint *len)
+ {
++	gchar *end;
+ 	g_return_val_if_fail (str != NULL, 0);
+ 	g_return_val_if_fail (len != NULL, 0);
+ 	
+-	gchar *end = offset_to_pointer_validated (*str, *len, len);
++	end = offset_to_pointer_validated (*str, *len, len);
+ 	if (end) {
+ 		return end - *str;
+ 	} else {
diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
index 796491d14ceb..5c4468b4861a 100644
--- a/www/gtkhtml38/pkg-plist
+++ b/www/gtkhtml38/pkg-plist
@@ -85,7 +85,7 @@ include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo.h
 lib/gtkhtml/libgnome-gtkhtml-editor-%%VERSION%%.so
 lib/libgtkhtml-%%VERSION%%.a
 lib/libgtkhtml-%%VERSION%%.so
-lib/libgtkhtml-%%VERSION%%.so.12
+lib/libgtkhtml-%%VERSION%%.so.18
 libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
 libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
 share/gnome/gtkhtml-%%VERSION%%/Editor.idl
@@ -179,7 +179,6 @@ share/locale/he/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/hi/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/hr/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/hu/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
-share/locale/id/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/it/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ja/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ko/LC_MESSAGES/gtkhtml-%%VERSION%%.mo