- Update to version 2.14.0

PR:		174176
Submitted by:	ports fury

9 files changed, 119 insertions, 377 deletions

diff --git a/audio/timidity++/files/patch-Makefile.in b/audio/timidity++/files/patch-Makefile.in
index 8dbf06732a37..2c106efd2b58 100644
--- a/audio/timidity++/files/patch-Makefile.in
+++ b/audio/timidity++/files/patch-Makefile.in
@@ -1,37 +1,10 @@
-http://timidity-docs.sourceforge.jp/cgi-bin/kagemai-en/guest.cgi?project=timidity-bugs-en&action=view_report&id=56
-
-Plus another patch...
-
---- timidity/Makefile.in	Sun Oct  3 08:39:54 2004
-+++ timidity/Makefile.in	Thu Sep 22 03:11:09 2005
-@@ -478,5 +477,5 @@
- @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(SYSEXTRAS:.c=.$(OBJEXT)) \
- @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/interface/libinterface.a \
--@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/libarc/libarc.a \
-+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	-larc \
- @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/libunimod/libunimod.a \
- @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/utils/libutils.a \
-@@ -509,5 +507,4 @@
- @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
- @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/interface/libinterface.a \
--@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/libarc/libarc.a \
- @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/libunimod/libunimod.a \
- @BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/utils/libutils.a \
-@@ -585,5 +583,4 @@
- @BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(SYSEXTRAS:.c=.$(OBJEXT)) \
- @BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/interface/libinterface.a \
--@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/libarc/libarc.a \
- @BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/libunimod/libunimod.a \
- @BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/utils/libutils.a
-@@ -576,9 +576,8 @@
- 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
- 	  if test -f $$p \
- 	  ; then \
--	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
--	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
--	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$p"; \
-+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$p || exit 1; \
- 	  else :; fi; \
- 	done
- 
+--- Makefile.in.orig	2012-06-28 23:14:25.000000000 +0900
++++ Makefile.in	2012-10-01 02:41:14.000000000 +0900
+@@ -284,7 +284,6 @@
+ SUBDIRS = \
+ 	autoconf \
+ 	utils \
+-	libarc \
+ 	libunimod \
+ 	interface \
+ 	timidity \
diff --git a/audio/timidity++/files/patch-configure b/audio/timidity++/files/patch-configure
deleted file mode 100644
index 091ea5e8226e..000000000000
--- a/audio/timidity++/files/patch-configure
+++ /dev/null
@@ -1,33 +0,0 @@
-http://timidity-docs.sourceforge.jp/cgi-bin/kagemai-en/guest.cgi?project=timidity-bugs-en&action=view_report&id=58
-
---- configure	Sun Oct  3 08:39:51 2004
-+++ configure	Thu Sep 22 02:49:01 2005
-@@ -16605,5 +16605,5 @@
-     tcl_lib=
-     tk_lib=
--    for l in tcl tcl8.4 tcl8.3 tcl8.0jp tcl7.6jp tcl80jp tcl76jp tcl8.0 tcl7.6 tcl80 tcl76; do
-+    for l in tcl84 tcl83 tcl8.0jp tcl7.6jp tcl80jp tcl76jp tcl8.0 tcl7.6 tcl80 tcl76; do
-       case "x$tcl_lib" in x) as_ac_Lib=`echo "ac_cv_lib_$l''_Tcl_Init" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for Tcl_Init in -l$l" >&5
-@@ -16677,5 +16677,5 @@
-     done
-     LIBS="$LIBS $tcl_lib"
--    for l in tk tk8.4 tk8.3 tk8.0jp tk4.2jp tk80jp tk42jp tk8.0 tk4.2 tk80 tk42; do
-+    for l in tk tk84 tk83 tk8.0jp tk4.2jp tk80jp tk42jp tk8.0 tk4.2 tk80 tk42; do
-       case "x$tk_lib" in x) as_ac_Lib=`echo "ac_cv_lib_$l''_Tk_Init" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for Tk_Init in -l$l" >&5
-@@ -19522,5 +19522,5 @@
- 
- 
--                                                                                                                                                                                    ac_config_files="$ac_config_files Makefile autoconf/Makefile common.makefile configs/Makefile doc/Makefile doc/C/Makefile doc/ja_JP.eucJP/Makefile interface/Makefile interface/motif_bitmaps/Makefile interface/bitmaps/Makefile interface/pixmaps/Makefile libarc/Makefile libunimod/Makefile timidity/Makefile utils/Makefile script/Makefile TiMidity.ad TiMidity-uj.ad"
-+                                                                                                                                                                                    ac_config_files="$ac_config_files Makefile autoconf/Makefile common.makefile configs/Makefile doc/Makefile doc/C/Makefile doc/ja_JP.eucJP/Makefile interface/Makefile interface/motif_bitmaps/Makefile interface/bitmaps/Makefile interface/pixmaps/Makefile libunimod/Makefile timidity/Makefile utils/Makefile script/Makefile TiMidity.ad TiMidity-uj.ad"
- 
- cat >confcache <<\_ACEOF
---- Makefile.in	Wed Sep 22 13:23:32 2004
-+++ Makefile.in	Thu Sep 22 02:49:17 2005
-@@ -268,5 +268,4 @@
- 	autoconf \
- 	utils \
--	libarc \
- 	libunimod \
- 	interface \
diff --git a/audio/timidity++/files/patch-dynamic b/audio/timidity++/files/patch-dynamic
deleted file mode 100644
index 1668d5015786..000000000000
--- a/audio/timidity++/files/patch-dynamic
+++ /dev/null
@@ -1,230 +0,0 @@
-http://timidity-docs.sourceforge.jp/cgi-bin/kagemai-en/guest.cgi?project=timidity-bugs-en&action=view_report&id=54
-
---- interface/Makefile.in	Sun Oct  3 08:39:54 2004
-+++ interface/Makefile.in	Thu Sep 22 00:01:34 2005
-@@ -1240,5 +1240,5 @@
- @NEEDDLOPEN_TRUE@install.dynamics: $(dynamic_targets)
- @NEEDDLOPEN_TRUE@	test -d $(DESTDIR)$(SHLIB_DIR) || mkdir -p $(DESTDIR)$(SHLIB_DIR)
--@NEEDDLOPEN_TRUE@	for f in $(dynamic_targets) ''; do case ".$$f" in .);; *) $(INSTALL_PROGRAM) $$f $(DESTDIR)$(SHLIB_DIR) ; $(INSTALL_DATA) $${f%%$(so)}txt $(DESTDIR)$(SHLIB_DIR);; esac; done
-+@NEEDDLOPEN_TRUE@	for f in $(dynamic_targets) ''; do case ".$$f" in .);; *) $(INSTALL_PROGRAM) $$f $(DESTDIR)$(SHLIB_DIR);; esac; done
- 
- @NEEDDLOPEN_TRUE@.c.$(so):
---- timidity/timidity.c	Sat Oct  2 06:46:17 2004
-+++ timidity/timidity.c	Thu Sep 22 02:32:24 2005
-@@ -386,5 +386,5 @@
- static inline int parse_opt_c(char *);
- static inline int parse_opt_D(const char *);
--static inline int parse_opt_d(const char *);
-+static inline int parse_opt_d(char *);
- static inline int parse_opt_E(char *);
- static inline int parse_opt_mod_wheel(const char *);
-@@ -418,5 +418,5 @@
- #ifdef IA_DYNAMIC
- static inline void list_dyna_interface(FILE *, char *, char *);
--static inline char *dynamic_interface_info(int);
-+static inline const char *dynamic_interface_info(int);
- char *dynamic_interface_module(int);
- #endif
-@@ -501,4 +501,5 @@
- #ifdef IA_DYNAMIC
- MAIN_INTERFACE char dynamic_interface_id;
-+ControlMode *ctl_load(int id);
- #endif /* IA_DYNAMIC */
- 
-@@ -2929,11 +2930,9 @@
- }
- 
--static inline int parse_opt_d(const char *arg)
-+static inline int parse_opt_d(char *arg)
- {
- 	/* dynamic lib root */
- #ifdef IA_DYNAMIC
--	if (dynamic_lib_root)
--		free(dynamic_lib_root);
--	dynamic_lib_root = safe_strdup(arg);
-+	dynamic_lib_root = arg;
- 	return 0;
- #else
-@@ -3935,5 +3934,6 @@
- {
- 	URL url;
--	char fname[BUFSIZ], *info;
-+	char fname[63];
-+	const char *info;
- 	int id;
- 	
-@@ -3946,6 +3946,5 @@
- 				continue;
- 			mark[id] = 1;
--			if ((info = dynamic_interface_info(id)) == NULL)
--				info = dynamic_interface_module(id);
-+			info = dynamic_interface_info(id);
- 			if (info != NULL)
- 				fprintf(fp, "  -i%c          %s" NLS, id, info);
-@@ -3954,39 +3953,27 @@
- }
- 
--static inline char *dynamic_interface_info(int id)
-+static inline const char *
-+dynamic_interface_info(int id)
- {
--	static char libinfo[MAXPATHLEN];
--	int fd, n;
--	char *nl;
--	
--	sprintf(libinfo, "%s" PATH_STRING "interface_%c.txt",
--			dynamic_lib_root, id);
--	if ((fd = open(libinfo, 0)) < 0)
--		return NULL;
--	n = read(fd, libinfo, sizeof(libinfo) - 1);
--	close(fd);
--	if (n <= 0)
--		return NULL;
--	libinfo[n] = '\0';
--	if ((nl = strchr(libinfo, '\n')) == libinfo)
-+	ControlMode *actl;
-+
-+	actl = ctl_load(id);
-+	if (actl == NULL)
- 		return NULL;
--	if (nl != NULL) {
--		*nl = '\0';
--		if (*(nl - 1) == '\r')
--			*(nl - 1) = '\0';
--	}
--	return libinfo;
-+
-+	return actl->id_name;
- }
- 
--char *dynamic_interface_module(int id)
-+char *
-+dynamic_interface_module(int id)
- {
--	static char shared_library[MAXPATHLEN];
--	int fd;
-+	char *shared_library;
- 	
-+	shared_library = malloc(strlen(dynamic_lib_root) +
-+	    sizeof(PATH_STRING) - 1 + sizeof("interface_X") - 1 +
-+	    sizeof(SHARED_LIB_EXT) - 1 + 1);
--	sprintf(shared_library, "%s" PATH_STRING "interface_%c%s",
--			dynamic_lib_root, id, SHARED_LIB_EXT);
-+	sprintf(shared_library, "%s" PATH_STRING "interface_%c" SHARED_LIB_EXT,
-+	    dynamic_lib_root, id);
--	if ((fd = open(shared_library, 0)) < 0)
--		return NULL;
--	close(fd);
-+
- 	return shared_library;
- }
-@@ -4012,5 +3996,5 @@
- #ifdef IA_DYNAMIC
- 		if (cmp->id_character == dynamic_interface_id
--				&& dynamic_interface_module(*arg)) {
-+				&& ctl_load(*arg)) {
- 			/* Dynamic interface loader */
- 			found = 1;
---- interface/dynamic_c.c	Tue Jan 15 05:53:20 2002
-+++ interface/dynamic_c.c	Thu Sep 22 01:17:11 2005
-@@ -80,40 +80,66 @@
- }
- 
--static int ctl_open(int using_stdin, int using_stdout)
-+ControlMode *
-+ctl_load(int id)
- {
--    ControlMode *(* inferface_loader)(void);
--    char *path;
--    char buff[256];
--    int id;
--
--    if(dynamic_control_mode.opened)
--	return 0;
--    dynamic_control_mode.opened = 1;
--
--    id = dynamic_control_mode.id_character;
--    path = dynamic_interface_module(id);
--    if(path == NULL)
--    {
--	fprintf(stderr, "FATAL ERROR: dynamic_c.c: ctl_open()\n");
--	exit(1);
--    }
--
--    if((libhandle = dl_load_file(path)) == NULL)
--	return -1;
--
--    sprintf(buff, "interface_%c_loader", id);
--    if((inferface_loader = (ControlMode *(*)(void))
--	dl_find_symbol(libhandle, buff)) == NULL)
--	return -1;
--
--    ctl = inferface_loader();
--
--    ctl->verbosity = dynamic_control_mode.verbosity;
--    ctl->trace_playing = dynamic_control_mode.trace_playing;
--    ctl->flags = dynamic_control_mode.flags;
--    ctl_close_hook = ctl->close;
--    ctl->close = dynamic_control_mode.close; /* ctl_close() */
-+	static int	last_id;
-+	static ControlMode *last_ctl;
-+	ControlMode *(* inferface_loader)(void);
-+	char *path;
-+	char buff[sizeof("interface_%_loader")];
-+
-+	if (last_id == id)
-+		return last_ctl; /* success */
-+	if (last_id) {
-+		dl_free(libhandle);
-+		last_ctl = NULL;
-+	}
-+
-+	last_id = id;
-+	path = dynamic_interface_module(id);
-+	if(path == NULL) {
-+		fprintf(stderr, "FATAL ERROR: dynamic_c.c: ctl_load()\n");
-+		exit(1);
-+	}
-+
-+	libhandle = dl_load_file(path);
-+	free(path);
-+	if (libhandle == NULL)
-+		return NULL;
-+
-+	sprintf(buff, "interface_%c_loader", id);
-+	if((inferface_loader = (ControlMode *(*)(void))
-+	    dl_find_symbol(libhandle, buff)) == NULL) {
-+		dl_free(libhandle);
-+		return NULL;
-+	}
- 
--    return ctl->open(using_stdin, using_stdout);
-+	last_ctl = inferface_loader();
-+
-+	return last_ctl;
-+}
-+
-+static int
-+ctl_open(int using_stdin, int using_stdout)
-+{
-+	int id;
-+	ControlMode *newctl;
-+
-+	if(dynamic_control_mode.opened)
-+		return 0;
-+	dynamic_control_mode.opened = 1;
-+
-+	id = dynamic_control_mode.id_character;
-+	newctl = ctl_load(id);
-+	if (newctl == NULL)
-+		return 0;
-+
-+	ctl = newctl;
-+	ctl->verbosity = dynamic_control_mode.verbosity;
-+	ctl->trace_playing = dynamic_control_mode.trace_playing;
-+	ctl->flags = dynamic_control_mode.flags;
-+	ctl_close_hook = ctl->close;
-+	ctl->close = dynamic_control_mode.close; /* ctl_close() */
-+	return ctl->open(using_stdin, using_stdout);
- }
- 
diff --git a/audio/timidity++/files/patch-interface__Makefile.in b/audio/timidity++/files/patch-interface__Makefile.in
new file mode 100644
index 000000000000..4b914b6a79d4
--- /dev/null
+++ b/audio/timidity++/files/patch-interface__Makefile.in
@@ -0,0 +1,10 @@
+--- interface/Makefile.in.orig	2012-06-28 23:14:25.000000000 +0900
++++ interface/Makefile.in	2012-10-13 00:59:03.000000000 +0900
+@@ -340,7 +340,6 @@
+ 
+ INCLUDES = \
+ 	-I$(top_srcdir)/timidity \
+-	-I$(top_srcdir)/libarc \
+ 	-I$(top_srcdir)/utils
+ 
+ 
diff --git a/audio/timidity++/files/patch-interface__tk_c.c b/audio/timidity++/files/patch-interface__tk_c.c
new file mode 100644
index 000000000000..19b88a914e9c
--- /dev/null
+++ b/audio/timidity++/files/patch-interface__tk_c.c
@@ -0,0 +1,11 @@
+--- interface/tk_c.c.orig
++++ interface/tk_c.c
+@@ -913,7 +913,7 @@
+ 	vsnprintf(buf, sizeof(buf), fmt, ap);
+ 	Tcl_Eval(my_interp, buf);
+ 	va_end(ap);
+-	return my_interp->result;
++	return Tcl_GetStringResult(my_interp);
+ }
+ 
+ static const char *v_get2(const char *v1, const char *v2)
diff --git a/audio/timidity++/files/patch-playmidi b/audio/timidity++/files/patch-playmidi
deleted file mode 100644
index 653f1e26f9c9..000000000000
--- a/audio/timidity++/files/patch-playmidi
+++ /dev/null
@@ -1,11 +0,0 @@
-http://timidity-docs.sourceforge.jp/cgi-bin/kagemai-en/guest.cgi?project=timidity-bugs-en&action=view_report&id=55
-
---- timidity/playmidi.c	Sat Aug 28 01:38:18 2004
-+++ timidity/playmidi.c	Sat Sep 10 17:07:45 2005
-@@ -4160,5 +4162,5 @@
- 		case 0x20:	/* Delay Send Level to Reverb */
- 			ctl->cmsg(CMSG_INFO,VERB_NOISY,"Delay Send Level to Reverb (%d)",val);
--			if (delay_status_gs.send_reverb = val) {
-+			if (delay_status_gs.send_reverb != val) {
- 				delay_status_gs.send_reverb = val;
- 				recompute_delay_status_gs();
diff --git a/audio/timidity++/files/patch-timidity__Makefile.in b/audio/timidity++/files/patch-timidity__Makefile.in
new file mode 100644
index 000000000000..9375cd99432d
--- /dev/null
+++ b/audio/timidity++/files/patch-timidity__Makefile.in
@@ -0,0 +1,88 @@
+--- timidity/Makefile.in.orig	2012-06-28 23:14:25.000000000 +0900
++++ timidity/Makefile.in	2012-10-01 03:09:08.000000000 +0900
+@@ -336,7 +336,6 @@
+ 
+ INCLUDES = \
+ 	-I$(top_srcdir) \
+-	-I$(top_srcdir)/libarc \
+ 	-I$(top_srcdir)/libunimod \
+ 	-I$(top_srcdir)/interface \
+ 	-I$(top_srcdir)/utils \
+@@ -497,7 +496,7 @@
+ @VCPP_TRUE@timidity_LDADD = \
+ @VCPP_TRUE@	$(SYSEXTRAS:.c=.$(OBJEXT)) \
+ @VCPP_TRUE@	$(top_builddir)/interface/interface.lib \
+-@VCPP_TRUE@	$(top_builddir)/libarc/arc.lib \
++@VCPP_TRUE@	-larc \
+ @VCPP_TRUE@	$(top_builddir)/libunimod/unimod.lib \
+ @VCPP_TRUE@	$(top_builddir)/utils/utils.lib \
+ @VCPP_TRUE@	$(W32GUI_RES)
+@@ -528,7 +527,7 @@
+ @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_LDADD = \
+ @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(SYSEXTRAS:.c=.$(OBJEXT)) \
+ @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/interface/libinterface.a \
+-@BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/libarc/libarc.a \
++@BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	-larc \
+ @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/libunimod/libunimod.a \
+ @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/utils/libutils.a \
+ @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(W32GUI_RES)
+@@ -558,7 +557,6 @@
+ 
+ @BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
+ @BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@	$(top_builddir)/interface/interface.lib \
+-@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@	$(top_builddir)/libarc/arc.lib \
+ @BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@	$(top_builddir)/libunimod/unimod.lib \
+ @BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@	$(top_builddir)/utils/utils.lib \
+ @BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@	$(W32GUI_RES)
+@@ -573,7 +571,6 @@
+ 
+ @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
+ @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/interface/libinterface.a \
+-@BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/libarc/libarc.a \
+ @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/libunimod/libunimod.a \
+ @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/utils/libutils.a \
+ @BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(W32GUI_RES)
+@@ -648,7 +645,6 @@
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(SYSEXTRAS:.c=.$(OBJEXT)) \
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/interface/libinterface.a \
+-@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/libarc/libarc.a \
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/libunimod/libunimod.a \
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/utils/libutils.a
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@timidity_DEPENDENCIES = \
+@@ -695,7 +691,6 @@
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(SYSEXTRAS:.c=.$(OBJEXT)) \
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/interface/libinterface.a \
+-@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/libarc/libarc.a \
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/libunimod/libunimod.a \
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/utils/libutils.a \
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/interface/w32g_res.res
+@@ -749,7 +744,6 @@
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(SYSEXTRAS:.c=.$(OBJEXT)) \
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/interface/libinterface.a \
+-@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/libarc/libarc.a \
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/libunimod/libunimod.a \
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/utils/libutils.a \
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/interface/w32g_res.res
+@@ -803,7 +797,6 @@
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(SYSEXTRAS:.c=.$(OBJEXT)) \
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/interface/libinterface.a \
+-@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/libarc/libarc.a \
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/libunimod/libunimod.a \
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/utils/libutils.a \
+ @BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@	$(top_builddir)/interface/w32g_res.res
+@@ -1538,9 +1531,8 @@
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	  ; then \
+-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+-	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$p"; \
++	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$p || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
diff --git a/audio/timidity++/files/patch-x_sherry.c b/audio/timidity++/files/patch-x_sherry.c
deleted file mode 100644
index c33a60cf7ce0..000000000000
--- a/audio/timidity++/files/patch-x_sherry.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- interface/x_sherry.c.orig	2002-07-14 23:19:32.000000000 +0200
-+++ interface/x_sherry.c	2012-04-27 13:12:58.000000000 +0200
-@@ -34,6 +34,7 @@
- #endif
- #include <stdlib.h>
- #include <png.h>
-+#include <pngpriv.h>
- 
- #include "timidity.h"
- #include "common.h"
-@@ -909,7 +910,7 @@
- 	{
- 	    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);
- 	}
-     }
-@@ -934,7 +935,7 @@
- 		}
- 	    }
- 	}
--	png_set_dither(pngPtr, stdColorCube,
-+	png_set_quantize(pngPtr, stdColorCube,
- 		       6*7*6, MAX_SCREEN_COLORS,
- 		       NULL, 1);
- 	/*???*/
diff --git a/audio/timidity++/files/patch-xaw_i.c b/audio/timidity++/files/patch-xaw_i.c
deleted file mode 100644
index 7f407b4f4e3a..000000000000
--- a/audio/timidity++/files/patch-xaw_i.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- interface/xaw_i.c.orig	2004-09-27 08:40:14.000000000 +0900
-+++ interface/xaw_i.c	2007-07-04 01:31:24.000000000 +0900
-@@ -261,7 +261,7 @@
- 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 xaw_i_voices = 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 @@
-     c= *(local_buf+1);
-     n= atoi(local_buf+2);
-     if(c == 'L')
--      voices = n;
-+      xaw_i_voices = n;
-     else
-       last_voice = n;
-     if(IsTracePlaying()) drawVoices();
-@@ -2070,7 +2070,7 @@
-   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, xaw_i_voices);
-   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));
-@@ -2326,7 +2326,7 @@
-           if (c == LF || c == EOF || i > SSIZE) break;
-           *p++ = c;
-         }
--        *p = (char)NULL;
-+        *p = '\0';
-         if (0 != strncasecmp(s, "set ", 4)) continue;
-         switch (configcmp(s+4, &k)) {
-         case S_RepeatPlay: