Index: head/shells/fd/Makefile
===================================================================
--- head/shells/fd/Makefile	(revision 347284)
+++ head/shells/fd/Makefile	(revision 347285)
@@ -1,64 +1,48 @@
 # Created by: Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 # $FreeBSD$
 
 PORTNAME=	fd
 PORTVERSION=	3.01a
 CATEGORIES=	shells net
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA012337/soft/fd/ \
 		ftp://ftp.unixusers.net/src/fdclone/
 DISTNAME=	FD-${PORTVERSION}
 
 MAINTAINER=	knu@FreeBSD.org
-COMMENT=	A CUI-based file and directory management tool
+COMMENT=	CUI-based file and directory management tool
 
-MANLANG=	"" ja
-MAN1=		fd.1 fdsh.1
+OPTIONS_DEFINE=	DOCS
+
 MAKE_ENV=	LANG=ja
-MAKE_ARGS=	CC="${CC}" CONFDIR="${PREFIX}/etc"
+MAKE_ARGS=	CC="${CC}" PREFIX="\$$(DESTDIR)${PREFIX}" CONFDIR="\$$(DESTDIR)${PREFIX}/etc"
 
 DOCS_EN=	FAQ.eng \
 		LICENSES.eng \
 		README.eng \
 		TECHKNOW.eng \
 		ToAdmin.eng
 DOCS_JA=	FAQ \
 		HISTORY \
 		LICENSES \
 		README \
 		TECHKNOW \
 		ToAdmin
 
-NO_STAGE=	yes
+BROKEN_powerpc=		Does not compile on powerpc: tzfile.h: No such file or directory
+
 post-configure:
 	${REINPLACE_CMD} -E -e 's|^(#[[:space:]]*define[[:space:]]+EXTENDCCOPT[[:space:]]+"([^"]+ )?)-O(["[:space:]])|\1${CFLAGS}\3|' ${WRKSRC}/machine.h
 
 post-install:
-	@${ECHO} "Updating /etc/shells"
-	@-${CP} /etc/shells /etc/shells.bak; \
-		(${GREP} -v ${PREFIX}/bin/fdsh /etc/shells.bak; \
-		${ECHO_CMD} ${PREFIX}/bin/fdsh) > /etc/shells; \
-		${RM} -f /etc/shells.bak
-	@${INSTALL_DATA} ${WRKSRC}/_fdrc.orig ${PREFIX}/etc/fd2rc.dist
-	@${INSTALL_DATA} ${WRKSRC}/_fdrc ${PREFIX}/etc/fd2rc.sample
-	if [ ! -f ${PREFIX}/etc/fd2rc ]; then \
-		${CP} -p ${PREFIX}/etc/fd2rc.sample ${PREFIX}/etc/fd2rc; \
-	fi
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${MKDIR} ${PREFIX}/share/doc/ja/${PORTNAME}
+	@${INSTALL_DATA} ${WRKSRC}/_fdrc.orig ${STAGEDIR}${PREFIX}/etc/fd2rc.dist
+	@${INSTALL_DATA} ${WRKSRC}/_fdrc ${STAGEDIR}${PREFIX}/etc/fd2rc.sample
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME}
 	@for i in ${DOCS_EN}; do \
-		${INSTALL_DATA} ${WRKSRC}/$$i ${DOCSDIR}; \
+		${INSTALL_DATA} ${WRKSRC}/$$i ${STAGEDIR}${DOCSDIR}; \
 	done
 	@for i in ${DOCS_JA}; do \
-		${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/ja/${PORTNAME}; \
+		${INSTALL_DATA} ${WRKSRC}/$$i ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME}; \
 	done
-	@${CAT} ${PKGMESSAGE}
-.endif
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "powerpc"
-BROKEN=		Does not compile on powerpc: tzfile.h: No such file or directory
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/shells/fd/pkg-plist
===================================================================
--- head/shells/fd/pkg-plist	(revision 347284)
+++ head/shells/fd/pkg-plist	(revision 347285)
@@ -1,25 +1,29 @@
 bin/fd
 bin/fd-cat.C
 bin/fd-cat.ja
 bin/fdsh
 @exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells; rm -f /etc/shells.bak
 @unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
 bin/fd-dict.tbl
 bin/fd-unicd.tbl
 etc/fd2rc.dist
 @unexec if cmp -s %D/etc/fd2rc %D/etc/fd2rc.sample; then rm -f %D/etc/fd2rc; fi
 etc/fd2rc.sample
 @exec [ ! -f %B/fd2rc ] && cp %B/%f %B/fd2rc
+man/ja/man1/fd.1.gz
+man/ja/man1/fdsh.1.gz
+man/man1/fd.1.gz
+man/man1/fdsh.1.gz
 %%PORTDOCS%%share/doc/ja/fd/FAQ
 %%PORTDOCS%%share/doc/ja/fd/HISTORY
 %%PORTDOCS%%share/doc/ja/fd/LICENSES
 %%PORTDOCS%%share/doc/ja/fd/README
 %%PORTDOCS%%share/doc/ja/fd/TECHKNOW
 %%PORTDOCS%%share/doc/ja/fd/ToAdmin
 %%PORTDOCS%%@dirrm share/doc/ja/fd
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.eng
 %%PORTDOCS%%%%DOCSDIR%%/LICENSES.eng
 %%PORTDOCS%%%%DOCSDIR%%/README.eng
 %%PORTDOCS%%%%DOCSDIR%%/TECHKNOW.eng
 %%PORTDOCS%%%%DOCSDIR%%/ToAdmin.eng
 %%PORTDOCS%%@dirrm %%DOCSDIR%%