juggle patches around

textproc/sablotron/patches/patch-autocfg_ltmain_sh

@@ -0,0 +1,38 @@
+$OpenBSD: patch-autocfg_ltmain_sh,v 1.1 2004/02/29 00:39:25 avsm Exp $
+--- autocfg/ltmain.sh.orig	2003-11-24 10:13:10.000000000 +0000
++++ autocfg/ltmain.sh	2004-02-29 00:31:03.000000000 +0000
+@@ -1079,12 +1079,34 @@ compiler."
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
++	  *-*-openbsd*)
++	    # Do not include libc due to us having libc/libc_r.
++	    continue
++	    ;;
++	  esac
++	elif test "$arg" = "-lc_r"; then
++	  case "$host" in
++	  *-*-openbsd*)
++	    # Do not include libc_r directly, use -pthread flag.
++	    continue
++	    ;;
+ 	  esac
+ 	fi
+ 	deplibs="$deplibs $arg"
+ 	continue
+ 	;;
+ 
++      -pthread)
++	case $host in
++	*-*-openbsd*)
++	  deplibs="$deplibs $arg"
++	  ;;
++	*)
++	  continue
++	  ;;
++	esac
++	;;
++
+       -module)
+ 	module=yes
+ 	continue

textproc/sablotron/patches/patch-tools_ltmain_sh

@@ -1,48 +0,0 @@
-$OpenBSD: patch-tools_ltmain_sh,v 1.4 2003/06/29 23:14:36 avsm Exp $
---- tools/ltmain.sh.orig	Tue Mar 18 09:05:14 2003
-+++ tools/ltmain.sh	Sun Jun 29 23:50:03 2003
-@@ -1054,12 +1054,34 @@
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-+	  *-*-openbsd*)
-+	    # Do not include libc due to us having libc/libc_r.
-+	    continue
-+	    ;;
- 	  esac
-+	elif test "$arg" = "-lc_r"; then
-+	  case "$host" in
-+	  *-*-openbsd*)
-+	    # Do not include libc_r directly, use -pthread flag.
-+	    continue
-+	    ;;
-+	  esac
- 	fi
- 	deplibs="$deplibs $arg"
- 	continue
- 	;;
- 
-+      -pthread)
-+	case $host in
-+	*-*-openbsd*)
-+	  deplibs="$deplibs $arg"
-+	  ;;
-+	*)
-+	  continue
-+	  ;;
-+	esac
-+	;;
-+
-       -module)
- 	module=yes
- 	continue
-@@ -3387,6 +3409,9 @@
- 	  # Transform the symbol file into the correct name.
- 	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
- 	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+	  ;;
-+	*-*-openbsd*)
-+	  # Do not include libc due to us having libc/libc_r.
- 	  ;;
- 	*)
- 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2