Update to 2.14.0, provided by Yair K. in PR 46662.

pkgsrc changes:
install default config
enable flac again
enable server and spectogram
enable alsa on Linux
make x11 optional
add gtk option

Upstream changes:

06/29, 2012
    * Version 2.14.0 released.
    * Add --reverb option for Freeverb parameter.
    * Add --preserve-silence option.
    * Add a "trysource" config file directive, which allows to try and
      source other config files, while continuing without error if the
      specified file is missing.
    * Support for GM2 Master Fine/Coarse Tuning, GS Master Tune and XG
      Master Tuning (4C not 27) SysEx.
    * Allow Device Numbers other than 0x10 for XG SYSTEM ON SYSEX
      events.
    * Fix multiple vulnerabilities found in GNU gzip also apply to lha,
      namely: CVE-2006-4335, CVE-2006-4337 and CVE-2006-4338.
    * Support for lzma decompression.
    * Support for ipv6.
    * Support for libpng 1.5 and newer.
    * Support for Tcl/Tk 8.5.
    * Make compatible with xaw3d v1.5, style changes.
    * Various improvements in XAW interface (see README.xaw).
    * Support for Windows Named Pipe interface.
    * ...and many other bug fixes.

11 files changed, 70 insertions, 201 deletions

diff --git a/audio/timidity/DESCR b/audio/timidity/DESCR
index 6439b25c129..7adb901a75d 100644
--- a/audio/timidity/DESCR
+++ b/audio/timidity/DESCR
@@ -1,4 +1,4 @@
 TiMidity is a MIDI to WAVE converter using Gravis
-Ultrasound-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.
+Ultrasound-compatible patch files or Soundfonts 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/MESSAGE b/audio/timidity/MESSAGE
index e1bd1fa9975..6a445aa7316 100644
--- a/audio/timidity/MESSAGE
+++ b/audio/timidity/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2006/10/27 17:20:52 wiz Exp $
+$NetBSD: MESSAGE,v 1.6 2012/07/08 09:51:31 wiz Exp $
 
   To use this program, you'll have to install one of the following:
 	* pkgsrc/audio/eawpatches
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index b59e2f811a7..b057140d488 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2012/03/10 13:20:12 shattered Exp $
+# $NetBSD: Makefile,v 1.81 2012/07/08 09:51:31 wiz Exp $
 
-DISTNAME=	TiMidity++-2.13.2
+DISTNAME=	TiMidity++-2.14.0
 PKGNAME=	${DISTNAME:S/TiMidity++/timidity/}
-PKGREVISION=	21
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=timidity/}
 EXTRACT_SUFX=	.tar.bz2
@@ -18,15 +17,19 @@ CONFLICTS=		kdemultimedia-2.*{,nb*}
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-vt100
-CONFIGURE_ARGS+=	--enable-gtk --enable-wrd --enable-xaw --enable-ncurses
+CONFIGURE_ARGS+=	--enable-ncurses
+CONFIGURE_ARGS+=	--enable-server
 CONFIGURE_ARGS+=	--with-ogg="${BUILDLINK_DIR}/include"
 CONFIGURE_ARGS+=	--with-vorbis="${BUILDLINK_DIR}/include"
+CONFIGURE_ARGS+=	--with-libFLAC="${BUILDLINK_DIR}/include"
 CONFIGURE_ARGS+=	--with-default-path=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--enable-audio=${TIMIDITY_NATIVE_AUDIO},ao,vorbis,speex
-# flac disabled since there is currently (20070111) no patch available
-# that adapts timidity for the flac-1.1.3 API
-#CONFIGURE_ARGS+=	--enable-audio=${TIMIDITY_NATIVE_AUDIO},vorbis,flac,speex
-#CONFIGURE_ARGS+=	--with-libFLAC="${BUILDLINK_DIR}/include"
+CONFIGURE_ARGS+=	--enable-audio=${TIMIDITY_NATIVE_AUDIO},ao,vorbis,flac,speex
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Linux"
+CONFIGURE_ARGS+=	--enable-alsaseq
+.endif
 
 SUBST_CLASSES+=		confdir
 SUBST_MESSAGE.confdir=	Configuring to use PKG_SYSCONFDIR.
@@ -34,26 +37,38 @@ SUBST_STAGE.confdir=	post-patch
 SUBST_FILES.confdir=	doc/C/timidity.cfg.5 doc/ja_JP.eucJP/timidity.cfg.5
 SUBST_SED.confdir=	-e 's,/usr/local/share/timidity,${PKG_SYSCONFDIR},g'
 
-.include "../../mk/bsd.prefs.mk"
-
 TIMIDITY_NATIVE_AUDIO=	# empty
 
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" || ${OPSYS} == "OpenBSD"
 TIMIDITY_NATIVE_AUDIO=	sun
