--- .pkgextract
+++ .pkgextract	Fri Apr 16 16:07:40 2004
@@ -0,0 +1,3 @@
+patch -p0 -b --suffix=.zlib < ../texinfo-4.7-zlib.patch
+patch -p0 -b --suffix=.tmpf < ../texinfo-4.8-tempfile.patch
+patch -p0 -b --suffix=.echo < ../texinfo-4.8-echo.patch
--- info/filesys.h
+++ info/filesys.h	Fri Apr 16 16:07:40 2004
@@ -78,7 +78,7 @@
 
 /* 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/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)
--- po/nl.po
+++ po/nl.po	Fri Apr 16 16:07:41 2004
@@ -305,7 +305,7 @@
 "  info --show-options emacs  start at node with emacs' command line options\n"
 "  info -f ./foo.info         show file ./foo.info, not searching dir\n"
 msgstr ""
-"Aanroep: %s [OPTIE]... [INFO-BESTAND [MENU-ITEM...]]]\n"
+"Aanroep: %s [OPTIE]... [INFO-BESTAND [MENU-ITEM...]]\n"
 "\n"
 "Lees documentatie in Info-formaat\n"
 "Voor een meer complete omschrijving van het gebruik van Info, type `info "
--- util/texi2dvi
+++ util/texi2dvi	Fri Apr 16 16:23:08 2004
@@ -116,14 +116,7 @@
 # return true if program $1 is somewhere in PATH, else false.
 # 
 findprog () {
-  foundprog=false
-  for dir in `echo $PATH | tr "$path_sep" " "`; do
-    if test -x "$dir/$1"; then  # does anyone still need test -f?
-      foundprog=true
-      break
-    fi
-  done
-  $foundprog
+  type -p $1 > /dev/null 2>&1
 }
 
 # Report an error and exit with failure.
@@ -262,7 +255,7 @@
 
 # Prepare the temporary directory.  Remove it at exit, unless debugging.
 if test -z "$debug"; then
-  trap "cd / && rm -rf $tmpdir" 0 1 2 15
+  trap "cd / && rm -rf $tmpdir" 0 1 2 3 7 13 15
 fi
 
 # Create the temporary directory with strict rights
@@ -489,6 +482,12 @@
       # Assume a LaTeX file.  LaTeX needs bibtex and uses latex for
       # compilation.  No makeinfo.
       bibtex=${BIBTEX:-bibtex}
+
+      if ! type -p $bibtex > /dev/null 2>&1 ; then
+	echo "${0##*/}: requires $bibtex, please install tetex and te_latex" 1>&2
+	exit 1
+      fi
+
       makeinfo= # no point in running makeinfo on latex source.
       texindex=${MAKEINDEX:-makeindex}
       textra_cmd=1i
@@ -497,6 +496,22 @@
       else
         tex=${PDFLATEX:-pdflatex}
       fi
+
+      case "$tex" in
+	pdflatex)
+	  if ! type -p pdflatex > /dev/null 2>&1 ; then
+	    echo "${0##*/}: requires $tex, please install tetex, te_latex, and te_pdf" 1>&2
+	    exit 1
+	  fi
+	  ;;
+	*latex)
+	  if ! type -p $tex > /dev/null 2>&1 ; then
+	    echo "${0##*/}: requires $tex, please install tetex and te_latex" 1>&2
+	    exit 1
+	  fi
+	  ;;
+      esac
+
       thumbpdf=${THUMBPDF:-thumbpdf}
       ;;
 
@@ -510,6 +525,22 @@
       else
         tex=$PDFTEX
       fi
+
+      case "$tex" in
+	pdftex)
+	  if ! type -p pdflatex > /dev/null 2>&1 ; then
+	    echo "${0##*/}: requires $tex, please install tetex, te_latex, and te_pdf" 1>&2
+	    exit 1
+	  fi
+	  ;;
+	*tex)
+	  if ! type -p $tex > /dev/null 2>&1 ; then
+	    echo "${0##*/}: requires $tex, please install tetex and te_latex" 1>&2
+	    exit 1
+	  fi
+	  ;;
+      esac
+
       # Unless required by the user, makeinfo expansion is wanted only
       # if texinfo.tex is too old.
       if test "$expand" = t; then