From 3efd075d9c2d15692460a3ec19074fb4ce1292b7 Mon Sep 17 00:00:00 2001
From: danh <danh@openbsd.org>
Date: Mon, 19 Feb 2001 19:53:58 +0000
Subject: [PATCH] sync libtool patches

---
 x11/eterm/patches/patch-ltconfig  | 47 +++++++++++++++++++++++++++++--
 x11/eterm/patches/patch-ltmain.sh | 46 ++++++++++++++++++++++++++++--
 2 files changed, 87 insertions(+), 6 deletions(-)

diff --git a/x11/eterm/patches/patch-ltconfig b/x11/eterm/patches/patch-ltconfig
index afeec7524f0..54041b8f7ff 100644
--- a/x11/eterm/patches/patch-ltconfig
+++ b/x11/eterm/patches/patch-ltconfig
@@ -1,6 +1,47 @@
---- ltconfig.orig	Mon Jul  3 01:59:40 2000
-+++ ltconfig	Mon Jul  3 02:00:34 2000
-@@ -1962,6 +1962,7 @@
+--- ltconfig.orig	Fri Nov  5 13:56:27 1999
++++ ltconfig	Mon Feb 19 14:48:50 2001
+@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
+     with_gnu_ld=no
+   fi
+   ;;
++openbsd*)
++  with_gnu_ld=no
++  ;;
+ 
+ esac
+ 
+@@ -1391,10 +1394,21 @@ else
+     ;;
+ 
+   openbsd*)
+-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+-    hardcode_libdir_flag_spec='-R$libdir'
+     hardcode_direct=yes
+     hardcode_shlibpath_var=no
++    case "$host_os" in
++      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
++       hardcode_libdir_flag_spec='-R$libdir'
++      ;;
++      *)
++       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
++       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++       if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
++         export_dynamic_flag_spec='${wl}-E'
++       fi
++      ;;
++    esac
+     ;;
+ 
+   os2*)
+@@ -1955,13 +1969,10 @@ netbsd*)
+ 
+ openbsd*)
+   version_type=sunos
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-    need_version=no
+-  fi
    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
diff --git a/x11/eterm/patches/patch-ltmain.sh b/x11/eterm/patches/patch-ltmain.sh
index 842214afe14..8e15d95697f 100644
--- a/x11/eterm/patches/patch-ltmain.sh
+++ b/x11/eterm/patches/patch-ltmain.sh
@@ -1,6 +1,46 @@
---- ltmain.sh.orig	Mon Jul  3 02:00:59 2000
-+++ ltmain.sh	Mon Jul  3 02:01:18 2000
-@@ -3522,40 +3522,6 @@
+--- ltmain.sh.orig	Fri Nov  5 13:56:27 1999
++++ ltmain.sh	Mon Feb 19 14:51:01 2001
+@@ -1073,7 +1073,18 @@ compiler."
+ 	    # These systems don't actually have c library (as such)
+ 	    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
+ 	elif test "$arg" = "-lm"; then
+ 	  case "$host" in
+ 	  *-*-cygwin* | *-*-beos*)
+@@ -1085,6 +1096,10 @@ compiler."
+ 	deplibs="$deplibs $arg"
+ 	;;
+ 
++      -?thread)
++        deplibs="$deplibs $arg"
++        ;;
++
+       -module)
+ 	module=yes
+ 	continue
+@@ -1789,6 +1804,9 @@ compiler."
+ 	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
+ 	  # these systems don't actually have a c library (as such)!
+ 	  ;;
++	*-*-openbsd*)
++          # Do not include libc due to us having libc/libc_r.
++          ;;
+ 	*)
+ 	  # Add libc to deplibs on all other systems.
+ 	  deplibs="$deplibs -lc"
+@@ -3522,40 +3540,6 @@ libdir='$install_libdir'\
      # Exit here if they wanted silent mode.
      test "$show" = : && exit 0