Update fd to 3.00j.

Ver. 3.00j	Failure of some HTTP redirection is fixed.
 (09/25/10)	Needless network access when URLDRIVE=1 is suppressed.
		Mis-parsing of the file list from some HTTP servers is fixed.
		Failure of INFO_FILESYS on MINIX is fixed.

Ver. 3.00i	Support MINIX 3.
 (07/24/10)	Support NetBSD 5.0.
		Changing to directory on some pseudo file system is allowed.
		Freezing of pseudo terminal with utf8-mac is fixed.
		Failure to convert Kanji code of startup argument is fixed.
		Broken shell output string with effective DEFKCODE is fixed.
		Failure to convert case letter on ShiftJIS is fixed.
		Miscount of items on customizer when changing tab is fixed.
		Misprint of string to map key code is fixed.
		Column overflow of Japanese filename on status line is fixed.
		Wrong cursor position when closing archive browser is fixed.
		Failed archive browser with here-document is fixed.
		Illegal newline code with archive browser is fixed. (MS-DOS)
		Invalid terminal input with internal shell on DJGPP is fixed.
		Unloadable newline (^J) from command history file is fixed.

Ver. 3.00h	Hang-up when 'PS1' internal variable includes \[...\] is fixed.
 (06/14/10)	Failure to compile with non-standard C compiler is fixed.
		Recursive call of malloc() in abortion is fixed.

Ver. 3.00g	Broken tree screen with unprintable directory name is fixed.
 (06/04/10)	Abortion when accessing directory with Japanese is fixed.
		Buffer overflow in Japanese string parser is fixed.

Ver. 3.00f	Mis-action of 'dir' builtin which differs from MS-DOS is fixed.
 (05/29/10)	Invalidated default attribute mask of 'dir' builtin is fixed.
		Abortion when canceling in COPY_TREE/MOVE_TREE is fixed.

Ver. 3.00e	Add mkdir_p.c for installation.
 (02/27/10)	Support Cygwin 1.7.1.
		Failure to compile with some non-ANSI C compilers is fixed.

Ver. 3.00d	Freezing by filename completion on some environments is fixed.
 (11/30/08)	Mis-identified path invoked as login shell via su(1) is fixed.
		Freezing by the large value set as 'HISTSIZE' is fixed.
		Bug that 'echo' builtin ignores anyone starts with - is fixed.
		Support function keys with some VT100 compatible terminals.
		Warning by ioctl() on 64bits BSDs is fixed.

Ver. 3.00c	Bug to garble the pasted string when INPUTKCODE=utf8 is fixed.
 (07/27/08)	Failure to access the root directory is fixed. (MS-DOS)
		Failure to be invoked on Windows NT is fixed. (MS-DOS)
		Illegal newline code for input/output is fixed. (MS-DOS)
		Failure to replace some strings in 'fc' builtin is fixed.

Ver. 3.00b	Failure to replace with $()/$(()) is fixed.
 (07/06/08)	Bug that some temporary files may remain is fixed.
		Freezing by here-document with huge size is fixed.
		Mis-substitution of variables with exit status is fixed.
		Failure to treat argument with '=' as substitution is fixed.
		Buffer overflow with the undefined floppy drive is fixed.
		Mis-operation for redirections with complex sentences is fixed.
		Bug that trap on exit cannot be executed suitably is fixed.
		Inaccurate value of 'LINENO' internal variable is fixed.
		Bug that newline cannot be allowed in 'case' sentence is fixed.
		Bug that ${} cannot include meta characters within "" is fixed.
		Mis-replacement for meta characters in here-document is fixed.
		Adjust representations for 'FD_VERSION' of each documents.
		Bug that 'FD_VERSION' may not be set is fixed.

Ver. 3.00a	Failure to replace the alias with no argument is fixed.
 (06/21/08)	Abortion with recursively invoked archive browser is fixed.
		Resolve a directory traversal vulnerability on the URL drive.
		Mis-implementation of telnet commands in FTP is fixed.
		Failure to compile on Solaris 8 is fixed.
		Adjust representations of each documents to Ver. 3.00.

