From: Frank Jensen <[email-masked]>
Date: Tue, 5 Apr 1994 21:28:31 +0200

Please direct questions about this patch to the [email-masked] mailing
list or to Frank directly. (In other words, not to [email-masked].) Thanks.

Here are the instructions for upgrading web2c-6.1 to work with
kpathsea-1.8.

1. Unpack `web2c-6.1.tar.gz' and `web-6.1.tar.gz', remove the
   directory `web2c-6.1/kpathsea' and replace it with the `kpathsea'
   directory from, e.g., `xdvik-1.8.tar.gz'.  Be sure to preserve your
   `paths.h.in' file if you modified it.

2. Patch the file `web2c-6.1/web2c/lib/ourpaths.c'.  The patch is
   appended below.

3. To prevent invocation of `autoconf' during the installation, say
   `touch web2c-6.1/web2c/configure'.

4. Follow the normal procedure for installation of web2c-6.1.

*** web2c-6.1/web2c/lib/ourpaths.c	Tue Apr  5 21:07:07 1994
--- ourpaths.c	Tue Apr  5 21:07:14 1994
***************
*** 2,8 ****
  
  #include "config.h"
  
! #include <kpathsea/filefmt.h>
  #include <kpathsea/fontmap.h>
  #include <kpathsea/pathsearch.h>
  
--- 2,8 ----
  
  #include "config.h"
  
! #include <kpathsea/tex-file.h>
  #include <kpathsea/fontmap.h>
  #include <kpathsea/pathsearch.h>
  
***************
*** 78,84 ****
    /* Look for it.  Don't use the kpse_find_glyph stuff, since we don't
       have the dpi available separately, and anyway we don't care about
       having pktogf run MakeTeXPK, etc.  */
!   found = kpse_path_search (path, name);
  
    /* If we didn't find it, and we're looking for a font, maybe it's
       an alias defined in a mapping file.  This duplicates most of
--- 78,84 ----
    /* Look for it.  Don't use the kpse_find_glyph stuff, since we don't
       have the dpi available separately, and anyway we don't care about
       having pktogf run MakeTeXPK, etc.  */
!   found = kpse_path_search (path, name, true);
  
    /* If we didn't find it, and we're looking for a font, maybe it's
       an alias defined in a mapping file.  This duplicates most of
***************
*** 88,97 ****
                   || path_index == PKFILEPATH))
      {
        string *mapped_names;
!       static map_type fontmap = NULL;
        
        /* Fault in the mapping if necessary.  */
!       if (!fontmap)
          fontmap = map_create (path);
        
        /* Now look for our filename in the mapping.  */
--- 88,97 ----
                   || path_index == PKFILEPATH))
      {
        string *mapped_names;
!       static hash_table_type fontmap = { NULL, 0 };
        
        /* Fault in the mapping if necessary.  */
!       if (fontmap.size == 0)
          fontmap = map_create (path);
        
        /* Now look for our filename in the mapping.  */
***************
*** 101,107 ****
            string mapped_name;
            while ((mapped_name = *mapped_names++) && !found)
              {
!               found = kpse_path_search (path, mapped_name);
              }
          }
      }
--- 101,107 ----
            string mapped_name;
            while ((mapped_name = *mapped_names++) && !found)
              {
!               found = kpse_path_search (path, mapped_name, true);
              }
          }
      }