- Update to 1.5

PR:		ports/155806
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

5 files changed, 17 insertions, 39 deletions

diff --git a/misc/dejagnu/Makefile b/misc/dejagnu/Makefile
index c381d4d79334..fbac08d9ec6d 100644
--- a/misc/dejagnu/Makefile
+++ b/misc/dejagnu/Makefile
@@ -6,20 +6,23 @@
 #
 
 PORTNAME=	dejagnu
-PORTVERSION=	1.4.4
-PORTREVISION=	2
+PORTVERSION=	1.5
 CATEGORIES=	misc tcl tk
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Automated program/system tester
 
+BUILD_DEPENDS=	expect:${PORTSDIR}/lang/expect
 RUN_DEPENDS=	expect:${PORTSDIR}/lang/expect
 
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 MAN1=		runtest.1
+INFO=	${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/misc/dejagnu/distinfo b/misc/dejagnu/distinfo
index 638184be747e..86b7378559ca 100644
--- a/misc/dejagnu/distinfo
+++ b/misc/dejagnu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dejagnu-1.4.4.tar.gz) = d0fbedef20fb0843318d60551023631176b27ceb1e11de7468a971770d0e048d
-SIZE (dejagnu-1.4.4.tar.gz) = 1080346
+SHA256 (dejagnu-1.5.tar.gz) = c8b45808357a6f3e32cd56d8b56a4fdf8a1d5f3818818045c2022993e0e8a3db
+SIZE (dejagnu-1.5.tar.gz) = 576269
diff --git a/misc/dejagnu/files/patch-dejagnu.h b/misc/dejagnu/files/patch-dejagnu.h
deleted file mode 100644
index 8596d320d34c..000000000000
--- a/misc/dejagnu/files/patch-dejagnu.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- dejagnu.h.orig	2009-02-27 10:06:02.041427718 +0100
-+++ dejagnu.h	2009-02-27 10:06:11.829233615 +0100
-@@ -136,7 +136,7 @@
-     if (untest)
-         printf ("\t#untested:\t\t%d\n", untest);
-     if (unresolve)
--        printf ("\t#unresolved:\t\t%d\n", unresolved);
-+        printf ("\t#unresolved:\t\t%d\n", unresolve);
- }
- 
- #ifdef __cplusplus
diff --git a/misc/dejagnu/files/patch-example-calc::Makefile.in b/misc/dejagnu/files/patch-example-calc::Makefile.in
deleted file mode 100644
index 50c3430ae069..000000000000
--- a/misc/dejagnu/files/patch-example-calc::Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- example/calc/Makefile.in	Thu Apr 25 22:29:39 2002
-+++ example/calc/Makefile.in.new	Fri Oct 11 15:50:27 2002
-@@ -382,7 +382,8 @@
- 
- install-data-am:
- 
--install-exec-am:
-+install-exec-am: $(PROGRAMS)
-+	$(INSTALL_PROGRAM) $(PROGRAMS) $(bindir)
- 
- install-info: install-info-am
- 
diff --git a/misc/dejagnu/pkg-plist b/misc/dejagnu/pkg-plist
index 4f11f28acdad..750bb775e943 100644
--- a/misc/dejagnu/pkg-plist
+++ b/misc/dejagnu/pkg-plist
@@ -1,7 +1,6 @@
 bin/runtest
 include/dejagnu.h
 %%DATADIR%%/baseboards/README
-%%DATADIR%%/baseboards/a29k-udi.exp
 %%DATADIR%%/baseboards/am33_2.0-libremote.exp
 %%DATADIR%%/baseboards/arc-sim.exp
 %%DATADIR%%/baseboards/arm-ice.exp
@@ -10,6 +9,7 @@ include/dejagnu.h
 %%DATADIR%%/baseboards/basic-sid.exp
 %%DATADIR%%/baseboards/basic-sim.exp
 %%DATADIR%%/baseboards/cf.exp
+%%DATADIR%%/baseboards/cris-sim.exp
 %%DATADIR%%/baseboards/cygmon.exp
 %%DATADIR%%/baseboards/cygwin.exp
 %%DATADIR%%/baseboards/d10v-sim.exp
@@ -31,10 +31,12 @@ include/dejagnu.h
 %%DATADIR%%/baseboards/i386-sid.exp
 %%DATADIR%%/baseboards/i960-cyclone.exp
 %%DATADIR%%/baseboards/i960-sim.exp
+%%DATADIR%%/baseboards/iq2000-sim.exp
 %%DATADIR%%/baseboards/jmr3904-sim.exp
 %%DATADIR%%/baseboards/linux-gdbserver.exp
 %%DATADIR%%/baseboards/linux-libremote.exp
 %%DATADIR%%/baseboards/m32r-elf.exp
+%%DATADIR%%/baseboards/m32r-linux-sim.exp
 %%DATADIR%%/baseboards/m32r-sid.exp
 %%DATADIR%%/baseboards/m32r-sim.exp
 %%DATADIR%%/baseboards/m68hc11-sim.exp
@@ -58,6 +60,7 @@ include/dejagnu.h
 %%DATADIR%%/baseboards/mn10300-cygmon.exp
 %%DATADIR%%/baseboards/mn10300-sim.exp
 %%DATADIR%%/baseboards/msparc-cygmon.exp
+%%DATADIR%%/baseboards/mt-sid.exp
 %%DATADIR%%/baseboards/op50n.exp
 %%DATADIR%%/baseboards/powerpc-bug.exp
 %%DATADIR%%/baseboards/powerpc-bug1.exp
@@ -73,24 +76,24 @@ include/dejagnu.h
 %%DATADIR%%/baseboards/sparclite-coff.exp
 %%DATADIR%%/baseboards/sparclite-cygmon.exp
 %%DATADIR%%/baseboards/sparclite-sim-le.exp
+%%DATADIR%%/baseboards/sparclite-sim.exp
+%%DATADIR%%/baseboards/strongarm-cygmon.exp
 %%DATADIR%%/baseboards/tic80-sim.exp
 %%DATADIR%%/baseboards/tx39-dve.exp
 %%DATADIR%%/baseboards/tx39-sim.exp
 %%DATADIR%%/baseboards/unix.exp
+%%DATADIR%%/baseboards/usparc-cygmon.exp
 %%DATADIR%%/baseboards/v850-sim.exp
 %%DATADIR%%/baseboards/vr4100-ddb.exp
-%%DATADIR%%/baseboards/sparclite-sim.exp
 %%DATADIR%%/baseboards/vr4100-sim.exp
 %%DATADIR%%/baseboards/vr4111-sim.exp
 %%DATADIR%%/baseboards/vr4300-ddb.exp
 %%DATADIR%%/baseboards/vr4300-sim.exp
 %%DATADIR%%/baseboards/vr4300.exp
 %%DATADIR%%/baseboards/vr5000-ddb.exp
-%%DATADIR%%/baseboards/strongarm-cygmon.exp
 %%DATADIR%%/baseboards/vx4300.exp
 %%DATADIR%%/baseboards/vx68k.exp
 %%DATADIR%%/baseboards/vx960.exp
-%%DATADIR%%/baseboards/usparc-cygmon.exp
 %%DATADIR%%/baseboards/vxsparc.exp
 %%DATADIR%%/baseboards/x86-cygmon.exp
 %%DATADIR%%/baseboards/xscale-cygmon.exp
@@ -131,12 +134,10 @@ include/dejagnu.h
 %%DATADIR%%/config/slite.exp
 %%DATADIR%%/config/sparclet.exp
 %%DATADIR%%/config/tic80.exp
-%%DATADIR%%/config/udi.exp
 %%DATADIR%%/config/unix.exp
 %%DATADIR%%/config/vr4100.exp
 %%DATADIR%%/config/vr4300.exp
 %%DATADIR%%/config/vr5000.exp
-%%DATADIR%%/config/vrtx.exp
 %%DATADIR%%/config/vxworks.exp
 %%DATADIR%%/debugger.exp
 %%DATADIR%%/dejagnu.exp
@@ -146,7 +147,6 @@ include/dejagnu.h
 %%DATADIR%%/kermit.exp
 %%DATADIR%%/libexec/config.guess
 %%DATADIR%%/libgloss.exp
-%%DATADIR%%/mondfe.exp
 %%DATADIR%%/remote.exp
 %%DATADIR%%/rlogin.exp
 %%DATADIR%%/rsh.exp
@@ -158,10 +158,8 @@ include/dejagnu.h
 %%DATADIR%%/telnet.exp
 %%DATADIR%%/testglue.c
 %%DATADIR%%/tip.exp
-%%DATADIR%%/util-defs.exp
 %%DATADIR%%/utils.exp
-%%DATADIR%%/xsh.exp
 @dirrm %%DATADIR%%/libexec
-@dirrm %%DATADIR%%/baseboards
 @dirrm %%DATADIR%%/config
+@dirrm %%DATADIR%%/baseboards
 @dirrm %%DATADIR%%