Ver. 3.00	Add the URL drive function.
 (05/31/08)	Add scheme moditiers to access socket as redirect file.
		Support the message catalog.
		Abolish limits of each registrations.
		Support argument of EDIT_CONFIG as environment variable name.
		Add 'AUTOUPDATE' internal variable.
		Add 'VERSION' internal variable.
		Add 'URLDRIVE', 'URLKCODE', 'HIDEPASSWD' internal variables.
		Add 'URLOPTIONS', 'URLTIMEOUT' internal variables.
		Add 'FTPPROXY', 'FTPLOGFILE', 'FTPADDRESS' internal variables.
		Add 'HTTPPROXY', 'HTTPLOGFILE' internal variables.
		Add 'HTMLLOGFILE' internal variable.
		Add 'accept', 'socketinfo', 'addcr' builtins.
		Add -N option in 'echo' builtin.
		Add -N option in 'read' builtin.
		Add the formats of %w, %p, %B, %b, %/, %! for archive browser.
		Add the redirectees of '<>&', '><&' for duplication.
		Add the redirectees of '<>-', '<>&-', '><-', '><&-' for close.
		Change default file descriptor of '><' redirectee to stdout.

Ver. 2.09i	Failure to compile on Darwin 9.x (Mac OS X 10.5) is fixed.
 (04/19/08)	Odd screen when displaying some long file names is fixed.
		Failure to write directory for FAT file system is fixed.

Ver. 2.09h	Bug that ATTR_FILE/ATTR_DIR have sometimes no effect is fixed.
 (03/15/08)	Unsuitable error message with no controlling terminal is fixed.
		Odd completion choice list while shifting filename is fixed.

Ver. 2.09g	Abortion with no controlling terminal is fixed.
 (01/26/08)	Failure to find the startup directory is resolved partly.
		Failure to input some special keys is reduced.

Ver. 2.09f	Bug to garble the pasted string in some environments is fixed.
 (10/28/07)	Mis-inputted keys after dynamic variation of 'TERM' is fixed.
		Bug to ignore some configuration files on NFS is fixed.
		Failure with some builtins in non-interactive shell is fixed.
		Bug not to expand variables after '~' is fixed.

Ver. 2.09e	Freezing sometimes caused in 'copy' builtin is fixed.
 (09/16/07)	Abortion when missing the current directory is fixed.
		Wrong default file descriptor of '<>'/'><' redirectee is fixed.
		Incomplete check for the supplementary group is fixed.

Ver. 2.09d	Support Linux kernel 2.6.20.
 (04/26/07)	Progress key responses when INPUTKCODE=utf8.
		Abortion with accessing the empty directory is fixed.
		Inaccessiblity of the floppy drive with large size is fixed.

Ver. 2.09c	Failure to support Linux kernel 2.6.18 is fixed.
 (01/17/07)

Ver. 2.09b	Support Linux kernel 2.6.18.
 (12/22/06)	Bug that '..' is not accessible in floppy drive is fixed.

7 files changed, 62 insertions, 82 deletions

diff --git a/misc/fd/Makefile b/misc/fd/Makefile
index e618db68f86..42b932c7c04 100644
--- a/misc/fd/Makefile
+++ b/misc/fd/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2010/02/25 15:03:36 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2011/04/08 11:34:44 obache Exp $
 #
 
-DISTNAME=	FD-2.09a
-PKGNAME=	fd-2.09a
-PKGREVISION=	1
+DISTNAME=	FD-3.00j
+PKGNAME=	${DISTNAME:tl}
 CATEGORIES=	misc shells
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA012337/soft/fd/
 
@@ -11,42 +10,45 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://hp.vector.co.jp/authors/VA012337/soft/fd/
 COMMENT=	File and directory management tool
 
-MAKE_ENV+=	CONFDIR=${PKG_SYSCONFDIR:Q}
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+MAKE_FLAGS+=	CONFDIR=${PKG_SYSCONFDIR}
+MAKE_FLAGS+=	PREFIX=${PREFIX}
+
+.include "../../mk/bsd.prefs.mk"
 
 MANLANG?=	ja_JP.eucJP
