Update of /cvsroot/fink/experimental/thesin/finkinfo In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4142
Modified Files: texinfo.info texinfo.patch Log Message: - Update to current fink 5.1 - Still need to test bootstrapping with it. Index: texinfo.info =================================================================== RCS file: /cvsroot/fink/experimental/thesin/finkinfo/texinfo.info,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- texinfo.info 3 Aug 2012 02:46:22 -0000 1.9 +++ texinfo.info 2 Apr 2013 20:40:06 -0000 1.10 @@ -1,76 +1,72 @@ Package: texinfo -Version: 4.13 -Revision: 1002 +Version: 5.1 +Revision: 1.1 Source: gnu -Source-MD5: 71ba711519209b5fb583fed2b3d86fcb +Source-MD5: 54e250014fe698fb4832016158747c03 SourceDirectory: %n-%v BuildDepends: fink (>= 0.34.99.git), libiconv-dev, libncurses5 (>= 5.4-20041023-1006), libgettext8-dev, gettext-tools Depends: ncurses (>= 5.4-20041023-1006), libncurses5-shlibs (>= 5.4-20041023-1006), libgettext8-shlibs, libiconv Replaces: tetex-base (<< 3.0-1) PatchFile: %n.patch -PatchFile-MD5: 27c113940707c9d4f99d7ffffc6ceb67 +PatchFile-MD5: 547bfe54593879cd6a62f9a07a2b84ee PatchScript: << chmod a+x build-aux/install-sh sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1 +patch -p1 < fink/patches/fix-broken-po-files patch -p1 < fink/patches/warn_missing_tex -patch -p1 < fink/patches/replace_egrep_fgrep_sigs -# UTF-8 issues in patch -#patch -p1 < fink/patches/info_universal_argument +patch -p1 < fink/patches/numerical-signal-names +patch -p1 < fink/patches/info_universal_argument patch -p1 < fink/patches/dont_build_info -patch -p1 < fink/patches/texi-allow-tilde -patch -p1 < fink/patches/check-nodes-boundaries -patch -p1 < fink/patches/info_core_dump_small_window -patch -p1 < fink/patches/minor-buffer-size-fix -patch -p1 < fink/patches/texi2dvi-local-fallback-syntax.diff -patch -p1 < fink/patches/texi2dvi_non-C_locale -patch -p1 < fink/patches/texi-allow-shell-escape.diff # help2man isn't present in bootstrap so patch it out perl -pi -e 's,help2man,true,g' configure << -ConfigureParams: --mandir=%p/share/man --infodir=%p/share/info +ConfigureParams: --mandir=%p/share/man --infodir=%p/share/info --with-external-Text-Unidecode=yes --with-external-libintl-perl=yes CompileScript: << ./configure %c echo '#define DEFAULT_INFOPATH "%p/share/info:%p/info:/usr/local/share/info:/usr/local/lib/info:/usr/local/info:/usr/share/info:."' >>config.h make << +InfoTest: << + TestScript: /usr/bin/make check ALL_TESTS=yes || exit 2 +<< InstallScript: << -make install prefix=%i mandir=%i/share/man infodir=%i/share/info -TEXMF=%i/share/texmf make install-tex prefix=%i mandir=%i/share/man infodir=%i/share/info -find %i -type f -name dir | xargs rm -f -# pdfcolor and epsf.tex are in tetex and texlive -rm -rf %i/share/texmf/tex/plain -rm -rf %i/share/texmf/tex/generic -rm -rf %i/share/texmf/pdftex/plain/misc/pdfcolor.tex + make install prefix=%i mandir=%i/share/man infodir=%i/share/info + TEXMF=%i/share/texmf make install-tex prefix=%i mandir=%i/share/man infodir=%i/share/info + find %i -type f -name dir | xargs rm -f -# charset.alias supplied from gettext -rm -rf %i/lib + # epsf.tex is in texlive + rm -rf %i/share/texmf/tex/generic -install -d -m 0755 %i/share/man/man1 -install -m 0644 fink/texi2pdf.man %i/share/man/man1/texi2pdf.1 -mv %i/bin/install-info %i/bin/ginstall-info -sed -e "s/install-info/g&/g" \ - < %i/share/man/man1/install-info.1 \ - > %i/share/man/man1/ginstall-info.1 -rm -f %i/share/man/man1/install-info.1 + # install additional files that are not installed by default + install -m 0755 util/txixml2texi %i/bin/txixml2texi -install -m 0755 fink/install-info.sh %i/bin/install-info -install -m 0644 fink/install-info.1 %i/share/man/man1/install-info.1 -install -d -m 0755 %i/sbin -install -m 0755 fink/update-info-dir %i/sbin/update-info-dir -install -d -m 0755 %i/share/man/man8 -install -m 0644 fink/update-info-dir.8 %i/share/man/man8/update-info-dir.8 -install -d -m 0755 %i/share/menu -install -m 0644 fink/info.menu %i/share/menu/info + # work on fink install-info + mv %i/bin/install-info %i/bin/ginstall-info + sed -e "s/install-info/g&/g" \ + < %i/share/man/man1/install-info.1 \ + > %i/share/man/man1/ginstall-info.1 + rm -f %i/share/man/man1/install-info.1 + install -m 0755 fink/install-info.sh %i/bin/install-info + install -m 0644 fink/install-info.1 %i/share/man/man1/install-info.1 + install -d -m 0755 %i/sbin + install -m 0755 fink/update-info-dir %i/sbin/update-info-dir + install -d -m 0755 %i/share/man/man8 + install -m 0644 fink/update-info-dir.8 %i/share/man/man8/update-info-dir.8 + install -d -m 0755 %i/etc/texmf/fmt.d + install -m 0644 fink/conf/50cyrtexinfo.cnf %i/etc/texmf/fmt.d + install -d -m 0755 %i/var/lib/tex-common/fmtutil-cnf + echo "50cyrtexinfo" > %i/var/lib/tex-common/fmtutil-cnf/texinfo.list -install -d -m 0755 %i/etc/texmf/fmt.d -install -m 0644 fink/conf/50cyrtexinfo.cnf %i/etc/texmf/fmt.d -install -d -m 0755 %i/var/lib/tex-common/fmtutil-cnf -echo "50cyrtexinfo" > %i/var/lib/tex-common/fmtutil-cnf/texinfo.list + install -d -m 0755 %i/share/menu + install -m 0644 fink/info.menu %i/share/menu/info + + # charset.alias supplied from gettext + rm -rf %i/lib << -DocFiles: README COPYING AUTHORS INTRODUCTION NEWS TODO doc/*.texi fink/transition-plan.txt +DocFiles: README COPYING AUTHORS NEWS TODO doc/*.texi fink/transition-plan.txt #InfoDocs: texinfo info-stnd.info info.info # Description: GNU documentation system @@ -253,7 +249,7 @@ share/man/man5/info.5 share/menu/info << - DocFiles: README COPYING AUTHORS INTRODUCTION NEWS TODO doc/*.texi fink/transition-plan.txt + DocFiles: README COPYING AUTHORS NEWS TODO doc/*.texi fink/transition-plan.txt Description: Standalone GNU Info documentation browser DescDetail: << The Info file format is an easily-parsable representation for online @@ -291,7 +287,7 @@ share/man/man1/install-info.1 share/man/man8/update-info-dir.8 << - DocFiles: README COPYING AUTHORS INTRODUCTION NEWS TODO doc/*.texi fink/transition-plan.txt + DocFiles: README COPYING AUTHORS NEWS TODO doc/*.texi fink/transition-plan.txt InterestTriggers: << %p/share/info %p/info Index: texinfo.patch =================================================================== RCS file: /cvsroot/fink/experimental/thesin/finkinfo/texinfo.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- texinfo.patch 10 Jul 2012 20:38:49 -0000 1.2 +++ texinfo.patch 2 Apr 2013 20:40:06 -0000 1.3 @@ -1,6 +1,6 @@ -diff -ruN texinfo-4.13.orig/fink/conf/50cyrtexinfo.cnf texinfo-4.13/fink/conf/50cyrtexinfo.cnf ---- texinfo-4.13.orig/fink/conf/50cyrtexinfo.cnf 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/conf/50cyrtexinfo.cnf 2012-07-09 13:20:38.000000000 -0600 +diff -ruN texinfo-5.1.orig/fink/conf/50cyrtexinfo.cnf texinfo-5.1/fink/conf/50cyrtexinfo.cnf +--- texinfo-5.1.orig/fink/conf/50cyrtexinfo.cnf 1969-12-31 17:00:00.000000000 -0700 ++++ texinfo-5.1/fink/conf/50cyrtexinfo.cnf 2012-07-09 13:20:38.000000000 -0600 @@ -0,0 +1,18 @@ +# +# 50cyrtexinfo.cnf @@ -20,15 +20,15 @@ +# . call fmtutil-sys --missing (or --all) +# +#cyrtexinfo pdfetex language.dat -translate-file=cp227.tcx *cyrtxinf.ini -diff -ruN texinfo-4.13.orig/fink/info.menu texinfo-4.13/fink/info.menu ---- texinfo-4.13.orig/fink/info.menu 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/info.menu 2012-07-09 13:31:11.000000000 -0600 +diff -ruN texinfo-5.1.orig/fink/info.menu texinfo-5.1/fink/info.menu +--- texinfo-5.1.orig/fink/info.menu 1969-12-31 17:00:00.000000000 -0700 ++++ texinfo-5.1/fink/info.menu 2012-07-09 13:31:11.000000000 -0600 @@ -0,0 +1,2 @@ +?package(info): needs="text" title="Info" section="Help" \ + longtitle="GNU Info browser" command="info" -diff -ruN texinfo-4.13.orig/fink/install-info.1 texinfo-4.13/fink/install-info.1 ---- texinfo-4.13.orig/fink/install-info.1 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/install-info.1 2012-07-09 13:17:17.000000000 -0600 +diff -ruN texinfo-5.1.orig/fink/install-info.1 texinfo-5.1/fink/install-info.1 +--- texinfo-5.1.orig/fink/install-info.1 1969-12-31 17:00:00.000000000 -0700 ++++ texinfo-5.1/fink/install-info.1 2012-07-09 13:17:17.000000000 -0600 @@ -0,0 +1,29 @@ +.TH INSTALL-INFO 1 +.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection @@ -59,9 +59,9 @@ +.SH AUTHOR +This manual page was written by Norbert Preining <prein...@logic.at>, +for the Debian GNU/Linux system (but may be used by others). -diff -ruN texinfo-4.13.orig/fink/install-info.sh texinfo-4.13/fink/install-info.sh ---- texinfo-4.13.orig/fink/install-info.sh 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/install-info.sh 2012-07-09 13:16:47.000000000 -0600 +diff -ruN texinfo-5.1.orig/fink/install-info.sh texinfo-5.1/fink/install-info.sh +--- texinfo-5.1.orig/fink/install-info.sh 1969-12-31 17:00:00.000000000 -0700 ++++ texinfo-5.1/fink/install-info.sh 2012-07-09 13:16:47.000000000 -0600 @@ -0,0 +1,36 @@ +#!/bin/sh +# @@ -99,61 +99,30 @@ +fi + + -diff -ruN texinfo-4.13.orig/fink/install-info.triggers texinfo-4.13/fink/install-info.triggers ---- texinfo-4.13.orig/fink/install-info.triggers 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/install-info.triggers 2012-07-09 13:30:53.000000000 -0600 +diff -ruN texinfo-5.1.orig/fink/install-info.triggers texinfo-5.1/fink/install-info.triggers +--- texinfo-5.1.orig/fink/install-info.triggers 1969-12-31 17:00:00.000000000 -0700 ++++ texinfo-5.1/fink/install-info.triggers 2012-07-09 13:30:53.000000000 -0600 @@ -0,0 +1,2 @@ +interest @FINKPREFIX@/share/info +interest @FINKPREFIX@/info -diff -ruN texinfo-4.13.orig/fink/patches/check-nodes-boundaries texinfo-4.13/fink/patches/check-nodes-boundaries ---- texinfo-4.13.orig/fink/patches/check-nodes-boundaries 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/patches/check-nodes-boundaries 2012-07-09 13:22:37.000000000 -0600 -@@ -0,0 +1,22 @@ -+patch for fixing #598932, a segfault under certain circumstances due to -+wrong node computation if the .info file is malformed. -+The patch is based on the one checked in to texinfo cvs by -+Sergey Poznyakoff -+--- -+ info/nodes.c | 13 +++++++++++-- -+ 1 file changed, 11 insertions(+), 2 deletions(-) -+ -+Index: texinfo-4.13a.dfsg.1/info/nodes.c -+=================================================================== -+--- texinfo-4.13a.dfsg.1.orig/info/nodes.c 2010-10-08 10:00:22.000000000 +0900 -++++ texinfo-4.13a.dfsg.1/info/nodes.c 2010-10-08 10:13:25.000000000 +0900 -+@@ -960,6 +960,9 @@ -+ /* If we were able to find this file and load it, then return -+ the node within it. */ -+ { -++ if (!(tag->nodestart >= 0 && tag->nodestart < subfile->filesize)) -++ return NULL; -++ -+ NODE *node = xmalloc (sizeof (NODE)); -+ node->filename = subfile->fullpath; -+ node->parent = NULL; -diff -ruN texinfo-4.13.orig/fink/patches/dont_build_info texinfo-4.13/fink/patches/dont_build_info ---- texinfo-4.13.orig/fink/patches/dont_build_info 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/patches/dont_build_info 2012-07-09 13:22:09.000000000 -0600 -@@ -0,0 +1,44 @@ -+70_dont_build_info.dpatch by Norbert Preining -+ +diff -ruN texinfo-5.1.orig/fink/patches/dont_build_info texinfo-5.1/fink/patches/dont_build_info +--- texinfo-5.1.orig/fink/patches/dont_build_info 1969-12-31 17:00:00.000000000 -0700 ++++ texinfo-5.1/fink/patches/dont_build_info 2013-04-02 13:43:06.000000000 -0600 +@@ -0,0 +1,39 @@ +dont build the info documentation, it has been removed -+ +--- + doc/Makefile.in | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + -+Index: texinfo-4.13a.dfsg.1/doc/Makefile.in -+=================================================================== -+--- texinfo-4.13a.dfsg.1.orig/doc/Makefile.in 2008-09-18 20:46:24.000000000 +0200 -++++ texinfo-4.13a.dfsg.1/doc/Makefile.in 2009-03-09 15:17:15.000000000 +0100 -+@@ -121,14 +121,16 @@ -+ CONFIG_CLEAN_FILES = -+ SOURCES = -+ DIST_SOURCES = ++--- texinfo.orig/doc/Makefile.in +++++ texinfo/doc/Makefile.in ++@@ -210,14 +210,16 @@ ++ am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@) ++ am__v_texidevnull_0 = > /dev/null ++ am__v_texidevnull_1 = +-INFO_DEPS = texinfo info-stnd.info info.info ++#INFO_DEPS = texinfo info-stnd.info info.info -++INFO_DEPS = +++INFO_DEPS = + TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex + am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux + DVIS = texinfo.dvi info-stnd.dvi info.dvi @@ -166,191 +135,104 @@ + TEXI2DVI = texi2dvi + TEXI2PDF = $(TEXI2DVI) --pdf --batch + MAKEINFOHTML = $(MAKEINFO) --html -+@@ -435,8 +437,10 @@ -+ top_srcdir = @top_srcdir@ ++@@ -1006,8 +1008,10 @@ ++ SUBDIRS = tp_api + + # Put texinfo.txi first because that's the most important. +-info_TEXINFOS = texinfo.txi info-stnd.texi info.texi +-DISTCLEANFILES = texinfo texinfo-* info*.info* ++#info_TEXINFOS = texinfo.txi info-stnd.texi info.texi ++#DISTCLEANFILES = texinfo texinfo-* info*.info* -++info_TEXINFOS = -++DISTCLEANFILES = -+ man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 \ -+ info.5 texinfo.5 texi2dvi.1 texi2pdf.1 pdftexi2dvi.1 +++info_TEXINFOS = +++DISTCLEANFILES = + -diff -ruN texinfo-4.13.orig/fink/patches/fix-texi2dvi-bashism texinfo-4.13/fink/patches/fix-texi2dvi-bashism ---- texinfo-4.13.orig/fink/patches/fix-texi2dvi-bashism 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/patches/fix-texi2dvi-bashism 2012-07-09 13:22:56.000000000 -0600 -@@ -0,0 +1,17 @@ ++ # Use the programs built in our distribution, taking account of possible ++ # cross-compiling. +diff -ruN texinfo-5.1.orig/fink/patches/fix-broken-po-files texinfo-5.1/fink/patches/fix-broken-po-files +--- texinfo-5.1.orig/fink/patches/fix-broken-po-files 1969-12-31 17:00:00.000000000 -0700 ++++ texinfo-5.1/fink/patches/fix-broken-po-files 2013-04-02 13:43:43.000000000 -0600 +@@ -0,0 +1,18 @@ ++fix wrong control character in some .po files ++See Ubuntu bug 707931 ++https://bugs.launchpad.net/ubuntu/+source/texinfo/+bug/707931 +--- -+ util/texi2dvi | 2 +- ++ po/id.po | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + -+Index: texinfo-4.12.dfsg.1/util/texi2dvi -+=================================================================== -+--- texinfo-4.12.dfsg.1.orig/util/texi2dvi 2008-06-13 09:28:00.000000000 +0200 -++++ texinfo-4.12.dfsg.1/util/texi2dvi 2008-06-13 09:36:34.000000000 +0200 -+@@ -1105,7 +1105,7 @@ -+ # main info output, the user asked to run TeX, not makeinfo. -+ run_makeinfo () -+ { -+- test $in_lang == texinfo || -++ test $in_lang = texinfo || -+ return 0 -+ -+ # Unless required by the user, makeinfo expansion is wanted only -diff -ruN texinfo-4.13.orig/fink/patches/info_core_dump_small_window texinfo-4.13/fink/patches/info_core_dump_small_window ---- texinfo-4.13.orig/fink/patches/info_core_dump_small_window 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/patches/info_core_dump_small_window 2012-07-09 13:23:15.000000000 -0600 -@@ -0,0 +1,17 @@ -+--- texinfo-4.13a.dfsg.1.orig/info/window.c 2008-09-18 20:31:59.000000000 +0200 -++++ texinfo-4.13a.dfsg.1/info/window.c 2011-02-09 15:51:46.000000000 +0100 -+@@ -923,7 +923,13 @@ -+ break; -+ } -+ -+- return i - 1; -++ /* Something is wrong with the above logic as it allows a negative -++ index to be returned for small windows. Until someone figures it -++ out, at least don't core dump. */ -++ if (i>0) -++ return i - 1; -++ else -++ return 0; -+ } -+ -+ /* Get and return the goal column for this window. */ -diff -ruN texinfo-4.13.orig/fink/patches/info_universal_argument texinfo-4.13/fink/patches/info_universal_argument ---- texinfo-4.13.orig/fink/patches/info_universal_argument 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/patches/info_universal_argument 2012-07-09 14:00:25.000000000 -0600 -@@ -0,0 +1,35 @@ -+50_info_universal_argument.dpatch by Peter De Wachter <pdewa...@vub.ac.be> -+ -+fix crash in info under nl locale -+ ++--- texinfo.orig/po/id.po +++++ texinfo/po/id.po ++@@ -2166,7 +2166,7 @@ ++ "Ini adalah berkas .../info/dir, yang berisi\n" ++ "titik paling atas dari struktur Info, dipanggil (dir)Top.\n" ++ "Pertama kali anda memanggil Info anda berawal dari melihat titik ini.\n" ++-"^_\n" +++"\n" ++ "%s\tIni adalah tingkat paling atas dari pohon INFO\n" ++ "\n" ++ " Ini (titik Direktori) memberikan sebuah menu dari topik utama.\n" +diff -ruN texinfo-5.1.orig/fink/patches/info_universal_argument texinfo-5.1/fink/patches/info_universal_argument +--- texinfo-5.1.orig/fink/patches/info_universal_argument 1969-12-31 17:00:00.000000000 -0700 ++++ texinfo-5.1/fink/patches/info_universal_argument 2013-04-02 13:43:27.000000000 -0600 +@@ -0,0 +1,16 @@ ++fix some .po files that have wrong references +--- + po/ro.po | 2 +- -+ po/tr.po | 2 +- -+ 2 files changed, 2 insertions(+), 2 deletions(-) ++ 1 file changed, 1 insertion(+), 1 deletion(-) + -+Index: texinfo-4.13a.dfsg.1/po/ro.po -+=================================================================== -+--- texinfo-4.13a.dfsg.1.orig/po/ro.po 2008-09-18 20:38:32.000000000 +0200 -++++ texinfo-4.13a.dfsg.1/po/ro.po 2009-03-09 15:17:06.000000000 +0100 -+@@ -1681,7 +1681,7 @@ ++--- texinfo.orig/po/ro.po +++++ texinfo/po/ro.po ++@@ -1817,7 +1817,7 @@ + -+ #: info/session.c:5149 ++ #: info/session.c:5216 + msgid "Internally used by \\[universal-argument]" +-msgstr "Folosit intern de \\[argument-universal]" ++msgstr "Folosit intern de \\[universal-argument]" + -+ #: info/tilde.c:336 -+ #, c-format -+Index: texinfo-4.13a.dfsg.1/po/tr.po -+=================================================================== -+--- texinfo-4.13a.dfsg.1.orig/po/tr.po 2008-09-18 20:38:33.000000000 +0200 -++++ texinfo-4.13a.dfsg.1/po/tr.po 2009-03-09 15:17:06.000000000 +0100 -+@@ -1683,7 +1683,7 @@ -+ -+ #: info/session.c:5149 -+ msgid "Internally used by \\[universal-argument]" -+-msgstr "Dahili olarak \\[universal argument] taraf?ndan kullan?l?yor" -++msgstr "Dahili olarak \\[universal-argument] taraf?ndan kullan?l?yor" -+ -+ #: info/tilde.c:336 ++ #: info/tilde.c:361 + #, c-format -diff -ruN texinfo-4.13.orig/fink/patches/minor-buffer-size-fix texinfo-4.13/fink/patches/minor-buffer-size-fix ---- texinfo-4.13.orig/fink/patches/minor-buffer-size-fix 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/patches/minor-buffer-size-fix 2012-07-09 13:24:04.000000000 -0600 -@@ -0,0 +1,26 @@ -+Author: Kees Cook <k...@ubuntu.com> -+Description: extend stack buffers to be large enough for the type values -+ they are expected to hold. -+Bug: https://savannah.gnu.org/bugs/?32122 -+Bug-Ubuntu: https://launchpad.net/bugs/569802 -+ -+Index: texinfo-4.13a.dfsg.1/makeinfo/sectioning.c -+=================================================================== -+--- texinfo-4.13a.dfsg.1.orig/makeinfo/sectioning.c 2011-01-13 14:12:35.382016526 -0800 -++++ texinfo-4.13a.dfsg.1/makeinfo/sectioning.c 2011-01-13 14:14:41.285127427 -0800 -+@@ -256,13 +256,13 @@ -+ 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]; -++ char s[32]; -+ sprintf (s, "%d", numbers[0]); -+ return xstrdup (s); -+ } -diff -ruN texinfo-4.13.orig/fink/patches/replace_egrep_fgrep_sigs texinfo-4.13/fink/patches/replace_egrep_fgrep_sigs ---- texinfo-4.13.orig/fink/patches/replace_egrep_fgrep_sigs 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/patches/replace_egrep_fgrep_sigs 2012-07-09 13:25:36.000000000 -0600 -@@ -0,0 +1,103 @@ -+40_replace_egrep_fgrep_sigs.dpatch by David Weinehall <t...@debian.org> -+ -+Replace egrep by grep -E, fgrep by grep -F, and numerical signals -+by signal names -+ +diff -ruN texinfo-5.1.orig/fink/patches/numerical-signal-names texinfo-5.1/fink/patches/numerical-signal-names +--- texinfo-5.1.orig/fink/patches/numerical-signal-names 1969-12-31 17:00:00.000000000 -0700 ++++ texinfo-5.1/fink/patches/numerical-signal-names 2013-04-02 13:43:56.000000000 -0600 +@@ -0,0 +1,48 @@ ++replace numerical signal names with symbolical +--- -+ makeinfo/tests/cond | 16 ++++++++-------- -+ util/fixfonts | 2 +- -+ util/gen-dir-node | 6 +++--- -+ util/texi2dvi | 2 +- -+ 4 files changed, 13 insertions(+), 13 deletions(-) ++ contrib/fix-info-dir | 6 +++--- ++ contrib/fixfonts | 2 +- ++ util/texi2dvi | 2 +- ++ 3 files changed, 5 insertions(+), 5 deletions(-) + -+Index: texinfo-4.13a.dfsg.1/makeinfo/tests/cond -+=================================================================== -+--- texinfo-4.13a.dfsg.1.orig/makeinfo/tests/cond 2005-04-05 23:04:16.000000000 +0200 -++++ texinfo-4.13a.dfsg.1/makeinfo/tests/cond 2009-03-09 15:16:58.000000000 +0100 -+@@ -6,28 +6,28 @@ -+ -+ # Default Info output. -+ ../makeinfo -o cond.out $srcdir/cond.txi || exit 1 -+-egrep 'This is (ifnothtml|ifinfo|ifnottex) text' cond.out >/dev/null \ -++grep -E 'This is (ifnothtml|ifinfo|ifnottex) text' cond.out >/dev/null \ -+ || exit 2 -+-test `fgrep -c ' text.' cond.out` -eq 3 || exit 3 -++test `grep -F -c ' text.' cond.out` -eq 3 || exit 3 -+ -+ # Default HTML output. -+ ../makeinfo --no-split --html -o cond.out $srcdir/cond.txi || exit 1 -+-egrep 'This is (html|ifhtml|ifnotinfo|ifnottex) text' cond.out >/dev/null \ -++grep -E 'This is (html|ifhtml|ifnotinfo|ifnottex) text' cond.out >/dev/null \ -+ || exit 2 -+-test `fgrep -c ' text.' cond.out` -eq 4 || exit 3 -++test `grep -F -c ' text.' cond.out` -eq 4 || exit 3 ++--- texinfo.orig/util/texi2dvi +++++ texinfo/util/texi2dvi ++@@ -1948,7 +1948,7 @@ ++ sed "s,^$orig_pwd/,,;s,^\./,,;s,/,!,g"` ++ esac ++ # Remove it at exit if clean mode. ++- trap "cleanup" 0 1 2 15 +++ trap "cleanup" 0 HUP INT TERM + -+ # --ifhtml off, --ifinfo off, --iftex off. -+ ../makeinfo --no-ifhtml --no-ifinfo --no-iftex -o cond.out $srcdir/cond.txi || exit 1 -+-egrep 'This is ifnot(html|info|tex) text' cond.out >/dev/null \ -++grep -E 'This is ifnot(html|info|tex) text' cond.out >/dev/null \ -+ || exit 2 -+-test `fgrep -c ' text.' cond.out` -eq 3 || exit 3 -++test `grep -F -c ' text.' cond.out` -eq 3 || exit 3 ++ ensure_dir "$build_dir" "$t2ddir" + -+ # Do we really need to test all the other permutations? ++--- texinfo.orig/contrib/fix-info-dir +++++ texinfo/contrib/fix-info-dir ++@@ -255,13 +255,13 @@ + -+ # --ifhtml on, --ifinfo on, --iftex on. -+ ../makeinfo --ifhtml --ifinfo --iftex -o cond.out $srcdir/cond.txi || exit 1 -+-egrep 'This is (html|ifhtml|ifinfo|tex|iftex) text' cond.out >/dev/null \ -++grep -E 'This is (html|ifhtml|ifinfo|tex|iftex) text' cond.out >/dev/null \ -+ || exit 2 -+-test `fgrep -c ' text.' cond.out` -eq 5 || exit 3 -++test `grep -F -c ' text.' cond.out` -eq 5 || exit 3 ++ trap ' eval "$DEBUG"; rm -f $TMP_FILE_LIST; exit ' 0 ++ trap ' rm -f $TMP_FILE_LIST ++- exit ' 1 +++ exit ' HUP ++ trap ' rm -f $TMP_FILE_LIST ++ echo "$0:$LINENO: received INT signal.">&2 ++- exit ' 2 +++ exit ' INT ++ trap ' rm -f $TMP_FILE_LIST ++ echo "$0:$LINENO: received QUIT signal.">&2 ++- exit ' 3 +++ exit ' QUIT + -+ rm -f cond.out cond.info -+Index: texinfo-4.13a.dfsg.1/util/fixfonts -+=================================================================== -+--- texinfo-4.13a.dfsg.1.orig/util/fixfonts 2002-08-26 01:38:39.000000000 +0200 -++++ texinfo-4.13a.dfsg.1/util/fixfonts 2009-03-09 15:16:58.000000000 +0100 ++ sed -e "1,/$MENU_BEGIN/d" -e "$MENU_FILTER1" -e "$MENU_FILTER2"<$DIR_FILE\ ++ |sed -n -e '/\* /{ ++--- texinfo.orig/contrib/fixfonts +++++ texinfo/contrib/fixfonts +@@ -33,7 +33,7 @@ + tempfile2="${TMPDIR}/circ2$$" + @@ -360,224 +242,19 @@ + + # Find all the fonts with names that include `circle'. + (cd "${texfontdir}"; find . -name '*circle*' -print > "${tempfile}") -+Index: texinfo-4.13a.dfsg.1/util/gen-dir-node -+=================================================================== -+--- texinfo-4.13a.dfsg.1.orig/util/gen-dir-node 2004-04-11 19:56:47.000000000 +0200 -++++ texinfo-4.13a.dfsg.1/util/gen-dir-node 2009-03-09 15:16:58.000000000 +0100 -+@@ -79,7 +79,7 @@ -+ ### then generate entries for those in the same way, putting the info for -+ ### those at the end.... -+ -+-infofiles=`(cd ${INFODIR}; /bin/ls | grep -v '\-[0-9]*$' | egrep -v '^dir$|^dir\.info$|^dir\.orig$')` -++infofiles=`(cd ${INFODIR}; /bin/ls | grep -v '\-[0-9]*$' | grep -E -v '^dir$|^dir\.info$|^dir\.orig$')` -+ -+ # echoing gets clobbered by backquotes; we do it the hard way... -+ lines=`wc $SKELETON | awk '{print $1}'` -+@@ -166,8 +166,8 @@ -+ -+ # Sort remaining files by INFO-DIR-SECTION. -+ prevsect= -+-filesectdata=`(cd ${INFODIR}; fgrep INFO-DIR-SECTION /dev/null ${infofiles} | \ -+- fgrep -v 'INFO-DIR-SECTION Miscellaneous' | \ -++filesectdata=`(cd ${INFODIR}; grep -F INFO-DIR-SECTION /dev/null ${infofiles} | \ -++ grep -F -v 'INFO-DIR-SECTION Miscellaneous' | \ -+ sort -t: -k2 -k1 | tr ' ' '_')` -+ for sectdata in ${filesectdata}; do -+ file=`echo ${sectdata} | cut -d: -f1` -+Index: texinfo-4.13a.dfsg.1/util/texi2dvi -+=================================================================== -+--- texinfo-4.13a.dfsg.1.orig/util/texi2dvi 2009-03-09 15:16:49.000000000 +0100 -++++ texinfo-4.13a.dfsg.1/util/texi2dvi 2009-03-09 15:16:58.000000000 +0100 -+@@ -1760,7 +1760,7 @@ -+ sed 's,/,!,g'` -+ esac -+ # Remove it at exit if clean mode. -+- trap "cleanup" 0 1 2 15 -++ trap "cleanup" 0 HUP INT TERM -+ -+ ensure_dir "$build_dir" "$t2ddir" -+ -diff -ruN texinfo-4.13.orig/fink/patches/texi-allow-shell-escape.diff texinfo-4.13/fink/patches/texi-allow-shell-escape.diff ---- texinfo-4.13.orig/fink/patches/texi-allow-shell-escape.diff 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/patches/texi-allow-shell-escape.diff 2012-07-09 13:27:02.000000000 -0600 -@@ -0,0 +1,37 @@ -+diff -urN texinfo-4.13a.dfsg.1_svn/util/texi2dvi texinfo-4.13a.dfsg.1/util/texi2dvi -+--- texinfo-4.13a.dfsg.1_svn/util/texi2dvi 2012-02-07 13:45:49.000000000 +0100 -++++ texinfo-4.13a.dfsg.1/util/texi2dvi 2012-02-07 13:47:53.000000000 +0100 -+@@ -69,6 +69,7 @@ -+ recode=false -+ set_language= -+ src_specials= -++shell_escape= -+ textra= # Extra TeX commands to insert in the input file. -+ txiprereq=19990129 # minimum texinfo.tex version with macro expansion -+ verb=false # true for verbose mode -+@@ -331,6 +332,7 @@ -+ -p, --pdf use pdftex or pdflatex for processing -+ -r, --recode call recode before TeX to translate input -+ --recode-from=ENC recode from ENC to the @documentencoding -++ --shell-escape pass --shell-escape to TeX -+ --src-specials pass --src-specials to TeX -+ -t, --command=CMD insert CMD in copy of input file -+ or --texinfo=CMD multiple values accumulate -+@@ -936,6 +938,9 @@ -+ # source, given a sufficiently smart editor), if specifed. -+ test -n "$src_specials" && cmd="$cmd $src_specials" -+ -++ # Tell TeX to allow running external executables -++ test -n "$shell_escape" && cmd="$cmd $shell_escape" -++ -+ # Tell TeX to be batch if requested. -+ if $batch; then -+ # \batchmode does not show terminal output at all, so we don't -+@@ -1563,6 +1568,7 @@ -+ -r | --recode) recode=true;; -+ --recode-from) shift; recode=true; recode_from="$1";; -+ --src-specials) src_specials=--src-specials;; -++ --shell-escape) shell_escape=--shell-escape;; -+ -t | --texinfo | --command ) shift; textra="$textra\\ -+ "`echo "$1" | sed 's/\\\\/\\\\\\\\/g'`;; -+ --text) out_lang=text;; -diff -ruN texinfo-4.13.orig/fink/patches/texi-allow-tilde texinfo-4.13/fink/patches/texi-allow-tilde ---- texinfo-4.13.orig/fink/patches/texi-allow-tilde 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/patches/texi-allow-tilde 2012-07-09 13:27:40.000000000 -0600 -@@ -0,0 +1,74 @@ -+texi-allow-tilde patch by Karl Berry -+included upstream -+ -+ calling texi2dvi /path/with~tilde/in/the/path.texi breaks -+ -+I installed the patch below (modulo documentation, etc.) to support tildes. -+There's an undocumented -~ option to avoid all this madness in case it's -+totally broken. Hope none of these literal tildes mess anything up. -+ -+More special characters could be supported, but then we'd have to assume -+a matching texinfo.tex (then -~ could come in useful). Plus, I've -+already spent too long on this for today. -+ -+In any case, I advise using texi2dvi's tidy mode when special characters -+are a concern. It will work with a wider range of characters in the -+directory portion, at least. Besides being cleaner in general. -+ -+--- -+ util/texi2dvi | 26 +++++++++++++++++++++----- -+ 1 file changed, 21 insertions(+), 5 deletions(-) -+ -+Index: texinfo-4.13a.dfsg.1/util/texi2dvi -+=================================================================== -+--- texinfo-4.13a.dfsg.1.orig/util/texi2dvi 2009-03-18 14:40:08.000000000 +0100 -++++ texinfo-4.13a.dfsg.1/util/texi2dvi 2009-03-18 14:40:18.000000000 +0100 -+@@ -56,6 +56,7 @@ -+ # Instead, assign them an empty value. -+ action=compile -+ batch=false # true for batch mode -++catcode_special=true -+ debug=false -+ escape="\\" -+ expand= # t for expansion via makeinfo -+@@ -938,12 +939,27 @@ -+ # \batchmode does not show terminal output at all, so we don't -+ # want that. And even in batch mode, TeX insists on having input -+ # from the user. Close its stdin to make it impossible. -+- cmd="$cmd </dev/null '${escape}nonstopmode' '${escape}input'" -++ cmd="$cmd </dev/null '${escape}nonstopmode'" -+ fi -+ -+- # we'd like to handle arbitrary input file names, such as a~b.tex. -+- # This isn't a general way to do it :), though it does work, kind of. -+- # cmd="$cmd '${escape}catcode126=12 \input '" -++ # we'd like to handle arbitrary input file names, especially -++ # foo~bar/a~b.tex, since Debian likes ~ characters. -++ if $catcode_special; then -++ # $normaltilde is just to reduce line length in this source file. -++ # The idea is to define \normaltilde as a catcode other ~ character, -++ # then make the active ~ be equivalent to that, instead of the plain -++ # TeX tie. Then when the active ~ appears in the filename, it will -++ # be expanded to itself, as far as \input will see. (This is the -++ # same thing that texinfo.tex does in general, BTW.) -++ normaltilde="${escape}catcode126=12 ${escape}def${escape}normaltilde{~}" -++ cmd="$cmd '$normaltilde${escape}catcode126=13 ${escape}let~\normaltilde '" -++ fi -++ # Other special (non-active) characters could be supported by -++ # resetting their catcodes to other on the command line and changing -++ # texinfo.tex to initialize everything to plain catcodes. Maybe someday. -++ -++ # append the \input command. -++ cmd="$cmd '${escape}input'" -+ -+ # TeX's \input does not (easily or reliably) support whitespace -+ # characters or other special characters in file names. Our intensive -+@@ -958,7 +974,7 @@ -+ # harm in making the link. -+ # -+ case $tidy:`func_dirname "$in_input"` in -+- true:*["$space$tab$newline\"#\$%\\^_{}"]*) -++ true:*["$space$tab$newline\"#\$%\\^_{}~"]*) -+ _run_tex_file_name=`basename "$in_input"` -+ if test ! -f "$_run_tex_file_name"; then -+ # It might not be a file, clear it. -diff -ruN texinfo-4.13.orig/fink/patches/texi2dvi-local-fallback-syntax.diff texinfo-4.13/fink/patches/texi2dvi-local-fallback-syntax.diff ---- texinfo-4.13.orig/fink/patches/texi2dvi-local-fallback-syntax.diff 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/patches/texi2dvi-local-fallback-syntax.diff 2012-07-10 14:36:45.000000000 -0600 -@@ -0,0 +1,21 @@ -+ ChangeLog | 7 +++++++ -+ util/texi2dvi | 4 +++- -+ 2 files changed, 10 insertions(+), 1 deletions(-) -+ -+--- texinfo-4.12.dfsg.1.orig/util/texi2dvi -++++ texinfo-4.12.dfsg.1/util/texi2dvi -+@@ -141,11 +141,13 @@ test -n "$TEX" && test -d "$TEX" && unset TEX -+ } -+ test_local -+ test $foo = bar -+-) || local () { -++) || eval ' -++local () { -+ case $1 in -+ *=*) eval "$1";; -+ esac -+ } -++' -+ -+ -+ # cd_orig -diff -ruN texinfo-4.13.orig/fink/patches/texi2dvi_non-C_locale texinfo-4.13/fink/patches/texi2dvi_non-C_locale ---- texinfo-4.13.orig/fink/patches/texi2dvi_non-C_locale 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/patches/texi2dvi_non-C_locale 2012-07-10 14:34:39.000000000 -0600 -@@ -0,0 +1,18 @@ -+"grep [A-z]" is not allowed in non-C locale. -+--- -+ util/texi2dvi | 2 +- -+ 1 file changed, 1 insertion(+), 1 deletion(-) -+ -+Index: texinfo-4.12.dfsg.1/util/texi2dvi -+=================================================================== -+--- texinfo-4.13a.dfsg.1.orig/util/texi2dvi.orig 2010-11-04 15:28:50.000000000 +0100 -++++ texinfo-4.13a.dfsg.1/util/texi2dvi 2010-11-04 15:35:14.000000000 +0100 -+@@ -1712,7 +1712,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 -ruN texinfo-4.13.orig/fink/patches/warn_missing_tex texinfo-4.13/fink/patches/warn_missing_tex ---- texinfo-4.13.orig/fink/patches/warn_missing_tex 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/patches/warn_missing_tex 2012-07-09 13:29:16.000000000 -0600 +diff -ruN texinfo-5.1.orig/fink/patches/warn_missing_tex texinfo-5.1/fink/patches/warn_missing_tex +--- texinfo-5.1.orig/fink/patches/warn_missing_tex 1969-12-31 17:00:00.000000000 -0700 ++++ texinfo-5.1/fink/patches/warn_missing_tex 2013-04-02 13:43:50.000000000 -0600 @@ -0,0 +1,28 @@ +20_warn_missing_tex.dpatch by <prein...@logic.at> + +--- -+ util/texi2dvi | 11 +++++++++++ -+ 1 file changed, 11 insertions(+) ++ util/texi2dvi | 13 +++++++++++++ ++ 1 file changed, 13 insertions(+) + -+Index: texinfo-4.13a.dfsg.1/util/texi2dvi -+=================================================================== -+--- texinfo-4.13a.dfsg.1.orig/util/texi2dvi 2008-09-18 20:46:01.000000000 +0200 -++++ texinfo-4.13a.dfsg.1/util/texi2dvi 2009-03-09 15:16:49.000000000 +0100 -+@@ -32,6 +32,17 @@ ++--- texinfo.orig/util/texi2dvi +++++ texinfo/util/texi2dvi ++@@ -33,6 +33,19 @@ + # No failure shall remain unpunished. + set -e + @@ -587,17 +264,19 @@ ++can't proceed without it. If you want to use this script, you have to ++install some kind of TeX, for example TeX Live Debian packages. You can do ++that with this command: -++ fink install texlive +++ apt-get install texlive ++%EOM% ++ exit 1 ++fi ++ -+ # This string is expanded by rcs automatically when this file is checked out. +++ +++ ++ # This string is expanded automatically when this file is checked out. + rcs_revision='$Revision$' + rcs_version=`set - $rcs_revision; echo $2` -diff -ruN texinfo-4.13.orig/fink/texi2pdf.man texinfo-4.13/fink/texi2pdf.man ---- texinfo-4.13.orig/fink/texi2pdf.man 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/texi2pdf.man 2012-07-09 13:15:44.000000000 -0600 +diff -ruN texinfo-5.1.orig/fink/texi2pdf.man texinfo-5.1/fink/texi2pdf.man +--- texinfo-5.1.orig/fink/texi2pdf.man 1969-12-31 17:00:00.000000000 -0700 ++++ texinfo-5.1/fink/texi2pdf.man 2012-07-09 13:15:44.000000000 -0600 @@ -0,0 +1,49 @@ +.TH "texi2pdf" "1" "September 2000" "teTeX" "teTeX" +.PP @@ -648,9 +327,9 @@ +without contacting the author\&. Any mistakes or omissions in the +manual page are my fault; inquiries about or corrections to this +manual page should be directed to me (and not to the primary author)\&. -diff -ruN texinfo-4.13.orig/fink/transition-plan.txt texinfo-4.13/fink/transition-plan.txt ---- texinfo-4.13.orig/fink/transition-plan.txt 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/transition-plan.txt 2012-07-09 13:32:54.000000000 -0600 +diff -ruN texinfo-5.1.orig/fink/transition-plan.txt texinfo-5.1/fink/transition-plan.txt +--- texinfo-5.1.orig/fink/transition-plan.txt 1969-12-31 17:00:00.000000000 -0700 ++++ texinfo-5.1/fink/transition-plan.txt 2012-07-09 13:32:54.000000000 -0600 @@ -0,0 +1,120 @@ +Proposal to replace Debian's install-info with GNU's install-info +================================================================= @@ -772,10 +451,10 @@ + previous step). + + -diff -ruN texinfo-4.13.orig/fink/update-info-dir texinfo-4.13/fink/update-info-dir ---- texinfo-4.13.orig/fink/update-info-dir 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/update-info-dir 2012-07-09 13:19:32.000000000 -0600 -@@ -0,0 +1,81 @@ +diff -ruN texinfo-5.1.orig/fink/update-info-dir texinfo-5.1/fink/update-info-dir +--- texinfo-5.1.orig/fink/update-info-dir 1969-12-31 17:00:00.000000000 -0700 ++++ texinfo-5.1/fink/update-info-dir 2013-04-02 14:04:40.000000000 -0600 +@@ -0,0 +1,82 @@ +#!/bin/bash +# update-info-dir +# create a dir file from all installed info files @@ -792,6 +471,7 @@ +# the dir file. Unset LANGUAGE and reload /etc/environment to get +# the system wide settings. See bug #536476 +unset LANGUAGE ++unset LANG +if [ -r @FINKPREFIX@/etc/environment ] ; then + . @FINKPREFIX@/etc/environment +fi @@ -857,9 +537,9 @@ +exit 0 + +# vim:set expandtab tabstop=2: # -diff -ruN texinfo-4.13.orig/fink/update-info-dir.8 texinfo-4.13/fink/update-info-dir.8 ---- texinfo-4.13.orig/fink/update-info-dir.8 1969-12-31 17:00:00.000000000 -0700 -+++ texinfo-4.13/fink/update-info-dir.8 2012-07-09 13:20:07.000000000 -0600 +diff -ruN texinfo-5.1.orig/fink/update-info-dir.8 texinfo-5.1/fink/update-info-dir.8 +--- texinfo-5.1.orig/fink/update-info-dir.8 1969-12-31 17:00:00.000000000 -0700 ++++ texinfo-5.1/fink/update-info-dir.8 2012-07-09 13:20:07.000000000 -0600 @@ -0,0 +1,34 @@ +.TH UPDATE-INFO-DIR 8 +.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection ------------------------------------------------------------------------------ Minimize network downtime and maximize team effectiveness. Reduce network management and security costs.Learn how to hire the most talented Cisco Certified professionals. Visit the Employer Resources Portal http://www.cisco.com/web/learning/employer_resources/index.html _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs