Bump dejagnu 1.4.4 to 1.5

-------------------------
patches/patch-ab
  Upstream now includes this change, removed.
patches/patch-ac
  Doc generation has changed and doc directory does not exist any more, removed.
patches/patch-Makefile.am
  *.exp files were execution bit set because of target name, patch added.
  has -SCRIPT string. Now correcting to -DATA
patches/patch-Makefile.in
  Generated by automake-1.11.1 from Makefile.am, patch added.
-------------------------
Changes since 1.4.4:

1. The runtest.1 man page has been brought up to date.
2. The Docbook/SGML documentation files were removed in favour of the
   Docbook/XML documentation.  The Texinfo source for the Info pages is
   now automatically generated from the Docbook source.
3. The Makefile structure has been substantially simplified.  There
   is now a single top-level Makefile.am.  The use of recursive make
   has been eliminated.
4. 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.
5. The configure script now ensures that Expect is installed and that
   it is linked against Tcl 8.3 or greater.
6. The runtest program now gracefully handles the possibility of the
   expect binary vanishing after DejaGnu has been installed (for
   example, by the user altering their PATH).
7. The user-visible utility procedures `absolute', `prune', `psource'
   and `slay' are deprecated and will be removed in the next release.
   If a testsuite uses any of these procedures, a copy of the
   procedure should be made and placed in the lib directory of the
   testsuite.

7 files changed, 340 insertions, 95 deletions

diff --git a/devel/dejagnu/Makefile b/devel/dejagnu/Makefile
index 94d94c454c0..8dc35222fb6 100644
--- a/devel/dejagnu/Makefile
+++ b/devel/dejagnu/Makefile
@@ -1,22 +1,27 @@
-# $NetBSD: Makefile,v 1.15 2012/10/31 11:16:52 asau Exp $
+# $NetBSD: Makefile,v 1.16 2013/06/10 01:09:48 mef Exp $
 #
 
-DISTNAME=	dejagnu-1.4.4
-PKGREVISION=	3
+DISTNAME=	dejagnu-1.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=dejagnu/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/dejagnu/dejagnu.html
 COMMENT=	TCL/Expect-based framework for regression testing
+LICENSE=	gnu-gpl-v3
 
 DEPENDS+=	tcl-expect>=5.32.1:../../lang/tcl-expect
 
 GNU_CONFIGURE=	yes
+INFO_FILES=	yes
 
-INSTALL_TARGET=	install install-doc
+CONFIGURE_ARGS+=	--infodir=${PREFIX}/info
 
-post-install:
-	chmod -x ${DESTDIR}${PREFIX}/share/dejagnu/runtest.exp
+INSTALL_TARGET=	install install-info
+
+# c++ is necessary for make test
+USE_LANGUAGES+=	c c++
+TEST_TARGET=	check
+TEST_ENV=	PATH=/usr/bin:/bin:${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/dejagnu/PLIST b/devel/dejagnu/PLIST
index 0cacbdc2f8c..250e5976158 100644
--- a/devel/dejagnu/PLIST
+++ b/devel/dejagnu/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:48:40 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2013/06/10 01:09:48 mef Exp $
 bin/runtest
 include/dejagnu.h
+info/dejagnu.info
 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
@@ -12,6 +12,7 @@ share/dejagnu/baseboards/arm-sim.exp
 share/dejagnu/baseboards/basic-sid.exp
 share/dejagnu/baseboards/basic-sim.exp
 share/dejagnu/baseboards/cf.exp
+share/dejagnu/baseboards/cris-sim.exp
 share/dejagnu/baseboards/cygmon.exp
 share/dejagnu/baseboards/cygwin.exp
 share/dejagnu/baseboards/d10v-sim.exp
@@ -33,10 +34,12 @@ share/dejagnu/baseboards/i386-bozo.exp
 share/dejagnu/baseboards/i386-sid.exp
 share/dejagnu/baseboards/i960-cyclone.exp
 share/dejagnu/baseboards/i960-sim.exp
+share/dejagnu/baseboards/iq2000-sim.exp
 share/dejagnu/baseboards/jmr3904-sim.exp
 share/dejagnu/baseboards/linux-gdbserver.exp
 share/dejagnu/baseboards/linux-libremote.exp
 share/dejagnu/baseboards/m32r-elf.exp
+share/dejagnu/baseboards/m32r-linux-sim.exp
 share/dejagnu/baseboards/m32r-sid.exp
 share/dejagnu/baseboards/m32r-sim.exp
 share/dejagnu/baseboards/m68hc11-sim.exp
@@ -60,6 +63,7 @@ share/dejagnu/baseboards/mn10200-sim.exp
 share/dejagnu/baseboards/mn10300-cygmon.exp
 share/dejagnu/baseboards/mn10300-sim.exp
 share/dejagnu/baseboards/msparc-cygmon.exp
+share/dejagnu/baseboards/mt-sid.exp
 share/dejagnu/baseboards/op50n.exp
 share/dejagnu/baseboards/powerpc-bug.exp
 share/dejagnu/baseboards/powerpc-bug1.exp
@@ -133,12 +137,10 @@ share/dejagnu/config/sim.exp
 share/dejagnu/config/slite.exp
 share/dejagnu/config/sparclet.exp
 share/dejagnu/config/tic80.exp
-share/dejagnu/config/udi.exp
 share/dejagnu/config/unix.exp
 share/dejagnu/config/vr4100.exp
 share/dejagnu/config/vr4300.exp
 share/dejagnu/config/vr5000.exp
-share/dejagnu/config/vrtx.exp
 share/dejagnu/config/vxworks.exp
 share/dejagnu/debugger.exp
 share/dejagnu/dejagnu.exp
@@ -148,7 +150,6 @@ share/dejagnu/ftp.exp
 share/dejagnu/kermit.exp
 share/dejagnu/libexec/config.guess
 share/dejagnu/libgloss.exp
-share/dejagnu/mondfe.exp
 share/dejagnu/remote.exp
 share/dejagnu/rlogin.exp
 share/dejagnu/rsh.exp
@@ -160,45 +161,4 @@ share/dejagnu/targetdb.exp
 share/dejagnu/telnet.exp
 share/dejagnu/testglue.c
 share/dejagnu/tip.exp
-share/dejagnu/util-defs.exp
 share/dejagnu/utils.exp
-share/dejagnu/xsh.exp
-share/doc/dejagnu/dejagnu.pdf
-share/doc/dejagnu/dejagnu.ps
-share/doc/dejagnu/dejagnu.rtf
-share/doc/dejagnu/html/book1.html
-share/doc/dejagnu/html/c1099.html
-share/doc/dejagnu/html/c1584.html
-share/doc/dejagnu/html/c1593.html
-share/doc/dejagnu/html/c203.html
-share/doc/dejagnu/html/c401.html
-share/doc/dejagnu/html/c50.html
-share/doc/dejagnu/html/c5112.html
-share/doc/dejagnu/html/c848.html
-share/doc/dejagnu/html/f40.html
-share/doc/dejagnu/html/x107.html
-share/doc/dejagnu/html/x1107.html
-share/doc/dejagnu/html/x1195.html
-share/doc/dejagnu/html/x1214.html
-share/doc/dejagnu/html/x1234.html
-share/doc/dejagnu/html/x134.html
-share/doc/dejagnu/html/x1445.html
-share/doc/dejagnu/html/x1462.html
-share/doc/dejagnu/html/x1493.html
-share/doc/dejagnu/html/x1522.html
-share/doc/dejagnu/html/x1551.html
-share/doc/dejagnu/html/x1590.html
-share/doc/dejagnu/html/x1600.html
-share/doc/dejagnu/html/x1655.html
-share/doc/dejagnu/html/x227.html
-share/doc/dejagnu/html/x276.html
-share/doc/dejagnu/html/x319.html
-share/doc/dejagnu/html/x428.html
-share/doc/dejagnu/html/x5058.html
-share/doc/dejagnu/html/x5158.html
-share/doc/dejagnu/html/x755.html
-share/doc/dejagnu/html/x81.html
-share/doc/dejagnu/html/x916.html
-share/doc/dejagnu/html/x935.html
-share/doc/dejagnu/html/x953.html
-share/doc/dejagnu/html/x992.html
diff --git a/devel/dejagnu/distinfo b/devel/dejagnu/distinfo
index d12a011d23a..029d9f7e349 100644
--- a/devel/dejagnu/distinfo
+++ b/devel/dejagnu/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2008/06/16 13:45:55 joerg Exp $
+$NetBSD: distinfo,v 1.10 2013/06/10 01:09:48 mef Exp $
 
-SHA1 (dejagnu-1.4.4.tar.gz) = fd82ffd396eba5b595f76d2f4a068cb7fcc6cffb
-RMD160 (dejagnu-1.4.4.tar.gz) = 5f00f4ce6ce24aad611be500e80c40fc816dc66a
-Size (dejagnu-1.4.4.tar.gz) = 1080346 bytes
-SHA1 (patch-ab) = 3be83f8ae3e20b50101a39501d863bf8bbb484a2
-SHA1 (patch-ac) = fefab5a22ed6ab4061f5fd4413d6c56cfda1cfd5
+SHA1 (dejagnu-1.5.tar.gz) = bd84c71e0587af0278a9b6a404d6da1b92df66cd
+RMD160 (dejagnu-1.5.tar.gz) = e2ded4f1f5b94a86734538a1091ec6738c4c9c99
+Size (dejagnu-1.5.tar.gz) = 576269 bytes
+SHA1 (patch-Makefile.am) = 3c04ff25ae62899912dbd00a0fc0921446d8f13d
+SHA1 (patch-Makefile.in) = 97f54b7cdd2409764957a7dceccf95babc9a47c7
diff --git a/devel/dejagnu/patches/patch-Makefile.am b/devel/dejagnu/patches/patch-Makefile.am
new file mode 100644
index 00000000000..9457c107ce2
--- /dev/null
+++ b/devel/dejagnu/patches/patch-Makefile.am
@@ -0,0 +1,47 @@
+$NetBSD: patch-Makefile.am,v 1.1 2013/06/10 01:09:48 mef Exp $
+
+Avoid following warning at make package-install:
+warning: share/dejagnu/baseboards/am33_2.0-libremote.exp: executable bit is set on non-executable file.
+
+--- Makefile.am.orig	2011-03-09 09:47:22.000000000 +0900
++++ Makefile.am	2013-06-08 18:02:03.000000000 +0900
+@@ -32,16 +32,16 @@
+ bin_SCRIPTS = runtest
+ include_HEADERS = dejagnu.h
+ 
+-pkgdata_SCRIPTS = \
+-  runtest.exp \
++pkgdata_DATA = \
++  runtest.exp  \
++  stub-loader.c testglue.c \
+   lib/debugger.exp lib/dejagnu.exp lib/dg.exp lib/framework.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
+-config_SCRIPTS = \
++config_DATA = config/README \
+ 	config/arc.exp \
+ 	config/arm-ice.exp \
+ 	config/base-config.exp \
+@@ -84,8 +84,7 @@
+ 	config/vxworks.exp
+ 
+ baseboarddir = $(pkgdatadir)/baseboards
+-baseboard_DATA = baseboards/README
+-baseboard_SCRIPTS = \
++baseboard_DATA = baseboards/README \
+ 	baseboards/am33_2.0-libremote.exp \
+ 	baseboards/arc-sim.exp \
+ 	baseboards/arm-ice.exp \
+@@ -184,8 +183,6 @@
+ 	baseboards/xscale-cygmon.exp \
+ 	baseboards/xtensa-sim.exp
+ 
+-pkgdata_DATA = stub-loader.c testglue.c
+-
+ djlibexecdir = $(pkgdatadir)/libexec
+ djlibexec_SCRIPTS = config.guess
+ 
diff --git a/devel/dejagnu/patches/patch-Makefile.in b/devel/dejagnu/patches/patch-Makefile.in
new file mode 100644
index 00000000000..4c4f918e25c
--- /dev/null
+++ b/devel/dejagnu/patches/patch-Makefile.in
@@ -0,0 +1,270 @@
+$NetBSD: patch-Makefile.in,v 1.1 2013/06/10 01:09:48 mef Exp $
+
+Generated by automake 1.11.1 
+(cd ../../devel/automake; cvs update -D 2009-12-10;
+ sudo pkg_delete automake;
+ make clean && make package-install)
+(cd work/dejagnu-1.5; automake; diff -u Makefile.in{.orig,}) >! patches/patch-Makefile.in-new;
+ sudo pkg_delete automake;
+ pkg_add automake-1.13.2
+
+(etc)
+--- Makefile.in.orig	2011-03-09 09:47:24.000000000 +0900
++++ Makefile.in	2013-06-08 18:21:40.000000000 +0900
+@@ -95,14 +95,11 @@
+ am__base_list = \
+   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+-am__installdirs = "$(DESTDIR)$(baseboarddir)" "$(DESTDIR)$(bindir)" \
+-	"$(DESTDIR)$(configdir)" "$(DESTDIR)$(djlibexecdir)" \
+-	"$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(infodir)" \
+-	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(baseboarddir)" \
+-	"$(DESTDIR)$(configdir)" "$(DESTDIR)$(pkgdatadir)" \
+-	"$(DESTDIR)$(includedir)"
+-SCRIPTS = $(baseboard_SCRIPTS) $(bin_SCRIPTS) $(config_SCRIPTS) \
+-	$(djlibexec_SCRIPTS) $(pkgdata_SCRIPTS)
++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(djlibexecdir)" \
++	"$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" \
++	"$(DESTDIR)$(baseboarddir)" "$(DESTDIR)$(configdir)" \
++	"$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(includedir)"
++SCRIPTS = $(bin_SCRIPTS) $(djlibexec_SCRIPTS)
+ DEFAULT_INCLUDES = -I.@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -251,16 +248,16 @@
+ DISTCLEANFILES = xXx.log xXx.sum x.log x.sum testrun.log testrun.sum
+ bin_SCRIPTS = runtest
+ include_HEADERS = dejagnu.h
+-pkgdata_SCRIPTS = \
+-  runtest.exp \
++pkgdata_DATA = \
++  runtest.exp  \
++  stub-loader.c testglue.c \
+   lib/debugger.exp lib/dejagnu.exp lib/dg.exp lib/framework.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
+-config_SCRIPTS = \
++config_DATA = config/README \
+ 	config/arc.exp \
+ 	config/arm-ice.exp \
+ 	config/base-config.exp \
+@@ -303,8 +300,7 @@
+ 	config/vxworks.exp
+ 
+ baseboarddir = $(pkgdatadir)/baseboards
+-baseboard_DATA = baseboards/README
+-baseboard_SCRIPTS = \
++baseboard_DATA = baseboards/README \
+ 	baseboards/am33_2.0-libremote.exp \
+ 	baseboards/arc-sim.exp \
+ 	baseboards/arm-ice.exp \
+@@ -403,7 +399,6 @@
+ 	baseboards/xscale-cygmon.exp \
+ 	baseboards/xtensa-sim.exp
+ 
+-pkgdata_DATA = stub-loader.c testglue.c
+ djlibexecdir = $(pkgdatadir)/libexec
+ djlibexec_SCRIPTS = config.guess
+ 
+@@ -484,40 +479,6 @@
+ unit$(EXEEXT): $(unit_OBJECTS) $(unit_DEPENDENCIES) 
+ 	@rm -f unit$(EXEEXT)
+ 	$(CXXLINK) $(unit_OBJECTS) $(unit_LDADD) $(LIBS)
+-install-baseboardSCRIPTS: $(baseboard_SCRIPTS)
+-	@$(NORMAL_INSTALL)
+-	test -z "$(baseboarddir)" || $(MKDIR_P) "$(DESTDIR)$(baseboarddir)"
+-	@list='$(baseboard_SCRIPTS)'; test -n "$(baseboarddir)" || list=; \
+-	for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+-	done | \
+-	sed -e 'p;s,.*/,,;n' \
+-	    -e 'h;s|.*|.|' \
+-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+-	      if (++n[d] == $(am__install_max)) { \
+-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+-	    else { print "f", d "/" $$4, $$1 } } \
+-	  END { for (d in files) print "f", d, files[d] }' | \
+-	while read type dir files; do \
+-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+-	     test -z "$$files" || { \
+-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(baseboarddir)$$dir'"; \
+-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(baseboarddir)$$dir" || exit $$?; \
+-	     } \
+-	; done
+-
+-uninstall-baseboardSCRIPTS:
+-	@$(NORMAL_UNINSTALL)
+-	@list='$(baseboard_SCRIPTS)'; test -n "$(baseboarddir)" || exit 0; \
+-	files=`for p in $$list; do echo "$$p"; done | \
+-	       sed -e 's,.*/,,;$(transform)'`; \
+-	test -n "$$list" || exit 0; \
+-	echo " ( cd '$(DESTDIR)$(baseboarddir)' && rm -f" $$files ")"; \
+-	cd "$(DESTDIR)$(baseboarddir)" && rm -f $$files
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+@@ -552,40 +513,6 @@
+ 	test -n "$$list" || exit 0; \
+ 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+-install-configSCRIPTS: $(config_SCRIPTS)
+-	@$(NORMAL_INSTALL)
+-	test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)"
+-	@list='$(config_SCRIPTS)'; test -n "$(configdir)" || list=; \
+-	for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+-	done | \
+-	sed -e 'p;s,.*/,,;n' \
+-	    -e 'h;s|.*|.|' \
+-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+-	      if (++n[d] == $(am__install_max)) { \
+-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+-	    else { print "f", d "/" $$4, $$1 } } \
+-	  END { for (d in files) print "f", d, files[d] }' | \
+-	while read type dir files; do \
+-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+-	     test -z "$$files" || { \
+-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(configdir)$$dir'"; \
+-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(configdir)$$dir" || exit $$?; \
+-	     } \
+-	; done
+-
+-uninstall-configSCRIPTS:
+-	@$(NORMAL_UNINSTALL)
+-	@list='$(config_SCRIPTS)'; test -n "$(configdir)" || exit 0; \
+-	files=`for p in $$list; do echo "$$p"; done | \
+-	       sed -e 's,.*/,,;$(transform)'`; \
+-	test -n "$$list" || exit 0; \
+-	echo " ( cd '$(DESTDIR)$(configdir)' && rm -f" $$files ")"; \
+-	cd "$(DESTDIR)$(configdir)" && rm -f $$files
+ install-djlibexecSCRIPTS: $(djlibexec_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(djlibexecdir)" || $(MKDIR_P) "$(DESTDIR)$(djlibexecdir)"
+@@ -620,40 +547,6 @@
+ 	test -n "$$list" || exit 0; \
+ 	echo " ( cd '$(DESTDIR)$(djlibexecdir)' && rm -f" $$files ")"; \
+ 	cd "$(DESTDIR)$(djlibexecdir)" && rm -f $$files
+-install-pkgdataSCRIPTS: $(pkgdata_SCRIPTS)
+-	@$(NORMAL_INSTALL)
+-	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
+-	@list='$(pkgdata_SCRIPTS)'; test -n "$(pkgdatadir)" || list=; \
+-	for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+-	done | \
+-	sed -e 'p;s,.*/,,;n' \
+-	    -e 'h;s|.*|.|' \
+-	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+-	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+-	      if (++n[d] == $(am__install_max)) { \
+-		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+-	    else { print "f", d "/" $$4, $$1 } } \
+-	  END { for (d in files) print "f", d, files[d] }' | \
+-	while read type dir files; do \
+-	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+-	     test -z "$$files" || { \
+-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(pkgdatadir)$$dir'"; \
+-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(pkgdatadir)$$dir" || exit $$?; \
+-	     } \
+-	; done
+-
+-uninstall-pkgdataSCRIPTS:
+-	@$(NORMAL_UNINSTALL)
+-	@list='$(pkgdata_SCRIPTS)'; test -n "$(pkgdatadir)" || exit 0; \
+-	files=`for p in $$list; do echo "$$p"; done | \
+-	       sed -e 's,.*/,,;$(transform)'`; \
+-	test -n "$$list" || exit 0; \
+-	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
+-	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -1209,7 +1102,7 @@
+ check: check-am
+ all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(MANS) $(DATA) $(HEADERS)
+ installdirs:
+-	for dir in "$(DESTDIR)$(baseboarddir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(djlibexecdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(baseboarddir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(includedir)"; do \
++	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(djlibexecdir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(baseboarddir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(includedir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+@@ -1261,10 +1154,9 @@
+ 
+ info-am: $(INFO_DEPS)
+ 
+-install-data-am: install-baseboardDATA install-baseboardSCRIPTS \
+-	install-configDATA install-configSCRIPTS \
++install-data-am: install-baseboardDATA install-configDATA \
+ 	install-includeHEADERS install-info-am install-man \
+-	install-pkgdataDATA install-pkgdataSCRIPTS
++	install-pkgdataDATA
+ 
+ install-dvi: install-dvi-am
+ 
+@@ -1389,12 +1281,11 @@
+ 
+ ps-am: $(PSS)
+ 
+-uninstall-am: uninstall-baseboardDATA uninstall-baseboardSCRIPTS \
+-	uninstall-binSCRIPTS uninstall-configDATA \
+-	uninstall-configSCRIPTS uninstall-djlibexecSCRIPTS \
++uninstall-am: uninstall-baseboardDATA uninstall-binSCRIPTS \
++	uninstall-configDATA uninstall-djlibexecSCRIPTS \
+ 	uninstall-dvi-am uninstall-html-am uninstall-includeHEADERS \
+ 	uninstall-info-am uninstall-man uninstall-pdf-am \
+-	uninstall-pkgdataDATA uninstall-pkgdataSCRIPTS uninstall-ps-am
++	uninstall-pkgdataDATA uninstall-ps-am
+ 
+ uninstall-man: uninstall-man1
+ 
+@@ -1407,25 +1298,22 @@
+ 	distclean-DEJAGNU distclean-compile distclean-generic \
+ 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-baseboardDATA install-baseboardSCRIPTS \
+-	install-binSCRIPTS install-configDATA install-configSCRIPTS \
++	install-baseboardDATA install-binSCRIPTS install-configDATA \
+ 	install-data install-data-am install-djlibexecSCRIPTS \
+ 	install-dvi install-dvi-am install-exec install-exec-am \
+ 	install-html install-html-am install-includeHEADERS \
+ 	install-info install-info-am install-man install-man1 \
+-	install-pdf install-pdf-am install-pkgdataDATA \
+-	install-pkgdataSCRIPTS install-ps install-ps-am install-strip \
+-	installcheck installcheck-am installdirs maintainer-clean \
+-	maintainer-clean-aminfo maintainer-clean-generic mostlyclean \
+-	mostlyclean-aminfo mostlyclean-compile mostlyclean-generic pdf \
+-	pdf-am ps ps-am tags uninstall uninstall-am \
+-	uninstall-baseboardDATA uninstall-baseboardSCRIPTS \
++	install-pdf install-pdf-am install-pkgdataDATA install-ps \
++	install-ps-am install-strip installcheck installcheck-am \
++	installdirs maintainer-clean maintainer-clean-aminfo \
++	maintainer-clean-generic mostlyclean mostlyclean-aminfo \
++	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-baseboardDATA \
+ 	uninstall-binSCRIPTS uninstall-configDATA \
+-	uninstall-configSCRIPTS uninstall-djlibexecSCRIPTS \
+-	uninstall-dvi-am uninstall-html-am uninstall-includeHEADERS \
+-	uninstall-info-am uninstall-man uninstall-man1 \
+-	uninstall-pdf-am uninstall-pkgdataDATA \
+-	uninstall-pkgdataSCRIPTS uninstall-ps-am
++	uninstall-djlibexecSCRIPTS uninstall-dvi-am uninstall-html-am \
++	uninstall-includeHEADERS uninstall-info-am uninstall-man \
++	uninstall-man1 uninstall-pdf-am uninstall-pkgdataDATA \
++	uninstall-ps-am
+ 
+ 
+ dejagnu.pdf: $(XML)
diff --git a/devel/dejagnu/patches/patch-ab b/devel/dejagnu/patches/patch-ab
deleted file mode 100644
index ef7e0645199..00000000000
--- a/devel/dejagnu/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/01/31 00:27:36 kristerw Exp $
-
---- 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\]*: 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
- 
diff --git a/devel/dejagnu/patches/patch-ac b/devel/dejagnu/patches/patch-ac
deleted file mode 100644
index 2dc925b3c2f..00000000000
--- a/devel/dejagnu/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2008/06/16 13:45:55 joerg Exp $
-
---- doc/Makefile.in.orig	2004-01-27 07:26:35.000000000 +0000
-+++ doc/Makefile.in
-@@ -17,7 +17,7 @@
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--pkgdatadir = $(datadir)/@PACKAGE@
-+pkgdatadir = $(datadir)/doc/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
-@@ -369,7 +369,7 @@ install-doc: $(TARGETS)
- 	$(INSTALL_DATA) overview.rtf $(DESTDIR)$(pkgdatadir)/dejagnu.rtf
- 	$(INSTALL_DATA) overview.ps $(DESTDIR)$(pkgdatadir)/dejagnu.ps
- 	$(INSTALL_DATA) overview.pdf $(DESTDIR)$(pkgdatadir)/dejagnu.pdf
--	$(INSTALL_DATA) $(srcdir)/runtest.1 $(mandir)/man1/
-+	$(INSTALL_DATA) $(srcdir)/runtest.1 $(DESTDIR)$(mandir)/man1/
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT: