--- Makefile.orig	Sun May 26 05:26:46 1996
+++ Makefile	Sat Mar  7 13:55:24 1998
@@ -24,22 +24,23 @@
 # But where to change without revealing my secret identity?
 
 ########### Compiler and flags.
-CC = gcc
-DEBUGFLAGS = -Wall -O2
+CC = cc
+DEBUGFLAGS = -Wall -O3 -fomit-frame-pointer -funroll-loops -ffast-math
 
 ########### Install.
-INSTALL = /usr/bin/install
+#INSTALL = /usr/bin/install
+INSTALL= install -c
 
 # Where to install the executable
-BIN_DIR = /usr/local/bin
+BIN_DIR = ${PREFIX}/bin
 
 # Where to install the manual pages
-MAN_DIR = /usr/local/man/man1
+MAN_DIR = ${PREFIX}/man/man1
 
 # Where to install the patches, config files, and MIDI files.
 # If you change this, it's a good idea to recompile the binary,
 # or you'll need to invoke timidity with the -L option.
-TIMID_DIR = /usr/local/lib/timidity
+TIMID_DIR = ${PREFIX}/lib/timidity
 
 # Where to install the Tcl code, if you use the Tcl code that is.
 TCL_DIR = $(TIMID_DIR)
@@ -54,8 +55,8 @@
 # do some axe work.
 
 # Select the Linux/FreeBSD audio driver
-SYSTEM += -DAU_LINUX
-SYSEXTRAS += linux_a.c
+#SYSTEM += -DAU_LINUX
+#SYSEXTRAS += linux_a.c
 #EXTRAINCS +=
 #EXTRALIBS += 
 
@@ -77,6 +78,18 @@
 #EXTRAINCS += -I/usr/demo/SOUND/include
 #EXTRALIBS += -L/usr/demo/SOUND/lib -laudio -lsocket
 
+## Select the Sun audio driver (for NetBSD)
+SYSTEM += -DAU_SUN
+SYSEXTRAS += sun_a.c
+EXTRAINCS +=
+EXTRALIBS +=
+
+## Select the IRIX audio driver
+#SYSTEM += -DAU_SGI
+#SYSEXTRAS += sgi_a.c
+#EXTRAINCS +=
+#EXTRALIBS += -laudio
+
 ## Select the DEC MMS audio server
 #SYSTEM += -DDEC -DAU_DEC
 #SYSEXTRAS += dec_a.c
@@ -93,8 +106,8 @@
 # Select the ncurses full-screen interface
 SYSTEM += -DIA_NCURSES
 SYSEXTRAS += ncurs_c.c
-EXTRAINCS += -I/usr/include/ncurses
-EXTRALIBS += -lncurses
+EXTRAINCS += -I${PREFIX}/include
+EXTRALIBS += -L${PREFIX}/lib -lncurses
 
 ## Select the S-Lang full-screen interface
 #SYSTEM += -DIA_SLANG
@@ -112,11 +125,11 @@
 #EXTRALIBS += -lgen
 
 # Select the Tcl/Tk interface
-SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
+SYSTEM += -DTCLTK -DWISH=\"wish8.0\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
 SYSEXTRAS += tk_c.c
 INST_TK = install.tk
-#EXTRAINCS +=
-#EXTRALIBS +=
+EXTRAINCS +=
+EXTRALIBS +=
 
 ########### Now check out the options in config.h
 
@@ -136,7 +149,7 @@
 SDIST = timidity-lib-$(SUPPVERSION).tar.gz
 SDISTZIP = tilib$(FNSUPPVERSION).zip
 
-CFLAGS= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
+CFLAGS+= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
 	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
 
 ########### All relevant files.. Anybody know autoconf?
@@ -228,10 +241,10 @@
 wav2pat: wav2pat.c
 	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
 
-depends depend dep:
-	$(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
-
-include depends
+#depends depend dep:
+#        $(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
+#
+#include depends
 
 ########### Installation targets
 
@@ -262,9 +275,9 @@
 	mkdir -p $(TIMID_DIR)
 	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
 
-install.patch: $(PATCHF)
+install.patch: #$(PATCHF)
 	mkdir -p $(TIMID_DIR)/patch
-	$(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
+#        $(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
 
 install.tk: $(ALLTCLF)
 	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)
@@ -281,7 +294,7 @@
 	groff -man $< >$@
 
 tclIndex: $(TCLF)
-	echo 'auto_mkindex . *.tcl; exit' | wish
+	echo 'auto_mkindex . *.tcl; exit' | wish8.0
 
 ########## Some special targets