diff -rc ../work.orig/Makefile ./Makefile
*** ../work.orig/Makefile	Wed Jul 19 22:09:45 1995
--- ./Makefile	Fri Jul 21 22:05:47 1995
***************
*** 37,63 ****
   		wolcomp \
   		until/V1.2 \
   		view
!  
  makeonly:
  	for i in $(PACKAGES) ;\
!  		do (cd $$i ; echo "Making in $$i..."; make $(MFLAGS)); done
   
  World: clean install
   
  clean:
  	for i in $(PACKAGES) ;\
   	    do (cd $$i ; echo "Making clean in $$i..."; \
!  		make  clean); done
   
  install:
  	for i in $(PACKAGES) ;\
  	    do (cd $$i ; echo "Making install in $$i..."; \
! 		make install); done
  
  create:
  	for i in $(PACKAGES) ;\
  	    do (cd $$i ; echo "Making create in $$i..."; \
! 		make create); done
   
   
   
--- 37,65 ----
   		wolcomp \
   		until/V1.2 \
   		view
! 
! all:	makeonly
! 
  makeonly:
  	for i in $(PACKAGES) ;\
!  		do (cd $$i ; echo "Making in $$i..."; gmake $(MFLAGS)); done
   
  World: clean install
   
  clean:
  	for i in $(PACKAGES) ;\
   	    do (cd $$i ; echo "Making clean in $$i..."; \
!  		gmake  clean); done
   
  install:
  	for i in $(PACKAGES) ;\
  	    do (cd $$i ; echo "Making install in $$i..."; \
! 		gmake install); done
  
  create:
  	for i in $(PACKAGES) ;\
  	    do (cd $$i ; echo "Making create in $$i..."; \
! 		gmake create); done
   
   
   
diff -rc ../work.orig/log/src/Makefile ./log/src/Makefile
*** ../work.orig/log/src/Makefile	Wed Jul 19 22:08:51 1995
--- ./log/src/Makefile	Fri Jul 21 23:20:05 1995
***************
*** 38,50 ****
  
  CD = cd
  
! LOGLIBDIR = `$(CD) ../../log/lib; pwd`
! LIBDIR = `$(CD) ../../lib; pwd`
  
  LOCINC = ../../psys/include
! XINCLUDEDIR = .
  
! BINDIR = ../../bin
  LIBP2C = ../../psys/src/libp2c.a
  LIBX11 = -lX11
  
--- 38,51 ----
  
  CD = cd
  
! LOGLIBDIR = /usr/local/lib/chipmunk
! LIBDIR = /usr/local/lib/chipmunk
  
  LOCINC = ../../psys/include
! XINCLUDEDIR = /usr/X11R6/include
! XLIBDIR = /usr/X11R6/lib
  
! BINDIR = /usr/local/bin
  LIBP2C = ../../psys/src/libp2c.a
  LIBX11 = -lX11
  
***************
*** 54,60 ****
  ##
  ## on some systems, -ldl must be added to the following line
  
! OTHERLIBS= -lm
  
  
  ##
--- 55,61 ----
  ##
  ## on some systems, -ldl must be added to the following line
  
! OTHERLIBS= -lm -lcompat
  
  
  ##
***************
*** 113,119 ****
  ##
  
  
! CFLAGS =  -I$(LOCINC) -I$(XINCLUDEDIR) -DLOGLIB=\"$(LOGLIBDIR)\" -DF_OK=0
  
  DIGOBJ = logsim.o logdig.o logsimasm.o logsimed.o diggates.o \
           loghier.o logsimh.o swap.o
--- 114,120 ----
  ##
  
  
! CFLAGS = -DBSD -O -m486 -I$(LOCINC) -I$(XINCLUDEDIR) -DLOGLIB=\"$(LOGLIBDIR)\" -DF_OK=0 -L$(XLIBDIR)
  
  DIGOBJ = logsim.o logdig.o logsimasm.o logsimed.o diggates.o \
           loghier.o logsimh.o swap.o
***************
*** 129,135 ****
  SIMOBJ = logcom.o $(DIGOBJ) $(ANAOBJ)
  TOOLOBJ = $(SIMOBJ) lplot.o logspc.o logntk.o
  
! main: log
  
  ##
  ## (5) Saving space during linking
--- 130,136 ----
  SIMOBJ = logcom.o $(DIGOBJ) $(ANAOBJ)
  TOOLOBJ = $(SIMOBJ) lplot.o logspc.o logntk.o
  
! all:  log  loged
  
  ##
  ## (5) Saving space during linking
***************
*** 145,164 ****
  ##
  
  install: makeana all
! 	cp log $(BINDIR)/diglog
  	-rm $(BINDIR)/analog
  	-ln $(BINDIR)/diglog $(BINDIR)/analog
