# HG changeset patch
# User John Donoghue
# Date 1552332452 14400
# Node ID b88723578fec32b7e19fbf7c66aba281d085178c
# Parent  47575f0163584170d0098d25c3dc86a8917a0d5d
texinfo: update to v6.6

* src/build-texinfo.mk, src/texinfo.mk:
  update version, checksum

* src/mingw-texinfo-1-fixes.patch: updated patch

diff -r 47575f016358 -r b88723578fec src/build-texinfo.mk
--- a/src/build-texinfo.mk	Mon Mar 11 15:27:31 2019 -0400
+++ b/src/build-texinfo.mk	Mon Mar 11 15:27:32 2019 -0400
@@ -3,8 +3,8 @@
 
 PKG             := build-texinfo
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 6.5
-$(PKG)_CHECKSUM := 0f8e69781e28ec102b6a9487b093c440f5bb8545
+$(PKG)_VERSION  := 6.6
+$(PKG)_CHECKSUM := f0418f3689b2b1e720027650c033c0fcdb270762
 $(PKG)_SUBDIR   := texinfo-$($(PKG)_VERSION)
 $(PKG)_FILE     := texinfo-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://ftp.gnu.org/gnu/texinfo/$($(PKG)_FILE)
diff -r 47575f016358 -r b88723578fec src/mingw-texinfo-1-fixes.patch
--- a/src/mingw-texinfo-1-fixes.patch	Mon Mar 11 15:27:31 2019 -0400
+++ b/src/mingw-texinfo-1-fixes.patch	Mon Mar 11 15:27:32 2019 -0400
@@ -1,18 +1,6 @@
-diff -ur texinfo-6.3.orig/info/echo-area.c texinfo-6.3/info/echo-area.c
---- texinfo-6.3.orig/info/echo-area.c	2016-12-17 14:57:59.207522263 -0500
-+++ texinfo-6.3/info/echo-area.c	2016-12-17 14:58:29.837452042 -0500
-@@ -1528,7 +1528,7 @@
- static void
- pause_or_input (void)
- {
--#ifdef FD_SET
-+#if defined(FD_SET) && !defined(__MINGW32__)
-   struct timeval timer;
-   fd_set readfds;
- 
-diff -ur texinfo-6.3.orig/info/man.c texinfo-6.3/info/man.c
---- texinfo-6.3.orig/info/man.c	2016-12-17 14:57:59.212939079 -0500
-+++ texinfo-6.3/info/man.c	2016-12-17 14:58:29.837452042 -0500
+diff -ur texinfo-6.6.orig/info/man.c texinfo-6.6/info/man.c
+--- texinfo-6.6.orig/info/man.c	2019-03-08 16:34:38.634930145 -0500
++++ texinfo-6.6/info/man.c	2019-03-08 16:41:52.845293995 -0500
 @@ -414,7 +414,7 @@
    int bsize = 0;
    int bindex = 0;
@@ -22,10 +10,10 @@
    fd_set read_fds;
  
    timeout.tv_sec = 15;
-diff -ur texinfo-6.3.orig/info/pcterm.c texinfo-6.3/info/pcterm.c
---- texinfo-6.3.orig/info/pcterm.c	2016-12-17 14:57:59.206438899 -0500
-+++ texinfo-6.3/info/pcterm.c	2016-12-17 14:58:29.836368678 -0500
-@@ -1621,7 +1621,7 @@
+diff -ur texinfo-6.6.orig/info/pcterm.c texinfo-6.6/info/pcterm.c
+--- texinfo-6.6.orig/info/pcterm.c	2019-03-08 16:34:38.630930050 -0500
++++ texinfo-6.6/info/pcterm.c	2019-03-08 16:41:52.845293995 -0500
+@@ -1679,7 +1679,7 @@
  }
  
  /* These should never be called, but they make the linker happy.  */
