Update to 0.6.5.

Fix PR pkg/44519

Changelog:
* Version 0.6.5 - December 2010, by Martin von Gagern

  * Never initialize or deinitialize terminals, as we do no cursor movement
  * Deprecated --no-init-term (-K) command line option
  * Avoid relative path in man pages
  * Updated gnulib, might be particularly important for uClibc users

* Version 0.6.4 - November 2010, by Martin von Gagern

  * Updated Catalan translations
  * Updated gnulib

* Version 0.6.3 - June 2010, by Martin von Gagern

  * Updated Italian and Swedish translations
  * Updated gnulib

* Version 0.6.2 - May 2010, by Martin von Gagern

  * Fix shell syntax in configure script
  * Updated gnulib and gettext, the latter to 0.18
  * Updated Dutch translation
  * Fixed a number of portability issues reported by maint.mk syntax checks

* Version 0.6.1 - April 2010, by Martin von Gagern

  * Introduce --with-default-pager=PAGER configure switch.
  * Fix missing newline in info dir entry list.

* Version 0.6.0 - March 2010, by Martin von Gagern

  First official release in a long time. Everything since 0.5 was inofficial.
  * `wdiff -d' to read input from single unified diff, perhaps stdin.
  * Updated texinfo documentation taking experimental switch into account.
  * Experimental programs (mdiff & friends) and a configure switch
    --enable-experimental to control them.
  * Recent imports from gnulib, use of recent autotools.
  * Improved autodetection of termcap library like ncurses.
  * Reformatted translations, still a number of fuzzy translations.
  * Changed from CVS to bzr for source code version control.
  * Various bug fixes. See ChangeLog for a more exhaustive list.
  * Known bugs: this NEWS file here was outdated in the release tarball.

* Version 0.5.4 - June 2007, by Denver Gingerich

  Integrated following changes from 0.5g (Francois Pinard, November 1998):
  * Messages from programs may be output in many natural languages.
  * Short `man' pages get installed for `mdiff', `unidiff' and `wdiff'.
  * The original man page for `wdiff' gets withdrawn, for legalistic reasons.
  * New `unify' converts context diffs to unidiffs or vice-versa.
  * New `mdiff' finds identical line clusters in one or more files.
  * A new `-K' option inhibits termcap initialization and termination.

* Version 0.5.3 - June 2007, by Denver Gingerich

  No user-visible changes; see ChangeLog for details

7 files changed, 77 insertions, 287 deletions

diff --git a/textproc/wdiff/Makefile b/textproc/wdiff/Makefile
index 87c06fcb643..4d76670e73a 100644
--- a/textproc/wdiff/Makefile
+++ b/textproc/wdiff/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2008/03/05 15:56:19 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2011/02/05 17:47:22 ryoon Exp $
 #
 
-DISTNAME=		wdiff-0.5
-PKGREVISION=		3
+DISTNAME=		wdiff-0.6.5
 CATEGORIES=		textproc
 MASTER_SITES=		${MASTER_SITE_GNU:=wdiff/}
 
@@ -13,22 +12,11 @@ COMMENT=		Word-by-word diff
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-CONFIGURE_HAS_INFODIR=	no
-CONFIGURE_HAS_MANDIR=	no
 
 USE_TOOLS+=		makeinfo
-INFO_FILES=		# PLIST
-INSTALLATION_DIRS=	bin ${PKGINFODIR} ${PKGMANDIR}/man1 share/doc/wdiff
-
-do-install:
-	${INSTALL_MAN} ${WRKSRC}/wdiff.1				\
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	cd ${WRKSRC}; for f in wdiff.info wdiff.info-[0-9]*; do		\
-		${TEST} ! -f "$$f" ||					\
-		${INSTALL_MAN} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR};	\
-	done
-	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/wdiff
-	${INSTALL_PROGRAM} ${WRKSRC}/wdiff ${DESTDIR}${PREFIX}/bin
+INFO_FILES=		yes
+CHECK_FILES_SKIP+=	lib/charset.alias
 
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/wdiff/PLIST b/textproc/wdiff/PLIST
index 106b70703ad..f0a6052030a 100644
--- a/textproc/wdiff/PLIST
+++ b/textproc/wdiff/PLIST
@@ -1,5 +1,70 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:17:33 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2011/02/05 17:47:22 ryoon Exp $
 bin/wdiff
-man/man1/wdiff.1
 info/wdiff.info