! 	cp loged $(BINDIR)/loged
! 	cp fixfet7 $(BINDIR)/fixfet7
  
  clean:
  	-rm -f *.o ana/*.o log loged
  
- all:  log  loged
- 
  
  makeana:
! 	($(CD) ana; make $(MFLAGS) grab all)
  
  
  
--- 146,167 ----
  ##
  
  install: makeana all
! 	install -c -g bin -o bin -m 755 log $(BINDIR)/diglog
  	-rm $(BINDIR)/analog
  	-ln $(BINDIR)/diglog $(BINDIR)/analog
! 	install -c -g bin -o bin -m 755 loged $(BINDIR)/loged
! 	install -c -g bin -o bin -m 755 fixfet7 $(BINDIR)/fixfet7
! 	cp -R ../lib/* $(LOGLIBDIR)
! 
! all:  log  loged
! 
  
  clean:
  	-rm -f *.o ana/*.o log loged
  
  
  makeana:
! 	($(CD) ana; gmake $(MFLAGS) grab all)
  
  
  
diff -rc ../work.orig/log/src/ana/Makefile ./log/src/ana/Makefile
*** ../work.orig/log/src/ana/Makefile	Wed Jul 19 22:08:49 1995
--- ./log/src/ana/Makefile	Fri Jul 21 22:05:47 1995
***************
*** 25,31 ****
  
  
  LOCINC = ../../../psys/include
! XINCLUDEDIR = .
  
  ##
  ##  (1) Choosing your compiler
--- 25,31 ----
  
  
  LOCINC = ../../../psys/include
! XINCLUDEDIR = /usr/X11R6/include
  
  ##
  ##  (1) Choosing your compiler
***************
*** 85,91 ****
  
  
  
! CFLAGS =   -I$(LOCINC) -I$(XINCLUDEDIR)
  
  ANAOBJ = globals.o nsolver.o main.o inter.o $(GATESOBJ)
  GATESOBJ = numbers.o mmeter.o iscope.o \
--- 85,91 ----
  
  
  
! CFLAGS =   -I$(LOCINC) -I$(XINCLUDEDIR) -O -m486
  
  ANAOBJ = globals.o nsolver.o main.o inter.o $(GATESOBJ)
  GATESOBJ = numbers.o mmeter.o iscope.o \
diff -rc ../work.orig/log/src/log.c ./log/src/log.c
*** ../work.orig/log/src/log.c	Wed Jul 19 22:08:52 1995
--- ./log/src/log.c	Fri Jul 21 22:05:49 1995
***************
*** 1649,1655 ****
  Static Void refreditmode PV();
  
  
! Static Void setmode(s)
  Char *s;
  {
    long h;
--- 1649,1655 ----
  Static Void refreditmode PV();
  
  
! Static Void Setmode(s)
  Char *s;
  {
    long h;
***************
*** 4813,4821 ****
    drawstr2(across + menux4, line1, "Misc");
    refreditmode();
    if (modeflag)
!     setmode(modename);
    else
!     setmode("");
    FORLIM = kindgroupsize;
    for (i = 1; i <= FORLIM; i++)
      kdrawgatec(i, gg.color.kindgate);
--- 4813,4821 ----
    drawstr2(across + menux4, line1, "Misc");
    refreditmode();
    if (modeflag)
!     Setmode(modename);
    else
!     Setmode("");
    FORLIM = kindgroupsize;
    for (i = 1; i <= FORLIM; i++)
      kdrawgatec(i, gg.color.kindgate);
***************
*** 5191,5197 ****
      gg.fastspeed = gg.fastmin;
    if (gg.showpage > 0 && !modeflag &&
        (timers_sysclock() / 6000 != modetime || gg.probekind != modeprobekind))
!     setmode("");
    if (gg.showpage > 0 || bottomcount > 0)
      clipon();
    else if (gg.showpage == log_page_history) {
--- 5191,5197 ----
      gg.fastspeed = gg.fastmin;
    if (gg.showpage > 0 && !modeflag &&
        (timers_sysclock() / 6000 != modetime || gg.probekind != modeprobekind))
!     Setmode("");
    if (gg.showpage > 0 || bottomcount > 0)
      clipon();
    else if (gg.showpage == log_page_history) {
***************
*** 9724,9730 ****
    short x1, y1, x2, y2;
    boolean flag;
  
!   setmode("DEL");
    clearfunc();
    cursortype = delete__;
    waitnear();
--- 9724,9730 ----
    short x1, y1, x2, y2;
    boolean flag;
  
!   Setmode("DEL");
    clearfunc();
    cursortype = delete__;
    waitnear();
***************
*** 9952,9965 ****
  
  Static Void yardstickcommand()
  {
!   setmode("YARD");
    clearfunc();
    cursortype = copy_;
    getfirstpoint();
    waitnear();
    yardstick();
    cursortype = normal;
!   setmode("");
  }
  
  
--- 9952,9965 ----
  
  Static Void yardstickcommand()
  {
!   Setmode("YARD");
    clearfunc();
    cursortype = copy_;
    getfirstpoint();
    waitnear();
    yardstick();
    cursortype = normal;
!   Setmode("");
  }
  
  
***************
*** 10393,10399 ****
    clearfunc();
    if (!copybuf.valid)
      return;
!   setmode("PASTE");
    smallbuf = (bufissmall(&copybuf) && !bufempty(&copybuf));
    if (smallbuf)
      cursortype = normal;
--- 10393,10399 ----
    clearfunc();
    if (!copybuf.valid)
      return;
!   Setmode("PASTE");
    smallbuf = (bufissmall(&copybuf) && !bufempty(&copybuf));
    if (smallbuf)
      cursortype = normal;
***************
*** 10484,10490 ****
      gg.refrflag = true;
    } while (movemode != 1);
    cursortype = normal;
!   setmode("");
  }
  
  
--- 10484,10490 ----
      gg.refrflag = true;
    } while (movemode != 1);
    cursortype = normal;
!   Setmode("");
  }
  
  
***************
*** 10519,10525 ****
    short x1, y1, x2, y2;
    boolean flag;
  
!   setmode("COPY");
    clearfunc();
    cursortype = copy_;
    waitnear();
--- 10519,10525 ----
    short x1, y1, x2, y2;
    boolean flag;
  
!   Setmode("COPY");
    clearfunc();
    cursortype = copy_;
    waitnear();
***************
*** 10549,10555 ****
    short x1, y1, x2, y2;
    boolean flag;
  
!   setmode("MOVE");
    clearfunc();
    cursortype = copy_;
    if (waitflag)
--- 10549,10555 ----
    short x1, y1, x2, y2;
    boolean flag;
  
!   Setmode("MOVE");
    clearfunc();
    cursortype = copy_;
    if (waitflag)
***************
*** 10576,10582 ****
    baseptrs buf;
    long max;
  
!   setmode("MOVE");
    clearfunc();
    cursortype = copy_;
    waitnear();
--- 10576,10582 ----
    baseptrs buf;
    long max;
  
!   Setmode("MOVE");
    clearfunc();
    cursortype = copy_;
    waitnear();
***************
*** 10680,10686 ****
      refreshsoon();
    }
    gg.startpoint = false;
!   setmode("");
    if (gg.t.dn && !gg.incircuit) {
      gg.t.dn = false;
      gg.t.depressed = false;
--- 10680,10686 ----
      refreshsoon();
    }
    gg.startpoint = false;
!   Setmode("");
    if (gg.t.dn && !gg.incircuit) {
      gg.t.dn = false;
      gg.t.depressed = false;
***************
*** 11216,11222 ****
    short x1, y1;
    boolean flag;
  
!   setmode("OPNH");
    clearfunc();
    cursortype = copy_;
    waitnear();
--- 11216,11222 ----
    short x1, y1;
    boolean flag;
  
!   Setmode("OPNH");
    clearfunc();
    cursortype = copy_;
    waitnear();
***************
*** 11319,11325 ****
      }
    } while (gg.incircuit && gg.stillnear && *gg.func == '\0');
    gg.startpoint = false;
!   setmode("");
    if (gg.t.dn && !gg.incircuit) {
      gg.t.dn = false;
      gg.t.depressed = false;
--- 11319,11325 ----
      }
    } while (gg.incircuit && gg.stillnear && *gg.func == '\0');
    gg.startpoint = false;
!   Setmode("");
    if (gg.t.dn && !gg.incircuit) {
      gg.t.dn = false;
      gg.t.depressed = false;
***************
*** 11364,11370 ****
    short x1, y1;
    boolean flag;
  
!   setmode("OPNV");
    clearfunc();
    cursortype = copy_;
    waitnear();
--- 11364,11370 ----
    short x1, y1;
    boolean flag;
  
!   Setmode("OPNV");
    clearfunc();
    cursortype = copy_;
    waitnear();
***************
*** 11466,11472 ****
      }
    } while (gg.incircuit && gg.stillnear && *gg.func == '\0');
    gg.startpoint = false;
!   setmode("");
    if (gg.t.dn && !gg.incircuit) {
      gg.t.dn = false;
      gg.t.depressed = false;
--- 11466,11472 ----
      }
    } while (gg.incircuit && gg.stillnear && *gg.func == '\0');
    gg.startpoint = false;
!   Setmode("");
    if (gg.t.dn && !gg.incircuit) {
      gg.t.dn = false;
      gg.t.depressed = false;
***************
*** 11511,11517 ****
    short x1, y1;
    boolean flag;
  
!   setmode("CLSH");
    clearfunc();
    cursortype = copy_;
    waitnear();
--- 11511,11517 ----
    short x1, y1;
    boolean flag;
  
!   Setmode("CLSH");
    clearfunc();
    cursortype = copy_;
    waitnear();
***************
*** 11661,11667 ****
      }
    } while (gg.incircuit && gg.stillnear && *gg.func == '\0');
    gg.startpoint = false;
!   setmode("");
    if (gg.t.dn && !gg.incircuit) {
      gg.t.dn = false;
      gg.t.depressed = false;
--- 11661,11667 ----
      }
    } while (gg.incircuit && gg.stillnear && *gg.func == '\0');
    gg.startpoint = false;
!   Setmode("");
    if (gg.t.dn && !gg.incircuit) {
      gg.t.dn = false;
      gg.t.depressed = false;
***************
*** 11706,11712 ****
    short x1, y1;
    boolean flag;
  
!   setmode("CLSV");
    clearfunc();
    cursortype = copy_;
    waitnear();
--- 11706,11712 ----
    short x1, y1;
    boolean flag;
  
!   Setmode("CLSV");
    clearfunc();
    cursortype = copy_;
    waitnear();
***************
*** 11857,11863 ****
      }
    } while (gg.incircuit && gg.stillnear && *gg.func == '\0');
    gg.startpoint = false;
!   setmode("");
    if (gg.t.dn && !gg.incircuit) {
      gg.t.dn = false;
      gg.t.depressed = false;
--- 11857,11863 ----
      }
    } while (gg.incircuit && gg.stillnear && *gg.func == '\0');
    gg.startpoint = false;
!   Setmode("");
    if (gg.t.dn && !gg.incircuit) {
      gg.t.dn = false;
      gg.t.depressed = false;
***************
*** 15505,15511 ****
  {
    short x1, y1;
  
!   setmode("BOX");
    clearfunc();
    cursortype = boxcursor;
    waitnear();
--- 15505,15511 ----
  {
    short x1, y1;
  
!   Setmode("BOX");
    clearfunc();
    cursortype = boxcursor;
    waitnear();
***************
*** 15555,15561 ****
      }
    } while (gg.incircuit && gg.stillnear && *gg.func == '\0');
    gg.startpoint = false;
!   setmode("");
    if (gg.t.dn && !gg.incircuit) {
      gg.t.dn = false;
      gg.t.depressed = false;
--- 15555,15561 ----
      }
    } while (gg.incircuit && gg.stillnear && *gg.func == '\0');
    gg.startpoint = false;
!   Setmode("");
    if (gg.t.dn && !gg.incircuit) {
      gg.t.dn = false;
      gg.t.depressed = false;
***************
*** 20417,20423 ****
        _Escape(P_escapecode);
      remcursor();
      gg.startpoint = false;
!     setmode("");
      /* refreshsoon; */
      if (gg.t.dn && !gg.incircuit) {
        gg.t.dn = false;
--- 20417,20423 ----
        _Escape(P_escapecode);
      remcursor();
      gg.startpoint = false;
!     Setmode("");
      /* refreshsoon; */
      if (gg.t.dn && !gg.incircuit) {
        gg.t.dn = false;
***************
*** 20576,20582 ****
    gg.hook.clip = clipon;
    gg.hook.remcursor = remcursor;
    gg.hook.clearscreen = clearscreen;
!   gg.hook.setmode = setmode;
    gg.hook.getword = getword;
    gg.hook.getint = pgetint;
    gg.hook.getreal = pgetreal;
--- 20576,20582 ----
    gg.hook.clip = clipon;
    gg.hook.remcursor = remcursor;
    gg.hook.clearscreen = clearscreen;
!   gg.hook.setmode = Setmode;
    gg.hook.getword = getword;
    gg.hook.getint = pgetint;
    gg.hook.getreal = pgetreal;
diff -rc ../work.orig/mosis/Makefile ./mosis/Makefile
*** ../work.orig/mosis/Makefile	Wed Jul 19 22:09:03 1995
--- ./mosis/Makefile	Fri Jul 21 23:07:43 1995
***************
*** 47,53 ****
  CC = gcc
  
  LIBX11 = -lX11
! XINCLUDEDIR = .
  ## (2) Adding appropriate flags
  ## -----------------------------
  ##
--- 47,55 ----
  CC = gcc
  
  LIBX11 = -lX11
! XINCLUDEDIR = /usr/X11R6/include
! XLIBDIR = /usr/X11R6/lib
! 
  ## (2) Adding appropriate flags
  ## -----------------------------
  ##
***************
*** 76,82 ****
  ## our alpha-testers have reported no problems using these two flags.
  ##
  
! CFLAGS = -O -I../psys/include -I$(XINCLUDEDIR)
  
  ##
  ## (3) Library additions
--- 78,84 ----
  ## our alpha-testers have reported no problems using these two flags.
  ##
  
! CFLAGS = -DBSD -DF_OK -m486 -O -I../psys/include -I$(XINCLUDEDIR)
  
  ##
  ## (3) Library additions
***************
*** 84,103 ****
  ##
  ## on some systems, -ldl must be added to the following line
  
! OTHERLIBS= -lm
  
  ##
  ##
  ##
  
  
! LDFLAGS = ../psys/src/libp2c.a  $(OTHERLIBS) $(LIBX11)
  
  mosis: mosis.o 
  	$(CC) -o mosis mosis.o  $(LDFLAGS)
  
  install: mosis
! 	cp mosis ../bin/mosis
  
  clean:
! 	rm -f *.o mosis
--- 86,105 ----
  ##
  ## on some systems, -ldl must be added to the following line
  
! OTHERLIBS= -lm -lcompat
  
  ##
  ##
  ##
  
  
! LDFLAGS = ../psys/src/libp2c.a  -L$(XLIBDIR) $(OTHERLIBS) $(LIBX11)
  
  mosis: mosis.o 
  	$(CC) -o mosis mosis.o  $(LDFLAGS)
  
  install: mosis
! 	install -c -g bin -o bin -m 755 mosis /usr/local/bin/mosis
  
  clean:
! 	rm -f *.o mosis
diff -rc ../work.orig/netcmp/Makefile ./netcmp/Makefile
*** ../work.orig/netcmp/Makefile	Wed Jul 19 22:09:01 1995
--- ./netcmp/Makefile	Fri Jul 21 23:08:17 1995
***************
*** 22,28 ****
  #
  # netcmp makefile
  
! BINDIR=	../bin
  
  ##
  ##  (1) Choosing your compiler
--- 22,28 ----
  #
  # netcmp makefile
  
! BINDIR=	/usr/local/bin
  
  ##
  ##  (1) Choosing your compiler
***************
*** 78,90 ****
  ## our alpha-testers have reported no problems using these two flags.
  ##
  
! CFLAGS = 
  
  netcmp:     main.o parser.o datastruct.o compare.o
! 	$(CC)  parser.o datastruct.o compare.o main.o -o netcmp
  
  install:    netcmp
! 	cp netcmp $(BINDIR)  
  
  clean:
  	-rm *.o netcmp
--- 78,90 ----
  ## our alpha-testers have reported no problems using these two flags.
  ##
  
! CFLAGS = -DBSD -DF_OK -O -m486
  
  netcmp:     main.o parser.o datastruct.o compare.o
! 	$(CC)  parser.o datastruct.o compare.o main.o -lcompat -o netcmp
  
  install:    netcmp
! 	install -c -g bin -o bin -m 755 netcmp $(BINDIR)  
  
  clean:
  	-rm *.o netcmp
diff -rc ../work.orig/psys/src/Makefile ./psys/src/Makefile
*** ../work.orig/psys/src/Makefile	Wed Jul 19 22:09:25 1995
--- ./psys/src/Makefile	Fri Jul 21 22:05:51 1995
***************
*** 30,43 ****
  ## to be made for different systems. Its a good idea to look over each
  ## block and make necessary changes before doing a "make install"
  
! LIBDIR = ../../lib
! BINDIR = ../../bin
  
  
  LIB = ../libp2c.a
  
  LOCINC = ../include
! XINCLUDEDIR = . 
  
  ##
  ##  (1) Choosing your compiler
--- 30,44 ----
  ## to be made for different systems. Its a good idea to look over each
  ## block and make necessary changes before doing a "make install"
  
! LIBDIR = /usr/local/lib/chipmunk
! BINDIR = /usr/local/bin
  
  
  LIB = ../libp2c.a
  
  LOCINC = ../include
! XINCLUDEDIR = /usr/X11R6/include
! XLIBDIR = /usr/X11R6/lib
  
  ##
  ##  (1) Choosing your compiler
***************
*** 139,145 ****
  ## our alpha-testers have reported no problems using these two flags.
  ##
  
! CFLAGS = -I$(LOCINC) -I$(XINCLUDEDIR) -DCHIPLIB=\"`$(CD) $(LIBDIR); pwd`\"
  
  P2CFLAGS = -DLOCAL_INIT=_local_p2c_init
  
--- 140,146 ----
  ## our alpha-testers have reported no problems using these two flags.
  ##
  
! CFLAGS = -DBSD -DF_OK -O -m486 -I$(LOCINC) -I$(XINCLUDEDIR) -L$(XLIBDIR) -DCHIPLIB=\"$(LIBDIR)\"
  
  P2CFLAGS = -DLOCAL_INIT=_local_p2c_init
  
***************
*** 155,161 ****
  ## below; however the "-" allows this to be non-fatal and thus not essential
  ## to delete
  
! all: setup libp2c.a
  
  setup:
  	-mkdir $(LIBDIR)
--- 156,162 ----
  ## below; however the "-" allows this to be non-fatal and thus not essential
  ## to delete
  
! all: libp2c.a
  
  setup:
  	-mkdir $(LIBDIR)
diff -rc ../work.orig/psys/src/mylib.c ./psys/src/mylib.c
*** ../work.orig/psys/src/mylib.c	Wed Jul 19 22:09:24 1995
--- ./psys/src/mylib.c	Fri Jul 21 22:05:51 1995
***************
*** 3773,3779 ****
  
    if (currentmode == m_hitdet) {
      m_hitcount += hitdet_drawpoly(n, pointlist);
!     cfree(pointlist);
      return;
    }
  
--- 3773,3779 ----
  
    if (currentmode == m_hitdet) {
      m_hitcount += hitdet_drawpoly(n, pointlist);
!     free(pointlist);
      return;
    }
  
***************
*** 3785,3791 ****
    Xfprintf(stderr, "XDrawLines()\n");
    XDrawLines(m_display, m_window, gc[currentcolor], pointlist, n+1, CoordModeOrigin);
  
!   cfree(pointlist);
  
  #ifdef SAVECURSOR
    if (cursor_is_on)
--- 3785,3791 ----
    Xfprintf(stderr, "XDrawLines()\n");
    XDrawLines(m_display, m_window, gc[currentcolor], pointlist, n+1, CoordModeOrigin);
  
!   free(pointlist);
  
  #ifdef SAVECURSOR
    if (cursor_is_on)
***************
*** 3946,3952 ****
  	j++;
        } while (count != 0 && j < last);
        if (edges[i].curx <= m_clip_x2 && edges[j-1].curx >= m_clip_x1) {
! 	cfree(edges);
  	return 1;     /* Found a visible trapezoid */
        }
      }
