* Makefile.am (pkgdata_SCRIPTS): Remove lib/mondfe, lib/xsh.exp.

	(config_SCRIPTS): Remove udi.exp, vrtx.exp.
	(baseboard_SCRIPTS): Remove a29k-udi.exp.
	* Makefile.in: Regenerate.
	* baseboards/a29k-udi.exp: Remove.
	* baseboards/dos.exp: Update comments.
	* config/udi.exp: Remove.
	* config/vrtx.exp: Remove.
	* doc/overview.sgml: Update. Don't mention mondfe and xsh support.
	* doc/ref.sgml: Likewise.
	* doc/user.sgml: Likewise.
	* lib/mondfe.exp: Remove.
	* lib/xsh.exp: Likewise.
	* lib/remote.exp: Don't load mondfe.exp or xsh.exp.
	* packaging/pkg/prototype: Update.
	* NEWS: Update.

14 files changed, 27 insertions, 826 deletions

diff --git a/Makefile.am b/Makefile.am
index f2598b1..6d28dda 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,10 +15,9 @@ include_HEADERS = dejagnu.h
 pkgdata_SCRIPTS = \
   runtest.exp \
   lib/debugger.exp lib/dejagnu.exp lib/dg.exp lib/framework.exp \
-  lib/ftp.exp lib/kermit.exp lib/libgloss.exp lib/mondfe.exp \
-  lib/remote.exp lib/rlogin.exp lib/rsh.exp lib/standard.exp \
-  lib/target.exp lib/targetdb.exp lib/telnet.exp lib/tip.exp \
-  lib/utils.exp lib/xsh.exp
+  lib/ftp.exp lib/kermit.exp lib/libgloss.exp lib/remote.exp \
+  lib/rlogin.exp lib/rsh.exp lib/standard.exp lib/target.exp \
+  lib/targetdb.exp lib/telnet.exp lib/tip.exp lib/utils.exp
 
 configdir = $(pkgdatadir)/config
 config_DATA = config/README
@@ -58,18 +57,15 @@ config_SCRIPTS = \
 	config/slite.exp \
 	config/sparclet.exp \
 	config/tic80.exp \
-	config/udi.exp \
 	config/unix.exp \
 	config/vr4100.exp \
 	config/vr4300.exp \
 	config/vr5000.exp \
-	config/vrtx.exp \
 	config/vxworks.exp
 
 baseboarddir = $(pkgdatadir)/baseboards
 baseboard_DATA = baseboards/README
 baseboard_SCRIPTS = \
-	baseboards/a29k-udi.exp \
 	baseboards/am33_2.0-libremote.exp \
 	baseboards/arc-sim.exp \
 	baseboards/arm-ice.exp \
@@ -183,7 +179,7 @@ rpm: dist $(srcdir)/packaging/rpm/dejagnu.spec
 
 # Build a Debian GNU/Linux package
 deb: dist
-	-rm -rf dejagnu-${VERSION}
+	rm -rf dejagnu-${VERSION}
 	tar xfz dejagnu-${VERSION}.tar.gz
 	cp -fr $(srcdir)/packaging/deb dejagnu-${VERSION}/
 	(cd dejagnu-${VERSION}; dpkg-buildpackage)
diff --git a/Makefile.in b/Makefile.in
index 7fc0064..ff42e50 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -189,10 +189,9 @@ include_HEADERS = dejagnu.h
 pkgdata_SCRIPTS = \
   runtest.exp \
   lib/debugger.exp lib/dejagnu.exp lib/dg.exp lib/framework.exp \
-  lib/ftp.exp lib/kermit.exp lib/libgloss.exp lib/mondfe.exp \
-  lib/remote.exp lib/rlogin.exp lib/rsh.exp lib/standard.exp \
-  lib/target.exp lib/targetdb.exp lib/telnet.exp lib/tip.exp \
-  lib/utils.exp lib/xsh.exp
+  lib/ftp.exp lib/kermit.exp lib/libgloss.exp lib/remote.exp \
+  lib/rlogin.exp lib/rsh.exp lib/standard.exp lib/target.exp \
+  lib/targetdb.exp lib/telnet.exp lib/tip.exp lib/utils.exp
 
 configdir = $(pkgdatadir)/config
 config_DATA = config/README
@@ -232,18 +231,15 @@ config_SCRIPTS = \
 	config/slite.exp \
 	config/sparclet.exp \
 	config/tic80.exp \
