diff -c -r gmod.orig/Makefile gmod/Makefile
*** gmod.orig/Makefile	Sun May  7 16:53:48 1995
--- gmod/Makefile	Sat Jul 15 15:29:02 1995
***************
*** 7,24 ****
  # USE_X will compile gmod with and X interface.
  # Note:  do not define both USE_NCURSES and USE_X at the sample time.
  
! DEFINES = -DLINEAR_VOLUME -DUSE_X
! LIBS = -lfwf -lX11 -lXaw -lXt -lSM -lXmu -lXext -lXpm
  
  CFLAGS = -O2 -m486 -fomit-frame-pointer -Wall
  #CFLAGS = -g -Wall
  
  # App-defaults directory for install
! APPDEFDIR = /usr/lib/X11/app-defaults
  
  # Where to put the binary and man page
! BINDIR = /usr/local/bin
! MANDIR = /usr/local/man/man1
  
  OFILES = compress.o cvt_period.o dump.o effects.o get_version.o gmod.o init.o \
  	info_shell.o load_669.o load_mod.o load_mtm.o load_s3m.o load_ult.o \
--- 7,24 ----
  # USE_X will compile gmod with and X interface.
  # Note:  do not define both USE_NCURSES and USE_X at the sample time.
  
! DEFINES = -I${X11BASE}/include -DLINEAR_VOLUME -DUSE_X
! LIBS = -L${X11BASE}/lib -lfwf -lXaw -lXt -lXmu -lXext -lSM -lICE -lXpm -lX11 -lm
  
  CFLAGS = -O2 -m486 -fomit-frame-pointer -Wall
  #CFLAGS = -g -Wall
  
  # App-defaults directory for install
! APPDEFDIR = ${X11BASE}/lib/X11/app-defaults
  
  # Where to put the binary and man page
! BINDIR = ${X11BASE}/bin
! MANDIR = ${X11BASE}/man/man1
  
  OFILES = compress.o cvt_period.o dump.o effects.o get_version.o gmod.o init.o \
  	info_shell.o load_669.o load_mod.o load_mtm.o load_s3m.o load_ult.o \
***************
*** 30,36 ****
  	$(CC) $(CFLAGS) $(DEFINES) -c $<
  
  xgmod: fallback.h .depend $(OFILES)
! 	$(CC) -s -o xgmod $(OFILES) $(LIBS)
  
  .depend:
  	$(CC) $(DEFINES) -MM *.c > .depend
--- 30,36 ----
  	$(CC) $(CFLAGS) $(DEFINES) -c $<
  
  xgmod: fallback.h .depend $(OFILES)
! 	$(CC) -o xgmod $(OFILES) $(LIBS)
  
  .depend:
  	$(CC) $(DEFINES) -MM *.c > .depend
***************
*** 40,52 ****
  	rm -f $(OFILES) xgmod core .depend fallback.h
  
  install: xgmod Xgmod.ad Xgmod-color.ad
! 	install -o bin -g bin -m 755 -s xgmod $(BINDIR)/xgmod
! 	install -o bin -g bin -m 644 Xgmod.ad $(APPDEFDIR)/Xgmod
! 	install -o bin -g bin -m 644 Xgmod-color.ad $(APPDEFDIR)/Xgmod-color 
! 	install -o bin -g info -m 644 xgmod.1 $(MANDIR)/xgmod.1
  
  fallback.h: fallback.awk Xgmod.ad
! 	gawk -f fallback.awk Xgmod.ad > fallback.h
  
  ifeq (.depend,$(wildcard .depend))
  include .depend
--- 40,52 ----
  	rm -f $(OFILES) xgmod core .depend fallback.h
  
  install: xgmod Xgmod.ad Xgmod-color.ad
! 	install -c -o bin -g bin -m 755 -s xgmod $(BINDIR)/xgmod
! 	install -c -o bin -g bin -m 644 Xgmod.ad $(APPDEFDIR)/Xgmod
! 	install -c -o bin -g bin -m 644 Xgmod-color.ad $(APPDEFDIR)/Xgmod-color 
! 	install -c -o bin -g man -m 644 xgmod.1 $(MANDIR)/xgmod.1
  
  fallback.h: fallback.awk Xgmod.ad
! 	awk -f fallback.awk Xgmod.ad > fallback.h
  
  ifeq (.depend,$(wildcard .depend))
  include .depend