--- 3946,3952 ----
  	j++;
        } while (count != 0 && j < last);
        if (edges[i].curx <= m_clip_x2 && edges[j-1].curx >= m_clip_x1) {
! 	free(edges);
  	return 1;     /* Found a visible trapezoid */
        }
      }
***************
*** 3956,3962 ****
    }
  
    /* No trapezoids intersect */
!   cfree(edges);
    return 0;
  }
  
--- 3956,3962 ----
    }
  
    /* No trapezoids intersect */
!   free(edges);
    return 0;
  }
  
***************
*** 3981,3987 ****
  
    if (currentmode == m_hitdet) {
      m_hitcount += hitdet_fillpoly(n, pointlist);
!     cfree(pointlist);
      return;
    }
  
--- 3981,3987 ----
  
    if (currentmode == m_hitdet) {
      m_hitcount += hitdet_fillpoly(n, pointlist);
!     free(pointlist);
      return;
    }
  
***************
*** 3993,3999 ****
    Xfprintf(stderr, "XFillPolygon()\n");
    XFillPolygon(m_display, m_window, gc[currentcolor], pointlist, n, Complex, CoordModeOrigin);
  
!   cfree(pointlist);
  
  #ifdef SAVECURSOR
    if (cursor_is_on)
--- 3993,3999 ----
    Xfprintf(stderr, "XFillPolygon()\n");
    XFillPolygon(m_display, m_window, gc[currentcolor], pointlist, n, Complex, CoordModeOrigin);
  