-.elif ${OPSYS} == "Linux"
+.elif ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
 TIMIDITY_NATIVE_AUDIO=	oss
+.elif ${OPSYS} == "Linux"
+TIMIDITY_NATIVE_AUDIO=	alsa,oss
 .elif ${OPSYS} == "Darwin"
 TIMIDITY_NATIVE_AUDIO=	darwin
 .endif
 
-# see above for reason this is not included
-#.include "../../audio/flac/buildlink3.mk"
+EGDIR=${PREFIX}/share/examples/timidity
+CONF_FILES=${EGDIR}/timidity.cfg ${PKG_SYSCONFDIR}/timidity.cfg
+
+pre-configure:
+	${SED} "s|@PREFIX@|${PREFIX}|" < ${FILESDIR}/timidity.cfg > \
+		${WRKDIR}/timidity.cfg
+
+post-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKDIR}/timidity.cfg ${DESTDIR}${EGDIR}
+
+.include "options.mk"
+
+.include "../../audio/flac/buildlink3.mk"
 .include "../../audio/libao/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/speex/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.if ${OPSYS} == "Linux"
+.  include "../../audio/alsa-lib/buildlink3.mk"
+.endif
 
-.include "../../mk/xaw.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/timidity/PLIST b/audio/timidity/PLIST
index dac58cca10a..adb2b825769 100644
--- a/audio/timidity/PLIST
+++ b/audio/timidity/PLIST
@@ -1,15 +1,7 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:32:23 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/07/08 09:51:31 wiz Exp $
 bin/timidity
-lib/timidity/bitmaps/back.xbm
-lib/timidity/bitmaps/fwrd.xbm
-lib/timidity/bitmaps/next.xbm
-lib/timidity/bitmaps/pause.xbm
-lib/timidity/bitmaps/play.xbm
-lib/timidity/bitmaps/prev.xbm
-lib/timidity/bitmaps/quit.xbm
-lib/timidity/bitmaps/random.xbm
-lib/timidity/bitmaps/repeat.xbm
-lib/timidity/bitmaps/stop.xbm
-lib/timidity/bitmaps/timidity.xbm
+${PLIST.x11}lib/X11/app-defaults/TiMidity
+${PLIST.x11}lib/X11/ja_JP.eucJP/app-defaults/TiMidity
 man/man1/timidity.1
 man/man5/timidity.cfg.5
+share/examples/timidity/timidity.cfg
diff --git a/audio/timidity/distinfo b/audio/timidity/distinfo
index 9a94c3282be..fb2781a0f16 100644
--- a/audio/timidity/distinfo
+++ b/audio/timidity/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.15 2011/01/31 23:52:18 wiz Exp $
+$NetBSD: distinfo,v 1.16 2012/07/08 09:51:31 wiz Exp $
 