-MAKE_ENV+=	LANGDIR=${MANLANG:Q} DATADIR=${DATADIR:Q}
+MAKE_ENV+=	LANGDIR=${MANLANG:Q} DATADIR=${DATADIR}
 PLIST_SUBST+=	FD_CONFIG=${FD_CONFIG:Q} MANLANG=${MANLANG:Q}
 
 DATADIR=	${PREFIX}/share/fd
 DOCDIR=		${PREFIX}/share/doc/fd
 EXAMPLESDIR=	${PREFIX}/share/examples/fd
 
+CFLAGS+=	-DUSEMANLANG -DUSEDATADIR
+DESTDIR_VARNAME=	BUILD
+
 DOCS=		FAQ LICENSES HISTORY README TECHKNOW ToAdmin
 
 .include "options.mk"
 
-CONF_FILES+=	${EXAMPLESDIR:Q}/${FD_CONFIG} ${PKG_SYSCONFDIR:Q}/${FD_CONFIG}
+CONF_FILES+=	${EXAMPLESDIR}/${FD_CONFIG} ${PKG_SYSCONFDIR}/${FD_CONFIG}
 
-.if empty(PKG_OPTIONS:Mfd-small)
-PLIST_SRC=	${PKGDIR}/PLIST ${WRKSRC}/PLIST
-.else
+.if !empty(PKG_OPTIONS:Mfd-small)
 USE_TOOLS+=	patch
 
 post-configure:
-	cd ${WRKSRC}; ${PATCH} -R < _fdrc.dif
+	${RUN}cd ${WRKSRC}; ${PATCH} -R < _fdrc.dif
 .endif
 
 post-install:
-	${INSTALL_DATA_DIR} ${DOCDIR}/ja
-	cd ${WRKSRC}; \
+	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}/ja
+	${RUN}cd ${WRKSRC}; \
 	for i in ${DOCS}; do \
