Update FD utility to 2.09a.

FD 2.09a has many improvement for functionality and portability from
previous 1.03u.  And it has a built-in Bourne-shell compatible shell
and also runs stand-alone shell under the name of 'fdsh', too.

And fd-small PKG_OPTION will build smaller and FD 1.x compatible
binary.

Fixed PR pkg/33067.

9 files changed, 131 insertions, 52 deletions

diff --git a/misc/fd/DESCR b/misc/fd/DESCR
index f798413fac1..76d4bc5a7e2 100644
--- a/misc/fd/DESCR
+++ b/misc/fd/DESCR
@@ -1,10 +1,12 @@
-`FD' is a file and directory management tool for text terminal.
-Browsing file list, viewing, editing, archiving/extracting management
-with a few touch.
+`FD' (FDclone) is a file and directory management tool for text
+terminal; browsing file list, viewing, editing, archiving/extracting
+management with a few touch.  FD 2.0 and later have a built-in
+Bourne-shell compatible shell and also runs stand-alone shell under
+the name of 'fdsh'.
 
-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).
+This version is a clone of original FD for DOS (AT and PC9801)
+designed and written 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.
+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.
diff --git a/misc/fd/MESSAGE b/misc/fd/MESSAGE
deleted file mode 100644
index c4398ad0e2e..00000000000
--- a/misc/fd/MESSAGE
+++ /dev/null
@@ -1,12 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:17 wiz Exp $
-
-This package is distributed under the following conditions:
-
-1. Source code distribution is fully free.
-2. Binary distribution is only permitted under license from
-the package maintainer, Nobuhiro Yasutomi (nobu@psrc.isac.co.jp).
-
-This is described in the README file in Japanese.
-
-===========================================================================
diff --git a/misc/fd/Makefile b/misc/fd/Makefile
index 22963b6b47c..0611f18a746 100644
--- a/misc/fd/Makefile
+++ b/misc/fd/Makefile
@@ -1,29 +1,51 @@
-# $NetBSD: Makefile,v 1.22 2006/05/18 20:29:59 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2006/12/06 15:36:31 taca Exp $
 #
 
-DISTNAME=	FD-1.03u
-PKGNAME=	fd-1.03u
-CATEGORIES=	misc
+DISTNAME=	FD-2.09a
+PKGNAME=	fd-2.09a
+CATEGORIES=	misc shells
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA012337/soft/fd/
 
 MAINTAINER=	nobu@psrc.isac.co.jp
+HOMEPAGE=	http://hp.vector.co.jp/authors/VA012337/soft/fd/
 COMMENT=	File and directory management tool
 
-BROKEN_IN=	pkgsrc-2005Q4 pkgsrc-2006Q1
+MAKE_ENV+=	CONFDIR=${PKG_SYSCONFDIR:Q}
 
-MANLANG=	ja
-MAKE_ENV+=	LANG=${MANLANG:Q}
-DOCS=		README FAQ HISTORY ToAdmin
+MANLANG?=	ja_JP.eucJP
+MAKE_ENV+=	LANGDIR=${MANLANG:Q} DATADIR=${DATADIR:Q}
+PLIST_SUBST+=	FD_CONFIG=${FD_CONFIG:Q} MANLANG=${MANLANG:Q}
 
-# require maintainer signature for binary package distributions
-do-configure:
-	@cd ${WRKSRC}; v=version.h; ${MV} $$v $$v.orig; \
-	${SED} 's/\(distributor = \)NULL/\1"${MAINTAINER}"/' $$v.orig > $$v
+DATADIR=	${PREFIX}/share/fd
+DOCDIR=		${PREFIX}/share/doc/fd
+EXAMPLESDIR=	${PREFIX}/share/examples/fd
+
+DOCS=		FAQ LICENSES HISTORY README TECHKNOW ToAdmin
+
+.include "options.mk"
+
+CONF_FILES+=	${EXAMPLESDIR:Q}/${FD_CONFIG} ${PKG_SYSCONFDIR:Q}/${FD_CONFIG}
+
+.if empty(PKG_OPTIONS:Mfd-small)
+PLIST_SRC=	${PKGDIR}/PLIST ${WRKSRC}/PLIST ${PKGDIR}/PLIST.common_end
+.else
+USE_TOOLS+=	patch
+
+post-configure:
+	cd ${WRKSRC}; ${PATCH} -R < _fdrc.dif
+.endif
 
 post-install:
