12 files changed, 2 insertions, 133 deletions
diff --git a/misc/Makefile b/misc/Makefile
index 5d0160c..951c8a6 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -63,7 +63,6 @@
     SUBDIR += ewipe
     SUBDIR += explosions
     SUBDIR += ezload
-    SUBDIR += fd
     SUBDIR += felis
     SUBDIR += fep
     SUBDIR += figlet
diff --git a/misc/fd/Makefile b/misc/fd/Makefile
deleted file mode 100644
index 10b7725..0000000
--- a/misc/fd/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# New ports collection makefile for:    FDclone
-# Date created:         20 Feb 1996
-# Whom:                 Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	fd
-PORTVERSION=	1.03u
-PORTREVISION=	2
-CATEGORIES=	misc
-MASTER_SITES=	http://hp.vector.co.jp/authors/VA012337/soft/fd/ \
-		ftp://ftp.vector.co.jp/pack/unix/util/file/filer/fd/
-DISTNAME=	FD-${PORTVERSION}
-
-MAINTAINER=	nobu@psrc.isac.co.jp
-
-MANLANG=	ja
-MAN1=		fd.1
-MAKE_ENV=	LANG=${MANLANG}
-DOCS=		README FAQ HISTORY ToAdmin
-SIGNATURE=	Nobuhiro Yasutomi <${MAINTAINER}>
-
-# require maintainer signature for binary package distributions
-do-configure:
-	@cd ${WRKSRC}; v=version.h; ${MV} $$v $$v.orig; \
-	${SED} 's/\(distributor = \)NULL/\1"${SIGNATURE}"/' $$v.orig > $$v
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/fd
-	@for i in $(DOCS); do \
-		${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/fd; \
-	done
-.endif
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/misc/fd/distinfo b/misc/fd/distinfo
deleted file mode 100644
index dc23017..0000000
--- a/misc/fd/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (FD-1.03u.tar.gz) = 1b0629a201c89b54e9e2517caa7242c8
diff --git a/misc/fd/files/patch-aa b/misc/fd/files/patch-aa
deleted file mode 100644
index f8ac5e2..0000000
--- a/misc/fd/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Tue Dec 18 00:00:00 2001
-+++ Makefile.in	Wed Dec 19 13:02:55 2001
-@@ -4,7 +4,7 @@
- 
- TITLE	= FD-
- VERSION	= __VERSION__
--PREFIX	= /usr/local
-+PREFIX	?= /usr/local
- MANSEC	= 1
- TOPDIR	= $(PREFIX)
- BINDIR	= $(TOPDIR)/bin
diff --git a/misc/fd/files/patch-libc.c b/misc/fd/files/patch-libc.c
deleted file mode 100644
index 79c7e0a..0000000
--- a/misc/fd/files/patch-libc.c
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -u ../old/FD-1.03u/libc.c ./libc.c
---- ../old/FD-1.03u/libc.c	Tue Dec 18 00:00:00 2001
-+++ ./libc.c	Tue Jan  8 12:06:14 2002
-@@ -165,7 +165,8 @@
- 				buf[i] = '\0';
- 				if (*buf == _SC_) strcpy(resolved, buf);
- 				else {
--					*(cp - 1) = '\0';
-+					if (cp - 1 > resolved) cp--;
-+					*cp = '\0';
- 					_realpath2(buf, resolved, rdlink);
- 				}
- 			}
diff --git a/misc/fd/files/patch-parse.c b/misc/fd/files/patch-parse.c
deleted file mode 100644
index 4e809b6..0000000
--- a/misc/fd/files/patch-parse.c
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -u ../old/FD-1.03u/parse.c ./parse.c
---- ../old/FD-1.03u/parse.c	Tue Dec 18 00:00:00 2001
-+++ ./parse.c	Mon Jan 21 10:15:02 2002
-@@ -322,11 +322,16 @@
- 	epath = next = NULL;
- 	size = 0;
- 	for (cp = path; cp && *cp; cp = next) {
--		next = strtkbrk(cp, delim, 0);
--		len = (next) ? (next++) - cp : strlen(cp);
--		if (!len) next = cp;
-+		if ((next = strtkbrk(cp, delim, 0))) {
-+			len = next - cp;
-+			for (i = 1; next[i] && strchr(delim, next[i]); i++);
-+		}
- 		else {
--			next = cp + len;
-+			len = strlen(cp);
-+			i = 0;
-+		}
-+		next = cp + len;
-+		if (len) {
- 			tmp = _evalpath(cp, next, 0, 0);
- # if	!MSDOS && !defined (_NOKANJIFCONV)
- 			cp = kanjiconv2(buf, tmp,
-@@ -336,17 +341,18 @@
- # endif
- 			len = strlen(cp);
- 		}
--		for (i = 1; next[i] && strchr(delim, next[i]); i++);
- 
- 		epath = (char *)realloc2(epath, size + len + i + 1);
- 		if (len) {
- 			strcpy(epath + size, cp);
- 			free(tmp);
-+			size += len;
-+		}
-+		if (i) {
-+			strncpy(epath + size, next, i);
-+			size += i;
-+			next += i;
- 		}
--		size += len;
--		strncpy(epath + size, next, i);
--		size += i;
--		next += i;
- 	}
- 
- 	if (!epath) return(strdup2(""));
diff --git a/misc/fd/pkg-comment b/misc/fd/pkg-comment
deleted file mode 100644
index 2a1c33f..0000000
--- a/misc/fd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A file and directory management tool
diff --git a/misc/fd/pkg-descr b/misc/fd/pkg-descr
deleted file mode 100644
index a078751..0000000
--- a/misc/fd/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-`FD' is a file and directory management tool for text terminal.
-Browsing file list, viewing, editing, archiving/extracting management
-with a few touch.
-
-FD for unix by shirai@nintendo.co.jp, and it is a clone of
-FD for DOS (AT and PC9801) designed by A. Idei (SDI00544@niftyserve.or.jp).
-
-      Currently, the man page is available only in Japanese, but it's
-    easy to use. Setting `FD_LANGUAGE' environment to 'english' you can 
-    use English help.
-                                     -- nobu@psrc.isac.co.jp
diff --git a/misc/fd/pkg-message b/misc/fd/pkg-message
deleted file mode 100644
index 8fe25b4..0000000
--- a/misc/fd/pkg-message
+++ /dev/null
@@ -1 +0,0 @@
-see additional documents at /usr/local/share/doc/fd/* on your disk.
diff --git a/misc/fd/pkg-plist b/misc/fd/pkg-plist
deleted file mode 100644
index c14d245..0000000
--- a/misc/fd/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/fd
-bin/fd-unicd.tbl
-share/doc/fd/FAQ
-share/doc/fd/HISTORY
-share/doc/fd/README
-share/doc/fd/ToAdmin
-@dirrm share/doc/fd
diff --git a/shells/Makefile b/shells/Makefile
index a9eeb1f..e2d663f 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -6,6 +6,7 @@
     SUBDIR += bash2
     SUBDIR += es
     SUBDIR += esh
+    SUBDIR += fd
     SUBDIR += flash
     SUBDIR += ksh93
     SUBDIR += mudsh
diff --git a/shells/fd/Makefile b/shells/fd/Makefile
index 10b7725..caf5025 100644
--- a/shells/fd/Makefile
+++ b/shells/fd/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	fd
 PORTVERSION=	1.03u
 PORTREVISION=	2
-CATEGORIES=	misc
+CATEGORIES=	shells
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA012337/soft/fd/ \
 		ftp://ftp.vector.co.jp/pack/unix/util/file/filer/fd/
 DISTNAME=	FD-${PORTVERSION}