Update to 2.11.2. Package changes: output directly to sound device now

works, compiles in ogg output support.
Changes since last version: Bug fixes, output improvements, vorbis
support, mod-to-midi conversion.

5 files changed, 57 insertions, 12 deletions

diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index 1531ac108e7..25e5867a460 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2001/12/19 14:40:59 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2002/01/17 01:20:39 wiz Exp $
 #
 
-DISTNAME=	TiMidity++-2.10.4
+DISTNAME=	TiMidity++-2.11.2
 PKGNAME=	${DISTNAME:S/TiMidity++/timidity/}
 CATEGORIES=     audio
 MASTER_SITES=	http://www.goice.co.jp/member/mo/timidity/dist/
@@ -12,10 +12,15 @@ HOMEPAGE=	http://www.goice.co.jp/member/mo/timidity/
 COMMENT=	MIDI to WAV renderer and player
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--enable-vt100 --enable-audio=sun --disable-debug \
-		--enable-gtk
-USE_CONFIG_WRAPPER=	yes
+CONFIGURE_ARGS+=--enable-vt100 --enable-audio=sun,vorbis --disable-debug \
+		--enable-gtk --enable-wrd \
+		--with-ogg-prefix="${BUILDLINK_DIR}/include" \
+		--with-vorbis-prefix="${BUILDLINK_DIR}/include"
 
+USE_BUILDLINK_ONLY=	yes
+
+.include "../../audio/libvorbis/buildlink.mk"
+.include "../../graphics/png/buildlink.mk"
 .include "../../x11/gtk/buildlink.mk"
 .include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/timidity/distinfo b/audio/timidity/distinfo
index c451f00be1e..d047d78ab72 100644
--- a/audio/timidity/distinfo
+++ b/audio/timidity/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.3 2001/12/19 14:40:59 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/01/17 01:20:39 wiz Exp $
 
-SHA1 (TiMidity++-2.10.4.tar.bz2) = a7870f98948daca7eabfc341a3cbaa2640bc67e1
-Size (TiMidity++-2.10.4.tar.bz2) = 867561 bytes
-SHA1 (patch-aa) = 6c5019f99759ca9050f149eab74f5361f554f560
+SHA1 (TiMidity++-2.11.2.tar.bz2) = b734874426a3dcbd3180e8e6b05b5c023354f3c7
+Size (TiMidity++-2.11.2.tar.bz2) = 961789 bytes
+SHA1 (patch-aa) = 35b267d74ff4e1bec8f12acad81a0e6d092cc8a7
+SHA1 (patch-ab) = 35f862331f88e2f9e5fc31d241739e799194195d
+SHA1 (patch-ad) = fea56f396c95c92873587ea3eccecf48bc73908b
diff --git a/audio/timidity/patches/patch-aa b/audio/timidity/patches/patch-aa
index 41ac5535e07..dd1a840ccfd 100644
--- a/audio/timidity/patches/patch-aa
+++ b/audio/timidity/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2001/03/31 02:13:03 mycroft Exp $
+$NetBSD: patch-aa,v 1.5 2002/01/17 01:20:39 wiz Exp $
 
---- timidity/sun_a.c.orig	Wed Nov  1 04:20:33 2000
-+++ timidity/sun_a.c	Sat Mar 31 02:11:02 2001
+--- timidity/sun_a.c.orig	Wed Jan  9 11:13:16 2002
++++ timidity/sun_a.c
 @@ -69,7 +69,11 @@
  #define SUNAUDIO_AENC_SIGWORD	AENC_SIGWORDB
  #endif
diff --git a/audio/timidity/patches/patch-ab b/audio/timidity/patches/patch-ab
new file mode 100644
index 00000000000..61768b77384
--- /dev/null
+++ b/audio/timidity/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.11 2002/01/17 01:20:39 wiz Exp $
+
+--- doc/C/timidity.1.orig	Wed Jan  9 09:11:59 2002
++++ doc/C/timidity.1
+@@ -359,10 +359,10 @@
+ .TP
+ .B \-k " msec"
+ Specify audio queue time limit to reduce voices.
+-If the remaining audio buffer is less than \fImsec\fB milliseconds,
++If the remaining audio buffer is less than \fImsec\fP milliseconds,
+ TiMidity tries to kill some voices.
+ This feature makes it possible to play complicated MIDI files on slow CPUs.
+-Setting \fImsec\fB to zero tells TiMidity to never remove any voices.
++Setting \fImsec\fP to zero tells TiMidity to never remove any voices.
+ 
+ .TP
+ .B \-L " directory"
diff --git a/audio/timidity/patches/patch-ad b/audio/timidity/patches/patch-ad
new file mode 100644
index 00000000000..d4fdb0a1832
--- /dev/null
+++ b/audio/timidity/patches/patch-ad
@@ -0,0 +1,21 @@
+$NetBSD: patch-ad,v 1.5 2002/01/17 01:20:40 wiz Exp $
+
+--- configure.orig	Wed Jan  9 09:09:24 2002
++++ configure
+@@ -1591,16 +1591,6 @@
+     CPPFLAGS="$CPPFLAGS -I${i}"
+ done
+ 
+-LDFLAGS="$LDFLAGS -L${PREFIX-/usr/local}/lib"
+-CPPFLAGS="$CPPFLAGS -I${PREFIX-/usr/local}/include"
+-SHLDFLAGS=${SHLDFLAGS-$LDFLAGS}
+-
+-if test "x$prefix" != xNONE -a "x$prefix" != "x$ac_default_prefix" -a "x$prefix" != "x/usr"; then
+-  LDFLAGS="-L$prefix/lib $LDFLAGS"
+-  SHLDFLAGS="-L$prefix/lib $SHLDFLAGS"
+-  CPPFLAGS="-I$prefix/include $CPPFLAGS"
+-fi
+-
+ # Check whether --with-includes or --without-includes was given.
+ if test "${with_includes+set}" = set; then
+   withval="$with_includes"