@@ -34,15 +22,16 @@
  int       tputs (const char *a, int b, int (*c)(int))
  {
    perror ("tputs"); return 0; /* here and below, added dummy retvals */
-@@ -1661,3 +1661,4 @@
+@@ -1719,3 +1719,4 @@
  {
    perror ("tcsetattr"); return 0;
  }
 +#endif
-diff -ur texinfo-6.3.orig/info/session.c texinfo-6.3/info/session.c
---- texinfo-6.3.orig/info/session.c	2016-12-17 14:57:59.212939079 -0500
-+++ texinfo-6.3/info/session.c	2016-12-17 14:58:29.838535405 -0500
-@@ -456,7 +456,7 @@
+Only in texinfo-6.6/info: pcterm.c.orig
+diff -ur texinfo-6.6.orig/info/session.c texinfo-6.6/info/session.c
+--- texinfo-6.6.orig/info/session.c	2019-03-08 16:34:38.634930145 -0500
++++ texinfo-6.6/info/session.c	2019-03-08 16:41:52.849294091 -0500
+@@ -453,7 +453,7 @@
      space_avail = sizeof (info_input_buffer) - (push_index - pop_index);
  
    /* If we can just find out how many characters there are to read, do so. */
@@ -51,7 +40,7 @@
    {
      ioctl (tty, FIONREAD, &chars_avail);
  
-@@ -648,7 +648,7 @@
+@@ -645,7 +645,7 @@
        if (in_map && pop_index == push_index)
          {
            int ready = 0;
@@ -60,7 +49,25 @@
            struct timeval timer, *timerp = 0;
            fd_set readfds;
  
-@@ -5490,7 +5490,7 @@
+@@ -750,7 +750,7 @@
+ void
+ pause_or_input (void)
+ {
+-#ifdef FD_SET
++#if defined (FD_SET) && !defined(__MINGW32__)
+   struct timeval timer;
+   fd_set readfds;
+ #endif
+@@ -758,7 +758,7 @@
+   if (pop_index != push_index)
+     return; /* Input is already waiting. */
+ 
+-#ifdef FD_SET
++#if defined (FD_SET) && !defined(__MINGW32__)
+   FD_ZERO (&readfds);
+   FD_SET (fileno (stdin), &readfds);
+   timer.tv_sec = 2;
+@@ -5433,7 +5433,7 @@
        ready = 1;
        if (!info_any_buffered_input_p ())
          {
@@ -69,10 +76,11 @@
            struct timeval timer;
            fd_set readfds;
  
-diff -ur texinfo-6.3.orig/tp/texi2any.pl texinfo-6.3/tp/texi2any.pl
---- texinfo-6.3.orig/tp/texi2any.pl	2016-12-17 14:57:59.069935127 -0500
-+++ texinfo-6.3/tp/texi2any.pl	2016-12-17 14:59:58.097974426 -0500
-@@ -53,7 +53,7 @@
+Only in texinfo-6.6/info: session.c.orig
+diff -ur texinfo-6.6.orig/tp/texi2any.pl texinfo-6.6/tp/texi2any.pl
+--- texinfo-6.6.orig/tp/texi2any.pl	2019-03-08 16:34:38.490926704 -0500
++++ texinfo-6.6/tp/texi2any.pl	2019-03-08 16:41:52.849294091 -0500
+@@ -54,7 +54,7 @@
    my $updir = File::Spec->updir();
  
    # These are substituted by the Makefile to create "texi2any".
@@ -81,3 +89,4 @@
    my $package = '@PACKAGE@';
    my $packagedir = '@pkglibdir@';
  
+Only in texinfo-6.6/tp: texi2any.pl.orig
diff -r 47575f016358 -r b88723578fec src/texinfo.mk
--- a/src/texinfo.mk	Mon Mar 11 15:27:31 2019 -0400
+++ b/src/texinfo.mk	Mon Mar 11 15:27:32 2019 -0400
@@ -3,8 +3,8 @@
 
 PKG             := texinfo
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 6.5
-$(PKG)_CHECKSUM := 0f8e69781e28ec102b6a9487b093c440f5bb8545
+$(PKG)_VERSION  := 6.6
+$(PKG)_CHECKSUM := f0418f3689b2b1e720027650c033c0fcdb270762
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://ftp.gnu.org/gnu/texinfo/$($(PKG)_FILE)