diff --git a/lang/clisp/patches/patch-ffcall_autoconf_ltconfig b/lang/clisp/patches/patch-ffcall_autoconf_ltconfig
new file mode 100644
index 00000000000..52332a9a117
--- /dev/null
+++ b/lang/clisp/patches/patch-ffcall_autoconf_ltconfig
@@ -0,0 +1,36 @@
+$OpenBSD: patch-ffcall_autoconf_ltconfig,v 1.1 2001/03/31 19:20:09 naddy Exp $
+--- ffcall/autoconf/ltconfig.orig	Tue Jul  4 14:05:20 2000
++++ ffcall/autoconf/ltconfig	Sat Mar 31 19:58:00 2001
+@@ -703,7 +703,7 @@ hardcode_shlibpath_var=unsupported
+ runpath_var=
+ 
+ case "$host_os" in
+-amigaos* | beos* | sunos4*)
++amigaos* | beos* | sunos4* | openbsd*)
+   # On these operating systems, we should treat GNU ld like the system ld.
+   gnu_ld_acts_native=yes
+   ;;
+@@ -826,10 +826,21 @@ else
+     ;;
+ 
+   openbsd*)
+-    archive_cmds='$LD -Bshareable -o $lib$libobjs'
+-    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'
++	hardcode_libdir_flag_spec='-R$libdir'
++      ;;
++      *)
++	archive_cmds='$CC -shared $pic_flag -o $lib$libobjs'
++	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*)
diff --git a/lang/clisp/patches/patch-ffcall_autoconf_ltmain_sh b/lang/clisp/patches/patch-ffcall_autoconf_ltmain_sh
new file mode 100644
index 00000000000..f26f630f17d
--- /dev/null
+++ b/lang/clisp/patches/patch-ffcall_autoconf_ltmain_sh
@@ -0,0 +1,88 @@
+$OpenBSD: patch-ffcall_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp $
+--- ffcall/autoconf/ltmain.sh.orig	Tue Jun  1 00:08:00 1999
++++ ffcall/autoconf/ltmain.sh	Sat Mar 31 19:58:27 2001
+@@ -507,7 +507,28 @@ if test -z "$show_help"; then
+         deplibs="$deplibs $arg"
+         ;;
+ 
+-      -l*) deplibs="$deplibs $arg" ;;
++      -l*)
++        if test "$arg" = "-lc"; then
++          case "$host" in
++          *-*-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"
++        ;;
++ 
++      -?thread)
++        deplibs="$deplibs $arg"
++        ;;
+ 
+       -no-undefined)
+ 	allow_undefined=no
+@@ -1004,7 +1025,15 @@ if test -z "$show_help"; then
+ 
+       # Add libc to deplibs on all systems.
+       dependency_libs="$deplibs"
+-      deplibs="$deplibs -lc"
++      case "$host_os" in
++      openbsd*)
++		# do not include libc due to us having libc/libc_r.
++      ;;
++      *)
++		# Add libc to deplibs on all other systems.
++		deplibs="$deplibs -lc"
++      ;;
++      esac
+ 
+       if test "$build_libtool_libs" = yes; then
+         # Get the real and link names of the library.
+@@ -2025,37 +2054,6 @@ libdir='$install_libdir'\
+       done
+     fi
+ 
+-    echo "------------------------------------------------------------------------------"
+-    echo "Libraries have been installed in:"
+-    for libdir in $libdirs; do
+-      echo "   $libdir"
+-    done
+-    echo
+-    echo "To link against installed libraries in a given directory, LIBDIR,"
+-    echo "you must use the \`-LLIBDIR' flag during linking."
+-    echo
+-    echo " You will also need to do one of the following:"
+-    if test -n "$shlibpath_var"; then
+-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+-      echo "     during execution"
+-    fi
+-    if test -n "$runpath_var"; then
+-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+-      echo "     during linking"
+-    fi
+-    if test -n "$hardcode_libdir_flag_spec"; then
+-      libdir=LIBDIR
+-      eval flag=\"$hardcode_libdir_flag_spec\"
+-
+-      echo "   - use the \`$flag' linker flag"
+-    fi
+-    if test -f /etc/ld.so.conf; then
+-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+-    fi
+-    echo
+-    echo "See any operating system documentation about shared libraries for"
+-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
+-    echo "------------------------------------------------------------------------------"
+     exit 0
+     ;;
+ 
diff --git a/lang/clisp/patches/patch-libiconv_autoconf_ltconfig b/lang/clisp/patches/patch-libiconv_autoconf_ltconfig
new file mode 100644
index 00000000000..cc6aac9b672
--- /dev/null
+++ b/lang/clisp/patches/patch-libiconv_autoconf_ltconfig
@@ -0,0 +1,52 @@
+$OpenBSD: patch-libiconv_autoconf_ltconfig,v 1.1 2001/03/31 19:20:09 naddy Exp $
+--- libiconv/autoconf/ltconfig.orig	Mon Feb 26 13:52:17 2001
++++ libiconv/autoconf/ltconfig	Sat Mar 31 20:01:41 2001
+@@ -1099,6 +1099,9 @@ cygwin* | mingw*)
+     with_gnu_ld=no
+   fi
+   ;;
++openbsd*)
++  with_gnu_ld=no
++  ;;
+ 
+ esac
+ 
+@@ -1396,10 +1399,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*)
+@@ -2016,13 +2030,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
++  deplibs_check_method='pass_all'
+   ;;
+ 
+ os2*)
diff --git a/lang/clisp/patches/patch-libiconv_autoconf_ltmain_sh b/lang/clisp/patches/patch-libiconv_autoconf_ltmain_sh
new file mode 100644
index 00000000000..c9a843a1ef9
--- /dev/null
+++ b/lang/clisp/patches/patch-libiconv_autoconf_ltmain_sh
@@ -0,0 +1,84 @@
+$OpenBSD: patch-libiconv_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp $
+--- libiconv/autoconf/ltmain.sh.orig	Wed Feb 21 15:13:29 2001
++++ libiconv/autoconf/ltmain.sh	Sat Mar 31 20:01:53 2001
+@@ -1079,7 +1079,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*)
+@@ -1091,6 +1102,10 @@ compiler."
+ 	deplibs="$deplibs $arg"
+ 	;;
+ 
++      -?thread)
++        deplibs="$deplibs $arg"
++        ;;
++
+       -module)
+ 	module=yes
+ 	continue
+@@ -1799,6 +1814,9 @@ compiler."
+ 	  # rhapsody is a little odd...
+ 	  deplibs="$deplibs -framework System"
+ 	  ;;
++	*-*-openbsd*)
++	  # do not include libc due to us having libc/libc_r.
++	  ;;
+ 	*)
+ 	  # Add libc to deplibs on all other systems.
+ 	  deplibs="$deplibs -lc"
+@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\
+     # Exit here if they wanted silent mode.
+     test "$show" = : && exit 0
+ 
+-    echo "----------------------------------------------------------------------"
+-    echo "Libraries have been installed in:"
+-    for libdir in $libdirs; do
+-      echo "   $libdir"
+-    done
+-    echo
+-    echo "If you ever happen to want to link against installed libraries"
+-    echo "in a given directory, LIBDIR, you must either use libtool, and"
+-    echo "specify the full pathname of the library, or use \`-LLIBDIR'"
+-    echo "flag during linking and do at least one of the following:"
+-    if test -n "$shlibpath_var"; then
+-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+-      echo "     during execution"
+-    fi
+-    if test -n "$runpath_var"; then
+-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+-      echo "     during linking"
+-    fi
+-    if test -n "$hardcode_libdir_flag_spec"; then
+-      libdir=LIBDIR
+-      eval flag=\"$hardcode_libdir_flag_spec\"
+-
+-      echo "   - use the \`$flag' linker flag"
+-    fi
+-    if test -n "$admincmds"; then
+-      echo "   - have your system administrator run these commands:$admincmds"
+-    fi
+-    if test -f /etc/ld.so.conf; then
+-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+-    fi
+-    echo
+-    echo "See any operating system documentation about shared libraries for"
+-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
+-    echo "----------------------------------------------------------------------"
+     exit 0
+     ;;
+ 
diff --git a/lang/clisp/patches/patch-libiconv_libcharset_autoconf_ltconfig b/lang/clisp/patches/patch-libiconv_libcharset_autoconf_ltconfig
new file mode 100644
index 00000000000..adb6223197c
--- /dev/null
+++ b/lang/clisp/patches/patch-libiconv_libcharset_autoconf_ltconfig
@@ -0,0 +1,52 @@
+$OpenBSD: patch-libiconv_libcharset_autoconf_ltconfig,v 1.1 2001/03/31 19:20:09 naddy Exp $
+--- libiconv/libcharset/autoconf/ltconfig.orig	Mon Feb 26 13:49:31 2001
++++ libiconv/libcharset/autoconf/ltconfig	Sat Mar 31 20:02:19 2001
+@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
+     with_gnu_ld=no
+   fi
+   ;;
++openbsd*)
++  with_gnu_ld=no
++  ;;
+ 
+ esac
+ 
+@@ -1402,10 +1405,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*)
+@@ -2021,13 +2035,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
++  deplibs_check_method='pass_all'
+   ;;
+ 
+ os2*)
diff --git a/lang/clisp/patches/patch-libiconv_libcharset_autoconf_ltmain_sh b/lang/clisp/patches/patch-libiconv_libcharset_autoconf_ltmain_sh
new file mode 100644
index 00000000000..602fa91e6ac
--- /dev/null
+++ b/lang/clisp/patches/patch-libiconv_libcharset_autoconf_ltmain_sh
@@ -0,0 +1,84 @@
+$OpenBSD: patch-libiconv_libcharset_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp $
+--- libiconv/libcharset/autoconf/ltmain.sh.orig	Wed Feb 21 15:09:19 2001
++++ libiconv/libcharset/autoconf/ltmain.sh	Sat Mar 31 20:02:13 2001
+@@ -1079,7 +1079,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*)
+@@ -1091,6 +1102,10 @@ compiler."
+ 	deplibs="$deplibs $arg"
+ 	;;
+ 
++      -?thread)
++        deplibs="$deplibs $arg"
++        ;;
++
+       -module)
+ 	module=yes
+ 	continue
+@@ -1799,6 +1814,9 @@ compiler."
+ 	  # rhapsody is a little odd...
+ 	  deplibs="$deplibs -framework System"
+ 	  ;;
++	*-*-openbsd*)
++	  # do not include libc due to us having libc/libc_r.
++	  ;;
+ 	*)
+ 	  # Add libc to deplibs on all other systems.
+ 	  deplibs="$deplibs -lc"
+@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\
+     # Exit here if they wanted silent mode.
+     test "$show" = : && exit 0
+ 
+-    echo "----------------------------------------------------------------------"
+-    echo "Libraries have been installed in:"
+-    for libdir in $libdirs; do
+-      echo "   $libdir"
+-    done
+-    echo
+-    echo "If you ever happen to want to link against installed libraries"
+-    echo "in a given directory, LIBDIR, you must either use libtool, and"
+-    echo "specify the full pathname of the library, or use \`-LLIBDIR'"
+-    echo "flag during linking and do at least one of the following:"
+-    if test -n "$shlibpath_var"; then
+-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+-      echo "     during execution"
+-    fi
+-    if test -n "$runpath_var"; then
+-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+-      echo "     during linking"
+-    fi
+-    if test -n "$hardcode_libdir_flag_spec"; then
+-      libdir=LIBDIR
+-      eval flag=\"$hardcode_libdir_flag_spec\"
+-
+-      echo "   - use the \`$flag' linker flag"
+-    fi
+-    if test -n "$admincmds"; then
+-      echo "   - have your system administrator run these commands:$admincmds"
+-    fi
+-    if test -f /etc/ld.so.conf; then
+-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+-    fi
+-    echo
+-    echo "See any operating system documentation about shared libraries for"
+-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
+-    echo "----------------------------------------------------------------------"
+     exit 0
+     ;;
+ 
diff --git a/lang/clisp/patches/patch-sigsegv_autoconf_ltconfig b/lang/clisp/patches/patch-sigsegv_autoconf_ltconfig
new file mode 100644
index 00000000000..30641a1dca0
--- /dev/null
+++ b/lang/clisp/patches/patch-sigsegv_autoconf_ltconfig
@@ -0,0 +1,36 @@
+$OpenBSD: patch-sigsegv_autoconf_ltconfig,v 1.1 2001/03/31 19:20:09 naddy Exp $
+--- sigsegv/autoconf/ltconfig.orig	Tue Jul  4 14:05:20 2000
++++ sigsegv/autoconf/ltconfig	Sat Mar 31 19:59:32 2001
+@@ -703,7 +703,7 @@ hardcode_shlibpath_var=unsupported
+ runpath_var=
+ 
+ case "$host_os" in
+-amigaos* | beos* | sunos4*)
++amigaos* | beos* | sunos4* | openbsd*)
+   # On these operating systems, we should treat GNU ld like the system ld.
+   gnu_ld_acts_native=yes
+   ;;
+@@ -826,10 +826,21 @@ else
+     ;;
+ 
+   openbsd*)
+-    archive_cmds='$LD -Bshareable -o $lib$libobjs'
+-    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'
++	hardcode_libdir_flag_spec='-R$libdir'
++      ;;
++      *)
++	archive_cmds='$CC -shared $pic_flag -o $lib$libobjs'
++	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*)
diff --git a/lang/clisp/patches/patch-sigsegv_autoconf_ltmain_sh b/lang/clisp/patches/patch-sigsegv_autoconf_ltmain_sh
new file mode 100644
index 00000000000..6180a58f2de
--- /dev/null
+++ b/lang/clisp/patches/patch-sigsegv_autoconf_ltmain_sh
@@ -0,0 +1,88 @@
+$OpenBSD: patch-sigsegv_autoconf_ltmain_sh,v 1.1 2001/03/31 19:20:09 naddy Exp $
+--- sigsegv/autoconf/ltmain.sh.orig	Tue May 18 22:26:51 1999
++++ sigsegv/autoconf/ltmain.sh	Sat Mar 31 19:59:38 2001
+@@ -507,7 +507,28 @@ if test -z "$show_help"; then
+         deplibs="$deplibs $arg"
+         ;;
+ 
+-      -l*) deplibs="$deplibs $arg" ;;
++      -l*)
++        if test "$arg" = "-lc"; then
++          case "$host" in
++          *-*-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"
++        ;;
++ 
++      -?thread)
++        deplibs="$deplibs $arg"
++        ;;
+ 
+       -no-undefined)
+ 	allow_undefined=no
+@@ -1004,7 +1025,15 @@ if test -z "$show_help"; then
+ 
+       # Add libc to deplibs on all systems.
+       dependency_libs="$deplibs"
+-      deplibs="$deplibs -lc"
++      case "$host_os" in
++      openbsd*)
++		# do not include libc due to us having libc/libc_r.
++      ;;
++      *)
++		# Add libc to deplibs on all other systems.
++		deplibs="$deplibs -lc"
++      ;;
++      esac
+ 
+       if test "$build_libtool_libs" = yes; then
+         # Get the real and link names of the library.
+@@ -2025,37 +2054,6 @@ libdir='$install_libdir'\
+       done
+     fi
+ 
+-    echo "------------------------------------------------------------------------------"
+-    echo "Libraries have been installed in:"
+-    for libdir in $libdirs; do
+-      echo "   $libdir"
+-    done
+-    echo
+-    echo "To link against installed libraries in a given directory, LIBDIR,"
+-    echo "you must use the \`-LLIBDIR' flag during linking."
+-    echo
+-    echo " You will also need to do one of the following:"
+-    if test -n "$shlibpath_var"; then
+-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+-      echo "     during execution"
+-    fi
+-    if test -n "$runpath_var"; then
+-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+-      echo "     during linking"
+-    fi
+-    if test -n "$hardcode_libdir_flag_spec"; then
+-      libdir=LIBDIR
+-      eval flag=\"$hardcode_libdir_flag_spec\"
+-
+-      echo "   - use the \`$flag' linker flag"
+-    fi
+-    if test -f /etc/ld.so.conf; then
+-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+-    fi
+-    echo
+-    echo "See any operating system documentation about shared libraries for"
+-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
+-    echo "------------------------------------------------------------------------------"
+     exit 0
+     ;;
+ 
diff --git a/lang/clisp/patches/patch-src_makemake_in b/lang/clisp/patches/patch-src_makemake_in
index d918868c9d2..20227049f25 100644
--- a/lang/clisp/patches/patch-src_makemake_in
+++ b/lang/clisp/patches/patch-src_makemake_in
@@ -1,6 +1,7 @@
---- src/makemake.in.orig	Fri Mar 16 00:28:34 2001
-+++ src/makemake.in	Thu Mar 22 22:33:30 2001
-@@ -1627,6 +1627,12 @@
+$OpenBSD: patch-src_makemake_in,v 1.3 2001/03/31 19:20:09 naddy Exp $
+--- src/makemake.in.orig	Thu Mar 15 17:28:34 2001
++++ src/makemake.in	Sat Mar 31 19:56:11 2001
+@@ -1627,6 +1627,12 @@ case "$fsstnd" in
      echol "docdir = \$(exec_prefix)${NEXT_}share${NEXT_}doc"
      echol "lispdocdir = \$(docdir)${NEXT_}clisp"
      ;;