!   free(pointlist);
  
  #ifdef SAVECURSOR
    if (cursor_is_on)
diff -rc ../work.orig/until/V1.2/Makefile ./until/V1.2/Makefile
*** ../work.orig/until/V1.2/Makefile	Wed Jul 19 22:09:26 1995
--- ./until/V1.2/Makefile	Fri Jul 21 23:09:45 1995
***************
*** 26,32 ****
  
  
  LOCINC = ../../psys/include
! XINCLUDEDIR = .
  
  LIBX11 = -lX11
  
--- 26,33 ----
  
  
  LOCINC = ../../psys/include
! XINCLUDEDIR = /usr/X11R6/include
! XLIBDIR = /usr/X11R6/lib
  
  LIBX11 = -lX11
  
***************
*** 36,42 ****
  ##
  ## on some systems, -ldl must be added to the following line
  
! OTHERLIBS= -lm
  
  ##
  ##  (2) Choosing your compiler
--- 37,43 ----
  ##
  ## on some systems, -ldl must be added to the following line
  
! OTHERLIBS= -lm -lcompat
  
  ##
  ##  (2) Choosing your compiler
***************
*** 62,69 ****
  CHIPMUNKCC = gcc
  CC = $(CHIPMUNKCC) 
  
! BINDIR = ../../bin
! LIBDIR = `pwd`/../../lib
  
  SYSRC =  $(LIBDIR)/system.untilrc
  SYSPS =  $(LIBDIR)/pensps.map
