Fix patch, so that it doesn't break some ports on 4-STABLE.

Submitted by:	Joe Macus Clarke <marcus@marcuscom.com>

8 files changed, 64 insertions, 48 deletions

diff --git a/devel/glade/files/patch-ltmain.sh b/devel/glade/files/patch-ltmain.sh
index 13a95afca583..91713d2306f8 100644
--- a/devel/glade/files/patch-ltmain.sh
+++ b/devel/glade/files/patch-ltmain.sh
@@ -1,13 +1,15 @@
 
 $FreeBSD$
 
---- ltmain.sh.orig	Sat Jan 26 02:53:27 2002
-+++ ltmain.sh	Tue Jan 29 09:13:29 2002
-@@ -1037,8 +1037,14 @@
+--- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
++++ ltmain.sh	Sun Feb  3 01:44:17 2002
+@@ -1037,8 +1037,16 @@
  	continue
  	;;
  
 +      -pthread)
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
 +	compiler_flags="$compiler_flags -pthread"
 +	continue
 +	;;
@@ -18,7 +20,7 @@ $FreeBSD$
  	continue
  	;;
  
-@@ -2416,6 +2422,9 @@
+@@ -2412,6 +2420,9 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
@@ -27,8 +29,8 @@ $FreeBSD$
 +	    ;;
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4183,10 +4192,12 @@
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4179,10 +4190,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/devel/glade2/files/patch-ltmain.sh b/devel/glade2/files/patch-ltmain.sh
index 13a95afca583..91713d2306f8 100644
--- a/devel/glade2/files/patch-ltmain.sh
+++ b/devel/glade2/files/patch-ltmain.sh
@@ -1,13 +1,15 @@
 
 $FreeBSD$
 
---- ltmain.sh.orig	Sat Jan 26 02:53:27 2002
-+++ ltmain.sh	Tue Jan 29 09:13:29 2002
-@@ -1037,8 +1037,14 @@
+--- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
++++ ltmain.sh	Sun Feb  3 01:44:17 2002
+@@ -1037,8 +1037,16 @@
  	continue
  	;;
  
 +      -pthread)
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
 +	compiler_flags="$compiler_flags -pthread"
 +	continue
 +	;;
@@ -18,7 +20,7 @@ $FreeBSD$
  	continue
  	;;
  
-@@ -2416,6 +2422,9 @@
+@@ -2412,6 +2420,9 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
@@ -27,8 +29,8 @@ $FreeBSD$
 +	    ;;
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4183,10 +4192,12 @@
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4179,10 +4190,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/devel/gnome-vfs/files/patch-ltmain.sh b/devel/gnome-vfs/files/patch-ltmain.sh
index 13a95afca583..91713d2306f8 100644
--- a/devel/gnome-vfs/files/patch-ltmain.sh
+++ b/devel/gnome-vfs/files/patch-ltmain.sh
@@ -1,13 +1,15 @@
 
 $FreeBSD$
 
---- ltmain.sh.orig	Sat Jan 26 02:53:27 2002
-+++ ltmain.sh	Tue Jan 29 09:13:29 2002
-@@ -1037,8 +1037,14 @@
+--- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
++++ ltmain.sh	Sun Feb  3 01:44:17 2002
+@@ -1037,8 +1037,16 @@
  	continue
  	;;
  
 +      -pthread)
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
 +	compiler_flags="$compiler_flags -pthread"
 +	continue
 +	;;
@@ -18,7 +20,7 @@ $FreeBSD$
  	continue
  	;;
  
-@@ -2416,6 +2422,9 @@
+@@ -2412,6 +2420,9 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
@@ -27,8 +29,8 @@ $FreeBSD$
 +	    ;;
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4183,10 +4192,12 @@
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4179,10 +4190,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/devel/gnome-vfs1/files/patch-ltmain.sh b/devel/gnome-vfs1/files/patch-ltmain.sh
index 13a95afca583..91713d2306f8 100644
--- a/devel/gnome-vfs1/files/patch-ltmain.sh
+++ b/devel/gnome-vfs1/files/patch-ltmain.sh
@@ -1,13 +1,15 @@
 
 $FreeBSD$
 
---- ltmain.sh.orig	Sat Jan 26 02:53:27 2002
-+++ ltmain.sh	Tue Jan 29 09:13:29 2002
-@@ -1037,8 +1037,14 @@
+--- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
++++ ltmain.sh	Sun Feb  3 01:44:17 2002
+@@ -1037,8 +1037,16 @@
  	continue
  	;;
  
 +      -pthread)
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
 +	compiler_flags="$compiler_flags -pthread"
 +	continue
 +	;;
@@ -18,7 +20,7 @@ $FreeBSD$
  	continue
  	;;
  