@@ -13,7 +14,7 @@
  esac
  echol "libdir = \$(exec_prefix)${NEXT_}lib"
  echol "lisplibdir = \$(libdir)${NEXT_}clisp"
-@@ -3129,14 +3135,14 @@
+@@ -3129,14 +3135,14 @@ if [ $CROSS = false ] ; then
          echotab "if [ ! -d \$(DESTDIR)\$(htmldir) ] ; then mkdir \$(DESTDIR)\$(htmldir) ; fi"
          echotab "if [ ! -d \$(DESTDIR)\$(dvidir) ] ; then mkdir \$(DESTDIR)\$(dvidir) ; fi"
          ;;
@@ -30,7 +31,7 @@
          ;;
        *)
          echotab "if [ ! -d \$(DESTDIR)\$(lispdocdir)/doc ] ; then mkdir \$(DESTDIR)\$(lispdocdir)/doc ; fi"
-@@ -3202,7 +3208,7 @@
+@@ -3202,7 +3208,7 @@ if [ $CROSS = false ] ; then
            echotab "\$(INSTALL_DATA) clreadline.dvi \$(DESTDIR)\$(dvidir)/clreadline.dvi"
          fi
          ;;
@@ -39,7 +40,7 @@
          echotab "if [ ! -d \$(DESTDIR)\$(lispdocdir) ] ; then mkdir \$(DESTDIR)\$(lispdocdir) ; fi"
          echotab "\$(INSTALL_DATA) clisp.html \$(DESTDIR)\$(lispdocdir)/clisp.html"
          if [ $TERMINAL = readline ] ; then
