Update dejagnu to 1.4.4.

Changes from 1.4.3 include:
1. New XML output option, so test results can be loaded into a database.
2. Support for the KFAIL/KPASS (known failures).
6. BlueGnu has been removed from the contrib directory.
7. The contrib/test* scipts were bitrotten and have been removed.  If
   you still want copies of these, they can be found in the previous
   DejaGnu release.
8. i960glue.c has been removed.

5 files changed, 23 insertions, 34 deletions

diff --git a/devel/dejagnu/Makefile b/devel/dejagnu/Makefile
index 948b098b7dc..9ee5bf8802b 100644
--- a/devel/dejagnu/Makefile
+++ b/devel/dejagnu/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:30:14 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/31 00:27:36 kristerw Exp $
 #
 
-DISTNAME=	dejagnu-1.4.3
-PKGREVISION=	2
+DISTNAME=	dejagnu-1.4.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=dejagnu/}
 
diff --git a/devel/dejagnu/PLIST b/devel/dejagnu/PLIST
index aa38e87fd81..6268c884f57 100644
--- a/devel/dejagnu/PLIST
+++ b/devel/dejagnu/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2002/09/27 23:43:42 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/01/31 00:27:36 kristerw Exp $
 bin/runtest
 include/dejagnu.h
 man/man1/runtest.1
 share/dejagnu/baseboards/README
 share/dejagnu/baseboards/a29k-udi.exp
+share/dejagnu/baseboards/am33_2.0-libremote.exp
 share/dejagnu/baseboards/arc-sim.exp
 share/dejagnu/baseboards/arm-ice.exp
 share/dejagnu/baseboards/arm-sid.exp
@@ -28,8 +29,8 @@ share/dejagnu/baseboards/frv-tomcat.exp
 share/dejagnu/baseboards/gdbserver-sample.exp
 share/dejagnu/baseboards/h8300-sim.exp
 share/dejagnu/baseboards/h8300.exp
-share/dejagnu/baseboards/i386-bozo.exp
-share/dejagnu/baseboards/i386-sid.exp
+share/dejagnu/baseboards/${MACHINE_ARCH}-bozo.exp
+share/dejagnu/baseboards/${MACHINE_ARCH}-sid.exp
 share/dejagnu/baseboards/i960-cyclone.exp
 share/dejagnu/baseboards/i960-sim.exp
 share/dejagnu/baseboards/jmr3904-sim.exp
@@ -65,9 +66,10 @@ share/dejagnu/baseboards/powerpc-bug1.exp
 share/dejagnu/baseboards/powerpc-sim.exp
 share/dejagnu/baseboards/powerpcle-sim.exp
 share/dejagnu/baseboards/rom68k-idp.exp
-share/dejagnu/baseboards/sh-hms-sim.exp
 share/dejagnu/baseboards/sh-hms.exp
 share/dejagnu/baseboards/sh-sid.exp
+share/dejagnu/baseboards/sh-sim.exp
+share/dejagnu/baseboards/sparc-sim.exp
 share/dejagnu/baseboards/sparc64-sim.exp
 share/dejagnu/baseboards/sparclet-aout.exp
 share/dejagnu/baseboards/sparclite-coff.exp
@@ -112,7 +114,7 @@ share/dejagnu/config/dve.exp
 share/dejagnu/config/gdb-comm.exp
 share/dejagnu/config/gdb_stub.exp
 share/dejagnu/config/h8300.exp
-share/dejagnu/config/i386-bozo.exp
+share/dejagnu/config/${MACHINE_ARCH}-bozo.exp
 share/dejagnu/config/i960.exp
 share/dejagnu/config/m32r-stub.exp
 share/dejagnu/config/m32r.exp
@@ -143,7 +145,6 @@ share/dejagnu/dejagnu.exp
 share/dejagnu/dg.exp
 share/dejagnu/framework.exp
 share/dejagnu/ftp.exp
-share/dejagnu/i960glue.c
 share/dejagnu/kermit.exp
 share/dejagnu/libexec/config.guess
 share/dejagnu/libgloss.exp
@@ -163,6 +164,6 @@ share/dejagnu/util-defs.exp
 share/dejagnu/utils.exp
 share/dejagnu/xsh.exp
 @dirrm share/dejagnu/libexec
-@dirrm share/dejagnu/baseboards
 @dirrm share/dejagnu/config