-@@ -2416,6 +2422,9 @@
+@@ -2412,6 +2420,9 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
@@ -27,8 +29,8 @@ $FreeBSD$
 +	    ;;
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4183,10 +4192,12 @@
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4179,10 +4190,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/devel/gnomevfs/files/patch-ltmain.sh b/devel/gnomevfs/files/patch-ltmain.sh
index 13a95afca583..91713d2306f8 100644
--- a/devel/gnomevfs/files/patch-ltmain.sh
+++ b/devel/gnomevfs/files/patch-ltmain.sh
@@ -1,13 +1,15 @@
 
 $FreeBSD$
 
---- ltmain.sh.orig	Sat Jan 26 02:53:27 2002
-+++ ltmain.sh	Tue Jan 29 09:13:29 2002
-@@ -1037,8 +1037,14 @@
+--- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
++++ ltmain.sh	Sun Feb  3 01:44:17 2002
+@@ -1037,8 +1037,16 @@
  	continue
  	;;
  
 +      -pthread)
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
 +	compiler_flags="$compiler_flags -pthread"
 +	continue
 +	;;
@@ -18,7 +20,7 @@ $FreeBSD$
  	continue
  	;;
  
-@@ -2416,6 +2422,9 @@
+@@ -2412,6 +2420,9 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
@@ -27,8 +29,8 @@ $FreeBSD$
 +	    ;;
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4183,10 +4192,12 @@
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4179,10 +4190,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/devel/gnomevfs2/files/patch-ltmain.sh b/devel/gnomevfs2/files/patch-ltmain.sh
index 13a95afca583..91713d2306f8 100644
--- a/devel/gnomevfs2/files/patch-ltmain.sh
+++ b/devel/gnomevfs2/files/patch-ltmain.sh
@@ -1,13 +1,15 @@
 
 $FreeBSD$
 
---- ltmain.sh.orig	Sat Jan 26 02:53:27 2002
-+++ ltmain.sh	Tue Jan 29 09:13:29 2002
-@@ -1037,8 +1037,14 @@
+--- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
++++ ltmain.sh	Sun Feb  3 01:44:17 2002
+@@ -1037,8 +1037,16 @@
  	continue
  	;;
  
 +      -pthread)
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
 +	compiler_flags="$compiler_flags -pthread"
 +	continue
 +	;;
@@ -18,7 +20,7 @@ $FreeBSD$
  	continue
  	;;
  
-@@ -2416,6 +2422,9 @@
+@@ -2412,6 +2420,9 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
@@ -27,8 +29,8 @@ $FreeBSD$
 +	    ;;
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4183,10 +4192,12 @@
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4179,10 +4190,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/devel/libgtop/files/patch-ltmain.sh b/devel/libgtop/files/patch-ltmain.sh
index 13a95afca583..91713d2306f8 100644
--- a/devel/libgtop/files/patch-ltmain.sh
+++ b/devel/libgtop/files/patch-ltmain.sh
@@ -1,13 +1,15 @@
 
 $FreeBSD$
 
---- ltmain.sh.orig	Sat Jan 26 02:53:27 2002
-+++ ltmain.sh	Tue Jan 29 09:13:29 2002
-@@ -1037,8 +1037,14 @@
+--- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
++++ ltmain.sh	Sun Feb  3 01:44:17 2002
+@@ -1037,8 +1037,16 @@
  	continue
  	;;
  
 +      -pthread)
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
 +	compiler_flags="$compiler_flags -pthread"
 +	continue
 +	;;
@@ -18,7 +20,7 @@ $FreeBSD$
  	continue
  	;;
  
-@@ -2416,6 +2422,9 @@
+@@ -2412,6 +2420,9 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
@@ -27,8 +29,8 @@ $FreeBSD$
 +	    ;;
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4183,10 +4192,12 @@
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4179,10 +4190,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/devel/libgtop2/files/patch-ltmain.sh b/devel/libgtop2/files/patch-ltmain.sh
index 13a95afca583..91713d2306f8 100644
--- a/devel/libgtop2/files/patch-ltmain.sh
+++ b/devel/libgtop2/files/patch-ltmain.sh
@@ -1,13 +1,15 @@
 
 $FreeBSD$
 
---- ltmain.sh.orig	Sat Jan 26 02:53:27 2002
-+++ ltmain.sh	Tue Jan 29 09:13:29 2002
-@@ -1037,8 +1037,14 @@
+--- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
++++ ltmain.sh	Sun Feb  3 01:44:17 2002
+@@ -1037,8 +1037,16 @@
  	continue
  	;;
  
 +      -pthread)
++	compile_command="$compile_command -pthread"
++	finalize_command="$finalize_command -pthread"
 +	compiler_flags="$compiler_flags -pthread"
 +	continue
 +	;;
@@ -18,7 +20,7 @@ $FreeBSD$
  	continue
  	;;
  
-@@ -2416,6 +2422,9 @@
+@@ -2412,6 +2420,9 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
@@ -27,8 +29,8 @@ $FreeBSD$
 +	    ;;
  	  *)
  	    # Add libc to deplibs on all other systems if necessary.
- 	    if test $build_libtool_need_lc = "yes"; then
-@@ -4183,10 +4192,12 @@
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4179,10 +4190,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.