-share/doc/wdiff/README
+man/man1/wdiff.1
+share/locale/af/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/be/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/bg/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/ca/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/ca/LC_MESSAGES/wdiff.mo
+share/locale/cs/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/cs/LC_MESSAGES/wdiff.mo
+share/locale/da/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/da/LC_MESSAGES/wdiff.mo
+share/locale/de/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/de/LC_MESSAGES/wdiff.mo
+share/locale/el/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/en@boldquot/LC_MESSAGES/wdiff.mo
+share/locale/en@quot/LC_MESSAGES/wdiff.mo
+share/locale/en_GB/LC_MESSAGES/wdiff.mo
+share/locale/es/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/es/LC_MESSAGES/wdiff.mo
+share/locale/et/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/et/LC_MESSAGES/wdiff.mo
+share/locale/eu/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/fi/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/fi/LC_MESSAGES/wdiff.mo
+share/locale/fr/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/fr/LC_MESSAGES/wdiff.mo
+share/locale/ga/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/ga/LC_MESSAGES/wdiff.mo
+share/locale/gl/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/gl/LC_MESSAGES/wdiff.mo
+share/locale/hu/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/hu/LC_MESSAGES/wdiff.mo
+share/locale/id/LC_MESSAGES/wdiff.mo
+share/locale/it/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/it/LC_MESSAGES/wdiff.mo
+share/locale/ja/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/ko/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/ms/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/ms/LC_MESSAGES/wdiff.mo
+share/locale/nb/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/nb/LC_MESSAGES/wdiff.mo
+share/locale/nl/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/nl/LC_MESSAGES/wdiff.mo
+share/locale/pl/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/pl/LC_MESSAGES/wdiff.mo
+share/locale/pt/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/pt_BR/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/pt_BR/LC_MESSAGES/wdiff.mo
+share/locale/ro/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/ro/LC_MESSAGES/wdiff.mo
+share/locale/ru/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/ru/LC_MESSAGES/wdiff.mo
+share/locale/rw/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/sk/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/sk/LC_MESSAGES/wdiff.mo
+share/locale/sl/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/sl/LC_MESSAGES/wdiff.mo
+share/locale/sv/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/sv/LC_MESSAGES/wdiff.mo
+share/locale/tr/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/tr/LC_MESSAGES/wdiff.mo
+share/locale/uk/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/vi/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/vi/LC_MESSAGES/wdiff.mo
+share/locale/zh_CN/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/zh_CN/LC_MESSAGES/wdiff.mo
+share/locale/zh_TW/LC_MESSAGES/wdiff-gnulib.mo
+share/locale/zh_TW/LC_MESSAGES/wdiff.mo
diff --git a/textproc/wdiff/distinfo b/textproc/wdiff/distinfo
index 164d80ccff9..1c65b1755b5 100644
--- a/textproc/wdiff/distinfo
+++ b/textproc/wdiff/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.6 2007/12/23 04:50:30 minskim Exp $
+$NetBSD: distinfo,v 1.7 2011/02/05 17:47:22 ryoon Exp $
 
