File texinfo-4.12.dif of Package texinfo

Overview Repositories Revisions Requests Users Attributes Meta

File texinfo-4.12.dif of Package texinfo (Revision 33f5085f9c3ca6bb58a9c74af110efc0)

Currently displaying revision 33f5085f9c3ca6bb58a9c74af110efc0 , Show latest

Index: .pkgextract
===================================================================
--- /dev/null
+++ .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
Index: install-info/install-info.c
===================================================================
--- install-info/install-info.c.orig
+++ install-info/install-info.c
@@ -2381,7 +2381,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)
     {
       char *opened_infilename;
 
Index: util/texi2dvi
===================================================================
--- util/texi2dvi.orig
+++ util/texi2dvi
@@ -371,25 +371,7 @@ error ()
 # findprog PROG - Return true if PROG is somewhere in PATH, else false.
 findprog ()
 {
-  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, but 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... - Echo each argument to stderr.
@@ -878,6 +860,11 @@ run_tex ()
     *) error 1 "$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
+
   # do the special catcode trick for ~ in filenames only for Texinfo,
   # not LaTeX.
   if test x"$in_lang" = xtexinfo && test $catcode_special = maybe; then
@@ -1014,6 +1001,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
@@ -1802,7 +1794,7 @@ do
              $SED "s,^$orig_pwd/,,;s,^\./,,;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"

Places

File texinfo-4.12.dif of Package texinfo (Revision 33f5085f9c3ca6bb58a9c74af110efc0)

Places