--- 63,70 ----
  CHIPMUNKCC = gcc
  CC = $(CHIPMUNKCC) 
  
! BINDIR = /usr/local/bin
! LIBDIR = /usr/local/lib/chipmunk
  
  SYSRC =  $(LIBDIR)/system.untilrc
  SYSPS =  $(LIBDIR)/pensps.map
***************
*** 98,107 ****
  ##
  
  
! CFLAGS =  -I$(LOCINC) -I$(XINCLUDEDIR) \
  -DF_OK=0 -DUNTILRC=\"$(SYSRC)\" -DUNTILPSMAP=\"$(SYSPS)\"
  
! LDFLAGS = ../../psys/libp2c.a  $(LIBX11) $(OTHERLIBS)
  
  OBJS = bb_stuff.o cnf_stuff.o  crt_stuff.o data_types.o datawalk.o \
  dispmod.o ffman.o gr_stuff.o main.o mat_stuff.o menu.o menu_stuff.o \
--- 99,108 ----
  ##
  
  
! CFLAGS =  -DBSD -O -m486 -I$(LOCINC) -I$(XINCLUDEDIR) \
  -DF_OK=0 -DUNTILRC=\"$(SYSRC)\" -DUNTILPSMAP=\"$(SYSPS)\"
  
! LDFLAGS = ../../psys/src/libp2c.a  $(LIBX11) $(OTHERLIBS) -L$(XLIBDIR)
  
  OBJS = bb_stuff.o cnf_stuff.o  crt_stuff.o data_types.o datawalk.o \
  dispmod.o ffman.o gr_stuff.o main.o mat_stuff.o menu.o menu_stuff.o \