-SHA1 (wdiff-0.5.tar.gz) = 44e18850e16518633139cf24a83165e62e3baa95
-RMD160 (wdiff-0.5.tar.gz) = 7b313cfaca2ec3759048888bbdba0be1cd88a5e1
-Size (wdiff-0.5.tar.gz) = 129267 bytes
-SHA1 (patch-aa) = ae9ed3d3f993f5ee2ed22599b9ce5ac7b47be0ab
-SHA1 (patch-ab) = 9c969894e3a5ef8f9454c6577e230ca9d1e06a06
-SHA1 (patch-ac) = 97311dd14a9a47688463ba325aec7874f69887a9
-SHA1 (patch-ae) = 7d64a7a160aaf152ceae0191afb3697e504e1278
+SHA1 (wdiff-0.6.5.tar.gz) = 8a1d5d76f7faa999a5573619b9f3f0a7711e1d08
+RMD160 (wdiff-0.6.5.tar.gz) = aead43659c8d8368318f1b1145826078aeec36da
+Size (wdiff-0.6.5.tar.gz) = 1232434 bytes
diff --git a/textproc/wdiff/patches/patch-aa b/textproc/wdiff/patches/patch-aa
deleted file mode 100644
index 4aa693a7c7c..00000000000
--- a/textproc/wdiff/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2003/01/24 14:12:04 itohy Exp $
-
---- configure.in.orig	Sun Nov  6 13:15:50 1994
-+++ configure.in	Fri Jan 24 22:23:43 2003
-@@ -40,7 +40,6 @@
- AC_HEADER_STDC
- AC_TYPE_SIGNAL
- 
--AC_CHECK_FUNCS(strerror tputs)
- AC_FUNC_ALLOCA
- test "$ALLOCA" = alloca.o && LIBOBJS="$LIBOBJS xmalloc.o"
- AC_FUNC_VPRINTF
-@@ -60,6 +59,7 @@
-   AC_MSG_RESULT(no)
-   LIBS="$LIBS -ltermcap"
- ])
-+AC_CHECK_FUNCS(strerror tputs mkstemp)
- 
- AC_MSG_CHECKING(if cbars is wanted)
- AC_ARG_ENABLE(cbars,
diff --git a/textproc/wdiff/patches/patch-ab b/textproc/wdiff/patches/patch-ab
deleted file mode 100644
index dac438c53eb..00000000000
--- a/textproc/wdiff/patches/patch-ab
+++ /dev/null
@@ -1,116 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/01/24 14:12:04 itohy Exp $
-
---- configure.orig	Sun Nov  6 16:59:26 1994
-+++ configure	Fri Jan 24 22:23:42 2003
-@@ -1159,55 +1159,6 @@
- 
- 
- 
--for ac_func in strerror tputs
--do
--echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
--if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&4
--else
--  cat > conftest.$ac_ext <<EOF
--#line 1170 "configure"
--#include "confdefs.h"
--#include <ctype.h> /* Arbitrary system header to define __stub macros. */
--/* Override any gcc2 internal prototype to avoid an error.  */
--char $ac_func(); 
--
--int main() { return 0; }
--int t() {
--
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
--choke me
--#else
--$ac_func();
--#endif
--
--; return 0; }
--EOF
--if eval $ac_link; then
--  rm -rf conftest*
--  eval "ac_cv_func_$ac_func=yes"
--else
--  rm -rf conftest*
--  eval "ac_cv_func_$ac_func=no"
--fi
--rm -f conftest*
--
--fi
--if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
--  echo "$ac_t""yes" 1>&4
--    ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_func 1
--EOF
-- 
--else
--  echo "$ac_t""no" 1>&4
--fi
--done
--
- # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
- # for constant arguments.  Useless!
- echo $ac_n "checking for working alloca.h""... $ac_c" 1>&4
-@@ -1712,6 +1663,55 @@
- 
- fi
- rm -f conftest*
-+
-+for ac_func in strerror tputs mkstemp
-+do
-+echo $ac_n "checking for $ac_func""... $ac_c" 1>&4
-+if eval "test \"`echo '${'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&4
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 1170 "configure"
-+#include "confdefs.h"
-+#include <ctype.h> /* Arbitrary system header to define __stub macros. */
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+char $ac_func(); 
-+
-+int main() { return 0; }
-+int t() {
-+
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
-+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+choke me
-+#else
-+$ac_func();
-+#endif
-+
-+; return 0; }
-+EOF
-+if eval $ac_link; then
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=yes"
-+else
-+  rm -rf conftest*
-+  eval "ac_cv_func_$ac_func=no"
-+fi
-+rm -f conftest*
-+
-+fi
-+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-+  echo "$ac_t""yes" 1>&4
-+    ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_func 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&4
-+fi
-+done
- 
- 
- echo $ac_n "checking if cbars is wanted""... $ac_c" 1>&4
diff --git a/textproc/wdiff/patches/patch-ac b/textproc/wdiff/patches/patch-ac
deleted file mode 100644
index 993e96951ce..00000000000
--- a/textproc/wdiff/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/01/24 14:12:04 itohy Exp $
-
---- config.h.in.orig	Wed Nov  2 02:23:02 1994
-+++ config.h.in	Fri Jan 24 22:30:16 2003
-@@ -79,6 +79,9 @@
- /* Define if you have the tputs function.  */
- #undef HAVE_TPUTS
- 
-+/* Define if you have the mkstemp function.  */
-+#undef HAVE_MKSTEMP
-+
- /* Define if you have the <string.h> header file.  */
- #undef HAVE_STRING_H
- 
diff --git a/textproc/wdiff/patches/patch-ae b/textproc/wdiff/patches/patch-ae
deleted file mode 100644
index be0bcf3dff1..00000000000
--- a/textproc/wdiff/patches/patch-ae
+++ /dev/null
@@ -1,109 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2007/12/23 04:50:30 minskim Exp $
-
---- wdiff.c.orig	1994-11-05 23:57:23.000000000 -0800
-+++ wdiff.c
-@@ -168,6 +168,10 @@ int interrupted;		/* set when some signa
- # define L_tmpnam PATH_MAX
- #endif
- 
-+#ifdef HAVE_MKSTEMP
-+# define MKSTEMP_TEMPLATE	"/tmp/wdiffXXXXXXXX"
-+#endif
-+
- typedef struct side SIDE;	/* all variables for one side */
- struct side
- {
-@@ -555,6 +559,9 @@ static void
- split_file_into_words (SIDE *side)
- {
-   struct stat stat_buffer;	/* for checking if file is directory */
-+#ifdef HAVE_MKSTEMP
-+  int fd;
-+#endif
- 
-   /* Open files.  */
- 
-@@ -566,10 +573,23 @@ split_file_into_words (SIDE *side)
- 	 this temporary local file.  Once done, prepare it for reading.
- 	 We do not need the file name itself anymore.  */
- 
-+#ifdef HAVE_MKSTEMP
-+      strcpy (side->temp_name, MKSTEMP_TEMPLATE);
-+      if ((fd = mkstemp(side->temp_name)) < 0)
-+	error (EXIT_OTHER_REASON, 0, "mkstemp failed");
-+      side->file = fdopen (fd, "w+");
-+      if (side->file == NULL)
-+	{
-+	  int e = errno;
-+	  (void) unlink (side->temp_name);
-+	  error (EXIT_OTHER_REASON, e, side->temp_name);
-+	}
-+#else
-       tmpnam (side->temp_name);
-       side->file = fopen (side->temp_name, "w+");
-       if (side->file == NULL)
- 	error (EXIT_OTHER_REASON, errno, side->temp_name);
-+#endif
-       if (unlink (side->temp_name) != 0)
- 	error (EXIT_OTHER_REASON, errno, side->temp_name);
-       while (side->character = getchar (), side->character != EOF)
-@@ -593,10 +613,23 @@ split_file_into_words (SIDE *side)
-   side->character = getc (side->file);
-   side->position = 0;
- 
-+#ifdef HAVE_MKSTEMP
-+  strcpy (side->temp_name, MKSTEMP_TEMPLATE);
-+  if ((fd = mkstemp(side->temp_name)) < 0)
-+    error (EXIT_OTHER_REASON, 0, "mkstemp failed");
-+  side->temp_file = fdopen (fd, "w");
-+  if (side->temp_file == NULL)
-+    {
-+      int e = errno;
-+      (void) unlink (side->temp_name);
-+      error (EXIT_OTHER_REASON, e, side->temp_name);
-+    }
-+#else
-   tmpnam (side->temp_name);
-   side->temp_file = fopen (side->temp_name, "w");
-   if (side->temp_file == NULL)
-     error (EXIT_OTHER_REASON, errno, side->temp_name);
-+#endif
- 
-   /* Complete splitting input file into words on output.  */
- 
-@@ -1135,7 +1168,7 @@ Mandatory arguments to long options are 
- | Main program.	 |
- `---------------*/
- 
--void
-+int
- main (int argc, char *const argv[])
- {
-   int option_char;		/* option character */
-@@ -1304,12 +1337,13 @@ main (int argc, char *const argv[])
-       reformat_diff_output ();
-       fclose (input_file);
-     }
--
--  /* Clean up.  Beware that input_file and output_file might not exist,
--     if a signal occurred early in the program.  */
--
--  if (input_file)
--    complete_input_program ();
-+  else
-+    {
-+      /* Clean up.  Beware that input_file and output_file might not
-+	exist, if a signal occurred early in the program.  */
-+      if (input_file)
-+	complete_input_program ();
-+    }
- 
-   if (*left_side->temp_name)
-     unlink (left_side->temp_name);
-@@ -1329,5 +1363,5 @@ main (int argc, char *const argv[])
-       || count_changed_left || count_changed_right)
-     exit (EXIT_ANY_DIFFERENCE);
- 
--  exit (EXIT_NO_DIFFERENCES);
-+  return EXIT_NO_DIFFERENCES;
- }