Update to 3.00m.

6 files changed, 3 insertions, 67 deletions

diff --git a/shells/fd/Makefile b/shells/fd/Makefile
index bfb8781cf669..1135dc540aa8 100644
--- a/shells/fd/Makefile
+++ b/shells/fd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fd
-PORTVERSION=	3.00l
+PORTVERSION=	3.00m
 CATEGORIES=	shells net
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA012337/soft/fd/ \
 		ftp://ftp.unixusers.net/src/fdclone/
diff --git a/shells/fd/distinfo b/shells/fd/distinfo
index 5e60899e8c2a..ec11956bd168 100644
--- a/shells/fd/distinfo
+++ b/shells/fd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (FD-3.00l.tar.gz) = c244a68cccaa2052a26bf095260b9b5f482bf3fa2936192220589e37d7a3ccf8
-SIZE (FD-3.00l.tar.gz) = 941893
+SHA256 (FD-3.00m.tar.gz) = 3076a6dbade707c66c1059c0acd7d275b7efdf1877a71f1c5759c115b08c2181
+SIZE (FD-3.00m.tar.gz) = 945922
diff --git a/shells/fd/files/patch-custom.c b/shells/fd/files/patch-custom.c
deleted file mode 100644
index b44250a975b5..000000000000
--- a/shells/fd/files/patch-custom.c
+++ /dev/null
@@ -1,18 +0,0 @@
-[FDclone-users:00986]
---- custom.c.orig	2012-06-30 00:00:00.000000000 +0900
-+++ custom.c	2012-07-16 19:12:29.374464026 +0900
-@@ -4004,11 +4004,10 @@
- 	char *new;
- 	int i, j, n;
- 
--	if (origflaglist) new = NULL;
-+	if (origflaglist || origmaxfdtype <= 0) new = NULL;
- 	else {
--		for (n = 0; n < origmaxfdtype; n++) /*EMPTY*/;
--		origflaglist = new = Xmalloc(n * sizeof(char));
--		memset(origflaglist, 0, n * sizeof(char));
-+		origflaglist = new = Xmalloc(origmaxfdtype * sizeof(char));
-+		memset(origflaglist, 0, origmaxfdtype * sizeof(char));
- 	}
- 
- 	for (i = n = 0; i < maxfdtype; i++) {
diff --git a/shells/fd/files/patch-mkmfsed.c b/shells/fd/files/patch-mkmfsed.c
deleted file mode 100644
index 1bc3f1a2538e..000000000000
--- a/shells/fd/files/patch-mkmfsed.c
+++ /dev/null
@@ -1,21 +0,0 @@
-[FDclone-users:00986]
---- mkmfsed.c.orig	2012-06-30 00:00:00.000000000 +0900
-+++ mkmfsed.c	2012-07-16 19:12:29.375463265 +0900
-@@ -193,7 +193,7 @@
- # if	__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)
- 	strappend(buf3, "-Wno-attributes");
- # endif
--# if	__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)
-+# if	__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
- 	strappend(buf3, "-Wno-empty-body");
- # endif
- #endif	/* __GNUC__ && __GNUC_MINOR__ */
-@@ -207,7 +207,7 @@
- #  if	H___GNUC__ > 4 || (H___GNUC__ == 4 && H___GNUC_MINOR__ >= 1)
- 		strappend(buf1, "-Wno-attributes");
- #  endif
--#  if	H___GNUC__ > 4 || (H___GNUC__ == 4 && H___GNUC_MINOR__ >= 2)
-+#  if	H___GNUC__ > 4 || (H___GNUC__ == 4 && H___GNUC_MINOR__ >= 3)
- 		strappend(buf1, "-Wno-empty-body");
- #  endif
- # endif	/* H___GNUC__ && H___GNUC_MINOR__ */
diff --git a/shells/fd/files/patch-posixsh.c b/shells/fd/files/patch-posixsh.c
deleted file mode 100644
index ba6473085279..000000000000
--- a/shells/fd/files/patch-posixsh.c
+++ /dev/null
@@ -1,13 +0,0 @@
-[FDclone-users:00997]
---- posixsh.c.orig	2012-06-30 00:00:00.000000000 +0900
-+++ posixsh.c	2012-07-16 19:12:29.376464809 +0900
-@@ -112,8 +112,7 @@
- 	int ret;
- 	sigmask_t mask, omask;
- 
--	if (ttypgrp < (p_id_t)0 || pgrp < (p_id_t)0 || pgrp == ttypgrp)
--		return(0);
-+	if (ttypgrp < (p_id_t)0 || pgrp < (p_id_t)0) return(0);
- 	else if (!job) {
- 		ttypgrp = pgrp;
- 		return(0);
diff --git a/shells/fd/files/patch-system.c b/shells/fd/files/patch-system.c
deleted file mode 100644
index 5dce208c5c39..000000000000
--- a/shells/fd/files/patch-system.c
+++ /dev/null
@@ -1,12 +0,0 @@
-[FDclone-users:00997]
---- system.c.orig	2012-06-30 00:00:00.000000000 +0900
-+++ system.c	2012-07-16 19:12:29.380468959 +0900
-@@ -2769,7 +2769,7 @@
- 	if (trapok >= 0) trapok = 0;
- 
- # ifndef	NOJOB
--	if (mypid == orgpgrp) {
-+	if (mypid == orgpgrp && (childpgrp < (p_id_t)0 || pid == childpgrp)) {
- 		VOID_C gettermio(orgpgrp, jobok);
- #  ifdef	FD
- 		checkscreen(-1, -1);