MIDI-to-WAV rendered/player, sounds much better than playmidi

15 files changed, 961 insertions, 0 deletions

diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
new file mode 100644
index 000000000000..a2844fbe46c1
--- /dev/null
+++ b/audio/timidity++/Makefile
@@ -0,0 +1,35 @@
+# New ports collection makefile for:    timidity
+# Homepage: http://www.clinet.fi/~toivonen/timidity/
+# Version required:     0.2i
+# Date created:         17 Nov 1996
+# Whom:                 ache
+#
+# $Id: Makefile,v 1.6 1996/11/15 10:52:00 asami Exp $
+#
+
+DISTNAME=       timidity-0.2i
+CATEGORIES=     audio
+MASTER_SITES=   ftp://ftp.cdrom.com/pub/demos/music/samples/ \
+		http://www.clinet.fi/~toivonen/timidity/
+TIINS=          dgguspat.zip
+DISTFILES=      ${TIINS} ${DISTNAME}.tar.gz
+EXTRACT_ONLY=   ${DISTNAME}.tar.gz
+BUILD_DEPENDS=  unzip:${PORTSDIR}/archivers/unzip
+
+MAINTAINER=     ache@FreeBSD.ORG
+
+
+INSTALL_TARGET= install.all
+
+do-configure:
+	@cd ${WRKSRC} && \
+	sed "s=%PREFIX%=${PREFIX}=" < gravis.cfg > gravis.cfg.new && \
+	mv gravis.cfg.new gravis.cfg
+
+post-install:
+	cd ${PREFIX}/lib/timidity/patch && \
+	unzip -q -L ${DISTDIR}${TIINS}
+
+MAN1=           timidity.1
+
+.include <bsd.port.mk>
diff --git a/audio/timidity++/distinfo b/audio/timidity++/distinfo
new file mode 100644
index 000000000000..f39b89342963
--- /dev/null
+++ b/audio/timidity++/distinfo
@@ -0,0 +1,2 @@
+MD5 (dgguspat.zip) = 94affd73c5b53ff0d5e12df1bc55c53d
+MD5 (timidity-0.2i.tar.gz) = 7dedd75232aaa7729e50c76cdd379b82
diff --git a/audio/timidity++/files/patch-ab b/audio/timidity++/files/patch-ab
new file mode 100644
index 000000000000..34e8d69c27af
--- /dev/null
+++ b/audio/timidity++/files/patch-ab
@@ -0,0 +1,150 @@
+*** Makefile.orig	Sun May 26 13:26:46 1996
+--- Makefile	Sun Nov 17 13:09:19 1996
+***************
+*** 24,45 ****
+  # But where to change without revealing my secret identity?
+  
+  ########### Compiler and flags.
+! CC = gcc
+! DEBUGFLAGS = -Wall -O2
+  
+  ########### Install.
+! INSTALL = /usr/bin/install
+  
+  # Where to install the executable
+! BIN_DIR = /usr/local/bin
+  
+  # Where to install the manual pages
+! MAN_DIR = /usr/local/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
+  
+  # Where to install the Tcl code, if you use the Tcl code that is.
+  TCL_DIR = $(TIMID_DIR)
+--- 24,45 ----
+  # But where to change without revealing my secret identity?
+  
+  ########### Compiler and flags.
+! #CC = gcc
+! DEBUGFLAGS = -Wall
+  
+  ########### Install.
+! #INSTALL = /usr/bin/install
+  
+  # Where to install the executable
+! BIN_DIR = ${PREFIX}/bin
+  
+  # Where to install the manual pages
+! 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 = ${PREFIX}/lib/timidity
+  
+  # Where to install the Tcl code, if you use the Tcl code that is.
+  TCL_DIR = $(TIMID_DIR)
+***************
+*** 93,100 ****
+  # Select the ncurses full-screen interface
+  SYSTEM += -DIA_NCURSES
+  SYSEXTRAS += ncurs_c.c
+! EXTRAINCS += -I/usr/include/ncurses
+! EXTRALIBS += -lncurses
+  
+  ## Select the S-Lang full-screen interface
+  #SYSTEM += -DIA_SLANG
+--- 93,100 ----
+  # Select the ncurses full-screen interface
+  SYSTEM += -DIA_NCURSES
+  SYSEXTRAS += ncurs_c.c
+! #EXTRAINCS += -I/usr/include/ncurses
+! EXTRALIBS += -lncurses -lmytinfo
+  
+  ## Select the S-Lang full-screen interface
+  #SYSTEM += -DIA_SLANG
+***************
+*** 112,120 ****
+  #EXTRALIBS += -lgen
+  
+  # Select the Tcl/Tk interface
+! SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
+! SYSEXTRAS += tk_c.c
+! INST_TK = install.tk
+  #EXTRAINCS +=
+  #EXTRALIBS +=
+  
+--- 112,120 ----
+  #EXTRALIBS += -lgen
+  
+  # Select the Tcl/Tk interface
+! #SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
+! #SYSEXTRAS += tk_c.c
+! #INST_TK = install.tk
+  #EXTRAINCS +=
+  #EXTRALIBS +=
+  
+***************
+*** 136,142 ****
+  SDIST = timidity-lib-$(SUPPVERSION).tar.gz
+  SDISTZIP = tilib$(FNSUPPVERSION).zip
+  
+! CFLAGS= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
+  	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
+  
+  ########### All relevant files.. Anybody know autoconf?
+--- 136,142 ----
+  SDIST = timidity-lib-$(SUPPVERSION).tar.gz
+  SDISTZIP = tilib$(FNSUPPVERSION).zip
+  
+! CFLAGS+= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
+  	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
+  
+  ########### All relevant files.. Anybody know autoconf?
+***************
+*** 228,237 ****
+  wav2pat: wav2pat.c
+  	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
+  
+! depends depend dep:
+! 	$(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
+! 
+! include depends
+  
+  ########### Installation targets
+  
+--- 228,237 ----
+  wav2pat: wav2pat.c
+  	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
+  
+! #depends depend dep:
+! #        $(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
+! #
+! #include depends
+  
+  ########### Installation targets
+  
+***************
+*** 262,270 ****
+  	mkdir -p $(TIMID_DIR)
+  	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
+  
+! install.patch: $(PATCHF)
+  	mkdir -p $(TIMID_DIR)/patch
+! 	$(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
+  
+  install.tk: $(ALLTCLF)
+  	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)
+--- 262,270 ----
+  	mkdir -p $(TIMID_DIR)
+  	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
+  
+! install.patch: #$(PATCHF)
+  	mkdir -p $(TIMID_DIR)/patch
+! #        $(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
+  
+  install.tk: $(ALLTCLF)
+  	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)
diff --git a/audio/timidity++/files/patch-ac b/audio/timidity++/files/patch-ac
new file mode 100644
index 000000000000..ad4e745c08e9
--- /dev/null
+++ b/audio/timidity++/files/patch-ac
@@ -0,0 +1,40 @@
+*** timidity.cfg.bak	Mon May 22 02:40:27 1995
+--- timidity.cfg	Sun Nov 17 10:50:44 1996
+***************
+*** 34,42 ****
+  # This sets up the default patches in the TiMidity support package
+  # "timidity-lib-0.1.tar.gz":
+  
+! bank 0
+!    0 patch/acpiano.pat
+!   24 patch/nylongt2.pat
+  
+  ##############################################################################
+  # If you have Dustin McCartney's "wowpats" patches, you can source the 
+--- 34,42 ----
+  # This sets up the default patches in the TiMidity support package
+  # "timidity-lib-0.1.tar.gz":
+  
+! #bank 0
+! #   0 patch/acpiano.pat
+! #  24 patch/nylongt2.pat
+  
+  ##############################################################################
+  # If you have Dustin McCartney's "wowpats" patches, you can source the 
+***************
+*** 67,73 ****
+  # Note that midia.cfg sources gravis.cfg in turn, since the filenames are 
+  # almost identical.
+  #
+! #source midia.cfg
+  #
+  
+  
+--- 67,73 ----
+  # Note that midia.cfg sources gravis.cfg in turn, since the filenames are 
+  # almost identical.
+  #
+! source midia.cfg
+  #
+  
+  
diff --git a/audio/timidity++/pkg-comment b/audio/timidity++/pkg-comment
new file mode 100644
index 000000000000..46e4a463861a
--- /dev/null
+++ b/audio/timidity++/pkg-comment
@@ -0,0 +1 @@
+MIDI to WAV renderer and player
diff --git a/audio/timidity++/pkg-descr b/audio/timidity++/pkg-descr
new file mode 100644
index 000000000000..0a7ddfe0523d
--- /dev/null
+++ b/audio/timidity++/pkg-descr
@@ -0,0 +1,5 @@
+TiMidity  is  a MIDI to WAVE converter using Gravis Ultra-
+sound-compatible patch files  to  generate  digital  audio
+data from General MIDI files.  The data can be stored in a
+file for processing, or played in  real  time  through  an
+audio device.
diff --git a/audio/timidity++/pkg-plist b/audio/timidity++/pkg-plist
new file mode 100644
index 000000000000..48e11d087d34
--- /dev/null
+++ b/audio/timidity++/pkg-plist
@@ -0,0 +1,205 @@
+bin/timidity
+bin/bag
+bin/wav2pat
+man/man1/timidity.1.gz
+lib/timidity/timidity.cfg
+lib/timidity/gsdrum.cfg
+lib/timidity/gravis.cfg
+lib/timidity/midia.cfg
+lib/timidity/wowpats.cfg
+lib/timidity/mt32.cfg
+lib/timidity/patch/acbass.pat
+lib/timidity/patch/accordn.pat
+lib/timidity/patch/acguitar.pat
+lib/timidity/patch/acpiano.pat
+lib/timidity/patch/agogo.pat
+lib/timidity/patch/agogohi.pat
+lib/timidity/patch/agogolo.pat
+lib/timidity/patch/altosax.pat
+lib/timidity/patch/applause.pat
+lib/timidity/patch/atmosphr.pat
+lib/timidity/patch/aurora.pat
+lib/timidity/patch/bagpipes.pat
+lib/timidity/patch/banjo.pat
+lib/timidity/patch/barisax.pat
+lib/timidity/patch/basslead.pat
+lib/timidity/patch/bassoon.pat
+lib/timidity/patch/belltree.pat
+lib/timidity/patch/blank.pat
+lib/timidity/patch/bongohi.pat
+lib/timidity/patch/bongolo.pat
+lib/timidity/patch/bottle.pat
+lib/timidity/patch/bowglass.pat
+lib/timidity/patch/britepno.pat
+lib/timidity/patch/c550kc_1.pat
+lib/timidity/patch/c550sn10.pat
+lib/timidity/patch/c550sn_6.pat
+lib/timidity/patch/c550vibs.pat
+lib/timidity/patch/cabasa.pat
+lib/timidity/patch/calliope.pat
+lib/timidity/patch/carillon.pat
+lib/timidity/patch/castinet.pat
+lib/timidity/patch/celeste.pat
+lib/timidity/patch/cello.pat
+lib/timidity/patch/charang.pat
+lib/timidity/patch/chiflead.pat
+lib/timidity/patch/choir.pat
+lib/timidity/patch/church.pat
+lib/timidity/patch/claps.pat
+lib/timidity/patch/clarinet.pat
+lib/timidity/patch/clave.pat
+lib/timidity/patch/clavinet.pat
+lib/timidity/patch/cleangtr.pat
+lib/timidity/patch/concrtna.pat
+lib/timidity/patch/congahi1.pat
+lib/timidity/patch/congahi2.pat
+lib/timidity/patch/congalo.pat
+lib/timidity/patch/contraba.pat
+lib/timidity/patch/cowbell.pat
+lib/timidity/patch/crystal.pat
+lib/timidity/patch/cuica1.pat
+lib/timidity/patch/cuica2.pat
+lib/timidity/patch/cymbell.pat
+lib/timidity/patch/cymchina.pat
+lib/timidity/patch/cymcrsh1.pat
+lib/timidity/patch/cymcrsh2.pat
+lib/timidity/patch/cymride1.pat
+lib/timidity/patch/cymride2.pat
+lib/timidity/patch/cymsplsh.pat
+lib/timidity/patch/distgtr.pat
+lib/timidity/patch/doo.pat
+lib/timidity/patch/echovox.pat
+lib/timidity/patch/englhorn.pat
+lib/timidity/patch/epiano1.pat
+lib/timidity/patch/epiano2.pat
+lib/timidity/patch/fantasia.pat
+lib/timidity/patch/fiddle.pat
+lib/timidity/patch/flute.pat
+lib/timidity/patch/fngrbass.pat
+lib/timidity/patch/frenchrn.pat
+lib/timidity/patch/freshair.pat
+lib/timidity/patch/fretless.pat
+lib/timidity/patch/fx-blow.pat
+lib/timidity/patch/fx-fret.pat
+lib/timidity/patch/ghostie.pat
+lib/timidity/patch/glocken.pat
+lib/timidity/patch/gtrharm.pat
+lib/timidity/patch/guiro1.pat
+lib/timidity/patch/guiro2.pat
+lib/timidity/patch/halopad.pat
+lib/timidity/patch/harmonca.pat
+lib/timidity/patch/harp.pat
+lib/timidity/patch/helicptr.pat
+lib/timidity/patch/highq.pat
+lib/timidity/patch/hihatcl.pat
+lib/timidity/patch/hihatop.pat
+lib/timidity/patch/hihatpd.pat
+lib/timidity/patch/hitbrass.pat
+lib/timidity/patch/homeorg.pat
+lib/timidity/patch/honky.pat
+lib/timidity/patch/hrpschrd.pat
+lib/timidity/patch/jazzgtr.pat
+lib/timidity/patch/jingles.pat
+lib/timidity/patch/jungle.pat
+lib/timidity/patch/kalimba.pat
+lib/timidity/patch/kick1.pat
+lib/timidity/patch/kick2.pat
+lib/timidity/patch/koto.pat
+lib/timidity/patch/lead5th.pat
+lib/timidity/patch/maracas.pat
+lib/timidity/patch/marcato.pat
+lib/timidity/patch/marimba.pat
+lib/timidity/patch/metalpad.pat
+lib/timidity/patch/metbell.pat
+lib/timidity/patch/metclick.pat
+lib/timidity/patch/musicbox.pat
+lib/timidity/patch/mutegtr.pat
+lib/timidity/patch/mutetrum.pat
+lib/timidity/patch/nyguitar.pat
+lib/timidity/patch/oboe.pat
+lib/timidity/patch/ocarina.pat
+lib/timidity/patch/odguitar.pat
+lib/timidity/patch/orchhit.pat
+lib/timidity/patch/percorg.pat
+lib/timidity/patch/piccolo.pat
+lib/timidity/patch/pickbass.pat
+lib/timidity/patch/pistol.pat
+lib/timidity/patch/pizzcato.pat
+lib/timidity/patch/polysyn.pat
+lib/timidity/patch/recorder.pat
+lib/timidity/patch/reedorg.pat
+lib/timidity/patch/revcym.pat
+lib/timidity/patch/ringwhsl.pat
+lib/timidity/patch/rockorg.pat
+lib/timidity/patch/santur.pat
+lib/timidity/patch/sawwave.pat
+lib/timidity/patch/scratch1.pat
+lib/timidity/patch/scratch2.pat
+lib/timidity/patch/seashore.pat
+lib/timidity/patch/shakazul.pat
+lib/timidity/patch/shaker.pat
+lib/timidity/patch/shamisen.pat
+lib/timidity/patch/shannai.pat
+lib/timidity/patch/sitar.pat
+lib/timidity/patch/slap.pat
+lib/timidity/patch/slapbas1.pat
+lib/timidity/patch/slapbas2.pat
+lib/timidity/patch/slowstr.pat
+lib/timidity/patch/snare1.pat
+lib/timidity/patch/snare2.pat
+lib/timidity/patch/soundtrk.pat
+lib/timidity/patch/sprnosax.pat
+lib/timidity/patch/sqrclick.pat
+lib/timidity/patch/sqrwave.pat
+lib/timidity/patch/startrak.pat
+lib/timidity/patch/steeldrm.pat
+lib/timidity/patch/stickrim.pat
+lib/timidity/patch/sticks.pat
+lib/timidity/patch/surdo1.pat
+lib/timidity/patch/surdo2.pat
+lib/timidity/patch/sweeper.pat
+lib/timidity/patch/synbass1.pat
+lib/timidity/patch/synbass2.pat
+lib/timidity/patch/synbras1.pat
+lib/timidity/patch/synbras2.pat
+lib/timidity/patch/synpiano.pat
+lib/timidity/patch/synstr1.pat
+lib/timidity/patch/synstr2.pat
+lib/timidity/patch/syntom.pat
+lib/timidity/patch/taiko.pat
+lib/timidity/patch/tamborin.pat
+lib/timidity/patch/telephon.pat
+lib/timidity/patch/tenorsax.pat
+lib/timidity/patch/timbaleh.pat
+lib/timidity/patch/timbalel.pat
+lib/timidity/patch/timpani.pat
+lib/timidity/patch/tomhi1.pat
+lib/timidity/patch/tomhi2.pat
+lib/timidity/patch/tomlo1.pat
+lib/timidity/patch/tomlo2.pat
+lib/timidity/patch/tommid1.pat
+lib/timidity/patch/tommid2.pat
+lib/timidity/patch/toms.pat
+lib/timidity/patch/tremstr.pat
+lib/timidity/patch/triangl1.pat
+lib/timidity/patch/triangl2.pat
+lib/timidity/patch/trombone.pat
+lib/timidity/patch/trumpet.pat
+lib/timidity/patch/tuba.pat
+lib/timidity/patch/tubebell.pat
+lib/timidity/patch/unicorn.pat
+lib/timidity/patch/vibes.pat
+lib/timidity/patch/vibslap.pat
+lib/timidity/patch/viola.pat
+lib/timidity/patch/violin.pat
+lib/timidity/patch/voices.pat
+lib/timidity/patch/voxlead.pat
+lib/timidity/patch/warmpad.pat
+lib/timidity/patch/whistle.pat
+lib/timidity/patch/whistle1.pat
+lib/timidity/patch/whistle2.pat
+lib/timidity/patch/woodblk.pat
+lib/timidity/patch/woodblk1.pat
+lib/timidity/patch/woodblk2.pat
+lib/timidity/patch/woodflut.pat
+lib/timidity/patch/xylophon.pat
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
new file mode 100644
index 000000000000..a2844fbe46c1
--- /dev/null
+++ b/audio/timidity/Makefile
@@ -0,0 +1,35 @@
+# New ports collection makefile for:    timidity
+# Homepage: http://www.clinet.fi/~toivonen/timidity/
+# Version required:     0.2i
+# Date created:         17 Nov 1996
+# Whom:                 ache
+#
+# $Id: Makefile,v 1.6 1996/11/15 10:52:00 asami Exp $
+#
+
+DISTNAME=       timidity-0.2i
+CATEGORIES=     audio
+MASTER_SITES=   ftp://ftp.cdrom.com/pub/demos/music/samples/ \
+		http://www.clinet.fi/~toivonen/timidity/
+TIINS=          dgguspat.zip
+DISTFILES=      ${TIINS} ${DISTNAME}.tar.gz
+EXTRACT_ONLY=   ${DISTNAME}.tar.gz
+BUILD_DEPENDS=  unzip:${PORTSDIR}/archivers/unzip
+
+MAINTAINER=     ache@FreeBSD.ORG
+
+
+INSTALL_TARGET= install.all
+
+do-configure:
+	@cd ${WRKSRC} && \
+	sed "s=%PREFIX%=${PREFIX}=" < gravis.cfg > gravis.cfg.new && \
+	mv gravis.cfg.new gravis.cfg
+
+post-install:
+	cd ${PREFIX}/lib/timidity/patch && \
+	unzip -q -L ${DISTDIR}${TIINS}
+
+MAN1=           timidity.1
+
+.include <bsd.port.mk>
diff --git a/audio/timidity/distinfo b/audio/timidity/distinfo
new file mode 100644
index 000000000000..f39b89342963
--- /dev/null
+++ b/audio/timidity/distinfo
@@ -0,0 +1,2 @@
+MD5 (dgguspat.zip) = 94affd73c5b53ff0d5e12df1bc55c53d
+MD5 (timidity-0.2i.tar.gz) = 7dedd75232aaa7729e50c76cdd379b82
diff --git a/audio/timidity/files/patch-aa b/audio/timidity/files/patch-aa
new file mode 100644
index 000000000000..3f12b08b1ce0
--- /dev/null
+++ b/audio/timidity/files/patch-aa
@@ -0,0 +1,85 @@
+*** config.h.orig	Sat Jun  1 16:54:49 1996
+--- config.h	Sun Nov 17 10:00:29 1996
+***************
+*** 217,222 ****
+--- 217,238 ----
+  # endif
+  #endif /* linux */
+  
++ #ifdef __FreeBSD__
++ #include <errno.h>
++ #include <machine/endian.h>
++ #if BYTE_ORDER == LITTLE_ENDIAN
++ #undef BIG_ENDIAN
++ #undef PDP_ENDIAN
++ #elif BYTE_ORDER == BIG_ENDIAN
++ #undef LITTLE_ENDIAN
++ #undef PDP_ENDIAN
++ #else
++ # error No valid byte sex defined
++ #endif
++ #define USE_LDEXP
++ #define PI M_PI
++ #endif
++ 
+  /* Win32 on Intel machines */
+  #ifdef __WIN32__
+  #  define LITTLE_ENDIAN
+***************
+*** 254,266 ****
+--- 270,292 ----
+  #ifdef LITTLE_ENDIAN
+  #define LE_SHORT(x) x
+  #define LE_LONG(x) x
++ #ifdef __FreeBSD__
++ #define BE_SHORT(x) __byte_swap_word(x)
++ #define BE_LONG(x) __byte_swap_long(x)
++ #else
+  #define BE_SHORT(x) XCHG_SHORT(x)
+  #define BE_LONG(x) XCHG_LONG(x)
++ #endif
+  #else
+  #define BE_SHORT(x) x
+  #define BE_LONG(x) x
++ #ifdef __FreeBSD__
++ #define LE_SHORT(x) __byte_swap_word(x)
++ #define LE_LONG(x) __byte_swap_long(x)
++ #else
+  #define LE_SHORT(x) XCHG_SHORT(x)
+  #define LE_LONG(x) XCHG_LONG(x)
++ #endif
+  #endif
+  
+  #define MAX_AMPLIFICATION 800
+*** mix.c.orig	Mon May 20 17:09:46 1996
+--- mix.c	Sun Nov 17 10:01:36 1996
+***************
+*** 23,29 ****
+--- 23,33 ----
+  
+  #include <math.h>
+  #include <stdio.h>
++ #ifdef __FreeBSD__
++ #include <stdlib.h>
++ #else
+  #include <malloc.h>
++ #endif
+  
+  #include "config.h"
+  #include "common.h"
+*** resample.c.orig	Mon May 20 17:09:47 1996
+--- resample.c	Sun Nov 17 09:59:29 1996
+***************
+*** 22,28 ****
+--- 22,32 ----
+  
+  #include <math.h>
+  #include <stdio.h>
++ #ifdef __FreeBSD__
++ #include <stdlib.h>
++ #else
+  #include <malloc.h>
++ #endif
+  
+  #include "config.h"
+  #include "common.h"
diff --git a/audio/timidity/files/patch-ab b/audio/timidity/files/patch-ab
new file mode 100644
index 000000000000..34e8d69c27af
--- /dev/null
+++ b/audio/timidity/files/patch-ab
@@ -0,0 +1,150 @@
+*** Makefile.orig	Sun May 26 13:26:46 1996
+--- Makefile	Sun Nov 17 13:09:19 1996
+***************
+*** 24,45 ****
+  # But where to change without revealing my secret identity?
+  
+  ########### Compiler and flags.
+! CC = gcc
+! DEBUGFLAGS = -Wall -O2
+  
+  ########### Install.
+! INSTALL = /usr/bin/install
+  
+  # Where to install the executable
+! BIN_DIR = /usr/local/bin
+  
+  # Where to install the manual pages
+! MAN_DIR = /usr/local/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
+  
+  # Where to install the Tcl code, if you use the Tcl code that is.
+  TCL_DIR = $(TIMID_DIR)
+--- 24,45 ----
+  # But where to change without revealing my secret identity?
+  
+  ########### Compiler and flags.
+! #CC = gcc
+! DEBUGFLAGS = -Wall
+  
+  ########### Install.
+! #INSTALL = /usr/bin/install
+  
+  # Where to install the executable
+! BIN_DIR = ${PREFIX}/bin
+  
+  # Where to install the manual pages
+! 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 = ${PREFIX}/lib/timidity
+  
+  # Where to install the Tcl code, if you use the Tcl code that is.
+  TCL_DIR = $(TIMID_DIR)
+***************
+*** 93,100 ****
+  # Select the ncurses full-screen interface
+  SYSTEM += -DIA_NCURSES
+  SYSEXTRAS += ncurs_c.c
+! EXTRAINCS += -I/usr/include/ncurses
+! EXTRALIBS += -lncurses
+  
+  ## Select the S-Lang full-screen interface
+  #SYSTEM += -DIA_SLANG
+--- 93,100 ----
+  # Select the ncurses full-screen interface
+  SYSTEM += -DIA_NCURSES
+  SYSEXTRAS += ncurs_c.c
+! #EXTRAINCS += -I/usr/include/ncurses
+! EXTRALIBS += -lncurses -lmytinfo
+  
+  ## Select the S-Lang full-screen interface
+  #SYSTEM += -DIA_SLANG
+***************
+*** 112,120 ****
+  #EXTRALIBS += -lgen
+  
+  # Select the Tcl/Tk interface
+! SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
+! SYSEXTRAS += tk_c.c
+! INST_TK = install.tk
+  #EXTRAINCS +=
+  #EXTRALIBS +=
+  
+--- 112,120 ----
+  #EXTRALIBS += -lgen
+  
+  # Select the Tcl/Tk interface
+! #SYSTEM += -DTCLTK -DWISH=\"wishx\" -DTKPROGPATH=\"$(TCL_DIR)/tkmidity.tcl\"
+! #SYSEXTRAS += tk_c.c
+! #INST_TK = install.tk
+  #EXTRAINCS +=
+  #EXTRALIBS +=
+  
+***************
+*** 136,142 ****
+  SDIST = timidity-lib-$(SUPPVERSION).tar.gz
+  SDISTZIP = tilib$(FNSUPPVERSION).zip
+  
+! CFLAGS= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
+  	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
+  
+  ########### All relevant files.. Anybody know autoconf?
+--- 136,142 ----
+  SDIST = timidity-lib-$(SUPPVERSION).tar.gz
+  SDISTZIP = tilib$(FNSUPPVERSION).zip
+  
+! CFLAGS+= $(DEBUGFLAGS) -DDEFAULT_PATH=\"$(TIMID_DIR)\" \
+  	-DTIMID_VERSION=\"$(VERSION)\" $(SYSTEM) $(EXTRAINCS)
+  
+  ########### All relevant files.. Anybody know autoconf?
+***************
+*** 228,237 ****
+  wav2pat: wav2pat.c
+  	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
+  
+! depends depend dep:
+! 	$(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
+! 
+! include depends
+  
+  ########### Installation targets
+  
+--- 228,237 ----
+  wav2pat: wav2pat.c
+  	$(CC) $(CFLAGS) -o wav2pat wav2pat.c
+  
+! #depends depend dep:
+! #        $(CC) $(CFLAGS) -MM $(CSRCS) $(OPTSRCS) $(TOOLSRCS) > depends
+! #
+! #include depends
+  
+  ########### Installation targets
+  
+***************
+*** 262,270 ****
+  	mkdir -p $(TIMID_DIR)
+  	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
+  
+! install.patch: $(PATCHF)
+  	mkdir -p $(TIMID_DIR)/patch
+! 	$(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
+  
+  install.tk: $(ALLTCLF)
+  	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)
+--- 262,270 ----
+  	mkdir -p $(TIMID_DIR)
+  	$(INSTALL) -m 644 $(CONFIGF) $(TIMID_DIR)
+  
+! install.patch: #$(PATCHF)
+  	mkdir -p $(TIMID_DIR)/patch
+! #        $(INSTALL) -m 644 $(PATCHF) $(TIMID_DIR)/patch
+  
+  install.tk: $(ALLTCLF)
+  	$(INSTALL) -m 644 $(ALLTCLF) $(TCL_DIR)
diff --git a/audio/timidity/files/patch-ac b/audio/timidity/files/patch-ac
new file mode 100644
index 000000000000..ad4e745c08e9
--- /dev/null
+++ b/audio/timidity/files/patch-ac
@@ -0,0 +1,40 @@
+*** timidity.cfg.bak	Mon May 22 02:40:27 1995
+--- timidity.cfg	Sun Nov 17 10:50:44 1996
+***************
+*** 34,42 ****
+  # This sets up the default patches in the TiMidity support package
+  # "timidity-lib-0.1.tar.gz":
+  
+! bank 0
+!    0 patch/acpiano.pat
+!   24 patch/nylongt2.pat
+  
+  ##############################################################################
+  # If you have Dustin McCartney's "wowpats" patches, you can source the 
+--- 34,42 ----
+  # This sets up the default patches in the TiMidity support package
+  # "timidity-lib-0.1.tar.gz":
+  
+! #bank 0
+! #   0 patch/acpiano.pat
+! #  24 patch/nylongt2.pat
+  
+  ##############################################################################
+  # If you have Dustin McCartney's "wowpats" patches, you can source the 
+***************
+*** 67,73 ****
+  # Note that midia.cfg sources gravis.cfg in turn, since the filenames are 
+  # almost identical.
+  #
+! #source midia.cfg
+  #
+  
+  
+--- 67,73 ----
+  # Note that midia.cfg sources gravis.cfg in turn, since the filenames are 
+  # almost identical.
+  #
+! source midia.cfg
+  #
+  
+  
diff --git a/audio/timidity/pkg-comment b/audio/timidity/pkg-comment
new file mode 100644
index 000000000000..46e4a463861a
--- /dev/null
+++ b/audio/timidity/pkg-comment
@@ -0,0 +1 @@
+MIDI to WAV renderer and player
diff --git a/audio/timidity/pkg-descr b/audio/timidity/pkg-descr
new file mode 100644
index 000000000000..0a7ddfe0523d
--- /dev/null
+++ b/audio/timidity/pkg-descr
@@ -0,0 +1,5 @@
+TiMidity  is  a MIDI to WAVE converter using Gravis Ultra-
+sound-compatible patch files  to  generate  digital  audio
+data from General MIDI files.  The data can be stored in a
+file for processing, or played in  real  time  through  an
+audio device.
diff --git a/audio/timidity/pkg-plist b/audio/timidity/pkg-plist
new file mode 100644
index 000000000000..48e11d087d34
--- /dev/null
+++ b/audio/timidity/pkg-plist
@@ -0,0 +1,205 @@
+bin/timidity
+bin/bag
+bin/wav2pat
+man/man1/timidity.1.gz
+lib/timidity/timidity.cfg
+lib/timidity/gsdrum.cfg
+lib/timidity/gravis.cfg
+lib/timidity/midia.cfg
+lib/timidity/wowpats.cfg
+lib/timidity/mt32.cfg
+lib/timidity/patch/acbass.pat
+lib/timidity/patch/accordn.pat
+lib/timidity/patch/acguitar.pat
+lib/timidity/patch/acpiano.pat
+lib/timidity/patch/agogo.pat
+lib/timidity/patch/agogohi.pat
+lib/timidity/patch/agogolo.pat
+lib/timidity/patch/altosax.pat
+lib/timidity/patch/applause.pat
+lib/timidity/patch/atmosphr.pat
+lib/timidity/patch/aurora.pat
+lib/timidity/patch/bagpipes.pat
+lib/timidity/patch/banjo.pat
+lib/timidity/patch/barisax.pat
+lib/timidity/patch/basslead.pat
+lib/timidity/patch/bassoon.pat
+lib/timidity/patch/belltree.pat
+lib/timidity/patch/blank.pat
+lib/timidity/patch/bongohi.pat
+lib/timidity/patch/bongolo.pat
+lib/timidity/patch/bottle.pat
+lib/timidity/patch/bowglass.pat
+lib/timidity/patch/britepno.pat
+lib/timidity/patch/c550kc_1.pat
+lib/timidity/patch/c550sn10.pat
+lib/timidity/patch/c550sn_6.pat
+lib/timidity/patch/c550vibs.pat
+lib/timidity/patch/cabasa.pat
+lib/timidity/patch/calliope.pat
+lib/timidity/patch/carillon.pat
+lib/timidity/patch/castinet.pat
+lib/timidity/patch/celeste.pat
+lib/timidity/patch/cello.pat
+lib/timidity/patch/charang.pat
+lib/timidity/patch/chiflead.pat
+lib/timidity/patch/choir.pat
+lib/timidity/patch/church.pat
+lib/timidity/patch/claps.pat
+lib/timidity/patch/clarinet.pat
+lib/timidity/patch/clave.pat
+lib/timidity/patch/clavinet.pat
+lib/timidity/patch/cleangtr.pat
+lib/timidity/patch/concrtna.pat
+lib/timidity/patch/congahi1.pat
+lib/timidity/patch/congahi2.pat
+lib/timidity/patch/congalo.pat
+lib/timidity/patch/contraba.pat
+lib/timidity/patch/cowbell.pat
+lib/timidity/patch/crystal.pat
+lib/timidity/patch/cuica1.pat
+lib/timidity/patch/cuica2.pat
+lib/timidity/patch/cymbell.pat
+lib/timidity/patch/cymchina.pat
+lib/timidity/patch/cymcrsh1.pat
+lib/timidity/patch/cymcrsh2.pat
+lib/timidity/patch/cymride1.pat
+lib/timidity/patch/cymride2.pat
+lib/timidity/patch/cymsplsh.pat
+lib/timidity/patch/distgtr.pat
+lib/timidity/patch/doo.pat
+lib/timidity/patch/echovox.pat
+lib/timidity/patch/englhorn.pat
+lib/timidity/patch/epiano1.pat
+lib/timidity/patch/epiano2.pat
+lib/timidity/patch/fantasia.pat
+lib/timidity/patch/fiddle.pat
+lib/timidity/patch/flute.pat
+lib/timidity/patch/fngrbass.pat
+lib/timidity/patch/frenchrn.pat
+lib/timidity/patch/freshair.pat
+lib/timidity/patch/fretless.pat
+lib/timidity/patch/fx-blow.pat
+lib/timidity/patch/fx-fret.pat
+lib/timidity/patch/ghostie.pat
+lib/timidity/patch/glocken.pat
+lib/timidity/patch/gtrharm.pat
+lib/timidity/patch/guiro1.pat
+lib/timidity/patch/guiro2.pat
+lib/timidity/patch/halopad.pat
+lib/timidity/patch/harmonca.pat
+lib/timidity/patch/harp.pat
+lib/timidity/patch/helicptr.pat
+lib/timidity/patch/highq.pat
+lib/timidity/patch/hihatcl.pat
+lib/timidity/patch/hihatop.pat
+lib/timidity/patch/hihatpd.pat
+lib/timidity/patch/hitbrass.pat
+lib/timidity/patch/homeorg.pat
+lib/timidity/patch/honky.pat
+lib/timidity/patch/hrpschrd.pat
+lib/timidity/patch/jazzgtr.pat
+lib/timidity/patch/jingles.pat
+lib/timidity/patch/jungle.pat
+lib/timidity/patch/kalimba.pat
+lib/timidity/patch/kick1.pat
+lib/timidity/patch/kick2.pat
+lib/timidity/patch/koto.pat
+lib/timidity/patch/lead5th.pat
+lib/timidity/patch/maracas.pat
+lib/timidity/patch/marcato.pat
+lib/timidity/patch/marimba.pat
+lib/timidity/patch/metalpad.pat
+lib/timidity/patch/metbell.pat
+lib/timidity/patch/metclick.pat
+lib/timidity/patch/musicbox.pat
+lib/timidity/patch/mutegtr.pat
+lib/timidity/patch/mutetrum.pat
+lib/timidity/patch/nyguitar.pat
+lib/timidity/patch/oboe.pat
+lib/timidity/patch/ocarina.pat
+lib/timidity/patch/odguitar.pat
+lib/timidity/patch/orchhit.pat
+lib/timidity/patch/percorg.pat
+lib/timidity/patch/piccolo.pat
+lib/timidity/patch/pickbass.pat
+lib/timidity/patch/pistol.pat
+lib/timidity/patch/pizzcato.pat
+lib/timidity/patch/polysyn.pat
+lib/timidity/patch/recorder.pat
+lib/timidity/patch/reedorg.pat
+lib/timidity/patch/revcym.pat
+lib/timidity/patch/ringwhsl.pat
+lib/timidity/patch/rockorg.pat
+lib/timidity/patch/santur.pat
+lib/timidity/patch/sawwave.pat
+lib/timidity/patch/scratch1.pat
+lib/timidity/patch/scratch2.pat
+lib/timidity/patch/seashore.pat
+lib/timidity/patch/shakazul.pat
+lib/timidity/patch/shaker.pat
+lib/timidity/patch/shamisen.pat
+lib/timidity/patch/shannai.pat
+lib/timidity/patch/sitar.pat
+lib/timidity/patch/slap.pat
+lib/timidity/patch/slapbas1.pat
+lib/timidity/patch/slapbas2.pat
+lib/timidity/patch/slowstr.pat
+lib/timidity/patch/snare1.pat
+lib/timidity/patch/snare2.pat
+lib/timidity/patch/soundtrk.pat
+lib/timidity/patch/sprnosax.pat
+lib/timidity/patch/sqrclick.pat
+lib/timidity/patch/sqrwave.pat
+lib/timidity/patch/startrak.pat
+lib/timidity/patch/steeldrm.pat
+lib/timidity/patch/stickrim.pat
+lib/timidity/patch/sticks.pat
+lib/timidity/patch/surdo1.pat
+lib/timidity/patch/surdo2.pat
+lib/timidity/patch/sweeper.pat
+lib/timidity/patch/synbass1.pat
+lib/timidity/patch/synbass2.pat
+lib/timidity/patch/synbras1.pat
+lib/timidity/patch/synbras2.pat
+lib/timidity/patch/synpiano.pat
+lib/timidity/patch/synstr1.pat
+lib/timidity/patch/synstr2.pat
+lib/timidity/patch/syntom.pat
+lib/timidity/patch/taiko.pat
+lib/timidity/patch/tamborin.pat
+lib/timidity/patch/telephon.pat
+lib/timidity/patch/tenorsax.pat
+lib/timidity/patch/timbaleh.pat
+lib/timidity/patch/timbalel.pat
+lib/timidity/patch/timpani.pat
+lib/timidity/patch/tomhi1.pat
+lib/timidity/patch/tomhi2.pat
+lib/timidity/patch/tomlo1.pat
+lib/timidity/patch/tomlo2.pat
+lib/timidity/patch/tommid1.pat
+lib/timidity/patch/tommid2.pat
+lib/timidity/patch/toms.pat
+lib/timidity/patch/tremstr.pat
+lib/timidity/patch/triangl1.pat
+lib/timidity/patch/triangl2.pat
+lib/timidity/patch/trombone.pat
+lib/timidity/patch/trumpet.pat
+lib/timidity/patch/tuba.pat
+lib/timidity/patch/tubebell.pat
+lib/timidity/patch/unicorn.pat
+lib/timidity/patch/vibes.pat
+lib/timidity/patch/vibslap.pat
+lib/timidity/patch/viola.pat
+lib/timidity/patch/violin.pat
+lib/timidity/patch/voices.pat
+lib/timidity/patch/voxlead.pat
+lib/timidity/patch/warmpad.pat
+lib/timidity/patch/whistle.pat
+lib/timidity/patch/whistle1.pat
+lib/timidity/patch/whistle2.pat
+lib/timidity/patch/woodblk.pat
+lib/timidity/patch/woodblk1.pat
+lib/timidity/patch/woodblk2.pat
+lib/timidity/patch/woodflut.pat
+lib/timidity/patch/xylophon.pat