Update fhist to 1.16.

Based on patch provided in PR 35539.
And I made two modification related to pkgsrc.

PKGSRC CHANGES:
   Make document & nls files to be installed into standard location.
   Add test target.

RELEASE NOTES:
   Version 1.16 (20-Dec-2005)
       * There is a new fmerge -ignore-identical-conflicts option which may be
       used to suppress logical conflicts in which the same thing is done by
       both variants. This is often a better match for users' expectations for
       merging source code.

   Version 1.15 (8-Nov-2005)
       * There is a new fcomp -no-binary option, which may be used to prevent
       the comparison of binary files, instead it treats them both as empty.

       * A small build problem on MacOS X has been fixed.

   Version 1.14 (8-Jun-2004)
       * The ./configure script now understands the --with-nlsdir option, so
       that you can place the .mo files.

       * The fhist(1) program is now able to cope with numeric modules names.

       * The occasional false negative from test 26 has been fixed.  It was
       failing for some users because of message translation
       (internationalization) issues.

3 files changed, 32 insertions, 30 deletions

diff --git a/devel/fhist/Makefile b/devel/fhist/Makefile
index ee269411564..63d1d1aa6c2 100644
--- a/devel/fhist/Makefile
+++ b/devel/fhist/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2006/11/24 23:01:45 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/02/05 00:33:58 obache Exp $
 #
 
-DISTNAME=		fhist-1.13
-PKGREVISION=	2
+DISTNAME=		fhist-1.16
 CATEGORIES=		devel
 MASTER_SITES=		http://fhist.sourceforge.net/
 
@@ -12,6 +11,12 @@ COMMENT=		File history and comparison tools
 
 USE_TOOLS+=		gsoelim msgfmt yacc
 GNU_CONFIGURE=		YES
+USE_PKGLOCALEDIR=	YES
+
+CONFIGURE_ARGS+=	--with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/doc
+
+TEST_TARGET=		sure
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 
diff --git a/devel/fhist/PLIST b/devel/fhist/PLIST
index ecbfb0ce3d1..918ace415e5 100644
--- a/devel/fhist/PLIST
+++ b/devel/fhist/PLIST
@@ -1,30 +1,27 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/01/16 11:06:37 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/02/05 00:33:58 obache Exp $
 bin/fcomp
 bin/fhist
 bin/fmerge
-lib/fhist/en/LC_MESSAGES/fcomp.mo
-lib/fhist/en/LC_MESSAGES/fhist.mo
-lib/fhist/en/LC_MESSAGES/fmerge.mo
 man/man1/fcomp.1
 man/man1/fhist.1
 man/man1/fhist_lic.1
 man/man1/fmerge.1
-share/fhist/en/building.dvi
-share/fhist/en/building.ps
-share/fhist/en/building.txt
-share/fhist/en/man1/fcomp.1
-share/fhist/en/man1/fhist.1
-share/fhist/en/man1/fhist_lic.1
-share/fhist/en/man1/fmerge.1
-share/fhist/en/readme.dvi
-share/fhist/en/readme.ps
-share/fhist/en/readme.txt
-share/fhist/en/reference.dvi
-share/fhist/en/reference.ps
-share/fhist/en/reference.txt
-@dirrm share/fhist/en/man1
-@dirrm share/fhist/en
-@dirrm share/fhist
-@dirrm lib/fhist/en/LC_MESSAGES
-@dirrm lib/fhist/en
-@dirrm lib/fhist
+share/doc/fhist/en/building.dvi
+share/doc/fhist/en/building.ps
+share/doc/fhist/en/building.txt
+share/doc/fhist/en/man1/fcomp.1
+share/doc/fhist/en/man1/fhist.1
+share/doc/fhist/en/man1/fhist_lic.1
+share/doc/fhist/en/man1/fmerge.1
+share/doc/fhist/en/readme.dvi
+share/doc/fhist/en/readme.ps
+share/doc/fhist/en/readme.txt
+share/doc/fhist/en/reference.dvi
+share/doc/fhist/en/reference.ps
+share/doc/fhist/en/reference.txt
+share/locale/en/LC_MESSAGES/fcomp.mo
+share/locale/en/LC_MESSAGES/fhist.mo
+share/locale/en/LC_MESSAGES/fmerge.mo
+@dirrm share/doc/fhist/en/man1
+@dirrm share/doc/fhist/en
+@dirrm share/doc/fhist
diff --git a/devel/fhist/distinfo b/devel/fhist/distinfo
index 63ef326397b..fed01efad35 100644
--- a/devel/fhist/distinfo
+++ b/devel/fhist/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 22:24:13 agc Exp $
+$NetBSD: distinfo,v 1.4 2007/02/05 00:33:58 obache Exp $
 
-SHA1 (fhist-1.13.tar.gz) = bebbaa3f1db0fdbfae731c99a3a5ab19cdcd75fd
-RMD160 (fhist-1.13.tar.gz) = e58b280b96929765a853fafafdc3a7bdaef073b6
-Size (fhist-1.13.tar.gz) = 263993 bytes
+SHA1 (fhist-1.16.tar.gz) = e8d4f353240bde8afd48862d9b225c410e47c11e
+RMD160 (fhist-1.16.tar.gz) = 234ae94aeb9638453ac6ba4aebbe66b3af36f24a
+Size (fhist-1.16.tar.gz) = 383180 bytes