diff -c work/gmod/Makefile gmod/Makefile
*** Makefile	Sun Nov 27 13:42:25 1994
--- Makefile	Sun Jan  8 17:48:15 1995
***************
*** 6,15 ****
  # USE_NCURSES will compile gmod with support for special keys (arrows, etc).
  # The ncurses library must be installed to compile with this defined.
  
! DEFINES = -DLINEAR_VOLUME -DUSE_LOCAL -DUSE_NCURSES
  LIBS = -lncurses
  
! CFLAGS = -O2 -m486 -fomit-frame-pointer -Wall $(DEFINES)
  #CFLAGS = -Wall $(DEFINES)
  
  OFILES = compress.o cvt_period.o dump.o effects.o gmod.o init.o load_669.o \
--- 6,15 ----
  # USE_NCURSES will compile gmod with support for special keys (arrows, etc).
  # The ncurses library must be installed to compile with this defined.
  
! DEFINES = -DLINEAR_VOLUME -DUSE_NCURSES
  LIBS = -lncurses
  
! CFLAGS = -O2 -m486 $(DEFINES)
  #CFLAGS = -Wall $(DEFINES)
  
  OFILES = compress.o cvt_period.o dump.o effects.o gmod.o init.o load_669.o \
***************
*** 20,29 ****
  .c.o:
  	$(CC) $(CFLAGS) -c $<
  
  gmod: $(OFILES)
  	$(CC) -s -o gmod $(OFILES) $(LIBS)
! #added by Peter Federighi (it's always good to 'sync' when done with compiling)
! 	sync
  
  # dependencies obtained using "cc -MM *.c"
  
--- 20,36 ----
  .c.o:
  	$(CC) $(CFLAGS) -c $<
  
+ all:	 gmod
+ 
  gmod: $(OFILES)
  	$(CC) -s -o gmod $(OFILES) $(LIBS)
! 
! install: gmod gmod.1
! 	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
! 		gmod ${PREFIX}/bin
! 	${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
! 		gmod.1 ${PREFIX}/man/man1
! 
  
  # dependencies obtained using "cc -MM *.c"
  
diff -c work/gmod/defines.h gmod/defines.h
*** defines.h	Sun Nov 27 13:42:25 1994
--- defines.h	Sun Jan  8 17:38:51 1995
***************
*** 120,124 ****
  
  /* rc file defines */
  #define MAX_RC_LEN	161	/* maximum length of a line in the rc file */
! #define RC_NAME		"/usr/etc/gmodrc"	/* name of system rc file */
  #define USER_RC_NAME	"/.gmodrc"	/* name of a user's rc file */
--- 120,124 ----
  
  /* rc file defines */
  #define MAX_RC_LEN	161	/* maximum length of a line in the rc file */
! #define RC_NAME		"/usr/local/etc/gmodrc"	/* name of system rc file */
  #define USER_RC_NAME	"/.gmodrc"	/* name of a user's rc file */
diff -c work/gmod/effects.c gmod/effects.c
*** effects.c	Sun Nov 27 13:42:25 1994
--- effects.c	Sun Jan  8 17:30:05 1995
***************
*** 14,19 ****
--- 14,24 ----
  * Refer to the ChangeLog for details.
  */
  
+ #ifdef	__FreeBSD__
+ #include <machine/soundcard.h>
+ #include <machine/ultrasound.h>
+ 
+ #else
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
***************
*** 21,26 ****
--- 26,32 ----
  #endif
  
  #include <sys/ultrasound.h>
+ #endif
  
  #include "defines.h"
  #include "structs.h"
Only in work/gmod: gmod
diff -c work/gmod/gmod.c gmod/gmod.c
*** gmod.c	Wed Jan 18 17:08:35 1995
--- gmod.c	Sun Mar  5 21:35:17 1995
***************
*** 19,24 ****
--- 19,29 ----
  #include <fcntl.h>
  #include <unistd.h>
  
+ #ifdef __FreeBSD__
+ #include <machine/soundcard.h>
+ #include <machine/ultrasound.h>
+ #else
+ 
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
***************
*** 26,31 ****
--- 31,38 ----
  #endif
  
  #include <sys/ultrasound.h>
+ #endif
+ 
  #include <stdio.h>
  #include <string.h>
  
***************
*** 286,291 ****
        terminal_set (TERMINAL_RESTORE);
  #endif
      }
!   fclose (rc_fp);
    exit (exit_code);
  }
--- 293,299 ----
        terminal_set (TERMINAL_RESTORE);
  #endif
      }
!   if(rc_fp)
!     fclose (rc_fp);
    exit (exit_code);
  }
diff -c work/gmod/load_669.c gmod/load_669.c
*** load_669.c	Sun Nov 27 13:42:25 1994
--- load_669.c	Sun Jan  8 17:31:36 1995
***************
*** 21,26 ****
--- 21,31 ----
  #include <stdlib.h>
  #include <strings.h>
  
+ #ifdef __FreeBSD__
+ #include <machine/soundcard.h>
+ #include <machine/ultrasound.h>
+ #else
+ 
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
***************
*** 28,33 ****
--- 33,39 ----
  #endif
  
  #include <sys/ultrasound.h>
+ #endif
  
  #include "commands.h"
  #include "defines.h"
diff -c work/gmod/load_mod.c gmod/load_mod.c
*** load_mod.c	Wed Jan 18 17:08:35 1995
--- load_mod.c	Sun Mar  5 21:38:35 1995
***************
*** 19,29 ****
--- 19,34 ----
  #include <fcntl.h>
  #include <unistd.h>
  
+ #ifdef __FreeBSD__
+ #include <machine/soundcard.h>
+ #else
+ 
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
  #include <sys/soundcard.h>
  #endif
+ #endif
  
  #include <stdio.h>
  #include <stdlib.h>
***************
*** 505,511 ****
  	  break;
  	}
  
!       mod_fd = popen (command, "rb");
  
        if (mod_fd == NULL)
  	{
--- 510,516 ----
  	  break;
  	}
  
