Update to 3.1.17.

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

8 files changed, 44 insertions, 28 deletions

diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 6c5b3cafa..5602af5c0 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkhtml3
-PORTVERSION=	3.1.16
+PORTVERSION=	3.1.17
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.1
@@ -25,7 +25,7 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeui libgnomeprintui
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 PLIST_SUB=	VERSION="3.1"
 
diff --git a/www/gtkhtml3/distinfo b/www/gtkhtml3/distinfo
index a739938da..0b9cd29d0 100644
--- a/www/gtkhtml3/distinfo
+++ b/www/gtkhtml3/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gtkhtml-3.1.16.tar.bz2) = a16fc3d5e2c7b3d94791bf797588adc3
-SIZE (gnome2/gtkhtml-3.1.16.tar.bz2) = 1250130
+MD5 (gnome2/gtkhtml-3.1.17.tar.bz2) = 4bd30e9e13943de08b26bac3605aea42
+SIZE (gnome2/gtkhtml-3.1.17.tar.bz2) = 1265706
diff --git a/www/gtkhtml3/files/patch-ltmain.sh b/www/gtkhtml3/files/patch-ltmain.sh
index 1c2fba5d5..eba422a4f 100644
--- a/www/gtkhtml3/files/patch-ltmain.sh
+++ b/www/gtkhtml3/files/patch-ltmain.sh
@@ -1,6 +1,6 @@
---- ltmain.sh.orig	Fri Sep 13 15:38:11 2002
-+++ ltmain.sh	Fri Oct 11 01:44:24 2002
-@@ -1073,8 +1073,16 @@
+--- ltmain.sh.orig	Fri Mar  5 10:05:44 2004
++++ ltmain.sh	Mon Jul  5 17:36:23 2004
+@@ -1364,8 +1364,16 @@
  	continue
  	;;
  
@@ -17,17 +17,25 @@
  	continue
  	;;
  
-@@ -2502,6 +2510,9 @@
- 	  *-*-openbsd*)
- 	    # Do not include libc due to us having libc/libc_r.
+@@ -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...
 +	    ;;
  	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4286,10 +4297,12 @@
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5531,10 +5543,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/www/gtkhtml3/pkg-plist b/www/gtkhtml3/pkg-plist
index 363677301..8b7147929 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.10
+lib/libgtkhtml-%%VERSION%%.so.11
 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 6c5b3cafa..5602af5c0 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkhtml3
-PORTVERSION=	3.1.16
+PORTVERSION=	3.1.17
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/3.1
@@ -25,7 +25,7 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gail libgnomeui libgnomeprintui
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 PLIST_SUB=	VERSION="3.1"
 
diff --git a/www/gtkhtml38/distinfo b/www/gtkhtml38/distinfo
index a739938da..0b9cd29d0 100644
--- a/www/gtkhtml38/distinfo
+++ b/www/gtkhtml38/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gtkhtml-3.1.16.tar.bz2) = a16fc3d5e2c7b3d94791bf797588adc3
-SIZE (gnome2/gtkhtml-3.1.16.tar.bz2) = 1250130
+MD5 (gnome2/gtkhtml-3.1.17.tar.bz2) = 4bd30e9e13943de08b26bac3605aea42
+SIZE (gnome2/gtkhtml-3.1.17.tar.bz2) = 1265706
diff --git a/www/gtkhtml38/files/patch-ltmain.sh b/www/gtkhtml38/files/patch-ltmain.sh
index 1c2fba5d5..eba422a4f 100644
--- a/www/gtkhtml38/files/patch-ltmain.sh
+++ b/www/gtkhtml38/files/patch-ltmain.sh
@@ -1,6 +1,6 @@
---- ltmain.sh.orig	Fri Sep 13 15:38:11 2002
-+++ ltmain.sh	Fri Oct 11 01:44:24 2002
-@@ -1073,8 +1073,16 @@
+--- ltmain.sh.orig	Fri Mar  5 10:05:44 2004
++++ ltmain.sh	Mon Jul  5 17:36:23 2004
+@@ -1364,8 +1364,16 @@
  	continue
  	;;
  
@@ -17,17 +17,25 @@
  	continue
  	;;
  
-@@ -2502,6 +2510,9 @@
- 	  *-*-openbsd*)
- 	    # Do not include libc due to us having libc/libc_r.
+@@ -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...
 +	    ;;
  	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4286,10 +4297,12 @@
+ 	    verstring="0.0"
+ 	    ;;
+@@ -5531,10 +5543,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/www/gtkhtml38/pkg-plist b/www/gtkhtml38/pkg-plist
index 363677301..8b7147929 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.10
+lib/libgtkhtml-%%VERSION%%.so.11
 libdata/bonobo/servers/GNOME_GtkHTML_Editor-%%VERSION%%.server
 libdata/pkgconfig/libgtkhtml-%%VERSION%%.pc
 share/gnome/gtkhtml-%%VERSION%%/Editor.idl