Update to 1.3.15.

3 files changed, 51 insertions, 19 deletions

diff --git a/graphics/gimp-devel/files/patch-configure b/graphics/gimp-devel/files/patch-configure
index 3228641b4386..f05feba3bfe1 100644
--- a/graphics/gimp-devel/files/patch-configure
+++ b/graphics/gimp-devel/files/patch-configure
@@ -9,14 +9,6 @@
  LT_REVISION=$GIMP_INTERFACE_AGE
  LT_AGE=`expr $GIMP_BINARY_AGE - $GIMP_INTERFACE_AGE`
  LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
-@@ -7224,6 +7224,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 @@ -17657,8 +17658,8 @@
  fi
  fi;
diff --git a/graphics/gimp-devel/files/patch-ltmain.sh b/graphics/gimp-devel/files/patch-ltmain.sh
new file mode 100644
index 000000000000..bb660972a6d1
--- /dev/null
+++ b/graphics/gimp-devel/files/patch-ltmain.sh
@@ -0,0 +1,51 @@
+--- ltmain.sh.orig	Thu May 22 16:42:22 2003
++++ ltmain.sh	Tue May 27 12:12:52 2003
+@@ -1072,7 +1072,7 @@
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -1082,8 +1082,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
+ 	;;
+ 
+@@ -2498,6 +2506,9 @@
+ 	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test $build_libtool_need_lc = "yes"; then
+@@ -4325,10 +4336,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/graphics/gimp-devel/files/patch-plug-ins_Makefile.in b/graphics/gimp-devel/files/patch-plug-ins_Makefile.in
deleted file mode 100644
index 829f78c7162b..000000000000
--- a/graphics/gimp-devel/files/patch-plug-ins_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plug-ins/Makefile.in.orig	Fri Jul 27 21:36:22 2001
-+++ plug-ins/Makefile.in	Wed Aug 15 22:02:54 2001
-@@ -113,7 +113,7 @@
- HAVE_FINITE = @HAVE_FINITE@
- HAVE_GTK_DOC = @HAVE_GTK_DOC@
- HAVE_ISFINITE = @HAVE_ISFINITE@
--HELPBROWSER = @HELPBROWSER@
-+#HELPBROWSER = @HELPBROWSER@
- HTML_DIR = @HTML_DIR@
- INSTOBJEXT = @INSTOBJEXT@
- INTLBISON = @INTLBISON@