-	config/udi.exp \
 	config/unix.exp \
 	config/vr4100.exp \
 	config/vr4300.exp \
 	config/vr5000.exp \
-	config/vrtx.exp \
 	config/vxworks.exp
 
 baseboarddir = $(pkgdatadir)/baseboards
 baseboard_DATA = baseboards/README
 baseboard_SCRIPTS = \
-	baseboards/a29k-udi.exp \
 	baseboards/am33_2.0-libremote.exp \
 	baseboards/arc-sim.exp \
 	baseboards/arm-ice.exp \
@@ -952,14 +948,14 @@ uninstall-info: uninstall-info-recursive
 
 
 # Build an RPM package
-rpm: dist
+rpm: dist $(srcdir)/packaging/rpm/dejagnu.spec
 	cp -f $(srcdir)/packaging/rpm/dejagnu.spec /usr/src/redhat/SPECS/
 	cp -f dejagnu-${VERSION}.tar.gz /usr/src/redhat/SOURCES/
 	rpm -ba /usr/src/redhat/SPECS/dejagnu.spec
 
 # Build a Debian GNU/Linux package
 deb: dist
-	-rm -rf dejagnu-${VERSION}
+	rm -rf dejagnu-${VERSION}
 	tar xfz dejagnu-${VERSION}.tar.gz
 	cp -fr $(srcdir)/packaging/deb dejagnu-${VERSION}/
 	(cd dejagnu-${VERSION}; dpkg-buildpackage)
diff --git a/NEWS b/NEWS
index 0f2fa9b..6b6521a 100644
--- a/NEWS
+++ b/NEWS
@@ -2,9 +2,9 @@ Changes from 1.4.4
 
 1. The automake/autoconf-based build system has been cleaned up
    significantly.  It now has less moving parts for maintainers.
-2. lib/mondfe.exp and lib/xsh.exp are now deprecated and will be
-   removed in the next major release.  If you still use this code,
-   please notify dejagnu@gnu.org.
+2. lib/mondfe.exp and lib/xsh.exp have been removed.  Users requiring
+   these communication modes can still use the DejaGnu 1.4 branch or
+   can contact dejagnu@gnu.org to discuss reinstating these files.
 
 Changes from 1.4.2
 
diff --git a/baseboards/a29k-udi.exp b/baseboards/a29k-udi.exp
deleted file mode 100644
index 145f60e..0000000
--- a/baseboards/a29k-udi.exp
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software
-# Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {a29k-amd-udi}
-
-# Load the generic configuration for this board.
-load_generic_config "udi"
-
-# The compiler used to build for this board. This has *nothing* to do
-# with what compiler is tested if we're testing gcc.
-set_board_info compiler  "[find_gcc]"
-# The basic set of flags needed to build "hello world" for this
-# board. This target uses libgloss and newlib.
-set_board_info cflags  "[newlib_include_flags] [libgloss_include_flags]"
-set_board_info ldflags  "[libgloss_link_flags] [newlib_link_flags]"
-# We don't need a linker script.
-set_board_info ldscript ""
-
-# mondfe can't return exit statuses, so gcc (ctorture et al) needs to
-# do what it can to get them.
-set_board_info needs_status_wrapper  1
-
-# Used by a few gcc.c-torture testcases to delimit how large the stack can
-# be.
-set_board_info gcc,stack_size  16384
diff --git a/baseboards/dos.exp b/baseboards/dos.exp
index 56c5c28..e090ba9 100644
--- a/baseboards/dos.exp
+++ b/baseboards/dos.exp
@@ -36,8 +36,6 @@ set_board_info ldflags "[newlib_link_flags] [libio_link_flags] [winsup_link_flag
 # We don't need a link script.
 set_board_info ldscript ""
 
-# mondfe can't return exit statuses, so gcc (ctorture et al) needs to
-# do what it can to get them.
 set_board_info needs_status_wrapper 1
 
 set_board_info gdb_opts "--command gdbinit"
