Update to 0.6.4

7 files changed, 3 insertions, 313 deletions

diff --git a/textproc/wdiff/Makefile b/textproc/wdiff/Makefile
index 0306f859963f..520a00b3ba3e 100644
--- a/textproc/wdiff/Makefile
+++ b/textproc/wdiff/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	wdiff
-PORTVERSION=	0.5
-PORTREVISION=	3
+PORTVERSION=	0.6.4
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	wdiff
@@ -16,7 +15,6 @@ MAINTAINER=	sanpei@FreeBSD.org
 COMMENT=	Display word differences between text files
 
 GNU_CONFIGURE=	yes
-CPP=		#
 
 MAN1=		wdiff.1
 INFO=		wdiff
diff --git a/textproc/wdiff/distinfo b/textproc/wdiff/distinfo
index 6ca2506a70b6..7bb8ff200e4f 100644
--- a/textproc/wdiff/distinfo
+++ b/textproc/wdiff/distinfo
@@ -1,3 +1,2 @@
-MD5 (wdiff-0.5.tar.gz) = 7f9c78f5dd6fb4f3dabe28fbd4d14319
-SHA256 (wdiff-0.5.tar.gz) = ecfda74a17d12c84873a17943b0f3a509ac012cc35708864462a5380a8d2b428
-SIZE (wdiff-0.5.tar.gz) = 129267
+SHA256 (wdiff-0.6.4.tar.gz) = 2c53ca1577f568409eff128d978ab5725c41142e5b6874a0a510aac985cfb968
+SIZE (wdiff-0.6.4.tar.gz) = 1231233
diff --git a/textproc/wdiff/files/patch-aa b/textproc/wdiff/files/patch-aa
deleted file mode 100644
index 87ac9806c1e1..000000000000
--- a/textproc/wdiff/files/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
---- Makefile.in.org	Sun Nov  6 16:45:13 1994
-+++ Makefile.in	Thu Apr 15 18:22:59 2004
-@@ -129,7 +129,7 @@
- check: wdiff
- 	$(srcdir)/check_it
- 
--install: all
-+install: all install-man
- 	$(srcdir)/mkinstalldirs $(bindir) $(infodir)
- 	for name in $(PROGRAMS); do \
- 	  $(INSTALL_PROGRAM) $$name \
-@@ -194,17 +194,17 @@
- 	CONFIG_FILES=$@ CONFIG_HEADERS= ./config.status
- config.status: configure
- 	./config.status --recheck
--configure: configure.in aclocal.m4
--	cd $(srcdir) && autoconf
-+#configure: configure.in aclocal.m4
-+#	cd $(srcdir) && autoconf
- 
- config.h: stamp-h
- stamp-h: config.h.in config.status
- 	CONFIG_FILES= CONFIG_HEADERS=config.h ./config.status
- 	date > stamp-h
- config.h.in: stamp-h.in
--stamp-h.in: configure.in aclocal.m4 acconfig.h
--	cd $(srcdir) && autoheader
--	date > $(srcdir)/stamp-h.in
-+#stamp-h.in: configure.in aclocal.m4 acconfig.h
-+#	cd $(srcdir) && autoheader
-+#	date > $(srcdir)/stamp-h.in
- 
- # Tell versions [3.59,3.63) of GNU make not to export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/textproc/wdiff/files/patch-ab b/textproc/wdiff/files/patch-ab
deleted file mode 100644
index e7af9b83aba8..000000000000
--- a/textproc/wdiff/files/patch-ab
+++ /dev/null
@@ -1,114 +0,0 @@
---- configure.orig	Sun Nov  6 16:59:26 1994
-+++ configure	Thu Apr 15 18:29:36 2004
-@@ -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/files/patch-ac b/textproc/wdiff/files/patch-ac
deleted file mode 100644
index d505d033d944..000000000000
--- a/textproc/wdiff/files/patch-ac
+++ /dev/null
@@ -1,125 +0,0 @@
---- wdiff.c.org	Sun Nov  6 16:57:23 1994
-+++ wdiff.c	Thu Apr 15 18:21:41 2004
-@@ -108,7 +108,7 @@
- struct option const longopts[] =
- {
-   {"copyright"   , 0, NULL, 'C'},
--  {"version"     , 0, NULL, 'V'},
-+  {"version"     , 0, NULL, 'v'},
-   {"no-deleted"  , 0, NULL, '1'},
-   {"no-inserted" , 0, NULL, '2'},
-   {"no-common"   , 0, NULL, '3'},
-@@ -168,6 +168,10 @@
- # 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 @@
- 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 @@
- 	 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 @@
-   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.  */
- 
-@@ -892,8 +925,9 @@
- {
-   /* Launch the diff program.  */
- 
-+  unsetenv ("DIFF_OPTIONS");
-   if (ignore_case)
--    input_file = readpipe (DIFF_PROGRAM, "-c", left_side->temp_name,
-+    input_file = readpipe (DIFF_PROGRAM, "-i", left_side->temp_name,
- 			   right_side->temp_name, NULL);
-   else
-     input_file = readpipe (DIFF_PROGRAM, left_side->temp_name,
-@@ -1111,7 +1145,7 @@
- Mandatory arguments to long options are mandatory for short options too.\n\
- \n\
-   -C, --copyright            print Copyright then exit\n\
--  -V, --version              print program version then exit\n\
-+  -v, --version              print program version then exit\n\
-   -1, --no-deleted           inhibit output of deleted words\n\
-   -2, --no-inserted          inhibit output of inserted words\n\
-   -3, --no-common            inhibit output of common words\n\
-@@ -1135,7 +1169,7 @@
- | Main program.	 |
- `---------------*/
- 
--void
-+int
- main (int argc, char *const argv[])
- {
-   int option_char;		/* option character */
-@@ -1173,7 +1207,7 @@
-   count_changed_left = 0;
-   count_changed_right = 0;
- 
--  while (option_char = getopt_long (argc, argv, "123CVahidlnpstw:x:y:z:",
-+  while (option_char = getopt_long (argc, argv, "123Cahidlnpstvw:x:y:z:",
- 				    longopts, NULL),
- 	 option_char != EOF)
-     switch (option_char)
-@@ -1329,5 +1363,5 @@
-       || count_changed_left || count_changed_right)
-     exit (EXIT_ANY_DIFFERENCE);
- 
--  exit (EXIT_NO_DIFFERENCES);
-+  return EXIT_NO_DIFFERENCES;
- }
diff --git a/textproc/wdiff/files/patch-ad b/textproc/wdiff/files/patch-ad
deleted file mode 100644
index 4aa693a7c7c3..000000000000
--- a/textproc/wdiff/files/patch-ad
+++ /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/files/patch-ae b/textproc/wdiff/files/patch-ae
deleted file mode 100644
index 993e96951cee..000000000000
--- a/textproc/wdiff/files/patch-ae
+++ /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
-