*** pmfdir/src/Makefile	Sun May 23 11:54:05 1993
--- ./Makefile	Sun Sep 25 04:42:08 1994
***************
*** 29,40 ****
  # pmf without GNU readline or without sound.
  # Remove one (or both) of "-DGNU_READLINE" and "-DSOUND".
  #
! OPTIONS = -DGNU_READLINE -DSOUND
  
  # This variable, SOUND_OBJECT, should be changed if you want to
  # compile pmf without sound: remove this definition of SOUND_OBJECT.
  #
! SOUND_OBJECT = sound.o
  
  # This variable, HISTORY_OBJECT, should be changed if you want to
  # compile pmf without GNU readline: define HISTORY_OBJECT as
--- 29,41 ----
  # pmf without GNU readline or without sound.
  # Remove one (or both) of "-DGNU_READLINE" and "-DSOUND".
  #
! #OPTIONS = -DGNU_READLINE -DSOUND
! OPTIONS = -DGNU_READLINE
  
  # This variable, SOUND_OBJECT, should be changed if you want to
  # compile pmf without sound: remove this definition of SOUND_OBJECT.
  #
! #SOUND_OBJECT = sound.o
  
  # This variable, HISTORY_OBJECT, should be changed if you want to
  # compile pmf without GNU readline: define HISTORY_OBJECT as
***************
*** 65,71 ****
  #	-- the Makefiles in the subdirs have to be changed separately.
  # Distribution: CFLAGS = -O
  # Maximum debug: CFLAGS = -g -pg -DDEBUG -pipe
! CFLAGS = -O
  
  ######################################################################
  
--- 66,72 ----
  #	-- the Makefiles in the subdirs have to be changed separately.
  # Distribution: CFLAGS = -O
  # Maximum debug: CFLAGS = -g -pg -DDEBUG -pipe
! CFLAGS = -O2 -D_ANSI_SOURCE
  
  ######################################################################
  
***************
*** 104,110 ****
  READLINE_LIB = $(READLINE_DIR)/libreadline.a
  C_PACKAGES_LIB = $(C_PACKAGES_DIR)/libc_packs.a
  
! LIBS = $(READLINE_LIB) $(C_PACKAGES_LIB)
  
  INCLUDEDIRS = -I$(C_PACKAGES_DIR)/safe_malloc \
  	-I$(C_PACKAGES_DIR)/generic_list \
--- 105,112 ----
  READLINE_LIB = $(READLINE_DIR)/libreadline.a
  C_PACKAGES_LIB = $(C_PACKAGES_DIR)/libc_packs.a
  
! #LIBS = $(READLINE_LIB) $(C_PACKAGES_LIB)
! LIBS = $(C_PACKAGES_LIB) -lreadline -lcompat
  
  INCLUDEDIRS = -I$(C_PACKAGES_DIR)/safe_malloc \
  	-I$(C_PACKAGES_DIR)/generic_list \
***************
*** 132,137 ****
--- 132,140 ----
  compile_time.c:
  	echo 'char compile_time[] = "'`date`'";' > compile_time.c
  
+ install: pmf
+ 	install -o bin -g bin -m 0755 pmf /usr/local/bin
+ 
  ######################################################################
  
  $(READLINE_LIB):
***************
*** 138,144 ****
  	( cd $(READLINE_DIR); make )
  
  $(C_PACKAGES_LIB):
! 	( cd $(C_PACKAGES_DIR); make )
  
  READLINE_FILES = \
  	$(READLINE_DIR)/*
--- 141,147 ----
  	( cd $(READLINE_DIR); make )
  
  $(C_PACKAGES_LIB):
! 	( cd $(C_PACKAGES_DIR); make 'CFLAGS=$(CFLAGS)')
  
  READLINE_FILES = \
  	$(READLINE_DIR)/*
*** pmfdir/src/config.h	Fri Oct 29 09:25:35 1993
--- ./config.h	Sun Sep 25 02:33:58 1994
***************
*** 35,41 ****
   *  files instead.
   *  Note that "~" is not expanded in this directory name.
   */
! #define SYSTEM_DIR              "/home/diagnostix3/ida/tompa/pmf-1.13.1/pmfdir/system_dir"
  
  /*  These are the names of some files, usually in the system directory
   *  SYSTEM_DIR that is #defined above.
--- 35,41 ----
   *  files instead.
   *  Note that "~" is not expanded in this directory name.
   */