!       mod_fd = popen (command, "r");
  
        if (mod_fd == NULL)
  	{
diff -c work/gmod/load_mtm.c gmod/load_mtm.c
*** load_mtm.c	Sun Nov 27 13:42:25 1994
--- load_mtm.c	Sun Jan  8 17:32:53 1995
***************
*** 3,12 ****
--- 3,17 ----
  
  #include <sys/types.h>
  
+ #ifdef	__FreeBSD__
+ #include <machine/soundcard.h>
+ #else
+ 
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
  #include <sys/soundcard.h>
+ #endif
  #endif
  
  #include <unistd.h>
diff -c work/gmod/load_s3m.c gmod/load_s3m.c
*** load_s3m.c	Sun Nov 27 13:42:25 1994
--- load_s3m.c	Sun Jan  8 17:33:28 1995
***************
*** 7,16 ****
--- 7,21 ----
  #include <fcntl.h>
  #include <unistd.h>
  
+ #ifdef	__FreeBSD__
+ #include <machine/soundcard.h>
+ #else
+ 
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
  #include <sys/soundcard.h>
+ #endif
  #endif
  
  #include <stdio.h>
diff -c work/gmod/load_ult.c gmod/load_ult.c
*** load_ult.c	Sun Nov 27 13:42:25 1994
--- load_ult.c	Sun Jan  8 17:34:18 1995
***************
*** 3,12 ****
--- 3,17 ----
  
  #include <sys/types.h>
  
+ #ifdef __FreeBSD__
+ #include <machine/soundcard.h>
+ #else
+ 
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
  #include <sys/soundcard.h>
+ #endif
  #endif
  
  #include <unistd.h>
diff -c work/gmod/misc.c gmod/misc.c
*** misc.c	Sun Nov 27 13:42:25 1994
--- misc.c	Sun Jan  8 17:34:55 1995
***************
*** 18,23 ****
--- 18,28 ----
  #include <ctype.h>		/* for "isprint */
  #include <unistd.h>		/* for "pause" */
  
+ #ifdef __FreeBSD__
+ #include <machine/soundcard.h>
+ #include <machine/ultrasound.h>
+ #else
+ 
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
***************
*** 25,30 ****
--- 30,36 ----
  #endif
  
  #include <sys/ultrasound.h>
+ #endif
  
  #include "defines.h"
  #include "structs.h"
diff -c work/gmod/parse.c gmod/parse.c
*** parse.c	Sun Nov 27 13:42:25 1994
--- parse.c	Sun Jan  8 17:35:18 1995
***************
*** 9,15 ****
  
  
  #include <unistd.h>
! #include <getopt.h>
  #include <stdio.h>
  #include <stdlib.h>
  
--- 9,19 ----
  
  
  #include <unistd.h>
! 
! #ifndef __FreeBSD__
! #include <getopt.h> 
! #endif
! 
  #include <stdio.h>
  #include <stdlib.h>
  
diff -c work/gmod/patch_load.c gmod/patch_load.c
*** patch_load.c	Sun Nov 27 13:42:25 1994
--- patch_load.c	Sun Jan  8 17:35:43 1995
***************
*** 5,14 ****
--- 5,19 ----
  #include <unistd.h>
  #include <stdio.h>
  
+ #ifdef __FreeBSD__
+ #include <machine/soundcard.h>
+ #else
+ 
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
  #include <sys/soundcard.h>
+ #endif
  #endif
  
  #include "defines.h"
diff -c work/gmod/play_mod.c gmod/play_mod.c
*** play_mod.c	Sun Nov 27 13:42:25 1994
--- play_mod.c	Sun Jan  8 17:36:16 1995
***************
*** 14,19 ****
--- 14,23 ----
  * Refer to the ChangeLog for details.
  */
  
+ #ifdef	__FreeBSD__
+ #include <machine/soundcard.h>
+ #include <machine/ultrasound.h>
+ #else
  
  #ifdef USE_LOCAL
  #include "soundcard.h"
***************
*** 22,27 ****
--- 26,33 ----
  #endif
  
  #include <sys/ultrasound.h>
+ #endif
+ 
  #include <stdio.h>
  #include <stdlib.h>
  
diff -c work/gmod/play_note.c gmod/play_note.c
*** play_note.c	Sun Nov 27 13:42:25 1994
--- play_note.c	Sun Jan  8 17:36:49 1995
***************
*** 14,19 ****
--- 14,24 ----
  * Refer to the ChangeLog for details.
  */
  
+ #ifdef	__FreeBSD__
+ #include <machine/soundcard.h>
+ #include <machine/ultrasound.h>
+ #else
+ 
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
***************
*** 21,26 ****
--- 26,32 ----
  #endif
  
  #include <sys/ultrasound.h>
+ #endif
  
  #include "commands.h"
  #include "defines.h"
diff -c work/gmod/play_voice.c gmod/play_voice.c
*** play_voice.c	Sun Nov 27 13:42:25 1994
--- play_voice.c	Sun Jan  8 17:37:31 1995
***************
*** 14,19 ****
--- 14,24 ----
  * Refer to the ChangeLog for details.
  */
  
+ #ifdef	__FreeBSD__
+ #include <machine/soundcard.h>
+ #include <machine/ultrasound.h>
+ #else
+ 
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
***************
*** 21,26 ****
--- 26,32 ----
  #endif
  
  #include <sys/ultrasound.h>
+ #endif
  
  #include "defines.h"
  #include "structs.h"
diff -c work/gmod/signals.c gmod/signals.c
*** signals.c	Sun Nov 27 13:42:25 1994
--- signals.c	Sun Jan  8 17:37:55 1995
***************
*** 5,14 ****
--- 5,20 ----
  #include <stdio.h>
  #include <sys/time.h>
  
+ #ifdef __FreeBSD__
+ #include <machine/soundcard.h>
+ #include <machine/ultrasound.h>
+ #else
+ 
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
  #include <sys/soundcard.h>
+ #endif
  #endif
  
  #include <sys/types.h>