diff -c -r gmod.orig/dump.c gmod/dump.c
*** gmod.orig/dump.c	Tue May  2 21:31:44 1995
--- gmod/dump.c	Sat Jul 15 13:45:57 1995
***************
*** 30,36 ****
--- 30,40 ----
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
+ #if defined(__FreeBSD__)
+ #include <machine/soundcard.h>
+ #else
  #include <sys/soundcard.h>
+ #endif
  #endif
  
  #ifdef USE_X
diff -c -r gmod.orig/effects.c gmod/effects.c
*** gmod.orig/effects.c	Sat Apr  8 07:24:52 1995
--- gmod/effects.c	Sat Jul 15 13:45:57 1995
***************
*** 19,28 ****
--- 19,36 ----
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
+ #if defined(__FreeBSD__)
+ #include <machine/soundcard.h>
+ #else
  #include <sys/soundcard.h>
  #endif
+ #endif
  
+ #if defined(__FreeBSD__)
+ #include <machine/ultrasound.h>
+ #else
  #include <sys/ultrasound.h>
+ #endif
  
  #include "defines.h"
  #include "structs.h"
diff -c -r gmod.orig/gmod.c gmod/gmod.c
*** gmod.orig/gmod.c	Tue May  2 21:02:47 1995
--- gmod/gmod.c	Sat Jul 15 13:45:58 1995
***************
*** 25,34 ****
--- 25,42 ----
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
+ #if defined(__FreeBSD__)
+ #include <machine/soundcard.h>
+ #else
  #include <sys/soundcard.h>
  #endif
+ #endif
  
+ #if defined(__FreeBSD__) 
+ #include <machine/ultrasound.h>
+ #else
  #include <sys/ultrasound.h>
+ #endif
  #include <stdio.h>
  #include <string.h>
  
diff -c -r gmod.orig/load_669.c gmod/load_669.c
*** gmod.orig/load_669.c	Sat Apr  8 07:24:52 1995
--- gmod/load_669.c	Sat Jul 15 13:45:58 1995
***************
*** 26,35 ****
--- 26,43 ----
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
+ #if defined(__FreeBSD__) 
+ #include <machine/soundcard.h>
+ #else
  #include <sys/soundcard.h>
  #endif
+ #endif
  
+ #if defined(__FreeBSD__)
+ #include <machine/ultrasound.h>
+ #else
  #include <sys/ultrasound.h>
+ #endif
  
  #include "commands.h"
  #include "defines.h"
diff -c -r gmod.orig/load_mod.c gmod/load_mod.c
*** gmod.orig/load_mod.c	Sun Apr 30 14:53:17 1995
--- gmod/load_mod.c	Sat Jul 15 13:45:58 1995
***************
*** 24,30 ****
--- 24,34 ----
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
+ #if defined(__FreeBSD__)
+ #include <machine/soundcard.h>
+ #else
  #include <sys/soundcard.h>
+ #endif
  #endif
  
  #include <stdio.h>
diff -c -r gmod.orig/load_mtm.c gmod/load_mtm.c
*** gmod.orig/load_mtm.c	Sat Apr  8 07:24:52 1995
--- gmod/load_mtm.c	Sat Jul 15 13:45:58 1995
***************
*** 11,17 ****
--- 11,21 ----
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
+ #if defined(__FreeBSD__)
+ #include <machine/soundcard.h>
+ #else
  #include <sys/soundcard.h>
+ #endif
  #endif
  
  #include <unistd.h>
diff -c -r gmod.orig/load_s3m.c gmod/load_s3m.c
*** gmod.orig/load_s3m.c	Sat Apr  8 07:24:52 1995
--- gmod/load_s3m.c	Sat Jul 15 13:45:58 1995
***************
*** 12,18 ****
--- 12,22 ----
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
+ #if defined(__FreeBSD__)
+ #include <machine/soundcard.h>
+ #else
  #include <sys/soundcard.h>
+ #endif
  #endif
  
  #include <stdio.h>
diff -c -r gmod.orig/load_ult.c gmod/load_ult.c
*** gmod.orig/load_ult.c	Sat Apr  8 07:24:52 1995
--- gmod/load_ult.c	Sat Jul 15 13:45:58 1995
***************
*** 8,14 ****
--- 8,18 ----
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
+ #if defined(__FreeBSD__)
+ #include <machine/soundcard.h>
+ #else
  #include <sys/soundcard.h>
+ #endif
  #endif
  
  #include <unistd.h>
diff -c -r gmod.orig/misc.c gmod/misc.c
*** gmod.orig/misc.c	Sat Apr  8 07:24:52 1995
--- gmod/misc.c	Sat Jul 15 13:45:58 1995
***************
*** 24,34 ****
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
  #include <sys/soundcard.h>
  #endif
  
  #include <sys/ultrasound.h>