diff --git a/config/udi.exp b/config/udi.exp
deleted file mode 100644
index ff3705a..0000000
--- a/config/udi.exp
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software
-# Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-
-# When using the simulator (-n iss) and running nice'd, things can naturally
-# take a little longer, so increase the timeout.
-
-#
-# udi_load -- load the program and execute it
-#
-# See default.exp for explanation of arguments and results.
-#
-
-proc udi_load { dest prog args } {
-    set shell_prompt [board_info $dest shell_prompt]
-    set output ""
-
-    if ![file exists $prog] then {
-	perror "$prog does not exist."
-	verbose -log "$prog does not exist." 3
-	return [list "untested" ""]
-    }
-
-    # Load the program.
-    if ![board_info $dest exists fileid] then {
-	remote_open $dest
-	if ![board_info $dest exists fileid] then {
-	    verbose -log "$prog not executed, couldn't connect to $dest." 3
-	    return "untested"
-	}
-    }
-
-    if { [remote_ld $dest $prog] == "" } {
-	verbose -log "$prog not executed, load failed." 3
-	return [list "unresolved" ""]
-    }
-
-    # Execute it.
-    set result -1
-    set output ""
-    set noappend 0
-
-    verbose "Executing $prog." 2
-    remote_send $dest "g\n"
-    # FIXME: The value 300 below should be a parameter.
-    remote_expect $dest 300 {
-	-re "(.*)Process exited with 0x0\[^\r\n\]*\[\r\n\]" {
-	    append output $expect_out(1,string)
-            verbose "$prog executed successfully" 2
-	    set noappend 1
-	    set result 0
-	    exp_continue
-	}
-	-re "(.*)Halt instruction encountered" {
-	    append output $expect_out(1,string)
-            verbose "$prog got a HALT instruction" 2
-	    set result 1
-	    set noappend 1
-	    exp_continue
-	}
-	-re "(^|\[\r\n\])$shell_prompt" {
-	    if { $result == -1 } {
-		exp_continue
-	    }
-	}
-	-re "(^|\[\r\n\]+)g\[\r\n\]+" {
-	    exp_continue
-	}
-	-re "\[\r\n\]+" {
-	    if { ! $noappend } {
-		append output $expect_out(buffer)
-		if { [string length $output] < 512000 } {
-		    exp_continue
-		} else {
-		    set result 1
-		}
-	    } else {
-		exp_continue
-	    }
-	}
-	timeout {
-	    warning "$prog timed out."
-	}
-    }
-
-    # See what happened.
-    switch -- $result {
-	0 {
-	    set status [check_for_board_status output]
-	    if { $status < 0 } {
-		blammo
-	    }
-	    if { $status > 0 } {
-		set result "fail"
-	    } else {
-		set result "pass"
-	    }
-	}
-	1 - -1 {
-	    warning "Resetting $dest."
-	    remote_send $dest "r\n"
-	    remote_expect $dest 5 {
-		-re "r.*$shell_prompt.*" {
-		    verbose "Target reset." 2
-		}
-		timeout {
-		    # Get nastier.  We want to leave the system in a state
-		    # ready to run the next testcase.
-		    remote_send $dest "q\n"
-		    remote_close $dest
-		    set udi_shell_id [remote_open $dest]
-		    if { $udi_shell_id < 0 } {
-			perror "Couldn't reset $dest."
-		    }
-		}
-	    }
-	    if { $result == 1 } {
-		set result "fail"
-	    } else {
-		set result "unresolved"
-	    }
-	}
-	default {
-	    set result "unresolved"
-	}
-    }
-    return [list $result $output]
-}
-
-#
-# udi_exit -- shutdown the connection (or simulator)
-#
-
-proc udi_exit {} {
-    remote_close target
-}
-
-set_board_info protocol "udi"
-set_board_info connect "mondfe"
-set_board_info shell_prompt "mondfe>"
diff --git a/config/vrtx.exp b/config/vrtx.exp
deleted file mode 100644
index f982d52..0000000
--- a/config/vrtx.exp
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software
-# Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# This file was written by Rob Savoye. (rob@welcomehome.org)
-
-# This file uses the xsh protocol.
-
-#
-# load support libraries
-#
-load_lib remote.exp
-
-#
-# ${tool}_load -- load the program and execute it
-#
-# See default.exp for explanation of arguments and results.
-#
-
-proc vrtx_load { dest prog args } {
-    remote_open $dest
-
-    switch -- [remote_download $dest $prog] {
-	0 { return "pass" }
-	1 { return "fail" }
-	-1 {
-	    # FIXME: This needs work (as does xsh_load).
-	    verbose -log "Unable to run $prog, internal spectra error." 3
-	    return "unresolved"
-	}
-    }
-}
-
-set_board_info protocol  "vrtx"
-set_board_info connect  "xsh"
diff --git a/doc/overview.sgml b/doc/overview.sgml
index c5620a6..537d959 100644
--- a/doc/overview.sgml
+++ b/doc/overview.sgml
@@ -318,8 +318,8 @@ into another language, under the above conditions for modified versions.
     thereafter.  Once a communication procedure is coded, any test can
     use it.  Currently DejaGnu can use <command>rsh</command>,
     <command>rlogin</command>, <command>telnet</command>,