***************
*** 114,120 ****
  	-rm -f *.o until
   
  install: until
! 	cp until $(BINDIR)
  	cp pensps.map $(LIBDIR)/pensps.map
  	cp system.untilrc $(LIBDIR)/system.untilrc
  	cp until.pro  $(LIBDIR)/until.pro
--- 115,121 ----
  	-rm -f *.o until
   
  install: until
! 	install -c -g bin -o bin -m 755 until $(BINDIR)
  	cp pensps.map $(LIBDIR)/pensps.map
  	cp system.untilrc $(LIBDIR)/system.untilrc
  	cp until.pro  $(LIBDIR)/until.pro
diff -rc ../work.orig/view/Makefile ./view/Makefile
*** ../work.orig/view/Makefile	Wed Jul 19 22:09:45 1995
--- ./view/Makefile	Fri Jul 21 23:11:13 1995
***************
*** 27,33 ****
  ## block and make necessary changes before doing a "make install"
  
  LOCINC = ../psys/include
! XINCLUDEDIR = .
  
  LIBX11 = -lX11
  LIBP2C = ../psys/src/libp2c.a
--- 27,34 ----
  ## block and make necessary changes before doing a "make install"
  
  LOCINC = ../psys/include
! XINCLUDEDIR = /usr/X11R6/include
! XLIBDIR = /usr/X11R6/lib
  
  LIBX11 = -lX11
  LIBP2C = ../psys/src/libp2c.a