-SHA1 (TiMidity++-2.13.2.tar.bz2) = 8e603146e1164335303a5ac5dff291f369241b4e
-RMD160 (TiMidity++-2.13.2.tar.bz2) = 0156221846a88abef9312700a050972d85084fd8
-Size (TiMidity++-2.13.2.tar.bz2) = 1581230 bytes
-SHA1 (patch-aa) = 14151d3b036eac740bca40c97a0eff7de059514d
-SHA1 (patch-ab) = 7bd5c12448970131ee31e16de5952b11a093da23
-SHA1 (patch-ac) = 56e738ef60dc8040d27bb50722ed5e0294d343e4
-SHA1 (patch-ae) = 3f55ea58e91bd97ff42fbe67e8c89514c29aa2e9
-SHA1 (patch-interface_x__sherry.c) = 4a52bfebf3047438ab10b19eafeb1464769f8f8a
+SHA1 (TiMidity++-2.14.0.tar.bz2) = 3d1d18ddf3e52412985af9a49dbe7ad345b478a8
+RMD160 (TiMidity++-2.14.0.tar.bz2) = f12d56a1576931f90672304af6dcf8d653151b8a
+Size (TiMidity++-2.14.0.tar.bz2) = 1611424 bytes
+SHA1 (patch-ac) = 7e7d849bba481a2374eb830da9010f633a2aed29
+SHA1 (patch-interface_server__c.c) = 5a37bcb4a6aaa93fd80ab210ba64a2a1a5d04480
diff --git a/audio/timidity/patches/patch-aa b/audio/timidity/patches/patch-aa
deleted file mode 100644
index cb74ef281f6..00000000000
--- a/audio/timidity/patches/patch-aa
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2009/04/10 18:45:16 wiz Exp $
-
---- timidity/sun_a.c.orig	2004-09-26 23:40:14.000000000 +0000
-+++ timidity/sun_a.c
-@@ -296,6 +296,18 @@ int output_data(char *buff, int32 nbytes
- 
- 
- #if !defined(I_FLUSH) || !defined(FLUSHW)
-+#  if defined(AUDIO_FLUSH)	/* NetBSD */
-+static int sun_discard_playing(void)
-+{
-+    if(ioctl(dpm.fd, AUDIO_FLUSH, NULL) < 0)
-+    {
-+	ctl->cmsg(CMSG_ERROR, VERB_NORMAL, "%s: (ioctl) %s",
-+		  dpm.name, strerror(errno));
-+	return -1;
-+    }
-+    return 0;
-+}
-+#  else
- static void null_proc(){}
- static int sun_discard_playing(void)
- {
-@@ -308,6 +320,7 @@ static int sun_discard_playing(void)
-     signal(SIGALRM, orig_alarm_handler);
-     return open_output();
- }
-+#  endif
- #else
- static int sun_discard_playing(void)
- {
-@@ -328,6 +341,23 @@ static int acntl(int request, void *arg)
- 
-     switch(request)
-     {
-+#ifdef __NetBSD__
-+      case PM_REQ_GETQSIZ:
-+	if(ioctl(audioctl_fd, AUDIO_GETINFO, &auinfo) < 0)
-+	    return -1;
-+	*((int *)arg) = auinfo.play.buffer_size;
-+	return 0;
-+
-+      case PM_REQ_GETFRAGSIZ:
-+	if(ioctl(audioctl_fd, AUDIO_GETINFO, &auinfo) < 0)
-+	    return -1;
-+	*((int *)arg) = auinfo.blocksize;
-+	return 0;
-+
-+      case PM_REQ_OUTPUT_FINISH:
-+	return ioctl(audioctl_fd, AUDIO_DRAIN, NULL);
-+#endif
-+
-       case PM_REQ_GETFILLED:
- 	if(ioctl(audioctl_fd, AUDIO_GETINFO, &auinfo) < 0)
- 	    return -1;
diff --git a/audio/timidity/patches/patch-ab b/audio/timidity/patches/patch-ab
deleted file mode 100644
index 4f1f22c8981..00000000000
--- a/audio/timidity/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.14 2009/04/10 18:45:16 wiz Exp $
-
---- interface/xaw_i.c.orig	2004-09-26 23:40:14.000000000 +0000
-+++ interface/xaw_i.c
-@@ -261,7 +261,7 @@ int amplitude = DEFAULT_AMPLIFICATION;
- String bitmapdir = XAW_BITMAP_DIR;
- Boolean arrangetitle,savelist;
- static char **current_flist = NULL;
--static int voices = 0, last_voice = 0, voices_num_width;
-+static int xvoices = 0, last_voice = 0, voices_num_width;
- static int maxentry_on_a_menu = 0,submenu_n = 0;
- #define OPTIONS_WINDOW 1
- #define FLIST_WINDOW 2
-@@ -1329,7 +1329,7 @@ static void handle_input(XtPointer data,
-     c= *(local_buf+1);
-     n= atoi(local_buf+2);
-     if(c == 'L')
--      voices = n;
-+      xvoices = n;
-     else
-       last_voice = n;
-     if(IsTracePlaying()) drawVoices();
-@@ -2070,7 +2070,7 @@ static void drawVoices(void) {
-   XSetForeground(disp, gct, tracecolor);
-   XFillRectangle(disp,XtWindow(trace),gct,voices_num_width +4,
-                  MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+1,VOICENUM_WIDTH,TRACE_FOOT);  
--  sprintf(local_buf, "%3d/%d", last_voice, voices);
-+  sprintf(local_buf, "%3d/%d", last_voice, xvoices);
-   XSetForeground(disp, gct, capcolor);  
-   XDrawString(disp, XtWindow(trace),gct,voices_num_width+6,
-               MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+16,local_buf,strlen(local_buf));
diff --git a/audio/timidity/patches/patch-ac b/audio/timidity/patches/patch-ac
index a4be53542aa..5b3f5b567a0 100644
--- a/audio/timidity/patches/patch-ac
+++ b/audio/timidity/patches/patch-ac
@@ -1,4 +1,7 @@
-$NetBSD: patch-ac,v 1.4 2005/12/11 19:40:16 joerg Exp $
+$NetBSD: patch-ac,v 1.5 2012/07/08 09:51:31 wiz Exp $
+
+Unconditionally include errno.h since extern int errno does not
+conform to POSIX in general.
 
 --- timidity/timidity.h.orig	2005-12-07 19:35:02.000000000 +0000
 +++ timidity/timidity.h
diff --git a/audio/timidity/patches/patch-ae b/audio/timidity/patches/patch-ae
deleted file mode 100644
index 3c849265b65..00000000000
--- a/audio/timidity/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2004/04/14 14:41:34 adam Exp $
-
---- timidity/output.c.orig	2004-02-11 16:08:15.000000000 +0000
-+++ timidity/output.c
-@@ -25,6 +25,7 @@
- #ifdef HAVE_CONFIG_H
- #include "config.h"
- #endif /* HAVE_CONFIG_H */
-+#include <stdlib.h>
- #ifdef STDC_HEADERS
- #include <string.h>
- #include <ctype.h>
diff --git a/audio/timidity/patches/patch-interface_server__c.c b/audio/timidity/patches/patch-interface_server__c.c
new file mode 100644
index 00000000000..d957195af4d
--- /dev/null
+++ b/audio/timidity/patches/patch-interface_server__c.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-interface_server__c.c,v 1.1 2012/07/08 09:51:31 wiz Exp $
+
+Some MIDI definitions are missing on e.g. NetBSD, so just use
+internal definitions everywhere.
+
+--- interface/server_c.c.orig	2012-06-01 03:33:06.000000000 +0000
++++ interface/server_c.c
+@@ -58,11 +58,7 @@
+ #endif
+ #include <signal.h>
+ 
+-#ifdef HAVE_SYS_SOUNDCARD_H
+-#include <sys/soundcard.h>
+-#else
+ #include "server_defs.h"
+-#endif /* HAVE_SYS_SOUNDCARD_H */
+ 
+ #include "timidity.h"
+ #include "common.h"
diff --git a/audio/timidity/patches/patch-interface_x__sherry.c b/audio/timidity/patches/patch-interface_x__sherry.c
deleted file mode 100644
index b355ae2942d..00000000000
--- a/audio/timidity/patches/patch-interface_x__sherry.c
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-interface_x__sherry.c,v 1.1 2011/01/31 23:52:19 wiz Exp $
-
-Fix build with png-1.5. PLTE part in original code is a bit unclear
-in purpose.
-
---- interface/x_sherry.c.orig	2002-07-14 21:19:32.000000000 +0000
-+++ interface/x_sherry.c
-@@ -782,7 +782,7 @@ static void sry_pal_v2r(uint8 *data)
- static void png_read_func(png_structp png_ptr, char *buff, size_t n)
- {
-     struct timidity_file *tf;
--    tf = (struct timidity_file *)png_ptr->io_ptr;
-+    tf = (struct timidity_file *)png_get_io_ptr(png_ptr);
-     tf_read(buff, 1, n, tf);
- }
- 
-@@ -815,6 +815,7 @@ static void sry_load_png(uint8 *data)
-     int transParent;
-     int numTrans;
-     png_color_16p transValues;
-+    png_color stdColorCube[6*7*6];
- 
-     numPalette = -1;
-     memset(&palette, 0, sizeof(palette));
-@@ -909,7 +910,7 @@ static void sry_load_png(uint8 *data)
- 	{
- 	    if(png_get_valid(pngPtr, infoPtr, PNG_INFO_hIST))
- 		png_get_hIST(pngPtr, infoPtr, &hist);
--	    png_set_dither(pngPtr, palette,
-+	    png_set_quantize(pngPtr, palette,
- 			   numPalette, MAX_SCREEN_COLORS, hist, 1);
- 	}
-     }
-@@ -918,7 +919,6 @@ static void sry_load_png(uint8 *data)
- 	/* XXX */
- 	/* NOTE 6*7*6 = 252 */
- 	/* 6*7*6 = 5*7*6 + 6*6 + 6 */
--	png_color stdColorCube[6*7*6];
- 	png_byte r, g, b;
- 
- 	for(r = 0; r < 6; r++)
-@@ -934,13 +934,13 @@ static void sry_load_png(uint8 *data)
- 		}
- 	    }
- 	}
--	png_set_dither(pngPtr, stdColorCube,
-+	png_set_quantize(pngPtr, stdColorCube,
- 		       6*7*6, MAX_SCREEN_COLORS,
- 		       NULL, 1);
- 	/*???*/
--	png_set_PLTE(pngPtr, infoPtr, pngPtr->palette, pngPtr->num_palette);
--	palette = pngPtr->palette;
--	numPalette = pngPtr->num_palette;
-+	png_set_PLTE(pngPtr, infoPtr, stdColorCube, 6*7*6);
-+	palette = stdColorCube;
-+	numPalette = 6*7*6;
-     }
- 
-     if(png_get_valid(pngPtr, infoPtr, PNG_INFO_tRNS))