-    <command>tip</command>, <command>kermit</command> and
-    <command>mondfe</command> for remote communications.</para>
+    <command>tip</command> and <command>kermit</command> for remote
+    communications.</para>
 
     </sect1>
 
diff --git a/doc/ref.sgml b/doc/ref.sgml
index f25698f..bbbf99f 100644
--- a/doc/ref.sgml
+++ b/doc/ref.sgml
@@ -4248,7 +4248,6 @@
       <listitem><para>lib/ftp.exp</para></listitem>
       <listitem><para>lib/kermit.exp</para></listitem>
       <listitem><para>lib/libgloss.exp</para></listitem>
-      <listitem><para>lib/mondfe.exp</para></listitem>
       <listitem><para>lib/remote.exp</para></listitem>
       <listitem><para>lib/rlogin.exp</para></listitem>
       <listitem><para>lib/rsh.exp</para></listitem>
@@ -4258,7 +4257,6 @@
       <listitem><para>lib/telnet.exp</para></listitem>
       <listitem><para>lib/tip.exp</para></listitem>
       <listitem><para>lib/utils.exp</para></listitem>
-      <listitem><para>lib/xsh.exp</para></listitem>
       <listitem><para>lib/dejagnu.exp</para></listitem>
     </itemizedlist>
 
diff --git a/doc/user.sgml b/doc/user.sgml
index 5f71f85..21b59d2 100644
--- a/doc/user.sgml
+++ b/doc/user.sgml
@@ -1021,15 +1021,16 @@ powerpc-linux-gcc -g -O2 -o calc calc.o
 
         <varlistentry>
           <term><option>--connect [program]</option></term>
-	  <listitem><para>Connect to a target testing environment as specified
-	  by <emphasis>type</emphasis>, if the target is not the computer
-	  running <emphasis>runtest</emphasis>.  For example, use
-	  <emphasis>--connect</emphasis> to change the program used to connect
-	  to a ``bare board'' boot monitor.  The choices for
-	  <emphasis>type</emphasis> in the DejaGnu 1.4 distribution are
-	  <emphasis>rlogin</emphasis>, <emphasis>telnet</emphasis>,
-	  <emphasis>rsh</emphasis>, <emphasis>tip</emphasis>,
-	  <emphasis>kermit</emphasis>, and <emphasis>mondfe</emphasis>.</para>
+	  <listitem><para>Connect to a target testing environment as
+	  specified by <emphasis>type</emphasis>, if the target is not
+	  the computer running <emphasis>runtest</emphasis>.  For
+	  example, use <emphasis>--connect</emphasis> to change the
+	  program used to connect to a ``bare board'' boot monitor.
+	  The choices for <emphasis>type</emphasis> in the DejaGnu 1.4
+	  distribution are <emphasis>rlogin</emphasis>,
+	  <emphasis>telnet</emphasis>, <emphasis>rsh</emphasis>,
+	  <emphasis>tip</emphasis> and
+	  <emphasis>kermit</emphasis>.</para>
 
 	  <para>The default for this option depends on the configuration most
 	  convenient communication method available, but often other
@@ -1948,8 +1949,8 @@ powerpc-linux-gcc -g -O2 -o calc calc.o
 	    <entry>connectmode</entry>
 	    <entry><command>rlogin</command>,
 	    <command>telnet</command>, <command>rsh</command>,
-	    <command>kermit</command>, <command>tip</command>, or
-	    <command>mondfe</command></entry>
+	    <command>kermit</command> or <command>tip</command>.
+	    </entry>
 	  </row>
 
 	  <row>