-		${INSTALL_DATA} ${WRKSRC}/$$i.eng ${DOCDIR}/$$i; \
-		${INSTALL_DATA} ${WRKSRC}/$$i ${DOCDIR}/ja; \
+		${INSTALL_DATA} ${WRKSRC}/$${i}.eng ${DESTDIR}${DOCDIR}/$${i}; \
+		${INSTALL_DATA} ${WRKSRC}/$${i} ${DESTDIR}${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
+	${INSTALL_DATA_DIR} ${DESTDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/_fdrc ${DESTDIR}${EXAMPLESDIR}/${FD_CONFIG}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/fd/PLIST b/misc/fd/PLIST
index 18fca568a57..5d9b887f4c8 100644
--- a/misc/fd/PLIST
+++ b/misc/fd/PLIST
@@ -1,21 +1,24 @@
-@comment $NetBSD: PLIST,v 1.2 2006/12/06 15:36:31 taca Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/04/08 11:34:44 obache Exp $
 bin/fd
 bin/fdsh
-man/man1/fd.1
-man/man1/fdsh.1
 man/${MANLANG}/man1/fd.1
 man/${MANLANG}/man1/fdsh.1
+man/man1/fd.1
+man/man1/fdsh.1
 share/doc/fd/FAQ
-share/doc/fd/LICENSES
 share/doc/fd/HISTORY
+share/doc/fd/LICENSES
 share/doc/fd/README
 share/doc/fd/TECHKNOW
 share/doc/fd/ToAdmin
 share/doc/fd/ja/FAQ
-share/doc/fd/ja/LICENSES
 share/doc/fd/ja/HISTORY
+share/doc/fd/ja/LICENSES
 share/doc/fd/ja/README
 share/doc/fd/ja/TECHKNOW
 share/doc/fd/ja/ToAdmin
 share/examples/fd/${FD_CONFIG}
+${PLIST.fd-full}share/fd/${PKGVERSION}/fd-cat.C
+${PLIST.fd-full}share/fd/${PKGVERSION}/fd-cat.ja
+${PLIST.fd-full}share/fd/fd-dict.tbl
 share/fd/fd-unicd.tbl
diff --git a/misc/fd/distinfo b/misc/fd/distinfo
index 37467a2eb1d..901d8b8dbc6 100644
--- a/misc/fd/distinfo
+++ b/misc/fd/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.8 2007/01/22 03:52:27 hira Exp $
+$NetBSD: distinfo,v 1.9 2011/04/08 11:34:44 obache Exp $
 
-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-ae) = ef6980330eba5ed6d10e91fea780eb986a6c6925
+SHA1 (FD-3.00j.tar.gz) = 4cf6ce007ee62fba7166cb405122b2da7277dca3
+RMD160 (FD-3.00j.tar.gz) = b976c68e6facc01bf331959be4b831206c05fef7
+Size (FD-3.00j.tar.gz) = 925560 bytes
+SHA1 (patch-Makefile.in) = c454560aaba404026b419c554cd9ac607266bc0e
diff --git a/misc/fd/options.mk b/misc/fd/options.mk
index b5d0a763fd3..3a7994176b5 100644
--- a/misc/fd/options.mk
+++ b/misc/fd/options.mk
@@ -1,13 +1,16 @@
-# $NetBSD: options.mk,v 1.1 2006/12/06 15:36:32 taca Exp $
+# $NetBSD: options.mk,v 1.2 2011/04/08 11:34:44 obache Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.fd
 PKG_SUPPORTED_OPTIONS=		fd-small
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=	fd-full
+
 .if !empty(PKG_OPTIONS:Mfd-small)
-MAKE_ENV+=	VERSION=1
+MAKE_FLAGS+=	VERSION=1
 FD_CONFIG=	fdrc
 .else
 FD_CONFIG=	fd2rc
+PLIST.fd-full=	yes
 .endif
diff --git a/misc/fd/patches/patch-Makefile.in b/misc/fd/patches/patch-Makefile.in
new file mode 100644
index 00000000000..bc7b47e3890
--- /dev/null
+++ b/misc/fd/patches/patch-Makefile.in
@@ -0,0 +1,22 @@
+$NetBSD: patch-Makefile.in,v 1.1 2011/04/08 11:34:45 obache Exp $
+
+* honor PKGMANDIR
+* let not to take __LANGDIR__ from ${LANG}
+
+--- Makefile.in.orig	2010-09-24 15:00:00.000000000 +0000
++++ Makefile.in
+@@ -13,11 +13,11 @@ BINTOP	= $(PREFIX)/bin
+ BINDIR	= $(BUILD)$(BINTOP)
+ DATATOP	= $(PREFIX)/share
+ DATADIR	= $(BUILD)$(DATATOP)/fd
+-MANTOP	= $(PREFIX)/man
++MANTOP	= $(PREFIX)/$(PKGMANDIR)
+ MANDIR	= $(BUILD)$(MANTOP)/man$(MANSEC)
+ CATDIR	= $(BUILD)$(MANTOP)/cat$(MANSEC)
+-JMANDIR	= $(BUILD)$(MANTOP)__LANGDIR__/man$(MANSEC)
+-JCATDIR	= $(BUILD)$(MANTOP)__LANGDIR__/cat$(MANSEC)
++JMANDIR	= $(BUILD)$(MANTOP)/${LANGDIR}/man$(MANSEC)
++JCATDIR	= $(BUILD)$(MANTOP)/${LANGDIR}/cat$(MANSEC)
+ IPKWDIR	= ./ipk.work
+ IPKTDIR	= ./ipk.tmp
+ DEPDIR	= ./depend.tmp
diff --git a/misc/fd/patches/patch-aa b/misc/fd/patches/patch-aa
deleted file mode 100644
index a7fa5bb8c31..00000000000
--- a/misc/fd/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2006/12/06 15:36:32 taca Exp $
-
---- Makefile.orig	2006-10-31 00:00:00.000000000 +0900
-+++ Makefile
-@@ -2,10 +2,10 @@
- #	Makefile for fd
- #
- 
--VERSION	= 2
-+VERSION	?= 2
- VERMAJ	= $(VERSION)
--PREFIX	= /usr/local
--CONFDIR	= /etc
-+PREFIX	?= /usr/local
-+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
deleted file mode 100644
index 3bb5c18c8c3..00000000000
--- a/misc/fd/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$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