***************
*** 38,44 ****
  ##
  ## on some systems, -ldl must be added to the following line
  
! OTHERLIBS= -lm
  
  ##
  ## (2) IEEE library directory
--- 39,45 ----
  ##
  ## on some systems, -ldl must be added to the following line
  
! OTHERLIBS= -lm -lcompat
  
  ##
  ## (2) IEEE library directory
***************
*** 108,118 ****
  ##
  
  
! CFLAGS= -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0
  
  LDFLAGS= $(LIBP2C) $(LIBX11) $(OTHERLIBS) 
  MYLDFLAGS= $(LIBP2C)  $(IEEEDIR) $(LIBX11)  $(OTHERLIBS)
! BINDIR= ../bin
  
  OBJS =			\
  	viewfit.o	\
--- 109,119 ----
  ##
  
  
! CFLAGS= -DBSD -O -m486 -I$(LOCINC) -I$(XINCLUDEDIR) -DF_OK=0 -L$(XLIBDIR)
  
  LDFLAGS= $(LIBP2C) $(LIBX11) $(OTHERLIBS) 
  MYLDFLAGS= $(LIBP2C)  $(IEEEDIR) $(LIBX11)  $(OTHERLIBS)
! BINDIR= /usr/local/bin
  
  OBJS =			\
  	viewfit.o	\
