Update to 3.1.19.

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

4 files changed, 9 insertions, 59 deletions

diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 0a81b7cff..dac0fa34f 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkhtml3
-PORTVERSION=	3.1.18
+PORTVERSION=	3.1.19
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.1
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeui libgnomeprintui
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index 1e64f5f7d..b9c1a5b0b 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gtkhtml-3.1.18.tar.bz2) = b78a1af071a539910e1a31fb9469e446
-SIZE (gnome2/gtkhtml-3.1.18.tar.bz2) = 1281975
+MD5 (gnome2/gtkhtml-3.1.19.tar.bz2) = 7b842bd67f753c8e9272554a60c56ff2
+SIZE (gnome2/gtkhtml-3.1.19.tar.bz2) = 1281653
diff --git a/www/gtkhtml3/files/patch-ltmain.sh b/www/gtkhtml3/files/patch-ltmain.sh
deleted file mode 100644
index eba422a4f..000000000
--- a/www/gtkhtml3/files/patch-ltmain.sh
+++ /dev/null
@@ -1,50 +0,0 @@
---- ltmain.sh.orig	Fri Mar  5 10:05:44 2004
-+++ ltmain.sh	Mon Jul  5 17:36:23 2004
-@@ -1364,8 +1364,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+      compile_command="$compile_command -pthread"
-+      finalize_command="$finalize_command -pthread"
-+      compiler_flags="$compiler_flags -pthread"
-+      continue
-+      ;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -1849,6 +1857,7 @@
- 	    finalize_deplibs="$deplib $finalize_deplibs"
- 	  else
- 	    deplibs="$deplib $deplibs"
-+	    test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
- 	  fi
- 	  continue
- 	  ;;
-@@ -3059,6 +3068,9 @@
- 	    # problems, so we reset it completely
- 	    verstring=
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -5531,10 +5543,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/www/gtkhtml3/files/patch-src_gtkhtml.c b/www/gtkhtml3/files/patch-src_gtkhtml.c
index 1747affa3..902c39e8e 100644
--- a/www/gtkhtml3/files/patch-src_gtkhtml.c
+++ b/www/gtkhtml3/files/patch-src_gtkhtml.c
@@ -1,11 +1,11 @@
---- src/gtkhtml.c.orig	Wed Apr 16 01:52:24 2003
-+++ src/gtkhtml.c	Wed Apr 16 01:52:35 2003
-@@ -2677,7 +2677,7 @@
+--- 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 @@
  	add_bindings (klass);
  	gtk_html_accessibility_init ();
  
--	gtk_rc_parse (PREFIX "/share/gtkhtml-" GTKHTML_RELEASE "/keybindingsrc.emacs");
-+	gtk_rc_parse (PREFIX "/share/gnome/gtkhtml-" GTKHTML_RELEASE "/keybindingsrc.emacs");
+-	gtk_rc_parse (PREFIX "/share/" GTKHTML_RELEASE_STRING "/keybindingsrc.emacs");
++	gtk_rc_parse (PREFIX "/share/gnome/" GTKHTML_RELEASE_STRING "/keybindingsrc.emacs");
  	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",