diff --git a/automake-1.12.patch b/automake-1.12.patch
deleted file mode 100644
index 148f47f..0000000
--- a/automake-1.12.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: texinfo-4.13/configure.ac
-===================================================================
---- texinfo-4.13.orig/configure.ac
-+++ texinfo-4.13/configure.ac
-@@ -13,7 +13,7 @@ AC_INIT([GNU Texinfo], [4.13], [bug-texi
-
- dnl Must come before AM_INIT_AUTOMAKE.
- AC_CONFIG_AUX_DIR([build-aux])
--AM_INIT_AUTOMAKE([1.10.1 readme-alpha dist-lzma])
-+AM_INIT_AUTOMAKE([1.10.1 readme-alpha dist-xz])
-
- # Minimum Autoconf version required.
- AC_PREREQ(2.59)
diff --git a/config-guess-sub-update.patch b/config-guess-sub-update.patch
deleted file mode 100644
index e7366b9..0000000
--- a/config-guess-sub-update.patch
+++ /dev/null
@@ -1,1746 +0,0 @@
-Index: config.guess
-===================================================================
---- config.guess.orig
-+++ config.guess
-@@ -1,14 +1,14 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
--# Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+# 2011, 2012, 2013 Free Software Foundation, Inc.
-
--timestamp='2006-07-02'
-+timestamp='2012-12-30'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
-+# the Free Software Foundation; either version 3 of the License, or
- # (at your option) any later version.
- #
- # This program is distributed in the hope that it will be useful, but
-@@ -17,26 +17,22 @@ timestamp='2006-07-02'
- # General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program; if not, see .
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
--
--# Originally written by Per Bothner .
--# Please send patches to . Submit a context
--# diff and a properly formatted ChangeLog entry.
-+# the same distribution terms that you use for the rest of that
-+# program. This Exception is an additional permission under section 7
-+# of the GNU General Public License, version 3 ("GPLv3").
-+#
-+# Originally written by Per Bothner.
- #
--# This script attempts to guess a canonical system name similar to
--# config.sub. If it succeeds, it prints the system name on stdout, and
--# exits with 0. Otherwise, it exits with 1.
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
- #
--# The plan is that this can be called by configure scripts if you
--# don't specify an explicit build system type.
-+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
-+
-
- me=`echo "$0" | sed -e 's,.*/,,'`
-
-@@ -56,8 +52,9 @@ version="\
- GNU config.guess ($timestamp)
-
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
-+2012, 2013 Free Software Foundation, Inc.
-
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -144,7 +141,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` |
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
- *:NetBSD:*:*)
- # NetBSD (nbsd) targets should (where applicable) match one or
-- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
- # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
- # switched to ELF, *-*-netbsd* would select the old
- # object file format. This provides both forward
-@@ -161,6 +158,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- arm*) machine=arm-unknown ;;
- sh3el) machine=shl-unknown ;;
- sh3eb) machine=sh-unknown ;;
-+ sh5el) machine=sh5le-unknown ;;
- *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- esac
- # The Operating System including object format, if it has switched
-@@ -169,7 +167,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-- | grep __ELF__ >/dev/null
-+ | grep -q __ELF__
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
-@@ -179,7 +177,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- fi
- ;;
- *)
-- os=netbsd
-+ os=netbsd
- ;;
- esac
- # The OS release
-@@ -200,6 +198,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- echo "${machine}-${os}${release}"
- exit ;;
-+ *:Bitrig:*:*)
-+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
-+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
-+ exit ;;
- *:OpenBSD:*:*)
- UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
- echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-@@ -222,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- ;;
- *5.*)
-- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
- ;;
- esac
- # According to Compaq, /usr/sbin/psrinfo has been available on
-@@ -268,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- # A Xn.n version is an unreleased experimental baselevel.
- # 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-- exit ;;
-+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-+ exitcode=$?
-+ trap '' 0
-+ exit $exitcode ;;
- Alpha\ *:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # Should we change UNAME_MACHINE based on the output of uname instead
-@@ -294,12 +299,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- echo s390-ibm-zvmoe
- exit ;;
- *:OS400:*:*)
-- echo powerpc-ibm-os400
-+ echo powerpc-ibm-os400
- exit ;;
- arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- echo arm-acorn-riscix${UNAME_RELEASE}
- exit ;;
-- arm:riscos:*:*|arm:RISCOS:*:*)
-+ arm*:riscos:*:*|arm*:RISCOS:*:*)
- echo arm-unknown-riscos
- exit ;;
- SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-@@ -323,14 +328,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7; exit ;;
- esac ;;
-+ s390x:SunOS:*:*)
-+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit ;;
- sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
-- i86pc:SunOS:5.*:*)
-- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
-+ echo i386-pc-auroraux${UNAME_RELEASE}
-+ exit ;;
-+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-+ eval $set_cc_for_build
-+ SUN_ARCH="i386"
-+ # If there is a compiler, see if it is configured for 64-bit objects.
-+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-+ # This test works for both compilers.
-+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+ grep IS_64BIT_ARCH >/dev/null
-+ then
-+ SUN_ARCH="x86_64"
-+ fi
-+ fi
-+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:6*:*)
- # According to config.sub, this is the proper way to canonicalize
-@@ -374,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- # MiNT. But MiNT is downward compatible to TOS, so this should
- # be no problem.
- atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-- echo m68k-atari-mint${UNAME_RELEASE}
-+ echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
-- exit ;;
-+ exit ;;
- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-- echo m68k-atari-mint${UNAME_RELEASE}
-+ echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-- echo m68k-milan-mint${UNAME_RELEASE}
-- exit ;;
-+ echo m68k-milan-mint${UNAME_RELEASE}
-+ exit ;;
- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-- echo m68k-hades-mint${UNAME_RELEASE}
-- exit ;;
-+ echo m68k-hades-mint${UNAME_RELEASE}
-+ exit ;;
- *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-- echo m68k-unknown-mint${UNAME_RELEASE}
-- exit ;;
-+ echo m68k-unknown-mint${UNAME_RELEASE}
-+ exit ;;
- m68k:machten:*:*)
- echo m68k-apple-machten${UNAME_RELEASE}
- exit ;;
-@@ -460,8 +484,8 @@ EOF
- echo m88k-motorola-sysv3
- exit ;;
- AViiON:dgux:*:*)
-- # DG/UX returns AViiON for all architectures
-- UNAME_PROCESSOR=`/usr/bin/uname -p`
-+ # DG/UX returns AViiON for all architectures
-+ UNAME_PROCESSOR=`/usr/bin/uname -p`
- if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
- then
- if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-@@ -474,7 +498,7 @@ EOF
- else
- echo i586-dg-dgux${UNAME_RELEASE}
- fi
-- exit ;;
-+ exit ;;
- M88*:DolphinOS:*:*) # DolphinOS (SVR3)
- echo m88k-dolphin-sysv3
- exit ;;
-@@ -531,7 +555,7 @@ EOF
- echo rs6000-ibm-aix3.2
- fi
- exit ;;
-- *:AIX:*:[45])
-+ *:AIX:*:[4567])
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- IBM_ARCH=rs6000
-@@ -574,52 +598,52 @@ EOF
- 9000/[678][0-9][0-9])
- if [ -x /usr/bin/getconf ]; then
- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-- case "${sc_cpu_version}" in
-- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-- 532) # CPU_PA_RISC2_0
-- case "${sc_kernel_bits}" in
-- 32) HP_ARCH="hppa2.0n" ;;
-- 64) HP_ARCH="hppa2.0w" ;;
-+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+ case "${sc_cpu_version}" in
-+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+ 532) # CPU_PA_RISC2_0
-+ case "${sc_kernel_bits}" in
-+ 32) HP_ARCH="hppa2.0n" ;;
-+ 64) HP_ARCH="hppa2.0w" ;;
- '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
-- esac ;;
-- esac
-+ esac ;;
-+ esac
- fi
- if [ "${HP_ARCH}" = "" ]; then
- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-+ sed 's/^ //' << EOF >$dummy.c
-
-- #define _HPUX_SOURCE
-- #include
-- #include
--
-- int main ()
-- {
-- #if defined(_SC_KERNEL_BITS)
-- long bits = sysconf(_SC_KERNEL_BITS);
-- #endif
-- long cpu = sysconf (_SC_CPU_VERSION);
--
-- switch (cpu)
-- {
-- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-- case CPU_PA_RISC2_0:
-- #if defined(_SC_KERNEL_BITS)
-- switch (bits)
-- {
-- case 64: puts ("hppa2.0w"); break;
-- case 32: puts ("hppa2.0n"); break;
-- default: puts ("hppa2.0"); break;
-- } break;
-- #else /* !defined(_SC_KERNEL_BITS) */
-- puts ("hppa2.0"); break;
-- #endif
-- default: puts ("hppa1.0"); break;
-- }
-- exit (0);
-- }
-+ #define _HPUX_SOURCE
-+ #include
-+ #include
-+
-+ int main ()
-+ {
-+ #if defined(_SC_KERNEL_BITS)
-+ long bits = sysconf(_SC_KERNEL_BITS);
-+ #endif
-+ long cpu = sysconf (_SC_CPU_VERSION);
-+
-+ switch (cpu)
-+ {
-+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-+ case CPU_PA_RISC2_0:
-+ #if defined(_SC_KERNEL_BITS)
-+ switch (bits)
-+ {
-+ case 64: puts ("hppa2.0w"); break;
-+ case 32: puts ("hppa2.0n"); break;
-+ default: puts ("hppa2.0"); break;
-+ } break;
-+ #else /* !defined(_SC_KERNEL_BITS) */
-+ puts ("hppa2.0"); break;
-+ #endif
-+ default: puts ("hppa1.0"); break;
-+ }
-+ exit (0);
-+ }
- EOF
- (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
- test -z "$HP_ARCH" && HP_ARCH=hppa
-@@ -639,7 +663,7 @@ EOF
- # => hppa64-hp-hpux11.23
-
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-- grep __LP64__ >/dev/null
-+ grep -q __LP64__
- then
- HP_ARCH="hppa2.0w"
- else
-@@ -710,22 +734,22 @@ EOF
- exit ;;
- C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- echo c1-convex-bsd
-- exit ;;
-+ exit ;;
- C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
-- exit ;;
-+ exit ;;
- C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- echo c34-convex-bsd
-- exit ;;
-+ exit ;;
- C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- echo c38-convex-bsd
-- exit ;;
-+ exit ;;
- C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- echo c4-convex-bsd
-- exit ;;
-+ exit ;;
- CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit ;;
-@@ -749,14 +773,14 @@ EOF
- exit ;;
- F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-- exit ;;
-+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+ exit ;;
- 5000:UNIX_System_V:4.*:*)
-- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
- i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-@@ -768,37 +792,51 @@ EOF
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit ;;
- *:FreeBSD:*:*)
-- case ${UNAME_MACHINE} in
-- pc98)
-- echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ UNAME_PROCESSOR=`/usr/bin/uname -p`
-+ case ${UNAME_PROCESSOR} in
- amd64)
- echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- *)
-- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
- esac
- exit ;;
- i*:CYGWIN*:*)
- echo ${UNAME_MACHINE}-pc-cygwin
- exit ;;
-- i*:MINGW*:*)
-+ *:MINGW64*:*)
-+ echo ${UNAME_MACHINE}-pc-mingw64
-+ exit ;;
-+ *:MINGW*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
-+ i*:MSYS*:*)
-+ echo ${UNAME_MACHINE}-pc-msys
-+ exit ;;
- i*:windows32*:*)
-- # uname -m includes "-pc" on this system.
-- echo ${UNAME_MACHINE}-mingw32
-+ # uname -m includes "-pc" on this system.
-+ echo ${UNAME_MACHINE}-mingw32
- exit ;;
- i*:PW*:*)
- echo ${UNAME_MACHINE}-pc-pw32
- exit ;;
-- x86:Interix*:[3456]*)
-- echo i586-pc-interix${UNAME_RELEASE}
-- exit ;;
-- EM64T:Interix*:[3456]*)
-- echo x86_64-unknown-interix${UNAME_RELEASE}
-- exit ;;
-+ *:Interix*:*)
-+ case ${UNAME_MACHINE} in
-+ x86)
-+ echo i586-pc-interix${UNAME_RELEASE}
-+ exit ;;
-+ authenticamd | genuineintel | EM64T)
-+ echo x86_64-unknown-interix${UNAME_RELEASE}
-+ exit ;;
-+ IA64)
-+ echo ia64-unknown-interix${UNAME_RELEASE}
-+ exit ;;
-+ esac ;;
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
-+ 8664:Windows_NT:*)
-+ echo x86_64-pc-mks
-+ exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -828,20 +866,68 @@ EOF
- i*86:Minix:*:*)
- echo ${UNAME_MACHINE}-pc-minix
- exit ;;
-- arm*:Linux:*:*)
-+ aarch64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-+ aarch64_be:Linux:*:*)
-+ UNAME_MACHINE=aarch64_be
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
-+ alpha:Linux:*:*)
-+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+ EV5) UNAME_MACHINE=alphaev5 ;;
-+ EV56) UNAME_MACHINE=alphaev56 ;;
-+ PCA56) UNAME_MACHINE=alphapca56 ;;
-+ PCA57) UNAME_MACHINE=alphapca56 ;;
-+ EV6) UNAME_MACHINE=alphaev6 ;;
-+ EV67) UNAME_MACHINE=alphaev67 ;;
-+ EV68*) UNAME_MACHINE=alphaev68 ;;
-+ esac
-+ objdump --private-headers /bin/sh | grep -q ld.so.1
-+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+ exit ;;
-+ arm*:Linux:*:*)
-+ eval $set_cc_for_build
-+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+ | grep -q __ARM_EABI__
-+ then
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ else
-+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
-+ | grep -q __ARM_PCS_VFP
-+ then
-+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+ else
-+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
-+ fi
-+ fi
-+ exit ;;
- avr32*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- cris:Linux:*:*)
-- echo cris-axis-linux-gnu
-+ echo ${UNAME_MACHINE}-axis-linux-gnu
- exit ;;
- crisv32:Linux:*:*)
-- echo crisv32-axis-linux-gnu
-+ echo ${UNAME_MACHINE}-axis-linux-gnu
- exit ;;
- frv:Linux:*:*)
-- echo frv-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
-+ hexagon:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
-+ i*86:Linux:*:*)
-+ LIBC=gnu
-+ eval $set_cc_for_build
-+ sed 's/^ //' << EOF >$dummy.c
-+ #ifdef __dietlibc__
-+ LIBC=dietlibc
-+ #endif
-+EOF
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- exit ;;
- ia64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -852,74 +938,33 @@ EOF
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-- mips:Linux:*:*)
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #undef CPU
-- #undef mips
-- #undef mipsel
-- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mipsel
-- #else
-- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips
-- #else
-- CPU=
-- #endif
-- #endif
--EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-- /^CPU/{
-- s: ::g
-- p
-- }'`"
-- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-- ;;
-- mips64:Linux:*:*)
-+ mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
-- #undef mips64
-- #undef mips64el
-+ #undef ${UNAME_MACHINE}
-+ #undef ${UNAME_MACHINE}el
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mips64el
-+ CPU=${UNAME_MACHINE}el
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips64
-+ CPU=${UNAME_MACHINE}
- #else
- CPU=
- #endif
- #endif
- EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-- /^CPU/{
-- s: ::g
-- p
-- }'`"
-+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- ;;
- or32:Linux:*:*)
-- echo or32-unknown-linux-gnu
-- exit ;;
-- ppc:Linux:*:*)
-- echo powerpc-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-- ppc64:Linux:*:*)
-- echo powerpc64-unknown-linux-gnu
-+ padre:Linux:*:*)
-+ echo sparc-unknown-linux-gnu
- exit ;;
-- alpha:Linux:*:*)
-- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-- EV5) UNAME_MACHINE=alphaev5 ;;
-- EV56) UNAME_MACHINE=alphaev56 ;;
-- PCA56) UNAME_MACHINE=alphapca56 ;;
-- PCA57) UNAME_MACHINE=alphapca56 ;;
-- EV6) UNAME_MACHINE=alphaev6 ;;
-- EV67) UNAME_MACHINE=alphaev67 ;;
-- EV68*) UNAME_MACHINE=alphaev68 ;;
-- esac
-- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+ parisc64:Linux:*:* | hppa64:Linux:*:*)
-+ echo hppa64-unknown-linux-gnu
- exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
-@@ -929,14 +974,17 @@ EOF
- *) echo hppa-unknown-linux-gnu ;;
- esac
- exit ;;
-- parisc64:Linux:*:* | hppa64:Linux:*:*)
-- echo hppa64-unknown-linux-gnu
-+ ppc64:Linux:*:*)
-+ echo powerpc64-unknown-linux-gnu
-+ exit ;;
-+ ppc:Linux:*:*)
-+ echo powerpc-unknown-linux-gnu
- exit ;;
- s390:Linux:*:* | s390x:Linux:*:*)
- echo ${UNAME_MACHINE}-ibm-linux
- exit ;;
- sh64*:Linux:*:*)
-- echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
- sh*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -944,75 +992,18 @@ EOF
- sparc:Linux:*:* | sparc64:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-+ tile*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
- vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu
- exit ;;
- x86_64:Linux:*:*)
-- echo x86_64-unknown-linux-gnu
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
-+ xtensa*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-- i*86:Linux:*:*)
-- # The BFD linker knows what the default object file format is, so
-- # first see if it will tell us. cd to the root directory to prevent
-- # problems with other programs or directories called `ld' in the path.
-- # Set LC_ALL=C to ensure ld outputs messages in English.
-- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-- | sed -ne '/supported targets:/!d
-- s/[ ][ ]*/ /g
-- s/.*supported targets: *//
-- s/ .*//
-- p'`
-- case "$ld_supported_targets" in
-- elf32-i386)
-- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-- ;;
-- a.out-i386-linux)
-- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-- exit ;;
-- coff-i386)
-- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-- exit ;;
-- "")
-- # Either a pre-BFD a.out linker (linux-gnuoldld) or
-- # one that does not give us useful --help.
-- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-- exit ;;
-- esac
-- # Determine whether the default compiler is a.out or elf
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #include
-- #ifdef __ELF__
-- # ifdef __GLIBC__
-- # if __GLIBC__ >= 2
-- LIBC=gnu
-- # else
-- LIBC=gnulibc1
-- # endif
-- # else
-- LIBC=gnulibc1
-- # endif
-- #else
-- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-- LIBC=gnu
-- #else
-- LIBC=gnuaout
-- #endif
-- #endif
-- #ifdef __dietlibc__
-- LIBC=dietlibc
-- #endif
--EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-- /^LIBC/{
-- s: ::g
-- p
-- }'`"
-- test x"${LIBC}" != x && {
-- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-- exit
-- }
-- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-- ;;
- i*86:DYNIX/ptx:4*:*)
- # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
- # earlier versions are messed up and put the nodename in both
-@@ -1020,11 +1011,11 @@ EOF
- echo i386-sequent-sysv4
- exit ;;
- i*86:UNIX_SV:4.2MP:2.*)
-- # Unixware is an offshoot of SVR4, but it has its own version
-- # number series starting with 2...
-- # I am not positive that other SVR4 systems won't match this,
-+ # Unixware is an offshoot of SVR4, but it has its own version
-+ # number series starting with 2...
-+ # I am not positive that other SVR4 systems won't match this,
- # I just have to hope. -- rms.
-- # Use sysv4.2uw... so that sysv4* matches it.
-+ # Use sysv4.2uw... so that sysv4* matches it.
- echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit ;;
- i*86:OS/2:*:*)
-@@ -1041,7 +1032,7 @@ EOF
- i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
- exit ;;
-- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- i*86:*DOS:*:*)
-@@ -1056,7 +1047,7 @@ EOF
- fi
- exit ;;
- i*86:*:5:[678]*)
-- # UnixWare 7.x, OpenUNIX and OpenServer 6.
-+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
- case `/bin/uname -X | grep "^Machine"` in
- *486*) UNAME_MACHINE=i486 ;;
- *Pentium) UNAME_MACHINE=i586 ;;
-@@ -1084,10 +1075,13 @@ EOF
- exit ;;
- pc:*:*:*)
- # Left here for compatibility:
-- # uname -m prints for DJGPP always 'pc', but it prints nothing about
-- # the processor, so we play safe by assuming i386.
-- echo i386-pc-msdosdjgpp
-- exit ;;
-+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
-+ # the processor, so we play safe by assuming i586.
-+ # Note: whatever this is, it MUST be the same as what config.sub
-+ # prints for the "djgpp" host, or else GDB configury will decide that
-+ # this is a cross-build.
-+ echo i586-pc-msdosdjgpp
-+ exit ;;
- Intel:Mach:3*:*)
- echo i386-pc-mach3
- exit ;;
-@@ -1122,8 +1116,18 @@ EOF
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-- && { echo i486-ncr-sysv4; exit; } ;;
-+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+ && { echo i486-ncr-sysv4; exit; } ;;
-+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-+ OS_REL='.3'
-+ test -r /etc/.relid \
-+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
- m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit ;;
-@@ -1136,7 +1140,7 @@ EOF
- rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit ;;
-- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- SM[BE]S:UNIX_SV:*:*)
-@@ -1156,10 +1160,10 @@ EOF
- echo ns32k-sni-sysv
- fi
- exit ;;
-- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-- # says
-- echo i586-unisys-sysv4
-- exit ;;
-+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+ # says
-+ echo i586-unisys-sysv4
-+ exit ;;
- *:UNIX_System_V:4*:FTX*)
- # From Gerald Hewes .
- # How about differentiating between stratus architectures? -djm
-@@ -1185,11 +1189,11 @@ EOF
- exit ;;
- R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- if [ -d /usr/nec ]; then
-- echo mips-nec-sysv${UNAME_RELEASE}
-+ echo mips-nec-sysv${UNAME_RELEASE}
- else
-- echo mips-unknown-sysv${UNAME_RELEASE}
-+ echo mips-unknown-sysv${UNAME_RELEASE}
- fi
-- exit ;;
-+ exit ;;
- BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
- echo powerpc-be-beos
- exit ;;
-@@ -1199,6 +1203,12 @@ EOF
- BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
- echo i586-pc-beos
- exit ;;
-+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
-+ echo i586-pc-haiku
-+ exit ;;
-+ x86_64:Haiku:*:*)
-+ echo x86_64-unknown-haiku
-+ exit ;;
- SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux${UNAME_RELEASE}
- exit ;;
-@@ -1208,6 +1218,15 @@ EOF
- SX-6:SUPER-UX:*:*)
- echo sx6-nec-superux${UNAME_RELEASE}
- exit ;;
-+ SX-7:SUPER-UX:*:*)
-+ echo sx7-nec-superux${UNAME_RELEASE}
-+ exit ;;
-+ SX-8:SUPER-UX:*:*)
-+ echo sx8-nec-superux${UNAME_RELEASE}
-+ exit ;;
-+ SX-8R:SUPER-UX:*:*)
-+ echo sx8r-nec-superux${UNAME_RELEASE}
-+ exit ;;
- Power*:Rhapsody:*:*)
- echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit ;;
-@@ -1217,6 +1236,16 @@ EOF
- *:Darwin:*:*)
- UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
- case $UNAME_PROCESSOR in
-+ i386)
-+ eval $set_cc_for_build
-+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+ grep IS_64BIT_ARCH >/dev/null
-+ then
-+ UNAME_PROCESSOR="x86_64"
-+ fi
-+ fi ;;
- unknown) UNAME_PROCESSOR=powerpc ;;
- esac
- echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-@@ -1232,7 +1261,10 @@ EOF
- *:QNX:*:4*)
- echo i386-pc-qnx
- exit ;;
-- NSE-?:NONSTOP_KERNEL:*:*)
-+ NEO-?:NONSTOP_KERNEL:*:*)
-+ echo neo-tandem-nsk${UNAME_RELEASE}
-+ exit ;;
-+ NSE-*:NONSTOP_KERNEL:*:*)
- echo nse-tandem-nsk${UNAME_RELEASE}
- exit ;;
- NSR-?:NONSTOP_KERNEL:*:*)
-@@ -1277,13 +1309,13 @@ EOF
- echo pdp10-unknown-its
- exit ;;
- SEI:*:*:SEIUX)
-- echo mips-sei-seiux${UNAME_RELEASE}
-+ echo mips-sei-seiux${UNAME_RELEASE}
- exit ;;
- *:DragonFly:*:*)
- echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit ;;
- *:*VMS:*:*)
-- UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
- case "${UNAME_MACHINE}" in
- A*) echo alpha-dec-vms ; exit ;;
- I*) echo ia64-dec-vms ; exit ;;
-@@ -1298,11 +1330,14 @@ EOF
- i*86:rdos:*:*)
- echo ${UNAME_MACHINE}-pc-rdos
- exit ;;
-+ i*86:AROS:*:*)
-+ echo ${UNAME_MACHINE}-pc-aros
-+ exit ;;
-+ x86_64:VMkernel:*:*)
-+ echo ${UNAME_MACHINE}-unknown-esx
-+ exit ;;
- esac
-
--#echo '(No uname command or uname output not recognized.)' 1>&2
--#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
--
- eval $set_cc_for_build
- cat >$dummy.c <
- printf ("m68k-sony-newsos%s\n",
- #ifdef NEWSOS4
-- "4"
-+ "4"
- #else
-- ""
-+ ""
- #endif
-- ); exit (0);
-+ ); exit (0);
- #endif
- #endif
-
-@@ -1458,9 +1493,9 @@ This script, last modified $timestamp, h
- the operating system you are using. It is advised that you
- download the most up to date version of the config scripts from
-
-- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
- and
-- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
- If the version you run ($0) is already up to date, please
- send the following data and any information you think might be
-Index: config.sub
-===================================================================
---- config.sub.orig
-+++ config.sub
-@@ -1,44 +1,42 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
--# Inc.
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+# 2011, 2012, 2013 Free Software Foundation, Inc.
-
--timestamp='2006-09-20'
-+timestamp='2013-01-23'
-
--# This file is (in principle) common to ALL GNU software.
--# The presence of a machine in this file suggests that SOME GNU software
--# can handle that machine. It does not imply ALL GNU software can.
--#
--# This file is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
-+# This file is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 3 of the License, or
- # (at your option) any later version.
- #
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
--# GNU General Public License for more details.
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
- #
- # You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
--# 02110-1301, USA.
-+# along with this program; if not, see .
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
-+# the same distribution terms that you use for the rest of that
-+# program. This Exception is an additional permission under section 7
-+# of the GNU General Public License, version 3 ("GPLv3").
-
-
--# Please send patches to . Submit a context
--# diff and a properly formatted ChangeLog entry.
-+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
- #
- # Configuration subroutine to validate and canonicalize a configuration type.
- # Supply the specified configuration type as an argument.
- # If it is invalid, we print an error message on stderr and exit with code 1.
- # Otherwise, we print the canonical config type on stdout and succeed.
-
-+# You can get the latest version of this script from:
-+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-+
- # This file is supposed to be the same for all GNU packages
- # and recognize all the CPU types, system types and aliases
- # that are meaningful with *any* GNU software.
-@@ -72,8 +70,9 @@ Report bugs and patches to
- #endif
- #include
-+#include
- #include "texi2roff.h"
-
- #if !defined(S_ISDIR) && defined(S_IFDIR)
diff --git a/texi2roff-2.0.dif b/texi2roff-2.0.dif
deleted file mode 100644
index 9a90c34..0000000
--- a/texi2roff-2.0.dif
+++ /dev/null
@@ -1,58 +0,0 @@
---- .pkgextract
-+++ .pkgextract
-@@ -0,0 +1 @@
-+bzcat ../texi2roff.patch.bz2 | patch -p0 -s -b --suffix=.Bader
---- Makefile
-+++ Makefile
-@@ -1,14 +1,14 @@
-
- # Makefile for Texinfo to nroff/troff translator (texi2roff)
-
--CC = cc
-+CC = gcc
-
- # Flags:
- # -DBSD controls use of string(s).h and strchr/index only (not needed for Sun)
- # use -Dvoid=int for System III and V7
-
- # problems have been reported for -O with Sun4's, SunOS 4.0.1
--CFLAGS = -O -s
-+CFLAGS = $(RPM_OPT_FLAGS) -pipe
- # CFLAGS = -g
- # CFLAGS = -p
- # CFLAGS = -ql
-@@ -16,7 +16,7 @@
- OBJECTS = texi2roff.o table.o translate.o items.o
-
- texi2roff: $(OBJECTS)
-- $(CC) -o $@ $(CFLAGS) $(OBJECTS) -lc_s -link -z
-+ $(CC) -o $@ $(CFLAGS) $(OBJECTS)
-
- texi2roff.o : texi2roff.h
-
---- texi2index
-+++ texi2index
-@@ -14,7 +14,13 @@
- # characters that make troff drop lines and preserves sort order
- # for index entries containing typesetting commands.
-
--FILE="$*"
-+FILE="$@"
-+
-+if test -z "$FILE" ; then
-+ echo "${0##*/}: No index files of texi2roff call given," 1>&2
-+ echo " please read manual page of texi2roff." 1>&2
-+ exit 1
-+fi
-
- sed -n "s/^../&\\\\\\&/p" $FILE \
- | sed "
---- texi2roff.1
-+++ texi2roff.1
-@@ -1,4 +1,5 @@
--.TH TEXI2ROFF 1
-+.TH Texi2roff 1 "1 Jan 90" "2.0"
-+.UC 1
- .DA 1 Jan 90
- .SH NAME
- texi2roff, texi2index \- convert Texinfo documents for formatting by troff.
diff --git a/texi2roff-2.0.tar.bz2 b/texi2roff-2.0.tar.bz2
deleted file mode 100644
index de797e9..0000000
--- a/texi2roff-2.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e6a2ca1611d9c61f3c38a6a8ed537f9da2e22acc706b17109e7cab760e1c1e9
-size 45487
diff --git a/texi2roff.patch.bz2 b/texi2roff.patch.bz2
deleted file mode 100644
index 8e4bd1e..0000000
--- a/texi2roff.patch.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9073a7f16de521da99b143515d940c8c85727e59968592f2d0ea5c31a64994e6
-size 7928
diff --git a/texinfo-4.12-zlib.patch b/texinfo-4.12-zlib.patch
deleted file mode 100644
index 544144e..0000000
--- a/texinfo-4.12-zlib.patch
+++ /dev/null
@@ -1,155 +0,0 @@
---- configure.ac
-+++ configure.ac
-@@ -224,6 +224,26 @@ AC_CONFIG_FILES([util/defs])
- AC_CHECK_PROGS([HEVEA], [hevea], [])
- AC_CHECK_PROGS([TEX], [tex], [])
-
-+#
-+# Check for zlib and libbz2 libraries to use this together
-+# with SuSE's libzio to open compressed info files.
-+#
-+AC_CHECK_HEADER(zlib.h,[
-+ for lib in z gz
-+ do
-+ AC_CHECK_LIB($lib, gzopen, [LIBS="$LIBS -l$lib" ; break])
-+ done])
-+AC_CHECK_HEADER(bzlib.h,[
-+ for lib in bz2 bzip2
-+ do
-+ AC_CHECK_LIB($lib, BZ2_bzopen, [LIBS="$LIBS -l$lib" ; break])
-+ done])
-+AC_CHECK_HEADER(zio.h,[
-+ AC_CHECK_LIB(zio, fzopen, [LIBS="$LIBS -lzio"
-+ AC_DEFINE(HAVE_ZIO, [],
-+ [Define to 1 if you have libzio for opening compressed info files.])])
-+ ])
-+
- AC_CONFIG_FILES([
- Makefile
- doc/Makefile
---- install-info/install-info.c
-+++ install-info/install-info.c
-@@ -21,6 +21,9 @@
- #include
- #include
- #include
-+#ifdef HAVE_ZIO
-+# include
-+#endif
-
- #define TAB_WIDTH 8
-
-@@ -655,15 +658,47 @@ open_possibly_compressed_file (char *fil
-
- *opened_filename = filename;
- f = fopen (*opened_filename, FOPEN_RBIN);
-+#ifdef HAVE_ZIO
-+ if (!compression_program)
-+ compression_program = &local_compression_program;
-+ *compression_program = NULL;
-+ if (f)
-+ {
-+ nread = fread (data, sizeof (data), 1, f);
-+ if (nread == 1)
-+ {
-+ if (data[0] == '\x1f' && data[1] == '\x8b')
-+ *compression_program = "g";
-+ else if (data[0] == '\x1f' && data[1] == '\x9d')
-+ *compression_program = "Z";
-+ else if (data[0] == '\x1f' && data[1] == '\x9e')
-+ *compression_program = "z";
-+ else if (data[0] == 'B' && data[1] == 'Z' && data[2] == 'h')
-+ *compression_program = "b";
-+ }
-+ fclose (f);
-+ f = fzopen (*opened_filename, FOPEN_RBIN);
-+ }
-+#endif
- if (!f)
- {
- *opened_filename = concat (filename, ".gz", "");
-+#ifdef HAVE_ZIO
-+ f = fzopen (*opened_filename, FOPEN_RBIN);
-+ *compression_program = "g";
-+#else
- f = fopen (*opened_filename, FOPEN_RBIN);
-+#endif
- if (!f)
- {
- free (*opened_filename);
- *opened_filename = concat (filename, ".bz2", "");
-+#ifdef HAVE_ZIO
-+ f = fzopen (*opened_filename, FOPEN_RBIN);
-+ *compression_program = "b";
-+#else
- f = fopen (*opened_filename, FOPEN_RBIN);
-+#endif
- }
- if (!f)
- {
-@@ -695,7 +730,11 @@ open_possibly_compressed_file (char *fil
- /* And try opening it again. */
- free (*opened_filename);
- *opened_filename = filename;
-+#ifdef HAVE_ZIO
-+ f = fzopen (*opened_filename, FOPEN_RBIN);
-+#else
- f = fopen (*opened_filename, FOPEN_RBIN);
-+#endif
- if (!f)
- pfatal_with_name (filename);
- }
-@@ -704,6 +743,7 @@ open_possibly_compressed_file (char *fil
- }
- }
-
-+#ifndef HAVE_ZIO
- /* Read first few bytes of file rather than relying on the filename.
- If the file is shorter than this it can't be usable anyway. */
- nread = fread (data, sizeof (data), 1, f);
-@@ -778,6 +818,9 @@ open_possibly_compressed_file (char *fil
- #endif
- *is_pipe = 0;
- }
-+#else
-+ *is_pipe = 0;
-+#endif /* HAVE_ZIO */
-
- return f;
- }
-@@ -852,11 +895,23 @@ output_dirfile (char *dirfile, int dir_n
- int i;
- FILE *output;
-
-+#ifndef HAVE_ZIO
- if (compression_program)
- {
- char *command = concat (compression_program, ">", dirfile);
- output = popen (command, "w");
- }
-+#else
-+ if (compression_program)
-+ {
-+ if (*compression_program == 'g' || *compression_program == 'z')
-+ output = fzopen (dirfile, "wg");
-+ if (*compression_program == 'b')
-+ output = fzopen (dirfile, "wb");
-+ if (*compression_program == 'Z')
-+ output = fzopen (dirfile, "wZ");
-+ }
-+#endif
- else
- output = fopen (dirfile, "w");
-
-@@ -969,9 +1024,11 @@ output_dirfile (char *dirfile, int dir_n
- /* Some systems, such as MS-DOS, simulate pipes with temporary files.
- On those systems, the compressor actually gets run inside pclose,
- so we must call pclose. */
-+#ifndef HAVE_ZIO
- if (compression_program)
- pclose (output);
- else
-+#endif
- fclose (output);
- }
-
diff --git a/texinfo-4.12.dif b/texinfo-4.12.dif
deleted file mode 100644
index a751ba3..0000000
--- a/texinfo-4.12.dif
+++ /dev/null
@@ -1,89 +0,0 @@
---- .pkgextract
-+++ .pkgextract
-@@ -0,0 +1,2 @@
-+patch -p0 -b --suffix=.zlib < ../texinfo-4.11-zlib.patch
-+patch -p0 -b --suffix=.echo < ../texinfo-4.8-echo.patch
---- info/filesys.h
-+++ info/filesys.h
-@@ -78,7 +78,7 @@ extern int is_dir_name (char *filename);
-
- /* The default value of INFOPATH. */
- #if !defined (DEFAULT_INFOPATH)
--# define DEFAULT_INFOPATH ".:/usr/local/info:/usr/info:/usr/local/lib/info:/usr/lib/info:/usr/local/gnu/info:/usr/local/gnu/lib/info:/usr/gnu/info:/usr/gnu/lib/info:/opt/gnu/info:/usr/share/info:/usr/share/lib/info:/usr/local/share/info:/usr/local/share/lib/info:/usr/gnu/lib/emacs/info:/usr/local/gnu/lib/emacs/info:/usr/local/lib/emacs/info:/usr/local/emacs/info"
-+# define DEFAULT_INFOPATH "/usr/local/share/info:/usr/local/info:/usr/local/lib/info:/usr/share/info:/usr/info:/usr/lib/info:/opt/gnu/info:/usr/share/xemacs/info:."
- #endif /* !DEFAULT_INFOPATH */
-
- #if !defined (S_ISREG) && defined (S_IFREG)
---- install-info/install-info.c
-+++ install-info/install-info.c
-@@ -2243,7 +2243,7 @@ There is NO WARRANTY, to the extent perm
-
- /* Now Read the Info file and parse it into lines, unless we're
- removing exactly. */
-- if (!remove_exactly)
-+ if (!delete_flag)
- {
- if (debug_flag)
- printf ("debug: reading input file %s\n", infile);
---- util/texi2dvi
-+++ util/texi2dvi
-@@ -291,25 +291,7 @@ absolute ()
- # Return true if PROG is somewhere in PATH, else false.
- findprog ()
- {
-- local saveIFS="$IFS"
-- IFS=$path_sep # break path components at the path separator
-- for dir in $PATH; do
-- IFS=$saveIFS
-- # The basic test for an executable is `test -f $f && test -x $f'.
-- # (`test -x' is not enough, because it can also be true for directories.)
-- # We have to try this both for $1 and $1.exe.
-- #
-- # Note: On Cygwin and DJGPP, `test -x' also looks for .exe. On Cygwin,
-- # also `test -f' has this enhancement, bot not on DJGPP. (Both are
-- # design decisions, so there is little chance to make them consistent.)
-- # Thusly, it seems to be difficult to make use of these enhancements.
-- #
-- if { test -f "$dir/$1" && test -x "$dir/$1"; } ||
-- { test -f "$dir/$1.exe" && test -x "$dir/$1.exe"; }; then
-- return 0
-- fi
-- done
-- return 1
-+ type -p $1 > /dev/null 2>&1
- }
-
- # report LINE1 LINE2...
-@@ -803,6 +785,11 @@ run_tex ()
- *) error 1 "$0: $out_lang not supported for $in_lang";;
- esac
-
-+ if ! type -p $tex > /dev/null 2>&1 ; then
-+ echo "${0##*/}: requires $tex, please install texlive and texlive-latex" 1>&2
-+ exit 1
-+ fi
-+
- # Beware of aux files in subdirectories that require the
- # subdirectory to exist.
- case $in_lang:$tidy in
-@@ -915,6 +902,11 @@ run_bibtex ()
- texinfo) return;;
- esac
-
-+ if ! type -p $bibtex > /dev/null 2>&1 ; then
-+ echo "${0##*/}: requires $bibtex, please install texlive and texlive-latex" 1>&2
-+ exit 1
-+ fi
-+
- # "Citation undefined" is for LaTeX, "Undefined citation" for btxmac.tex.
- # The no .aux && \bibdata test is also for btxmac, in case it was the
- # first run of a bibtex-using document. Otherwise, it's possible that
-@@ -1673,7 +1665,7 @@ do
- sed 's,/,!,g'`
- esac
- # Remove it at exit if clean mode.
-- trap "cleanup" 0 1 2 15
-+ trap "cleanup" EXIT SIGHUP SIGINT SIGQUIT SIGBUS SIGPIPE SIGTERM
-
- ensure_dir "$build_dir" "$t2ddir"
-
diff --git a/texinfo-4.13a-bug640417.diff b/texinfo-4.13a-bug640417.diff
deleted file mode 100644
index 4c23acb..0000000
--- a/texinfo-4.13a-bug640417.diff
+++ /dev/null
@@ -1,31 +0,0 @@
---- texinfo-4.13-/info/window.c 2008-09-18 20:31:59.000000000 +0200
-+++ texinfo-4.13/info/window.c 2010-09-20 21:32:41.941755338 +0200
-@@ -1581,7 +1581,7 @@
- const char *carried_over_ptr;
- size_t carried_over_len, carried_over_count;
- const char *cur_ptr = mbi_cur_ptr (iter);
-- int cur_len = mb_len (mbi_cur (iter));
-+ size_t cur_len = mb_len (mbi_cur (iter));
- int replen;
- int delim = 0;
- int rc;
-@@ -1754,7 +1754,7 @@
- mbi_advance (iter))
- {
- const char *cur_ptr = mbi_cur_ptr (iter);
-- int cur_len = mb_len (mbi_cur (iter));
-+ size_t cur_len = mb_len (mbi_cur (iter));
-
- if (cur_len == 1)
- {
-@@ -1852,8 +1852,8 @@
- mbi_advance (iter))
- {
- const char *cur_ptr = mbi_cur_ptr (iter);
-- int cur_len = mb_len (mbi_cur (iter));
-- int replen;
-+ size_t cur_len = mb_len (mbi_cur (iter));
-+ size_t replen;
-
- if (cur_ptr >= endp)
- break;
diff --git a/texinfo-4.13a-bug713517.diff b/texinfo-4.13a-bug713517.diff
deleted file mode 100644
index 4798e05..0000000
--- a/texinfo-4.13a-bug713517.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- util/texi2dvi
-+++ util/texi2dvi 2011-09-02 10:25:04.616426245 +0000
-@@ -78,7 +78,7 @@ newline='
- IFS="$space$tab$newline"
-
- # In case someone pedantic insists on using grep -E.
--: ${EGREP=egrep}
-+: ${EGREP=grep -E}
-
- # Systems which define $COMSPEC or $ComSpec use semicolons to separate
- # directories in TEXINPUTS -- except for Cygwin et al., where COMSPEC
-@@ -1683,7 +1683,7 @@ input_file_name_decode ()
-
- # 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 --git a/texinfo-4.13a-bug788574.diff b/texinfo-4.13a-bug788574.diff
deleted file mode 100644
index 4fa0e2c..0000000
--- a/texinfo-4.13a-bug788574.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- makeinfo/sectioning.c 2008/09/26 11:56:28 1.30
-+++ makeinfo/sectioning.c 2011/01/15 00:23:19 1.32
-@@ -256,14 +256,14 @@
- return xstrdup ("");
- else if (enum_marker == APPENDIX_MAGIC)
- {
-- char s[1];
-+ char s[2];
- sprintf (s, "%c", numbers[0] + 64);
- return xstrdup (s);
- }
- else
- {
-- char s[5];
-- sprintf (s, "%d", numbers[0]);
-+ char s[100];
-+ sprintf (s, "%4d", numbers[0]);
- return xstrdup (s);
- }
- }
diff --git a/texinfo-4.13a.tar.bz2 b/texinfo-4.13a.tar.bz2
deleted file mode 100644
index 3c711b9..0000000
--- a/texinfo-4.13a.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1f93ace1ec658c594bf0803493b6ee94a1a979659eee3785b80df7aae3d04abf
-size 1969110
diff --git a/texinfo-4.8-echo.patch b/texinfo-4.8-echo.patch
deleted file mode 100644
index fd15375..0000000
--- a/texinfo-4.8-echo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- info/echo-area.c
-+++ info/echo-area.c Tue Jan 25 17:32:07 2005
-@@ -1502,7 +1502,7 @@
- void
- inform_in_echo_area (const char *message)
- {
-- int i;
-+ int i, len;
- char *text;
- int avail = EA_MAX_INPUT + 1 - input_line_end;
-
-@@ -1512,7 +1512,13 @@
- text[i] = 0;
-
- echo_area_initialize_node ();
-- sprintf (&input_line[input_line_end], "%s[%s]\n",
-+
-+ len = EA_MAX_INPUT - input_line_end;
-+ if (len <= 0) {
-+ free (text);
-+ return;
-+ }
-+ snprintf (&input_line[input_line_end], len, "%s[%s]\n",
- echo_area_is_active ? " ": "", text);
- free (text);
- the_echo_area->point = input_line_point;
diff --git a/texinfo-5.2.tar.gz b/texinfo-5.2.tar.gz
new file mode 100644
index 0000000..b981a29
--- /dev/null
+++ b/texinfo-5.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6b8ca30e9b6f093b54fe04439e5545e564c63698a806a48065c0bba16994cf74
+size 7672236
diff --git a/texinfo-zlib.patch b/texinfo-zlib.patch
new file mode 100644
index 0000000..a6538ef
--- /dev/null
+++ b/texinfo-zlib.patch
@@ -0,0 +1,77 @@
+Index: texinfo-5.2/install-info/Makefile.in
+===================================================================
+--- texinfo-5.2.orig/install-info/Makefile.in
++++ texinfo-5.2/install-info/Makefile.in
+@@ -201,7 +201,7 @@ am__installdirs = "$(DESTDIR)$(bindir)"
+ PROGRAMS = $(bin_PROGRAMS)
+ am_ginstall_info_OBJECTS = install-info.$(OBJEXT)
+ ginstall_info_OBJECTS = $(am_ginstall_info_OBJECTS)
+-ginstall_info_LDADD = $(LDADD)
++ginstall_info_LDADD = $(LDADD) -lzio
+ am__DEPENDENCIES_1 =
+ ginstall_info_DEPENDENCIES = $(top_builddir)/gnulib/lib/libgnu.a \
+ $(am__DEPENDENCIES_1)
+Index: texinfo-5.2/install-info/install-info.c
+===================================================================
+--- texinfo-5.2.orig/install-info/install-info.c
++++ texinfo-5.2/install-info/install-info.c
+@@ -22,6 +22,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #define TAB_WIDTH 8
+
+@@ -687,10 +688,31 @@ open_possibly_compressed_file (char *fil
+
+ *opened_filename = filename;
+ f = fopen (*opened_filename, FOPEN_RBIN);
++ if (!compression_program)
++ compression_program = &local_compression_program;
++ *compression_program = NULL;
++ if (f)
++ {
++ nread = fread (data, sizeof (data), 1, f);
++ if (nread == 1)
++ {
++ if (data[0] == '\x1f' && data[1] == '\x8b')
++ *compression_program = "g";
++ else if (data[0] == '\x1f' && data[1] == '\x9d')
++ *compression_program = "Z";
++ else if (data[0] == '\x1f' && data[1] == '\x9e')
++ *compression_program = "z";
++ else if (data[0] == 'B' && data[1] == 'Z' && data[2] == 'h')
++ *compression_program = "b";
++ }
++ fclose (f);
++ f = fzopen (*opened_filename, FOPEN_RBIN);
++ }
+ if (!f)
+ {
+ *opened_filename = concat (filename, ".gz", "");
+- f = fopen (*opened_filename, FOPEN_RBIN);
++ f = fzopen (*opened_filename, FOPEN_RBIN);
++ *compression_program = "g";
+ }
+ if (!f)
+ {
+@@ -702,7 +724,8 @@ open_possibly_compressed_file (char *fil
+ {
+ free (*opened_filename);
+ *opened_filename = concat (filename, ".bz2", "");
+- f = fopen (*opened_filename, FOPEN_RBIN);
++ f = fzopen (*opened_filename, FOPEN_RBIN);
++ *compression_program = "b";
+ }
+ if (!f)
+ {
+@@ -739,7 +762,7 @@ open_possibly_compressed_file (char *fil
+ /* And try opening it again. */
+ free (*opened_filename);
+ *opened_filename = filename;
+- f = fopen (*opened_filename, FOPEN_RBIN);
++ f = fzopen (*opened_filename, FOPEN_RBIN);
+ if (!f)
+ pfatal_with_name (filename);
+ }
diff --git a/texinfo.changes b/texinfo.changes
index c058f67..fe7b4a5 100644
--- a/texinfo.changes
+++ b/texinfo.changes
@@ -1,3 +1,71 @@
+-------------------------------------------------------------------
+Fri Feb 6 17:51:37 UTC 2015 - dimstar@opensuse.org
+
+- Add perl(Locale::Messages) and perl(Text::Unidecode) Requires to
+ makeinfo: since the switch to using the external ones, we also
+ must ensure to have them present for the user to execute
+ makeinfo. And makeinfo can be installed without texinfo (which
+ already does require those modules too).
+
+-------------------------------------------------------------------
+Fri Feb 6 15:58:27 UTC 2015 - werner@suse.de
+
+- Avoid including builtin perl-libintl-perl but require the package
+- The same for perl-Text-Unidecode
+- Move %install_info_delete from %postun to %preun
+
+-------------------------------------------------------------------
+Fri Feb 6 11:12:09 UTC 2015 - dimstar@opensuse.org
+
+- Recommend instead of Require texi2html and texi2roff: they are
+ not stricly required to operate texinfo, but can be valuable to
+ the users installing it.
+
+-------------------------------------------------------------------
+Thu Feb 5 20:23:34 UTC 2015 - dimstar@opensuse.org
+
+- Completely splitt off texi2html and texi2roff into their own
+ package containers. As a consequence, we no longer carry those
+ files / patches here (they live in their respective other
+ packages): texi2html-1.78.dif, texi2html-5.0.tar.bz2,
+ texi2html-5584.patch, texi2html.changes, texi2html.spec,
+ texi2roff-2.0-gcc4.patch, texi2roff-2.0.dif, texi2roff-2.0.tar.gz,
+ texi2roff.changes, texi2roff.patch.gz and texi2roff.spec.
+
+-------------------------------------------------------------------
+Fri Sep 12 13:45:49 UTC 2014 - werner@suse.de
+
+- Be aware that texinfo is GPL-3.0+
+- Require texi2html as well as readded texi2roff to make the build
+ system happy
+
+-------------------------------------------------------------------
+Wed Aug 6 18:32:36 UTC 2014 - dmitry_r@opensuse.org
+
+- Update to version 5.2
+ * New texinfo commands
+ * texi2any is the new generic converter for Texinfo that can
+ produce all supported output formats, both those from texi2dvi
+ (PDF/DVI) and from makeinfo (Info/HTML/etc.). texi2any and
+ makeinfo are now different names for the same program; there
+ are no differences in behavior based on the program name.
+ * See more detail at included NEWS file
+ * Remove obsolete texinfo-4.12.dif
+ * Remove obsolete texi2html-1.78.dif
+ * Remove obsolete texi2roff-2.0.dif
+ * Remove obsolete texi2roff.patch.bz2
+ * Remove obsolete texinfo-4.8-echo.patch
+ * Remove obsolete texi2roff-2.0-gcc4.patch
+ * Remove obsolete texinfo-4.13a-bug640417.diff
+ * Remove obsolete texinfo-4.13a-bug713517.diff
+ * Remove obsolete automake-1.12.patch
+ * Remove obsolete texinfo-4.13a-bug788574.diff
+ * Remove obsolete config-guess-sub-update.patch
+ * Rebase texinfo-4.12-zlib.patch to texinfo-zlib.patch
+- Merge makeinfo into main package
+- Drop not maintained texi2roff
+- Drop not maintained texi2html
+
-------------------------------------------------------------------
Mon May 6 16:05:29 UTC 2013 - schwab@linux-m68k.org
diff --git a/texinfo.spec b/texinfo.spec
index 9af43f3..f7f64af 100644
--- a/texinfo.spec
+++ b/texinfo.spec
@@ -1,7 +1,7 @@
#
# spec file for package texinfo
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,27 +17,33 @@
Name: texinfo
+Version: 5.2
+Release: 0
+Summary: Tools Needed to Create Documentation from Texinfo Sources
+License: GPL-3.0+
+Group: Productivity/Publishing/Texinfo
+Url: http://www.gnu.org/software/texinfo/
+Source0: ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-%{version}.tar.gz
+Source10: info-dir
+Patch1: texinfo-zlib.patch
BuildRequires: automake
BuildRequires: help2man
BuildRequires: libbz2-devel
+BuildRequires: libpth-devel
BuildRequires: libzio-devel
BuildRequires: ncurses-devel
+BuildRequires: perl
+Requires: perl-Text-Unidecode
+Requires: perl-gettext
+Requires: perl-libintl-perl
+BuildRequires: perl-Text-Unidecode
BuildRequires: perl-gettext
+BuildRequires: perl-libintl-perl
+BuildRequires: perl-macros
BuildRequires: zlib-devel
-Version: 4.13a
-Release: 0
-%global version_t2h 1.82
-%global version_t2r 2.0
-Summary: Tools Needed to Create Documentation from Texinfo Sources
-License: GPL-2.0+ and GPL-3.0+
-Group: Productivity/Publishing/Texinfo
-Url: http://www.texinfo.org
-PreReq: %{install_info_prereq}
-Provides: texi2html = %{version_t2h}
-Provides: texi2roff = %{version_t2r}
-%if %suse_version > 1220
-Requires: latex2html
Requires: makeinfo
+Requires: perl
+%if 0%{?suse_version} > 1220
Requires: texlive-bibtex
Requires: texlive-latex
Requires: texlive-makeindex
@@ -45,24 +51,11 @@ Requires: texlive-pdftex
Requires: texlive-tex
Requires: texlive-texinfo
%endif
-Source: ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-%{version}.tar.bz2
-Source1: http://download.savannah.nongnu.org/releases/texi2html/texi2html-%{version_t2h}.tar.bz2
-# texinfo.org: the domain is expired.
-# http://texinfo.org/texi2roff/texi2roff-%{version_t2r}.tar.bz2
-Source2: texi2roff-%{version_t2r}.tar.bz2
-Source10: info-dir
-Patch: texinfo-4.12.dif
-Patch1: texi2html-1.78.dif
-Patch2: texi2roff-2.0.dif
-Patch3: texi2roff.patch.bz2
-Patch4: texinfo-4.12-zlib.patch
-Patch5: texinfo-4.8-echo.patch
-Patch6: texi2roff-2.0-gcc4.patch
-Patch7: texinfo-4.13a-bug640417.diff
-Patch8: texinfo-4.13a-bug713517.diff
-Patch9: automake-1.12.patch
-Patch10: texinfo-4.13a-bug788574.diff
-Patch11: config-guess-sub-update.patch
+%if 0%{?suse_version} > 1310
+Recommends: texi2html
+Recommends: texi2roff
+%endif
+Requires(pre): %{install_info_prereq}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -74,13 +67,10 @@ same Texinfo source file, you can create a menu-driven, online info
file with nodes, menus, cross-references, and indices using the included
makeinfo tool.
-Aggregated with texinfo in this package is texi2html and texi2roff.
-
-%package -n info
+%package -n info
Summary: A Stand-Alone Terminal-Based Info Browser
-License: GPL-3.0+
Group: Productivity/Publishing/Texinfo
-PreReq: bash
+Requires(pre): bash
%description -n info
Info is a terminal-based program for reading documentation of computer
@@ -88,10 +78,14 @@ programs in the Info format. The GNU Project distributes most of its
on-line manuals in the Info format, so you need a program called "Info
reader" to read the manuals.
-%package -n makeinfo
+%package -n makeinfo
Summary: Translate Texinfo documents to info format
-License: GPL-3.0+
Group: Productivity/Publishing/Texinfo
+Requires: perl
+# /usr/share/texinfo/Texinfo/Report.pm uses Locale::Messages
+Requires: perl(Locale::Messages)
+# /usr/share/texinfo/Texinfo/Convert/NodeNameNormalization.pm uses Text::Unidecode
+Requires: perl(Text::Unidecode)
Provides: texinfo:/usr/bin/makeinfo
Suggests: texinfo
@@ -101,127 +95,84 @@ formats, by default Info files suitable for reading online with Emacs
or standalone GNU Info.
%prep
-rm -rf texi2html-%{version_t2h} texi2roff-%{version_t2r}
-%setup -q -b 1 -b 2 -n texinfo-4.13
-%patch4 -p0 -b .zlib
-%patch5 -p0 -b .echo
-%patch7 -p1 -b .size_t
-%patch8 -p0 -b .egrep
-%patch9 -p1
-%patch10 -p0 -b .appendix
-%patch -p0
-pushd ../texi2html-%{version_t2h}
-%patch1 -p0
-%patch11
-popd
-pushd ../texi2roff-%{version_t2r}
-%patch3 -p0 -b .Bader
-%patch2 -p0
-%patch6 -p1
-popd
+%setup -q
+%patch1 -p1
%build
- HOST=%{_target_cpu}-suse-linux
- CFLAGS="$RPM_OPT_FLAGS -pipe"
- LDFLAGS=""
- CC=gcc
- export CFLAGS LDFLAGS CC
- export SUSE_ASNEEDED=0
- AUTOPOINT=true autoreconf -fi
- ./configure --build=$HOST \
- --prefix=%{_prefix} \
- --mandir=%{_mandir} \
- --datadir=%{_datadir} \
- --infodir=%{_infodir} \
- --without-included-gettext \
- --enable-nls
- PATH=${PWD}/makeinfo:${PWD}/util:$PATH
- export PATH
- make %{?_smp_mflags};
-pushd ../texi2html-%{version_t2h}
- ./configure --build=$HOST \
- --prefix=%{_prefix} \
- --mandir=%{_mandir} \
- --datadir=%{_datadir} \
- --infodir=%{_infodir} \
- --without-included-gettext \
- --enable-nls
- make %{?_smp_mflags};
-popd
-pushd ../texi2roff-%{version_t2r}
- rm -f texi2roff
- make %{?_smp_mflags};
-popd
+%configure --with-external-Text-Unidecode --with-external-libintl-perl --with-gnu-ld
+
+make %{?_smp_mflags}
%install
- export SUSE_ASNEEDED=0
- make DESTDIR=%{buildroot} \
- infodir=%{_infodir} \
- htmldir=%{_defaultdocdir}/texi2html install
- rm -f %{buildroot}%{_infodir}/info.info*
- mkdir -p %{buildroot}/sbin
- mv %{buildroot}%{_bindir}/install-info %{buildroot}/sbin/
- ln -sf ../../sbin/install-info %{buildroot}%{_bindir}/install-info
- mkdir -p %{buildroot}%{_infodir}
- install -m 644 %{S:10} %{buildroot}%{_infodir}/dir
-pushd ../texi2html-%{version_t2h}
- make DESTDIR=%{buildroot} \
- infodir=%{_infodir} \
- texinfohtmldir=%{_defaultdocdir}/texi2html install
- install -m 644 README %{buildroot}%{_defaultdocdir}/texi2html/
- install -m 644 NEWS %{buildroot}%{_defaultdocdir}/texi2html/
- install -m 644 COPYING %{buildroot}%{_defaultdocdir}/texi2html/
-popd
-pushd ../texi2roff-%{version_t2r}
- doc=%{_defaultdocdir}/texi2roff
- install -m 755 texi2roff %{buildroot}%{_bindir}/
- install -m 755 texi2index %{buildroot}%{_bindir}/
- install -m 644 texi2roff.1 %{buildroot}%{_mandir}/man1/
- mkdir -p %{buildroot}${doc}
- install -m 644 Readme %{buildroot}${doc}
- install -m 644 copyright %{buildroot}${doc}
-popd
-%find_lang %name %{name}.lang
+%make_install
+if cmp %{buildroot}%{_bindir}/pdftexi2dvi %{buildroot}%{_bindir}/texi2pdf
+then
+ rm -vf %{buildroot}%{_bindir}/pdftexi2dvi
+ ln -sf texi2pdf %{buildroot}%{_bindir}/pdftexi2dvi
+fi
+if cmp %{buildroot}%{_mandir}/man1/pdftexi2dvi.1 %{buildroot}%{_mandir}/man1/texi2pdf.1
+then
+ rm -vf %{buildroot}%{_mandir}/man1/pdftexi2dvi.1
+ ln -sf texi2pdf.1.gz %{buildroot}%{_mandir}/man1/pdftexi2dvi.1.gz
+fi
-%clean
-test -n "%{buildroot}" && rm -rf %{buildroot}
+rm -f %{buildroot}%{_bindir}/makeinfo
+cp %{buildroot}%{_bindir}/texi2any %{buildroot}%{_bindir}/makeinfo
+
+mkdir -p %{buildroot}/sbin
+mv %{buildroot}%{_bindir}/install-info %{buildroot}/sbin/
+ln -sf ../../sbin/install-info %{buildroot}%{_bindir}/install-info
+
+install -m 644 %{SOURCE10} %{buildroot}%{_infodir}/dir
+
+# part of emacs-info
+rm -f %{buildroot}%{_infodir}/info.info*
+
+%find_lang %{name} %{name}.lang
+%find_lang %{name}_document %{name}_document.lang
%post
-%install_info --info-dir=%{_infodir} %{_infodir}/texinfo.gz
-%install_info --info-dir=%{_infodir} %{_infodir}/texi2html.info.gz
+%install_info --info-dir=%{_infodir} %{_infodir}/texinfo.info.gz
+%install_info --info-dir=%{_infodir} %{_infodir}/texinfo.info-1.gz
+%install_info --info-dir=%{_infodir} %{_infodir}/texinfo.info-2.gz
+%install_info --info-dir=%{_infodir} %{_infodir}/texinfo.info-3.gz
-%postun
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/texinfo.gz
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/texi2html.info.gz
+%preun
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/texinfo.info.gz
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/texinfo.info-1.gz
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/texinfo.info-2.gz
+%install_info_delete --info-dir=%{_infodir} %{_infodir}/texinfo.info-3.gz
%post -n info
%install_info --info-dir=%{_infodir} %{_infodir}/info-stnd.info.gz
-%postun -n info
+%preun -n info
%install_info_delete --info-dir=%{_infodir} %{_infodir}/info-stnd.info.gz
-%files
+%files -f %{name}_document.lang
%defattr(-, root, root)
-%dir %{_defaultdocdir}/texi2html
-%dir %{_defaultdocdir}/texi2roff
-%doc ABOUT-NLS AUTHORS COPYING INTRODUCTION NEWS README TODO
+%doc ABOUT-NLS AUTHORS COPYING NEWS README TODO
%doc doc/texinfo.tex doc/txi-*.tex
-%doc %{_defaultdocdir}/texi2html/*
-%doc %{_defaultdocdir}/texi2roff/*
-%{_bindir}/pdftexi*
-%{_bindir}/texi*
+%{_bindir}/pod2texi
+%{_bindir}/texi2any
+%{_bindir}/texi2dvi
+%{_bindir}/texi2pdf
+%{_bindir}/texindex
+%{_bindir}/pdftexi2dvi
%{_infodir}/texinfo*.gz
-%{_infodir}/texi2html*.gz
+%{_mandir}/man1/pod2texi.1.gz
+%{_mandir}/man1/texi2any.1.gz
+%{_mandir}/man1/texindex.1.gz
+%{_mandir}/man1/texi2dvi.1.gz
+%{_mandir}/man1/texi2pdf.1.gz
%{_mandir}/man1/pdftexi2dvi.1.gz
-%{_mandir}/man1/texi*.1.gz
%{_mandir}/man5/texinfo.5.gz
-%{_datadir}/texinfo
-%{_datadir}/texi2html
%files -n makeinfo -f %{name}.lang
%defattr(-,root,root)
%{_bindir}/makeinfo
%{_mandir}/man1/makeinfo.1.gz
+%{_datadir}/texinfo/
%files -n info
%defattr(-,root,root)