+@dirrm share/dejagnu/baseboards
 @dirrm share/dejagnu
diff --git a/devel/dejagnu/distinfo b/devel/dejagnu/distinfo
index 6e8bbd5447a..7e473ef09d2 100644
--- a/devel/dejagnu/distinfo
+++ b/devel/dejagnu/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2003/06/14 00:24:27 thorpej Exp $
+$NetBSD: distinfo,v 1.6 2004/01/31 00:27:36 kristerw Exp $
 
-SHA1 (dejagnu-1.4.3.tar.gz) = 4699f4281801109bafeb6245ee75db12e0769dfb
-Size (dejagnu-1.4.3.tar.gz) = 1817399 bytes
-SHA1 (patch-aa) = 250e1f77e93360fb01106f96f07504a0f4bf871a
-SHA1 (patch-ab) = 3e12b8cb999dadf6427d3982afaafe4d5cb7ce12
+SHA1 (dejagnu-1.4.4.tar.gz) = fd82ffd396eba5b595f76d2f4a068cb7fcc6cffb
+Size (dejagnu-1.4.4.tar.gz) = 1080346 bytes
+SHA1 (patch-ab) = 3be83f8ae3e20b50101a39501d863bf8bbb484a2
diff --git a/devel/dejagnu/patches/patch-aa b/devel/dejagnu/patches/patch-aa
deleted file mode 100644
index d133067fc29..00000000000
--- a/devel/dejagnu/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/11/25 21:13:52 kristerw Exp $
---- lib/utils.exp.orig	Fri Aug 30 05:54:53 2002
-+++ lib/utils.exp	Mon Nov 25 22:01:14 2002
-@@ -105,7 +105,7 @@
- 	    break
- 	}
- 	foreach i $tmp {
--	    set j [getdirs -all $i]
-+	    set j [getdirs $i]
- 	    if ![string match "" $j] {
- 		append dirs "$j "
- 		set rootdir $j
diff --git a/devel/dejagnu/patches/patch-ab b/devel/dejagnu/patches/patch-ab
index e424be5e49b..ef7e0645199 100644
--- a/devel/dejagnu/patches/patch-ab
+++ b/devel/dejagnu/patches/patch-ab
@@ -1,13 +1,15 @@
-$NetBSD: patch-ab,v 1.1 2003/06/14 00:24:28 thorpej Exp $
+$NetBSD: patch-ab,v 1.2 2004/01/31 00:27:36 kristerw Exp $
 
---- lib/target.exp.orig	2003-06-13 17:18:00.000000000 -0700
-+++ lib/target.exp	2003-06-13 17:17:35.000000000 -0700
-@@ -262,6 +262,8 @@
+--- lib/target.exp.orig	Fri Jan 30 23:22:00 2004
++++ lib/target.exp	Fri Jan 30 23:21:17 2004
+@@ -262,8 +262,8 @@
      regsub -all "(^|\n)(ld(|32|64): Giving up.*Use -wall\[^\n\]*\n?)+" $text "\\1" text
  
      # Or the NetBSD ones.
-+    regsub -all "(^|\n)(\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*warning: this program uses \[^\n\]*)" $text "\\1" text
-+    regsub -all "(^|\n)(\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*warning: reference to compatibility \[^\n\]*)" $text "\\1" text
-     regsub -all "(^|\n)(\[^\n\]*:\[0-9\]+: warning: \[^\n\]* possibly used unsafely, use \[^\n\]*\n?)" $text "\\1" text
+-     regsub -all "(^|\n)(\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*warning:this program uses \[^\n\]*)" $text "\\1" text
+-     regsub -all "(^|\n)(\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*warning:reference to compatibility \[^\n\]*)" $text "\\1" text
++     regsub -all "(^|\n)(\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*warning: this program uses \[^\n\]*)" $text "\\1" text
++     regsub -all "(^|\n)(\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*warning: reference to compatibility \[^\n\]*)" $text "\\1" text
+      regsub -all "(^|\n)(\[^\n\]*:\[0-9\]+: warning: \[^\n\]* possibly used unsafely, use \[^\n\]*\n?)" $text "\\1" text
      regsub -all "(^|\n)(\[^\n\]*: warning: reference to compatibility glob\[^\n\]*\n?)" $text "\\1" text