From: hideaki@berlioz.ee.uec.ac.jp (Hideaki Tsuchiya)
Subject: Re: [386bsd] still trying to compile rayshade
Organization: University of Electro-Communications, Chofu, Tokyo, JAPAN
Date: Fri, 22 Jan 1993 08:50:31 GMT


Here is a patch to rayshade 4.0 patchlevel 6 for installation under
386BSD0.1 and XFree86.

Main problem is that /usr/share/misc/lex.skel defines `yywrap()' and
don't declare `int yylineno'.

This patch has solved other small problems. Hopefully other people
that have ported rayshade 4.0 will correct the error I've made or
overlooked.

  NOTE:
	It isn't a good idea to run rayshade under no-fpu machines, I
	think. Too slow!

*** ./raypaint/Makefile.SH.orig	Fri Jan 22 14:42:52 1993
--- ./raypaint/Makefile.SH	Fri Jan 22 15:53:23 1993
***************
*** 55,70 ****
  
  #
  # If using X11, use:
! #GRAPHICSLIB = -lX11
  
  #
  # If you are using GL, use:
! GRAPHICSLIB = -lgl_s
  
  LIBRAY = $(LIBRAYDIR)/libray.a
  LIBSHADE = $(LIBSHADEDIR)/libshade.a
  
! CFLAGS = $(CCFLAGS) $(URTINC) $(INCLUDE) $(OPTIMIZE) -DSHARED_EDGES
  SHELL = /bin/sh
  
  #
--- 55,70 ----
  
  #
  # If using X11, use:
! GRAPHICSLIB = -L/usr/X386/lib -lX11
  
  #
  # If you are using GL, use:
! #GRAPHICSLIB = -lgl_s
  
  LIBRAY = $(LIBRAYDIR)/libray.a
  LIBSHADE = $(LIBSHADEDIR)/libshade.a
  
! CFLAGS = $(CCFLAGS) $(URTINC) $(INCLUDE) $(OPTIMIZE) -DSHARED_EDGES -I/usr/X386/include
  SHELL = /bin/sh
  
  #
***************
*** 73,79 ****
  #
  LIBS = $(LIBSHADE) $(LIBRAY) $(URTLIB)
  
! DRIVE_C =	main.c graphics.c render.c version.c
  
  DRIVE_O = $(DRIVE_C:.c=.o)
  
--- 73,79 ----
  #
  LIBS = $(LIBSHADE) $(LIBRAY) $(URTLIB)
  
! DRIVE_C =	main.c xgraphics.c render.c version.c
  
  DRIVE_O = $(DRIVE_C:.c=.o)
  
*** ./libshade/lex.l.orig	Fri Jan 22 14:46:37 1993
--- ./libshade/lex.l	Fri Jan 22 15:12:58 1993
***************
*** 28,33 ****
--- 28,34 ----
  #include "symtab.h"
  #include "y.tab.h"
  extern char *strsave();
+ int  yylineno=1;
  %}
  alpha	[a-zA-Z]
  special	[\.\_-]
***************
*** 159,165 ****
  .			return yytext[0];
  
  %%
! yywrap() {return 1;}
  /*
   * Skip over comments.
   */
--- 160,166 ----
  .			return yytext[0];
  
  %%
! /* yywrap() {return 1;} */
  /*
   * Skip over comments.
   */
*** ./etc/rsconvert/lex.l.orig	Fri Jan 22 14:46:37 1993
--- ./etc/rsconvert/lex.l	Fri Jan 22 15:12:24 1993
***************
*** 21,26 ****
--- 21,27 ----
  #endif
  #include "libcommon/common.h"
  #include "y.tab.h"
+ int  yylineno=1;
  %}
  alpha	[a-zA-Z]
  special	[\.\_-]
***************
*** 97,103 ****
  .			{return yytext[0];}
  
  %%
! yywrap() {return(1);}
  /*
   * Skip over comments.
   */
--- 98,104 ----
  .			{return yytext[0];}
  
  %%
! /* yywrap() {return(1);} */
  /*
   * Skip over comments.
   */
*** ./Configure.orig	Fri Jan 22 14:46:33 1993
--- ./Configure	Fri Jan 22 16:08:19 1993
***************
*** 172,181 ****
  fi
  
  if ls blurfl >/dev/null 2>&1; then
! 	if awk '' blurfl >/dev/null 2>&1; then
  		check='cat'
  	else
! 		check='awk ""'
  	fi
  else
  	check='ls'
--- 172,181 ----
  fi
  
  if ls blurfl >/dev/null 2>&1; then
! 	if awk '{}' blurfl >/dev/null 2>&1; then
  		check='cat'
  	else
! 		check='awk "{}"'
  	fi
  else
  	check='ls'
***************
*** 1235,1241 ****
  '');;
  *)  set X $cppflags
  	cppflags=''
! 	for flag do
  		case $flag in
  		-D*|-I*) cppflags="$cppflags $flag";;
  		esac
--- 1235,1241 ----
  '');;
  *)  set X $cppflags
  	cppflags=''
! 	for flag; do
  		case $flag in
  		-D*|-I*) cppflags="$cppflags $flag";;
  		esac
--
University of Electro-Communications, Japan.
Hideaki Tsuchiya (hideaki@strauss.ee.uec.ac.jp)