diff --git a/lib/mondfe.exp b/lib/mondfe.exp
deleted file mode 100644
index 40a51db..0000000
--- a/lib/mondfe.exp
+++ /dev/null
@@ -1,213 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-# 2001, 2002, 2003 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# This file was written by Rob Savoye. (rob@welcomehome.org)
-
-#
-# Connect to udi using mondfe
-#
-# HOSTNAME can be `iss' to talk to the simulator.
-# The result is the value of `spawn_id' or -1 for failure.
-#
-proc mondfe_open { hostname } {
-    global spawn_id
-    global board_info
-
-    set retries 0
-    set result  -1
-
-    set shell_prompt [board_info $hostname shell_prompt]
-    if ![board_info $hostname exists mondfe,name] {
-	perror "Must set board_info(${hostname},mondfe,name)"
-	return -1
-    }
-    if [board_info $hostname exists mondfe] {
-	set mondfe [board_info $hostname mondfe]
-    } else {
-	set mondfe "mondfe"
-    }
-
-    set remote_host [board_info $hostname mondfe,name]
-
-    if [board_info $hostname exists mondfe_host] {
-	set rh [board_info $hostname mondfe_host]
-    } else {
-	verbose "Attempting to connect to $hostname via mondfe."
-	set rh "host"
-    }
-
-    set shell_id [remote_spawn $rh "$mondfe -D -TIP $remote_host"]
-
-    remote_expect $rh 60 {
-	"$shell_prompt"	{
-	    verbose "Got prompt"
-	    set result 0
-	}
-	"*server bind*failed: Address already in use*" {
-	    warning "Socket file already exists."
-	    incr retries
-	    if { $retries <= 2 } {
-		exp_continue
-	    }
-	}
-	-indices -re ".*(UDIERROR\[^\r\n\]*)\[\r\n\]" {
-	    warning "$expect_out(1,string)"
-	    exp_continue
-	}
-	-indices -re ".*(DFEERROR\[^\r\n\]*)\[\r\n\]" {
-	    warning "$expect_out(1,string)"
-	    exp_continue
-	}
-	timeout	{
-	    warning "Timed out trying to connect."
-	    set result -1
-	    incr retries
-	    if { $retries <= 2 } {
-		remote_send $rh "\n"
-		exp_continue
-	    }
-	}
-    }
-
-    if { $result < 0 } {
-	perror "Couldn't connect after $retries retries."
-	remote_close $rh
-	return -1
-    } else {
-	set board_info($hostname,fileid) $shell_id
-	return $shell_id
-    }
-}
-
-#
-# Downloads using the y (yank) command in mondfe
-#
-# FILE is a full path name to the file to download.
-# Returns 1 if an error occured, 0 otherwise.
-#
-proc mondfe_ld { dest_machine file } {
-    global decimal		# Regexp to match a decimal number.
-
-    if ![file exists $file] {
-	perror "$file doesn't exist."
-	return ""
-    }
-
-    set shell_prompt [board_info $dest_machine shell_prompt]
-
-    if [board_info $dest_machine exists mondfe_host] {
-	set remote_host [board_info $dest_machine mondfe_host]
-	set file [remote_download $remote_host $file montest]
-    } else {
-	set remote_host "host"
-    }
-
-    verbose "Downloading $file." 2
-    verbose "Shell prompt is $shell_prompt." 3
-    set result 1
-    remote_send $remote_host "y $file\n"
-    remote_expect $remote_host 60 {
-	"y $file" {
-	    exp_continue
-	}
-	-re "loading $file\[\r\n\]+" {
-	    exp_continue
-	}
-	-re "Load(ing|ed) *TEXT section from\[^\r\n\]*\[\r\n\]+" {
-	    verbose -n "." 2
-	    exp_continue
-	}
-	-re "Load(ing|ed) *LIT section from\[^\r\n\]*\[\r\n\]+" {
-	    verbose -n "." 2
-	    exp_continue
-	}
-	-re "Load(ing|ed) *DATA section from\[^\r\n\]*\[\r\n\]+" {
-	    verbose -n "." 2
-	    exp_continue
-	}
-	-re "Clear(ing|ed) *BSS section from\[^\r\n\]*\[\r\n\]+" {
-	    verbose -n "." 2
-	    exp_continue
-	}
-	-re "(^|\[\r\n\]+)$shell_prompt$" {
-	    verbose "Downloaded $file successfully." 2
-	    set result 0
-	}
-	-re "Command failed.*$shell_prompt$" {
-	    set result 1
-	}
-	-re "DFEWARNING: $decimal : EMMAGIC:  Bad COFF file magic number.*Command failed.*$shell_prompt$" {
-	    warning "Bad COFF file magic number"
-	    set result 1
-	}
-        -re "Ignoring COMMENT section \($decimal bytes\)\[^\r\n\]*\[\r\n\]+" {
-            verbose "Ignoring COMMENT section" 2
-	    exp_continue
-        }
-	timeout {
-	    perror "Timed out trying to download $file."
-	    set result 1
-	}
-    }
-
-    if { $result && [info exists expect_out(buffer)] } {
-	send_log $expect_out(buffer)
-    }
-
-    if [board_info $dest_machine exists mondfe_host] {
-	remote_file $remote_machine delete $file
-    }
-
-    return $result
-}
-
-#
-# Exit the remote shell
-#
-proc mondfe_close { hostname } {
-    global board_info
-
-    if [board_info $hostname exists mondfe_host] {
-	set remote_host [board_info $hostname mondfe_host]
-    } else {
-	set remote_host "host"
-    }
-
-    if ![board_info $hostname exists fileid] {
-	return 0
-    }
-
-    if [board_info $remote_host exists fileid] {
-	remote_send $remote_host "q\n"
-	remote_expect $remote_host 30 {
-	    "Goodbye." {
-		verbose "Exited mondfe."
-	    }
-	    timeout {
-		warning "mondfe didn't exit cleanly."
-	    }
-	}
-
-	remote_close $remote_host
-    }
-
-    unset board_info($hostname,fileid)
-
-    return 0
-}
diff --git a/lib/remote.exp b/lib/remote.exp
index 129b9eb..b57276e 100644
--- a/lib/remote.exp
+++ b/lib/remote.exp
@@ -19,10 +19,8 @@
 
 # This file was written by Rob Savoye. (rob@welcomehome.org)
 
