Arrgh! Looks like even though the GNOME FTP site says 3.3.2 is needed

for GNOME 2.9.1, Evolution actually wants 3.5.0.  So update to 3.5.0.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3103 df743ca5-7f9a-e211-a948-0013205c9059

10 files changed, 12 insertions, 72 deletions

diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index bcf549949..ecbf78f8e 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gtkhtml3
-PORTVERSION=	3.3.2
+PORTVERSION=	3.5.0
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.3
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.5
 DISTNAME=	${PORTNAME:S/3$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -27,6 +27,6 @@ USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-PLIST_SUB=	VERSION="3.1"
+PLIST_SUB=	VERSION="3.6"
 
 .include <bsd.port.mk>
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index 41d218516..44acccdce 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gtkhtml-3.3.2.tar.bz2) = 88ea5bc9a7a477bd60c6c2edab64028d
-SIZE (gnome2/gtkhtml-3.3.2.tar.bz2) = 1331124
+MD5 (gnome2/gtkhtml-3.5.0.tar.bz2) = cfc9e9e3c1ba5d470d22e3eb13f93247
+SIZE (gnome2/gtkhtml-3.5.0.tar.bz2) = 1343373
diff --git a/www/gtkhtml3/files/patch-src_htmlgdkpainter.c b/www/gtkhtml3/files/patch-src_htmlgdkpainter.c
deleted file mode 100644
index 8cc54b3c4..000000000
--- a/www/gtkhtml3/files/patch-src_htmlgdkpainter.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/htmlgdkpainter.c.orig	Thu Sep  2 19:43:58 2004
-+++ src/htmlgdkpainter.c	Thu Sep  2 19:44:28 2004
-@@ -739,9 +739,10 @@
- item_gc (HTMLPainter *p, PangoItem *item, GdkDrawable *drawable, GdkGC *orig_gc, HTMLPangoProperties *properties, GdkGC **bg_gc)
- {
- 	GdkGC *new_gc = NULL;
--	html_pango_get_item_properties (item, properties);
- 
- 	HTMLEngine *e = GTK_HTML (p->widget)->engine;
-+
-+	html_pango_get_item_properties (item, properties);
- 
- 	*bg_gc = NULL;
- 
diff --git a/www/gtkhtml3/files/patch-src_htmltext.c b/www/gtkhtml3/files/patch-src_htmltext.c
deleted file mode 100644
index 7dee48f83..000000000
--- a/www/gtkhtml3/files/patch-src_htmltext.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/htmltext.c.orig	Tue Nov 23 15:07:15 2004
-+++ src/htmltext.c	Tue Nov 23 15:07:29 2004
-@@ -2423,10 +2423,12 @@
- 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/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index a6ecb1a29..b020dcb99 100644
--- a/www/gtkhtml3/pkg-plist
+++ b/www/gtkhtml3/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.11
+lib/libgtkhtml-%%VERSION%%.so.12
 libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
 libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
 share/gnome/gtkhtml-%%VERSION%%/Editor.idl
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index bcf549949..ecbf78f8e 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gtkhtml3
-PORTVERSION=	3.3.2
+PORTVERSION=	3.5.0
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.3
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.5
 DISTNAME=	${PORTNAME:S/3$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -27,6 +27,6 @@ USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-PLIST_SUB=	VERSION="3.1"
+PLIST_SUB=	VERSION="3.6"
 
 .include <bsd.port.mk>
diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo
index 41d218516..44acccdce 100644
--- a/www/gtkhtml38/distinfo
+++ b/www/gtkhtml38/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gtkhtml-3.3.2.tar.bz2) = 88ea5bc9a7a477bd60c6c2edab64028d
-SIZE (gnome2/gtkhtml-3.3.2.tar.bz2) = 1331124
+MD5 (gnome2/gtkhtml-3.5.0.tar.bz2) = cfc9e9e3c1ba5d470d22e3eb13f93247
+SIZE (gnome2/gtkhtml-3.5.0.tar.bz2) = 1343373
diff --git a/www/gtkhtml38/files/patch-src_htmlgdkpainter.c b/www/gtkhtml38/files/patch-src_htmlgdkpainter.c
deleted file mode 100644
index 8cc54b3c4..000000000
--- a/www/gtkhtml38/files/patch-src_htmlgdkpainter.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/htmlgdkpainter.c.orig	Thu Sep  2 19:43:58 2004
-+++ src/htmlgdkpainter.c	Thu Sep  2 19:44:28 2004
-@@ -739,9 +739,10 @@
- item_gc (HTMLPainter *p, PangoItem *item, GdkDrawable *drawable, GdkGC *orig_gc, HTMLPangoProperties *properties, GdkGC **bg_gc)
- {
- 	GdkGC *new_gc = NULL;
--	html_pango_get_item_properties (item, properties);
- 
- 	HTMLEngine *e = GTK_HTML (p->widget)->engine;
-+
-+	html_pango_get_item_properties (item, properties);
- 
- 	*bg_gc = NULL;
- 
diff --git a/www/gtkhtml38/files/patch-src_htmltext.c b/www/gtkhtml38/files/patch-src_htmltext.c
deleted file mode 100644
index 7dee48f83..000000000
--- a/www/gtkhtml38/files/patch-src_htmltext.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/htmltext.c.orig	Tue Nov 23 15:07:15 2004
-+++ src/htmltext.c	Tue Nov 23 15:07:29 2004
-@@ -2423,10 +2423,12 @@
- 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 a6ecb1a29..b020dcb99 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.11
+lib/libgtkhtml-%%VERSION%%.so.12
 libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
 libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
 share/gnome/gtkhtml-%%VERSION%%/Editor.idl