4 files changed, 22 insertions, 92 deletions

diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 8a8ff55917d9..436777c96568 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -3,31 +3,32 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/www/gtkhtml3/Makefile,v 1.62 2005/10/03 15:21:56 ahze Exp $
 #
 
 PORTNAME=	gtkhtml3
-PORTVERSION=	3.6.2
-PORTREVISION=	2
+PORTVERSION=	3.8.1
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.8
 DISTNAME=	${PORTNAME:S/3$//}-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Lightweight HTML rendering/printing/editing engine
 
-LIB_DEPENDS=	soup-2.2.9:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	soup-2.2.8:${PORTSDIR}/devel/libsoup
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeui libgnomeprintui
+USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeui \
+		libgnomeprintui ltverhack
 INSTALLS_SHLIB=	yes
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-PLIST_SUB=	VERSION="3.6"
+PLIST_SUB=	VERSION="3.8"
 
 .include <bsd.port.mk>
diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo
index e6d83cf53847..dec9c77e783b 100644
--- a/www/gtkhtml38/distinfo
+++ b/www/gtkhtml38/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gtkhtml-3.6.2.tar.bz2) = 37465fde0f1e1d7ba2284c5a4fd06fe7
-SIZE (gnome2/gtkhtml-3.6.2.tar.bz2) = 1416041
+MD5 (gnome2/gtkhtml-3.8.1.tar.bz2) = 4c66f0eb30d6c26a09ee2c8d60d9c520
+SIZE (gnome2/gtkhtml-3.8.1.tar.bz2) = 1527241
diff --git a/www/gtkhtml38/files/patch-src_gtkhtml.c b/www/gtkhtml38/files/patch-src_gtkhtml.c
index 902c39e8ecb1..cc9534035220 100644
--- a/www/gtkhtml38/files/patch-src_gtkhtml.c
+++ b/www/gtkhtml38/files/patch-src_gtkhtml.c
@@ -1,11 +1,11 @@
---- src/gtkhtml.c.orig	Mon Aug  2 11:21:24 2004
-+++ src/gtkhtml.c	Tue Aug  3 15:19:41 2004
-@@ -2955,7 +2955,7 @@
+--- src/gtkhtml.c.orig	Mon Aug 22 15:56:46 2005
++++ src/gtkhtml.c	Mon Aug 22 18:56:03 2005
+@@ -3104,7 +3104,7 @@
  	add_bindings (klass);
  	gtk_html_accessibility_init ();
  
--	gtk_rc_parse (PREFIX "/share/" GTKHTML_RELEASE_STRING "/keybindingsrc.emacs");
-+	gtk_rc_parse (PREFIX "/share/gnome/" GTKHTML_RELEASE_STRING "/keybindingsrc.emacs");
+-	filename = g_build_filename (PREFIX, "share", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
++	filename = g_build_filename (PREFIX, "share/gnome", GTKHTML_RELEASE_STRING, "keybindingsrc.emacs", NULL);
+ 	gtk_rc_parse (filename);
+ 	g_free (filename);
  	html_class->emacs_bindings = gtk_binding_set_find ("gtkhtml-bindings-emacs");
- 	read_key_theme (html_class);
- 	gconf_client_notify_add (gconf_client_get_default (), "/desktop/gnome/interface/gtk_key_theme",
diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
index 12becdca550e..f2e776ea939b 100644
--- a/www/gtkhtml38/pkg-plist
+++ b/www/gtkhtml38/pkg-plist
@@ -1,91 +1,17 @@
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-compat.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-embedded.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-enums.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-keybinding.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-private.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-properties.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-search.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-stream.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml-types.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtml.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtmldebug.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/gtkhtmlfontstyle.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlanchor.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlbutton.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcheckbox.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclue.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcluealigned.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclueflow.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlclueh.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcluev.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcolor.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcolorset.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlcursor.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmldrawqueue.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlembedded.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-clueflowstyle.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-cursor.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-cut-and-paste.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-fontstyle.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-images.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-movement.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-rule.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-selection-updater.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-table.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-tablecell.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit-text.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-edit.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-print.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-save.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine-search.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlengine.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlentity.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenums.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlenumutils.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlfontmanager.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlform.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlframe.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlframeset.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlgdkpainter.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlhidden.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmliframe.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlimage.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlimageinput.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlinterval.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmllist.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlmap.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlmarshal.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlobject.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlpainter.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlplainpainter.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlprinter.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlradio.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlreplace.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlrule.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlsearch.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlselect.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlselection.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlsettings.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlshape.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstack.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstringtokenizer.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlstyle.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltable.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltablecell.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltablepriv.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltext.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextarea.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextinput.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltextslave.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/htmltokenizer.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmltype.h
 include/libgtkhtml-%%VERSION%%/gtkhtml/htmltypes.h
-include/libgtkhtml-%%VERSION%%/gtkhtml/htmlundo-action.h
-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.18
+lib/libgtkhtml-%%VERSION%%.so.15
 libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
 libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
 share/gnome/gtkhtml-%%VERSION%%/Editor.idl
@@ -137,8 +63,8 @@ share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-16.png
 share/gnome/gtkhtml-%%VERSION%%/icons/search-and-replace-24.png
 share/gnome/gtkhtml-%%VERSION%%/icons/smiley-1.png
 share/gnome/gtkhtml-%%VERSION%%/icons/smiley-10.png
-share/gnome/gtkhtml-%%VERSION%%/icons/smiley-12.png
 share/gnome/gtkhtml-%%VERSION%%/icons/smiley-11.png
+share/gnome/gtkhtml-%%VERSION%%/icons/smiley-12.png
 share/gnome/gtkhtml-%%VERSION%%/icons/smiley-2.png
 share/gnome/gtkhtml-%%VERSION%%/icons/smiley-3.png
 share/gnome/gtkhtml-%%VERSION%%/icons/smiley-4.png
@@ -162,6 +88,7 @@ share/locale/bg/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/bn/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ca/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/cs/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/cy/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/da/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/de/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/el/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
@@ -180,6 +107,7 @@ 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
@@ -197,6 +125,7 @@ share/locale/pa/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/pl/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/pt/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/pt_BR/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
+share/locale/ro/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/ru/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/rw/LC_MESSAGES/gtkhtml-%%VERSION%%.mo
 share/locale/sk/LC_MESSAGES/gtkhtml-%%VERSION%%.mo