Software Package:       
	gnuplot

Release/Version:
	Unix version 3.5, patchlevel 3.50.1.17 Aug 1993

Retrieved from:
	ftp://ftp.dartmouth.edu/pub/gnuplot/gnuplot3.5.tar.Z

Bug reports:
	This software package is not maintained by BSDI, join the
	mailing list info-gnuplot@dartmouth.edu (via
	info-gnuplot-request@dartmouth.edu) for more information.
	Formal bug reports may be sent to bug-gnuplot@dartmouth.edu.

Comments:

=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
Modifications to this version made by BSDI:

	- Copied makefile.unx gnuplot.mk and made a few changes to add a
	  BSDI target.

	- Created a wrapper Makefile that has all the appropriate targets
	  for a standard build.

	- Minor patches to various C files (below).

	- Note that the install targets in the standard makefiles are not
	  used, the wrapper makefile does all the installing.

Wed Oct 25 13:06:51 MDT 1995 ewv

*** makefile.unx	Wed Oct 25 11:42:21 1995
--- gnuplot.mk	Wed Oct 25 12:42:29 1995
***************
*** 23,33 ****
  ############################################################
  #>>> Decide where the binaries and manuals will go.
  # directory where to install executables on 'make install'
! DEST=/usr/local/bin
  # directory for installing man page on 'make man_install'.
! MANDEST=/usr/local/man/manl
! # where to install help file gnuplot.gih
! HELPDEST=/usr/local/lib
  #HELPDEST=docs/gnuplot.gih
  # Where to send email about bugs and comments (locally)
  EMAIL=bug-gnuplot@dartmouth.edu
--- 23,33 ----
  ############################################################
  #>>> Decide where the binaries and manuals will go.
  # directory where to install executables on 'make install'
! DEST=NOTUSED
  # directory for installing man page on 'make man_install'.
! MANDEST=NOTUSED
! # where to install help file gnuplot.gih [actually installed by bsdi wrapper]
! HELPDEST=/usr/contrib/lib
  #HELPDEST=docs/gnuplot.gih
  # Where to send email about bugs and comments (locally)
  EMAIL=bug-gnuplot@dartmouth.edu
***************
*** 35,47 ****
  ############################################################
  #>>> Some machines may need MAKE to be defined explicitly
  MAKE   = make
  #>>> Choose your C compiler and basic compiler flags.
  # the C compiler
  CC     = cc
  # -O if you trust your compiler's optimizer
! COPTS  =
  # default loading command
! LD     = $(CC) $(CFLAGS)
  NPROC  = 2
  #
  ############################################################
--- 35,48 ----
  ############################################################
  #>>> Some machines may need MAKE to be defined explicitly
  MAKE   = make
+ MFLAGS = -f gnuplot.mk
  #>>> Choose your C compiler and basic compiler flags.
  # the C compiler
  CC     = cc
  # -O if you trust your compiler's optimizer
! COPTS  = -O
  # default loading command
! LD     = shlicc $(CFLAGS)
  NPROC  = 2
  #
  ############################################################
***************
*** 76,82 ****
  #
  
  #>>> List your X11 libraries
! X11LIBS = -lX11
  
  #>>> List where the X11 include directory is found (if other than /usr/include)
  X11INCLUDES =
--- 77,83 ----
  #
  
  #>>> List your X11 libraries
! X11LIBS = -L/usr/X11R6/lib -lX11
  
  #>>> List where the X11 include directory is found (if other than /usr/include)
  X11INCLUDES =
***************
*** 311,316 ****
--- 312,324 ----
             X11INSTALL= "$(X11INSTALL)" \
             TERMFLAGS="-Iterm -DUNIXPLOT -DX11"
  
+ BSDI_FLAGS = \
+            CFLAGS="$(COPTS) $(OPTIONS) -DGETCWD -DMEMSET -DMEMCPY -DTCSETSW" \
+            LIBS="$(LIBS)" X11FLAGS="$(X11FLAGS)" X11INCLUDES="$(X11INCLUDES)" \
+            X11LIBS="$(X11LIBS)" PLOTXFLAG="$(PLOTXFLAG)" GNUPLOT_X11="$(GNUPLOT_X11)" \
+            X11INSTALL= "$(X11INSTALL)" \
+            TERMFLAGS="-Iterm -DX11"
+ 
  ISC22_X11_FLAGS = \
             CFLAGS="$(COPTS) $(OPTIONS) -DGETCWD -DMEMSET -DMEMCPY -DNOVFORK -DISC22" \
             LIBS="$(LIBS) -lplot -lcposix" X11FLAGS="$(X11FLAGS)" X11INCLUDES="$(X11INCLUDES)" \
***************
*** 507,512 ****
--- 515,521 ----
  	@echo "Please do a 'make <MACHINE>' where <MACHINE> is one of the following:"
  	@echo
  	@echo "apollo       for Apollo running SR10.3 with Apollo's X11"
+ 	@echo "bsdi         for x86 machines running BSD/OS/X11"
  	@echo "dec_osf      for Dec3100/5000 running DEC OSF/1 v1.0"
  	@echo "dec          for Dec3100/5000 running Ultrix 3.1d with MIT's X11"
  	@echo "hp           for HP/9000 700 series running HP/UX 8.0 with MIT's X11R4"
***************
*** 592,597 ****
--- 601,609 ----
  apollo:
  	$(MAKE) $(MFLAGS) $(MY_FLAGS) $(APOLLO_FLAGS)   $(TARGET)
  