-# load various protocol support modules
+# Load various protocol support modules.
 
-load_lib "mondfe.exp"
-load_lib "xsh.exp"
 load_lib "telnet.exp"
 load_lib "rlogin.exp"
 load_lib "kermit.exp"
diff --git a/lib/xsh.exp b/lib/xsh.exp
deleted file mode 100644
index 5a3b64b..0000000
--- a/lib/xsh.exp
+++ /dev/null
@@ -1,322 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-# 2001, 2002, 2003 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# This file was written by Rob Savoye. (rob@welcomehome.org)
-
-#
-# Connect to Spectra (VTRX) using xsh
-#
-proc xsh_open { hostname } {
-    global hex
-    global target_triplet
-    global xsh_shell_prompt
-    global board_info
-
-    if [board_info $hostname exists fileid] {
-	unset board_info($hostname,fileid)
-    }
-
-    if ![board_info $hostname exists spectra] {
-	perror "No spectra directory for $hostname"
-	return -1
-    } else {
-	set spectra [board_info $hostname spectra]
-    }
-
-    if ![board_info $hostname exists xsh_shell_prompt] {
-	set xsh_shell_prompt ".*> "
-    } else {
-	set xsh_shell_prompt [board_info $hostname shell_prompt]
-    }
-
-    set retries 0
-    set result  0
-    if ![board_info $hostname exists xsh_prog] {
-	set xsh xsh
-    } else {
-	set xsh [board_info $hostname xsh_prog]
-    }
-
-    if {[which $xsh] != 0} {
-	spawn $xsh
-    } else {
-	warning "Can't find xsh in path"
-	return -1
-    }
-
-    set shell_id $spawn_id
-
-    # start the shell
-    expect {
-	"*Spectra Cross-Development Shell version*$xsh_shell_prompt" {
-	    verbose "Got prompt"
-	    set result 0
-	}
-	timeout			{
-	    warning "Timed out trying to connect."
-	    set result -1
-	    incr retries
-	    if { $retries <= 2 } {
-		exp_continue
-	    }
-	}
-    }
-
-    # connect to the shell
-    set retries 0
-    send "connect $hostname\n"
-    expect {
-	"connect $hostname*$hostname connected \(non-os mode\)*\n" {
-	    set xsh_shell_prompt "$hostname> "
-	    verbose "Connected to $hostname"
-	}
-	"*connect: not attached*" {
-	    warning "Couldn't attach target"
-	    set result -1
-	}
-	-re ".* reset on target.*$" {
-	    send_user "Spectra was reset\n"
-	    exp_continue
-	}
-	-re "\[0-9A-Fa-f\]+\[ 0x\]+\[0-9A-Fa-f\]+.*$" {
-	    exp_continue
-	}
-	"$hostname> " {
-	    #send "\n"
-	}
-	timeout {
-	    warning "Timed out trying to connect after $expect_out(seconds) seconds."
-	    set result -1
-	    incr retries
-	    if { $retries <= 2 } {
-		exp_continue
-	    }
-	}
-    }
-
-    send "\n\n\n"
-    expect {
-	"*$hostname*$hostname" {
-	    verbose "Cleared reset messages" 1
-	}
-	timeout {
-	    warning "Couldn't clear reset messages"
-	    set result 1
-	}
-    }
-
-    set board_info($hostname,fileid) $spawn_id
-    # load to operating system
-    set timeout 20
-    set retries 0
-    if {[xsh_download $hostname $spectra/${target_triplet}-os.o "" {-e sys_start_crt0}]!=0} {
-	perror "Couldn't load Spectra into target"
-	return -1
-    }
-
-    set timeout 10
-    # start the OS running
-    set retries 0
-    send "go\n"
-    expect {
-	-re ".*Multithreading on target darkstar.*$" {
-	    verbose "Spectra has been started..." 1
-	    set result 0
-	}
-	-re ".*reset on target.*$" {
-	    verbose "Spectra was reset"
-	    exp_continue
-	}
-	-re "\[0-9A-Fa-f\]+\[ 0x\]+\[0-9A-Fa-f\]+.*$" {
-	    #send "\n"
-	    exp_continue
-	}
-	-re "go\n" { exp_continue }
-	"$xsh_shell_prompt" { exp_continue }
-	timeout {
-	    perror "Spectra wouldn't start"
-	    set result -1
-	    incr retries
-	    if { $retries <= 2 } {
-		send "go\r"
-		exp_continue
-	    }
-	}
-    }
-
-    if { $result < 0 } {
-	perror "Couldn't connect after $retries retries.\n"
-	return -1
-    } else {
-	set board_info($hostname,fileid) $spawn_id
-	return $spawn_id
-    }
-}
-
-#
-# Download an executable using the load command in Spectra.
-#     arg[0] - is a full path name to the file to download.
-#     arg[1] - optional arguments to the load command.
-#     returns  1 if a spectra error occured,
-#             -1 if an internal error occured,
-#              0 otherwise.
-#
-proc xsh_download { dest file destfile args } {
-    global verbose
-    global shell_id
-    global decimal
-    global hex
-    global expect_out
-    global board_info
-
-    set result 1
-    set retries 0
-    set shell_id [board_info $dest fileid]
-
-    if { [llength $args] > 1 } {
-	set opts [lindex $args 1]
-    } else {
-	set opts ""
-    }
-
-    if { [llength $args] > 0 } {
-	set destfile [lindex $args 0]
-    }
-
-    if ![file exists $file] {
-	perror "$file doesn't exist."
-	return 1
-    }
-
-    verbose "Downloading $file..."
-
-    send -i $shell_id "load $opts $file\r"
-    set force 0
-    expect {
-	-i $shell_id -re "\[0-9A-Fa-f\]+\[ 0x\]+\[0-9A-Fa-f\]+\r\n" {
-	    set timeout 1
-	    send "dout\n"
-	    while $force<2 {
-		expect {
-		    "dout*undefined kernel symbol*$xsh_shell_prompt" {
-			verbose "Attempted to flush I/O buffers" 1
-		    }
-		    timout {	
-			incr force	
-			flush stdout	
-		    }
-		}
-	    }
-	    set timeout 20
-	    exp_continue
-	}
-	-i $shell_id  "load $opts $file*\r" {
-	    verbose "Loading a.out..."
-	    exp_continue
-	}
-	-i $shell_id "Warm reset on target*\n" {
-	    verbose "Spectra did a warm reset"
-	    exp_continue
-	}
-	-i $shell_id "Cold reset on target*\n" {
-	    verbose "Spectra did a cold reset"
-	    exp_continue
-	}
-	-i $shell_id "loading a.out*\r" {
-	    verbose "Loading a.out..."
-	    exp_continue
-	}
-	-i $shell_id "reading symbols*\r" {
-	    verbose "Reading symbols..."
-	    exp_continue
-	}
-	-i $shell_id "defining symbols*\r" {
-	    verbose "defining symbols..."
-	    exp_continue
-	}
-	-i $shell_id "*loading image*\r" {
-	    verbose "Loading image..."
-	    exp_continue
-	}
-	-i $shell_id -re ".*bytes loaded:.*$decimal.*$" {
-	    verbose "$expect_out(buffer)"
-	    exp_continue
-	}
-	-i $shell_id "*loading done*\r" {
-	    verbose "Loading done..."
-	    exp_continue
-	}
-	-i $shell_id "*setting PC*\r" {
-	    verbose "Setting PC..."
-	    exp_continue
-	}
-	-i $shell_id "*resolving symbols*\r" {
-	    verbose "Resolving symbols..."
-	    exp_continue
-	}
-        -i $shell_id -re ".*load module id = $decimal.*$" {
-	    verbose ""
-        }
-	-i $shell_id -re ".*load: undefined symbols.*$"  {
-	    perror "undefined symbols, make sure os is loaded and running"
-	    set result -1
-        }
-	-i $shell_id "$xsh_shell_prompt" {
-	    set result 0
-	    exp_continue
-	}
-	-i $shell_id "load: no default target" {
-	    perror "default target isn't set"
-	    return -1
-	}
-	-i $shell_id timeout {
-	    perror "Timed out trying to download after $expect_out(seconds) seconds."
-	    incr retries
-	    set result 1
-	    if { $retries <= 2 } {
-		exp_continue
-	    }
-	}
-    }
-
-    set timeout 10
-    if [info exists expect_out(buffer)] {
-	send_log $expect_out(buffer)
-    }
-    set board_info($hostname,fileid) $shell_id
-    return $result
-}
-
-#
-# Exit the remote shell
-#
-proc xsh_close { hostname } {
-    global board_info
-
-    if ![board_info $hostname exists fileid] {
-	return
-    }
-
-    set shell_id [board_info ${hostname} fileid]
-    send -i $shell_id "exit\n"
-    unset board_info(${hostname},fileid)
-
-    verbose "Exiting shell."
-    return 0
-}
diff --git a/packaging/pkg/prototype b/packaging/pkg/prototype
index 970933d..208fc35 100644
--- a/packaging/pkg/prototype
+++ b/packaging/pkg/prototype
@@ -15,7 +15,6 @@ f none /opt/dejagnu/share/dejagnu/libexec/config.guess 0755 nobody nobody
 d none /opt/dejagnu/share/dejagnu/baseboards 0775 nobody nobody
 f none /opt/dejagnu/share/dejagnu/baseboards/op50n.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/baseboards/README 0644 nobody nobody