-	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fd
-	@for i in ${DOCS}; do \
-		${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/fd; \
+	${INSTALL_DATA_DIR} ${DOCDIR}/ja
+	cd ${WRKSRC}; \
+	for i in ${DOCS}; do \
+		${INSTALL_DATA} ${WRKSRC}/$$i.eng ${DOCDIR}/$$i; \
+		${INSTALL_DATA} ${WRKSRC}/$$i ${DOCDIR}/ja; \
 	done
+	${INSTALL_DATA_DIR} ${EXAMPLESDIR}
+	cd ${WRKSRC}; ${INSTALL_DATA} _fdrc ${EXAMPLESDIR}/${FD_CONFIG}
+.if empty(PKG_OPTIONS:Mfd-small)
+	${ECHO} "share/fd/fd-dict.tbl" > ${WRKSRC}/PLIST
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/fd/PLIST b/misc/fd/PLIST
index 824c466a6ec..18fca568a57 100644
--- a/misc/fd/PLIST
+++ b/misc/fd/PLIST
@@ -1,9 +1,21 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:28:00 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/12/06 15:36:31 taca Exp $
 bin/fd
-bin/fd-unicd.tbl
+bin/fdsh
 man/man1/fd.1
+man/man1/fdsh.1
+man/${MANLANG}/man1/fd.1
+man/${MANLANG}/man1/fdsh.1
 share/doc/fd/FAQ
+share/doc/fd/LICENSES
 share/doc/fd/HISTORY
 share/doc/fd/README
+share/doc/fd/TECHKNOW
 share/doc/fd/ToAdmin
-@dirrm share/doc/fd
+share/doc/fd/ja/FAQ
+share/doc/fd/ja/LICENSES
+share/doc/fd/ja/HISTORY
+share/doc/fd/ja/README
+share/doc/fd/ja/TECHKNOW
+share/doc/fd/ja/ToAdmin
+share/examples/fd/${FD_CONFIG}
+share/fd/fd-unicd.tbl
diff --git a/misc/fd/PLIST.common_end b/misc/fd/PLIST.common_end
new file mode 100644
index 00000000000..5c2bd61f5bb
--- /dev/null
+++ b/misc/fd/PLIST.common_end
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.common_end,v 1.1 2006/12/06 15:36:31 taca Exp $
+@dirrm share/fd
+@dirrm share/examples/fd
+@dirrm share/doc/fd/ja
+@dirrm share/doc/fd
diff --git a/misc/fd/distinfo b/misc/fd/distinfo
index 0549d868fd6..7b70f60a745 100644
--- a/misc/fd/distinfo
+++ b/misc/fd/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 11:02:51 agc Exp $
+$NetBSD: distinfo,v 1.7 2006/12/06 15:36:31 taca Exp $
 
-SHA1 (FD-1.03u.tar.gz) = 5fd312b801a81400ae10bc3e5630ce315b48c765
-RMD160 (FD-1.03u.tar.gz) = 943a706dc64c81397c71babe7eab332341b3cc09
-Size (FD-1.03u.tar.gz) = 340097 bytes
-SHA1 (patch-aa) = 7877fcbf53da90e6d10fa57e3c6f55c761e9f11c
+SHA1 (FD-2.09a.tar.gz) = 1ceae6da209074ecac83a2822274146e7b3faf67
+RMD160 (FD-2.09a.tar.gz) = 1b35f1569d33e2050ad9a6cbdec3a26abe306c6f
+Size (FD-2.09a.tar.gz) = 800540 bytes
+SHA1 (patch-aa) = 1a82228acdc531f8a021c9fea76c5a51e63d1444
+SHA1 (patch-ab) = ef6980330eba5ed6d10e91fea780eb986a6c6925
diff --git a/misc/fd/options.mk b/misc/fd/options.mk
new file mode 100644
index 00000000000..b5d0a763fd3
--- /dev/null
+++ b/misc/fd/options.mk
@@ -0,0 +1,13 @@
+# $NetBSD: options.mk,v 1.1 2006/12/06 15:36:32 taca Exp $
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.fd
+PKG_SUPPORTED_OPTIONS=		fd-small
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mfd-small)
+MAKE_ENV+=	VERSION=1
+FD_CONFIG=	fdrc
+.else
+FD_CONFIG=	fd2rc
+.endif
diff --git a/misc/fd/patches/patch-aa b/misc/fd/patches/patch-aa
index 81abafd530a..a7fa5bb8c31 100644
--- a/misc/fd/patches/patch-aa
+++ b/misc/fd/patches/patch-aa
@@ -1,13 +1,36 @@
-$NetBSD: patch-aa,v 1.5 2001/12/30 13:46:04 wiz Exp $
+$NetBSD: patch-aa,v 1.6 2006/12/06 15:36:32 taca Exp $
 