! #define SYSTEM_DIR              "/usr/local/lib/pmf"
  
  /*  These are the names of some files, usually in the system directory
   *  SYSTEM_DIR that is #defined above.
***************
*** 71,76 ****
--- 71,80 ----
  #  define USE_TIOCGETP
  #else
  #  define USE_TCGETA
+ #endif
+ 
+ #ifdef BSD
+ #define _cnt _r
  #endif
  
  /*  The prompt to print after doing a builtin command. 0 means no prompt.
*** pmfdir/src/main.c	Sun Sep 22 03:13:43 1991
--- ./main.c	Sun Sep 25 02:51:47 1994
***************
*** 37,43 ****
      extern int stop_printing();
      extern int continue_printing();
  
!     extern int last_c_pos;
  #endif
  
  /* Longjmp buffer, jump there after error() or CTRL-C */
--- 37,43 ----
      extern int stop_printing();
      extern int continue_printing();
  
!     extern int _rl_last_c_pos;
  #endif
  
  /* Longjmp buffer, jump there after error() or CTRL-C */
***************
*** 58,64 ****
  	ldisplay("\n");
  	ldisplay("%s", rl_line_buffer);
  	rl_redisplay(count, key);
! 	last_c_pos = rl_end;
      }
  #endif
  
--- 58,64 ----
  	ldisplay("\n");
  	ldisplay("%s", rl_line_buffer);
  	rl_redisplay(count, key);
! 	_rl_last_c_pos = rl_end;
      }
  #endif
  
*** pmfdir/system_dir/.pmfrc.default	Sun Sep 22 03:15:42 1991
--- ../system_dir/.pmfrc.default	Sun Sep 25 05:19:41 1994
***************
*** 1,6 ****
  #
  # Default init file for pmf.
! # Thomas Padron-McCarhty, padrone@lysator.liu.se, Sept 22 1991
  # Remember that all blank lines are sent to Mud, which means that you
  # should probably NOT have any blank lines in the init file.
  # Silent mode is on while running the init file.
--- 1,6 ----
  #
  # Default init file for pmf.
! # Thomas Padron-McCarthy, padrone@lysator.liu.se, Sept 22 1991
  # Remember that all blank lines are sent to Mud, which means that you
  # should probably NOT have any blank lines in the init file.
  # Silent mode is on while running the init file.
***************
*** 12,19 ****
  /set history 40
  /set lines_to_save 100
  /set cryptkey "Have a Coke and a Smile!"
! /set substitute_history
! /set replace_control
  #
  # Some very useful aliases:
  #
--- 12,19 ----
  /set history 40
  /set lines_to_save 100
  /set cryptkey "Have a Coke and a Smile!"
! /unset substitute_history
! /unset replace_control
  #
  # Some very useful aliases:
  #
***************
*** 33,44 ****
  #
  # This alias lets you run from the church to the pub:
  #
! /alias . "perform $1 >"
  /alias church-to-pub ". s $n . e $n . e $n . n $n . e"
  #
  # Some more aliases:
  #
! /alias /soundon "/source /home/ingatrix3/ida/tompa/pmfdir/system_dir/soundfiles/pmf-sparc-sound"
  /alias /soundoff "/unset sound"
  #
  # Avoid printing some of the more annoying messages:
--- 33,44 ----
  #
  # This alias lets you run from the church to the pub:
  #
! /unalias . "perform $1 >"
  /alias church-to-pub ". s $n . e $n . e $n . n $n . e"
  #
  # Some more aliases:
  #
! /alias /soundon "/source /usr/local/lib/pmf/soundfiles/pmf-sparc-sound"
  /alias /soundoff "/unset sound"
  #
  # Avoid printing some of the more annoying messages:
*** ./c_packages/Makefile	Sat Sep 21 20:13:58 1991
--- ../../../pmfdir/src/c_packages/Makefile	Sat Oct  1 08:40:44 1994
***************
*** 8,14 ****
  	for i in $(PACKAGES) ; \
  	do \
  		echo Making $$i...; \
! 		( cd $$i; make ) \
  	done
  	ln -s */*.o .
  	ar rv libc_packs.a *.o
--- 8,14 ----
  	for i in $(PACKAGES) ; \
  	do \
  		echo Making $$i...; \
! 		( cd $$i; make 'CFLAGS=$(CFLAGS)') \
  	done
  	ln -s */*.o .
  	ar rv libc_packs.a *.o