-f none /opt/dejagnu/share/dejagnu/baseboards/a29k-udi.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/baseboards/arc-sim.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/baseboards/arm-ice.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/baseboards/arm-sid.exp 0644 nobody nobody
@@ -115,7 +114,6 @@ f none /opt/dejagnu/share/dejagnu/framework.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/ftp.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/kermit.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/libgloss.exp 0644 nobody nobody
-f none /opt/dejagnu/share/dejagnu/mondfe.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/remote.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/rlogin.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/rsh.exp 0644 nobody nobody
@@ -125,7 +123,6 @@ f none /opt/dejagnu/share/dejagnu/targetdb.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/telnet.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/tip.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/utils.exp 0644 nobody nobody
-f none /opt/dejagnu/share/dejagnu/xsh.exp 0644 nobody nobody
 d none /opt/dejagnu/share/dejagnu/config 0775 nobody nobody
 f none /opt/dejagnu/share/dejagnu/config/README 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/config/arc.exp 0644 nobody nobody
@@ -163,12 +160,10 @@ f none /opt/dejagnu/share/dejagnu/config/sim.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/config/slite.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/config/sparclet.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/config/tic80.exp 0644 nobody nobody
-f none /opt/dejagnu/share/dejagnu/config/udi.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/config/unix.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/config/vr4100.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/config/vr4300.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/config/vr5000.exp 0644 nobody nobody
-f none /opt/dejagnu/share/dejagnu/config/vrtx.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/config/vxworks.exp 0644 nobody nobody
 f none /opt/dejagnu/share/dejagnu/runtest.exp 0755 nobody nobody
 d none /opt/dejagnu/include 0775 nobody nobody