-@@ -3221,6 +3227,10 @@
+@@ -3221,6 +3227,10 @@ if [ $CROSS = false ] ; then
        netbsd)
          echotab "\$(INSTALL_DATA) \$(MANUALS)${manual_dvi} \$(DESTDIR)\$(lispdocdir)/"
          ;;
@@ -50,7 +51,7 @@
        *)
          echotab "if [ ! -d \$(DESTDIR)\$(lispdocdir)/doc ] ; then mkdir \$(DESTDIR)\$(lispdocdir)/doc ; fi"
          echotab "\$(INSTALL_DATA) \$(MANUALS)${manual_dvi} \$(DESTDIR)\$(lispdocdir)/doc/"
-@@ -3261,7 +3271,7 @@
+@@ -3261,7 +3271,7 @@ if [ $CROSS = false ] ; then
            echotab "\$(RM) \$(DESTDIR)\$(dvidir)/clreadline.dvi"
          fi
          ;;
@@ -59,7 +60,7 @@
          echotab "\$(RM) \$(DESTDIR)\$(lispdocdir)/clisp.html"
          if [ $TERMINAL = readline ] ; then
            echotab "\$(RM) \$(DESTDIR)\$(lispdocdir)/clreadline.html"
-@@ -3270,7 +3280,7 @@
+@@ -3270,7 +3280,7 @@ if [ $CROSS = false ] ; then
      esac
      echotab "for f in \$(READMES); do \$(RM) \$(DESTDIR)\$(lispdocdir)/\$\$f; done"
      case "$fsstnd" in