---- Makefile.in.orig	Tue Dec 18 00:00:00 2001
-+++ Makefile.in	Wed Dec 19 13:02:55 2001
-@@ -4,7 +4,7 @@
+--- Makefile.orig	2006-10-31 00:00:00.000000000 +0900
++++ Makefile
+@@ -2,10 +2,10 @@
+ #	Makefile for fd
+ #
  
- TITLE	= FD-
- VERSION	= __VERSION__
+-VERSION	= 2
++VERSION	?= 2
+ VERMAJ	= $(VERSION)
 -PREFIX	= /usr/local
+-CONFDIR	= /etc
 +PREFIX	?= /usr/local
- MANSEC	= 1
- TOPDIR	= $(PREFIX)
- BINDIR	= $(TOPDIR)/bin
++CONFDIR	?= /etc
+ BUILD	=
+ SHELL	= /bin/sh
+ MAKE	= make
+@@ -16,6 +16,7 @@ DICTSRC	=
+ 
+ DEFCFLAGS = -DPREFIX='"'$(PREFIX)'"' \
+ 	-DCONFDIR='"'$(CONFDIR)'"' \
++	-DUSEMANLANG -DUSEDATADIR \
+ 	-DDICTSRC='"''$(DICTSRC)''"' \
+ 	-DFD=$(VERMAJ) \
+ 	-DCCCOMMAND='"'$(CC)'"' \
+@@ -91,7 +92,8 @@ mkmfsed: mkmfsed.c fd.h machine.h config
+ config.h: config.hin
+ 	cp config.hin config.h
+ 
+-install catman catman-b compman compman-b \
++install install-sh install-bsh install-everything \
++catman catman-b compman compman-b \
+ jcatman jcatman-b jcompman jcompman-b: Makefile.tmp
+ 	$(MAKE) BUILD=$(BUILD) -f Makefile.tmp $@
+ 
diff --git a/misc/fd/patches/patch-ae b/misc/fd/patches/patch-ae
new file mode 100644
index 00000000000..3bb5c18c8c3
--- /dev/null
+++ b/misc/fd/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2006/12/06 15:36:32 taca Exp $
+
+--- mkmfsed.c.orig	2006-10-31 00:00:00.000000000 +0900
++++ mkmfsed.c
+@@ -119,7 +119,7 @@ char *argv[];
+ 	printf("s:__OSTYPE__:%s:\n", OSTYPE);
+ 
+ #ifdef	USEMANLANG
+-	if ((cp = (char *)getenv("LANG")) && *cp)
++	if ((cp = (char *)getenv("LANGDIR")) && *cp)
+ 		printf("s:__LANGDIR__:/%s:\n", cp);
+ 	else
+ #endif