Date: Sun, 1 Aug 93 19:42:05 -0400
From: sarto!jhpb@uunet.uu.net
Content-Type: text
Content-Length: 4413
Apparently-To: <Think.COM!Brewster>

Harry Morris,
Brewster Kahle,
Jonny Goldman,

Here are some bug fixes to wais-8-b5.1 to get it running under SVR4 on
a 386 platform.  Compile with the BSD compiler:

        PATH=/usr/ucb:$PATH make

There were only a few problems, mostly due to bugs in the code that
the compiler refused to accept.  I have not attempted to make these
pretty; you should be able to figure out what I did easily enough.  I
had to add arguments in a couple places; I took a guess at what needed
to be added, no more.

Some of the problems were due to confusion over the meaning of the BSD
#define.  Although SVR4 has a BSDish and a SYSVish compiler
environment, the BSDish environment is not exactly the same as a real
BSD system.

One thing that should be changed is the behavior of makex.sh: it tries
to rerun xmkmf every time.  My xmkmf does not generate proper
Makefiles for the BSD compiler, so I had to comment out the call to
xmkmf.

Joe Buehler

*** ./x/makex.sh.~1~    Wed Jul 29 18:30:18 1992
--- ./x/makex.sh        Sat Jul 31 20:36:53 1993
***************
*** 20,26 ****
  
  if ($?my_dir) then
   echo "Making xwais..."
!  xmkmf
   echo $MAKE CC=$CC "EXTRA_INCLUDES=$EXTRA_INCLUDES" TOP=$TOP
   $MAKE CC=$CC "EXTRA_INCLUDES=$EXTRA_INCLUDES" TOP=$TOP
  else
--- 20,26 ----
  
  if ($?my_dir) then
   echo "Making xwais..."
!  # xmkmf
   echo $MAKE CC=$CC "EXTRA_INCLUDES=$EXTRA_INCLUDES" TOP=$TOP
   $MAKE CC=$CC "EXTRA_INCLUDES=$EXTRA_INCLUDES" TOP=$TOP
  else
*** ./x/filereq.c.~1~   Thu Jul 16 20:18:51 1992
--- ./x/filereq.c       Sat Jul 31 20:52:01 1993
***************
*** 92,98 ****
    else {
      if(last_file == pos) {
        last_file = NO_ITEM_SELECTED;
!       DoSave();
      }
      else {
        last_file = pos;
--- 92,98 ----
    else {
      if(last_file == pos) {
        last_file = NO_ITEM_SELECTED;
!       DoSave(w, closure, call_data); /* jhpb hack */
      }
      else {
        last_file = pos;
*** ./x/qcommands.c.~1~ Fri Jul 17 17:11:21 1992
--- ./x/qcommands.c     Sat Jul 31 20:49:46 1993
***************
*** 1011,1017 ****
  
    messwidget = t->status;
    PrintStatus(STATUS_CONT, STATUS_MEDIUM, "\nSearching for next
keyword...");
!   PrintStatusW(msg, t->status);
  
    cpos = XawTextGetInsertionPoint(tw);
    minpos = findKeyword(t->text+cpos, NULL);
--- 1011,1017 ----
  
    messwidget = t->status;
    PrintStatus(STATUS_CONT, STATUS_MEDIUM, "\nSearching for next
keyword...");
!   PrintStatusW(msg, t->status, 0); /* jhpb hack: is it right? */
  
    cpos = XawTextGetInsertionPoint(tw);
    minpos = findKeyword(t->text+cpos, NULL);
*** ./doc/manl/waisindex.l.~1~  Sun May 10 18:04:14 1992
--- ./doc/manl/waisindex.l      Sat Jul 31 20:59:47 1993
***************
*** 33,39 ****
  .B \-r
  Recursively index subdirectories.
  .TP 10
! .B\-mem
  How much main memory to use during indexing.  This variable will have a
  large effect on how fast indexing is done.
  .TP 10
--- 33,39 ----
  .B \-r
  Recursively index subdirectories.
  .TP 10
! .B \-mem
  How much main memory to use during indexing.  This variable will have a
  large effect on how fast indexing is done.
  .TP 10
*** ./doc/manl/waisserver.l.~1~ Tue Apr 28 19:51:56 1992
--- ./doc/manl/waisserver.l     Sat Jul 31 21:00:02 1993
***************
*** 40,46 ****
  .TP 10
  \fB\-s
  listen to standard I/O for queries.
! .TP10
  \fB\-d\fI directory
  Use this directory as the default location of the indexes.  Therefore if
  the directory were /usr/local, then the database foo would be found in
--- 40,46 ----
  .TP 10
  \fB\-s
  listen to standard I/O for queries.
! .TP 10
  \fB\-d\fI directory
  Use this directory as the default location of the indexes.  Therefore if
  the directory were /usr/local, then the database foo would be found in
*** ./ir/cutil.c.~1~    Thu Apr 30 12:03:35 1992
--- ./ir/cutil.c        Sat Jul 31 20:29:48 1993
***************
*** 690,697 ****
--- 690,699 ----
  #endif
  }
  
+ #if 0
  #ifdef BSD
  #define NEED_VPRINTF
+ #endif
  #endif
  
  #ifdef NEED_VPRINTF
*** ./lib/pdftw.h.~1~   Sat Mar  7 22:36:29 1992
--- ./lib/pdftw.h       Sat Jul 31 20:28:42 1993
***************
*** 36,41 ****
--- 36,44 ----
  #define dirent direct
  #endif /* def NeXT */
  
+ #include <dirent.h>
+ #define USE_DIRENT
+ #if 0
  #if defined(BSD) 
  #ifndef NeXT
  #define USE_SYS_NDIR  
***************
*** 42,47 ****
--- 45,51 ----
  #include <sys/ndir.h>
  #define dirent direct
  #endif /* ndef NeXT */
+ #endif
  #endif
  
  #if  defined(ultrix)