+ bsdi:
+ 	$(MAKE) $(MFLAGS) $(MY_FLAGS) $(BSDI_X11_FLAGS) $(TARGET)
+ 
  hp:
  	$(MAKE) $(MFLAGS) $(MY_FLAGS) $(HP_FLAGS)       $(TARGET)
  
***************
*** 677,683 ****
  	$(LD) -o gnuplot $(OBJS) version.o $(LIBS)
  
  doc:
! 	( cd docs; $(MAKE) $(MFLAGS) $(MY_FLAGS) gnuplot.gih )
  
  gnuplot_x11: gplt_x11.c
  	$(CC) $(CFLAGS) $(X11FLAGS) $(X11INCLUDES) -o gnuplot_x11 \
--- 689,695 ----
  	$(LD) -o gnuplot $(OBJS) version.o $(LIBS)
  
  doc:
! 	( cd docs; $(MAKE) $(MY_FLAGS) gnuplot.gih )
  
  gnuplot_x11: gplt_x11.c
  	$(CC) $(CFLAGS) $(X11FLAGS) $(X11INCLUDES) -o gnuplot_x11 \
***************
*** 787,801 ****
  
  clean:
  	rm -f *.o *.orig *.rej *~ *.bak term/*~ term/*.orig term/*.bak
! 	( cd docs; $(MAKE) $(MFLAGS) clean )
! 	( cd docs/latextut; $(MAKE) $(MFLAGS) clean )
  
  spotless:
  	rm -f *.o *~ *.orig *.rej *.bak term/*~ term/*.orig term/*.bak \
  	TAGS gnuplot gnuplot_x11 \
  	bf_test demo/binary[1-3]
! 	( cd docs; $(MAKE) $(MFLAGS) clean )
! 	( cd docs/latextut; $(MAKE) $(MFLAGS) spotless )
  
  ################################################################
  # Making shar files for mailing gnuplot
--- 799,813 ----
  
  clean:
  	rm -f *.o *.orig *.rej *~ *.bak term/*~ term/*.orig term/*.bak
! 	( cd docs; $(MAKE) clean )
! 	( cd docs/latextut; $(MAKE) clean )
  
  spotless:
  	rm -f *.o *~ *.orig *.rej *.bak term/*~ term/*.orig term/*.bak \
  	TAGS gnuplot gnuplot_x11 \
  	bf_test demo/binary[1-3]
! 	( cd docs; $(MAKE) clean )
! 	( cd docs/latextut; $(MAKE) spotless )
  
  ################################################################
  # Making shar files for mailing gnuplot

============================

Patches to source:

diff -r -c gp/parse.c gp2/parse.c
*** gp/parse.c	Wed Sep 15 22:59:51 1993
--- gp2/parse.c	Wed Oct 25 12:47:57 1995
***************
*** 69,75 ****
  void
  fpe()
  #else
! #if defined( __ZTC__ ) || defined( _CRAY ) || defined( sgi )|| defined( OS2 ) || defined(__EMX__) || defined( __alpha)
  void
  fpe(an_int)
  	int             an_int;
--- 69,75 ----
  void
  fpe()
  #else
! #if defined( __ZTC__ ) || defined( _CRAY ) || defined( sgi )|| defined( OS2 ) || defined(__EMX__) || defined( __alpha) || defined(__bsdi__)
  void
  fpe(an_int)
  	int             an_int;
diff -r -c gp/plot.c gp2/plot.c
*** gp/plot.c	Wed Sep 15 22:59:51 1993
--- gp2/plot.c	Wed Oct 25 12:48:09 1995
***************
*** 195,201 ****
  #ifdef __ZTC__
  void ztc_interrupt()
  #else
! #if defined( _CRAY ) || defined( sgi ) || defined( __alpha )
  void inter(an_int)
  int an_int;
  #else
--- 195,201 ----
  #ifdef __ZTC__
  void ztc_interrupt()
  #else
! #if defined( _CRAY ) || defined( sgi ) || defined( __alpha ) || defined( __bsdi__ )
  void inter(an_int)
  int an_int;
  #else
diff -r -c gp/readline.c gp2/readline.c
*** gp/readline.c	Wed Sep 15 22:59:52 1993
--- gp2/readline.c	Wed Oct 25 13:02:28 1995
***************
*** 868,874 ****
--- 868,878 ----
  		ioctl(0, TIOCSLTC, &s_ltchars);
  #endif /* TIOCGLTC */
  #else  /* SGTTY */
+ #ifdef __bsdi__
+ 		rl_termio.c_iflag &= ~(BRKINT|PARMRK|INPCK|IXON|IXOFF);
+ #else
  		rl_termio.c_iflag &= ~(BRKINT|PARMRK|INPCK|IUCLC|IXON|IXOFF);
+ #endif
  		rl_termio.c_iflag |=  (IGNBRK|IGNPAR);
  
  		/* rl_termio.c_oflag &= ~(ONOCR); Costas Sphocleous Irvine,CA */
diff -r -c gp/util.c gp2/util.c
*** gp/util.c	Wed Sep 15 22:59:55 1993
--- gp2/util.c	Wed Oct 25 12:10:18 1995
***************
*** 49,57 ****
--- 49,59 ----
  #if !defined(__MSC__)
  extern int errno;
  #endif
+ #ifndef __bsdi__
  extern int sys_nerr;
  extern char *sys_errlist[];
  #endif
+ #endif
  #endif /* vms */
  
  extern char input_line[];
***************
*** 159,164 ****
--- 161,169 ----
  		   input_line[token[t_num].start_index] == '\"'));
  }
  
+ #ifdef __bsdi__
+ #undef isnumber
+ #endif
  
  isnumber(t_num)
  int t_num;