! 
  #include "defines.h"
  #include "structs.h"
  #include "globals.h"
--- 24,41 ----
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
+ #if defined(__FreeBSD__)
+ #include <machine/soundcard.h>
+ #else
  #include <sys/soundcard.h>
  #endif
+ #endif
  
+ #if defined(__FreeBSD__)
+ #include <machine/ultrasound.h>
+ #else
  #include <sys/ultrasound.h>
! #endif
  #include "defines.h"
  #include "structs.h"
  #include "globals.h"
diff -c -r gmod.orig/parse.c gmod/parse.c
*** gmod.orig/parse.c	Sat Apr  8 07:24:52 1995
--- gmod/parse.c	Sat Jul 15 13:45:59 1995
***************
*** 10,16 ****
  
  
  #include <unistd.h>
- #include <getopt.h>
  #include <stdio.h>
  #include <stdlib.h>
  
--- 10,15 ----
diff -c -r gmod.orig/patch_load.c gmod/patch_load.c
*** gmod.orig/patch_load.c	Sat Apr  8 07:24:52 1995
--- gmod/patch_load.c	Sat Jul 15 13:45:59 1995
***************
*** 10,16 ****
--- 10,20 ----
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
+ #if defined(__FreeBSD__)
+ #include <machine/soundcard.h>
+ #else
  #include <sys/soundcard.h>
+ #endif
  #endif
  
  #include "defines.h"
diff -c -r gmod.orig/play_mod.c gmod/play_mod.c
*** gmod.orig/play_mod.c	Sun Apr 30 14:42:03 1995
--- gmod/play_mod.c	Sat Jul 15 13:45:59 1995
***************
*** 23,32 ****
--- 23,40 ----
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
+ #if defined(__FreeBSD__)
+ #include <machine/soundcard.h>
+ #else
  #include <sys/soundcard.h>
  #endif
+ #endif
  
+ #if defined(__FreeBSD__)
+ #include <machine/ultrasound.h>
+ #else
  #include <sys/ultrasound.h>
+ #endif
  #include <stdio.h>
  #include <stdlib.h>
  
diff -c -r gmod.orig/play_note.c gmod/play_note.c
*** gmod.orig/play_note.c	Sat Apr  8 07:24:52 1995
--- gmod/play_note.c	Sat Jul 15 13:45:59 1995
***************
*** 19,29 ****
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
  #include <sys/soundcard.h>
  #endif
  
  #include <sys/ultrasound.h>
! 
  #include "commands.h"
  #include "defines.h"
  #include "structs.h"
--- 19,36 ----
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
+ #if defined(__FreeBSD__)
+ #include <machine/soundcard.h>
+ #else
  #include <sys/soundcard.h>
  #endif
+ #endif
  
+ #if defined(__FreeBSD__)
+ #include <machine/ultrasound.h>
+ #else
  #include <sys/ultrasound.h>
! #endif
  #include "commands.h"
  #include "defines.h"
  #include "structs.h"
diff -c -r gmod.orig/play_voice.c gmod/play_voice.c
*** gmod.orig/play_voice.c	Sat Apr  8 07:24:52 1995
--- gmod/play_voice.c	Sat Jul 15 13:45:59 1995
***************
*** 19,29 ****
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
  #include <sys/soundcard.h>
  #endif
  
  #include <sys/ultrasound.h>
! 
  #include "defines.h"
  #include "structs.h"
  #include "globals.h"
--- 19,36 ----
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
+ #if defined(__FreeBSD__)
+ #include <machine/soundcard.h>
+ #else
  #include <sys/soundcard.h>
  #endif
+ #endif
  
+ #if defined(__FreeBSD__)
+ #include <machine/ultrasound.h>
+ #else
  #include <sys/ultrasound.h>
! #endif
  #include "defines.h"
  #include "structs.h"
  #include "globals.h"
diff -c -r gmod.orig/proc_input.c gmod/proc_input.c
*** gmod.orig/proc_input.c	Sun May  7 16:47:33 1995
--- gmod/proc_input.c	Sat Jul 15 13:45:59 1995
***************
*** 8,14 ****
--- 8,18 ----
  #ifdef USE_LOCAL
  #include "soundcard.h"
  #else
+ #if defined(__FreeBSD__)
+ #include <machine/soundcard.h>
+ #else
  #include <sys/soundcard.h>
+ #endif
  #endif
  
  #ifdef USE_X