***************
*** 170,176 ****
  	(chdir mt;	make; chdir ..; chdir tek2430; make; chdir ..; make mtlink)
  
  install: view
! 	cp view $(BINDIR)/vc
  
  myinstall: myview
  	cp view ../bin/myview
--- 171,177 ----
  	(chdir mt;	make; chdir ..; chdir tek2430; make; chdir ..; make mtlink)
  
  install: view
! 	install -c -g bin -o bin -m 755 view $(BINDIR)/vc
  
  myinstall: myview
  	cp view ../bin/myview
diff -rc ../work.orig/wol/Makefile ./wol/Makefile
*** ../work.orig/wol/Makefile	Wed Jul 19 22:09:07 1995
--- ./wol/Makefile	Fri Jul 21 23:11:55 1995
***************
*** 24,30 ****
  #
  
  LOCINC = ../psys/include
! XINCLUDEDIR = .
  LIBX11 = -lX11
  
  ##
--- 24,31 ----
  #
  
  LOCINC = ../psys/include
! XINCLUDEDIR = /usr/X11R6/include
! XLIBDIR = /usr/X11R6/lib
  LIBX11 = -lX11
  
  ##
***************
*** 33,39 ****
  ##
  ## on some systems, -ldl must be added to the following line
  
! OTHERLIBS= -lm
  
  
  ##
--- 34,40 ----
  ##
  ## on some systems, -ldl must be added to the following line
  
! OTHERLIBS= -lm -lcompat
  
  
  ##
***************
*** 61,69 ****
  CHIPMUNKCC = gcc
  CC = $(CHIPMUNKCC) 
  
! LIBDIR = `pwd`/
  WOLPL = $(LIBDIR)
! BINDIR = ../bin
  
  ##
  ## (3) Adding appropriate flags
--- 62,70 ----
  CHIPMUNKCC = gcc
  CC = $(CHIPMUNKCC) 
  
! LIBDIR = /usr/local/lib/chipmunk
  WOLPL = $(LIBDIR)
! BINDIR = /usr/local/bin
  
  ##
  ## (3) Adding appropriate flags
***************
*** 94,102 ****
  ## our alpha-testers have reported no problems using these two flags.
  ##
  
! CFLAGS= -I$(LOCINC) -I$(XINCLUDEDIR) -DWOLLIBDIR=\"$(WOLPL)\"
  
! LDFLAGS= ../psys/libp2c.a $(LIBX11) $(OTHERLIBS)
  
  OBJ =               	\
           cell_stuff.o	\
--- 95,103 ----
  ## our alpha-testers have reported no problems using these two flags.
  ##
  
! CFLAGS= -DBSD -DF_OK -O -m486 -I$(LOCINC) -I$(XINCLUDEDIR) -DWOLLIBDIR=\"$(WOLPL)\" -L$(XLIBDIR)
  
! LDFLAGS= ../psys/src/libp2c.a $(LIBX11) $(OTHERLIBS)
  
  OBJ =               	\
           cell_stuff.o	\
***************
*** 127,133 ****
  	$(CC) $(CFLAGS) $(OBJ) $(LDFLAGS) -o wol
  
  install: wol 
! 	cp wol $(BINDIR)
  
  clean:
  	-rm -f *.o wol
--- 128,134 ----
  	$(CC) $(CFLAGS) $(OBJ) $(LDFLAGS) -o wol
  
  install: wol 
! 	install -c -g bin -o bin -m 755 wol $(BINDIR)
  
  clean:
  	-rm -f *.o wol
diff -rc ../work.orig/wolcomp/Makefile ./wolcomp/Makefile
*** ../work.orig/wolcomp/Makefile	Wed Jul 19 22:08:42 1995
--- ./wolcomp/Makefile	Fri Jul 21 22:05:53 1995
***************
*** 50,56 ****
  CC = $(CHIPMUNKCC) 
  
  LOCINC = ../psys/include
! XINCLUDEDIR = .
  
  ##
  ## (2) Adding appropriate flags
--- 50,57 ----
  CC = $(CHIPMUNKCC) 
  
  LOCINC = ../psys/include
! XINCLUDEDIR = /usr/X11R6/include
! XLIBDIR = /usr/X11R6/lib
  
  ##
  ## (2) Adding appropriate flags
***************
*** 82,88 ****
  ##
  
  
! CFLAGS =  -I$(LOCINC) -I$(XINCLUDEDIR)
  
  install : $(OBJS)
  	-rm wolcomp.a
--- 83,89 ----
  ##
  
  
! CFLAGS =  -DBSD -DF_OK -O -m486 -I$(LOCINC) -I$(XINCLUDEDIR) -L$(XLIBDIR)
  
  install : $(OBJS)
  	-rm wolcomp.a
