# HG changeset patch
# User John Donoghue <john.donoghue@ieee.org>
# Date 1397611937 14400
# Node ID 583d3bf548e6096a8ee9ecdff31ab2c603024539
# Parent  1ab2022ff6c72c976c66cd843a23c901102b10cd
texinfo: update to 5.2 and install all tools

* src/texinfo.mk: update to 5.2 and make/make install all.

* src/texinfo-1-fixes.patch: updated patch for 5.2.

diff -r 1ab2022ff6c7 -r 583d3bf548e6 src/texinfo-1-fixes.patch
--- a/src/texinfo-1-fixes.patch	Wed Mar 19 20:54:18 2014 -0400
+++ b/src/texinfo-1-fixes.patch	Tue Apr 15 21:32:17 2014 -0400
@@ -1,12 +1,17 @@
-diff -ru a/util/texi2dvi b/util/texi2dvi
---- a/util/texi2dvi	2008-09-18 14:46:01.000000000 -0400
-+++ b/util/texi2dvi	2014-02-14 13:21:50.038015947 -0500
-@@ -1683,7 +1683,7 @@
- 
-   # If the COMMAND_LINE_FILENAME is not absolute (e.g., --debug.tex),
-   # prepend `./' in order to avoid that the tools take it as an option.
--  echo "$command_line_filename" | $EGREP '^(/|[A-z]:/)' >&6 \
-+  echo "$command_line_filename" | $EGREP '^(/|[A-Za-z]:/)' >&6 \
-   || command_line_filename="./$command_line_filename"
- 
-   # See if the file exists.  If it doesn't we're in trouble since, even
+diff -ur texinfo-5.2.orig/info/pcterm.c texinfo-5.2/info/pcterm.c
+--- texinfo-5.2.orig/info/pcterm.c	2014-04-15 18:58:25.000000000 -0400
++++ texinfo-5.2/info/pcterm.c	2014-04-15 19:00:25.000000000 -0400
+@@ -1299,7 +1299,7 @@
+ }
+ 
+ /* These should never be called, but they make the linker happy.  */
+-
++#if 0
+ int       tputs (const char *a, int b, int (*c)(int))
+ {
+   perror ("tputs"); return 0; /* here and below, added dummy retvals */
+@@ -1339,3 +1339,4 @@
+ {
+   perror ("tcsetattr"); return 0;
+ }
++#endif
diff -r 1ab2022ff6c7 -r 583d3bf548e6 src/texinfo.mk
--- a/src/texinfo.mk	Wed Mar 19 20:54:18 2014 -0400
+++ b/src/texinfo.mk	Tue Apr 15 21:32:17 2014 -0400
@@ -3,10 +3,10 @@
 
 PKG             := texinfo
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.13a
-$(PKG)_CHECKSUM := a1533cf8e03ea4fa6c443b73f4c85e4da04dead0
-$(PKG)_SUBDIR   := $(PKG)-4.13
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_VERSION  := 5.2
+$(PKG)_CHECKSUM := dc54edfbb623d46fb400576b3da181f987e63516
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_URL      := ftp://ftp.gnu.org/gnu/texinfo/$($(PKG)_FILE)
 $(PKG)_DEPS     := # libgnurx
 
@@ -20,12 +20,9 @@
     cd '$(1).build' && '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
-        --prefix='$(HOST_PREFIX)'
+        --prefix='$(HOST_PREFIX)' LIBS='-lpthread -lws2_32'
 
-    ## All we need for Octave is makeinfo.
-    $(MAKE) -C '$(1).build/lib' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build/gnulib/lib' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build/makeinfo' -j '$(JOBS)'
+    $(MAKE) -C '$(1).build' -j '$(JOBS)'
 
-    $(MAKE) -C '$(1).build/makeinfo' -j '$(JOBS)' install DESTDIR='$(3)'
+    $(MAKE) -C '$(1).build' -j '1' install DESTDIR='$(3)'
 endef