6 files changed, 28 insertions, 28 deletions
diff --git a/audio/timidity++/files/patch-Makefile.in b/audio/timidity++/files/patch-Makefile.in
index 2c106efd2b58..2e7c72523847 100644
--- a/audio/timidity++/files/patch-Makefile.in
+++ b/audio/timidity++/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- Makefile.in.orig	2012-06-28 14:14:25 UTC
++++ Makefile.in
+@@ -284,7 +284,6 @@ M4DIR = autoconf
  SUBDIRS = \
  	autoconf \
  	utils \
diff --git a/audio/timidity++/files/patch-configure b/audio/timidity++/files/patch-configure
index dabec2cd2637..44f61834b14c 100644
--- a/audio/timidity++/files/patch-configure
+++ b/audio/timidity++/files/patch-configure
@@ -1,4 +1,4 @@
---- configure.orig	2012-06-28 14:14:25.000000000 +0000
+--- configure.orig	2012-06-28 14:14:25 UTC
 +++ configure
 @@ -3930,6 +3930,10 @@ case "$target" in
          test -n "$SHLD" || SHLD="ld -Bshareable"
diff --git a/audio/timidity++/files/patch-interface_Makefile.in b/audio/timidity++/files/patch-interface_Makefile.in
new file mode 100644
index 000000000000..85fa929efa4e
--- /dev/null
+++ b/audio/timidity++/files/patch-interface_Makefile.in
@@ -0,0 +1,10 @@
+--- interface/Makefile.in.orig	2012-06-28 14:14:25 UTC
++++ interface/Makefile.in
+@@ -340,7 +340,6 @@ SUBDIRS = motif_bitmaps bitmaps pixmaps
+ 
+ INCLUDES = \
+ 	-I$(top_srcdir)/timidity \
+-	-I$(top_srcdir)/libarc \
+ 	-I$(top_srcdir)/utils
+ 
+ 
diff --git a/audio/timidity++/files/patch-interface__Makefile.in b/audio/timidity++/files/patch-interface__Makefile.in
deleted file mode 100644
index 4b914b6a79d4..000000000000
--- a/audio/timidity++/files/patch-interface__Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
index 19b88a914e9c..de0028f9f28d 100644
--- a/audio/timidity++/files/patch-interface__tk_c.c
+++ b/audio/timidity++/files/patch-interface_tk__c.c
@@ -1,6 +1,6 @@
---- interface/tk_c.c.orig
+--- interface/tk_c.c.orig	2011-12-03 15:49:19 UTC
 +++ interface/tk_c.c
-@@ -913,7 +913,7 @@
+@@ -913,7 +913,7 @@ static char *v_eval(char *fmt, ...)
  	vsnprintf(buf, sizeof(buf), fmt, ap);
  	Tcl_Eval(my_interp, buf);
  	va_end(ap);
diff --git a/audio/timidity++/files/patch-timidity__Makefile.in b/audio/timidity++/files/patch-timidity_Makefile.in
index 9375cd99432d..ea2b2bc0ca5e 100644
--- a/audio/timidity++/files/patch-timidity__Makefile.in
+++ b/audio/timidity++/files/patch-timidity_Makefile.in
@@ -1,6 +1,6 @@
---- 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 @@
+--- timidity/Makefile.in.orig	2012-06-28 14:14:25 UTC
++++ timidity/Makefile.in
+@@ -336,7 +336,6 @@ BITMAP_DIR = $(TCL_DIR)/bitmaps
  
  INCLUDES = \
  	-I$(top_srcdir) \
@@ -8,7 +8,7 @@
  	-I$(top_srcdir)/libunimod \
  	-I$(top_srcdir)/interface \
  	-I$(top_srcdir)/utils \
-@@ -497,7 +496,7 @@
+@@ -497,7 +496,7 @@ calcnewt_SOURCES = calcnewt.c
  @VCPP_TRUE@timidity_LDADD = \
  @VCPP_TRUE@	$(SYSEXTRAS:.c=.$(OBJEXT)) \
  @VCPP_TRUE@	$(top_builddir)/interface/interface.lib \
@@ -17,7 +17,7 @@
  @VCPP_TRUE@	$(top_builddir)/libunimod/unimod.lib \
  @VCPP_TRUE@	$(top_builddir)/utils/utils.lib \
  @VCPP_TRUE@	$(W32GUI_RES)
-@@ -528,7 +527,7 @@
+@@ -528,7 +527,7 @@ calcnewt_SOURCES = calcnewt.c
  @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 \
@@ -26,7 +26,7 @@
  @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 @@
+@@ -558,7 +557,6 @@ calcnewt_SOURCES = calcnewt.c
  
  @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 \
@@ -34,7 +34,7 @@
  @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 @@
+@@ -573,7 +571,6 @@ calcnewt_SOURCES = calcnewt.c
  
  @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 \
@@ -42,7 +42,7 @@
  @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 @@
+@@ -648,7 +645,6 @@ timidity_OBJECTS = $(am_timidity_OBJECTS
  @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 \
@@ -50,7 +50,7 @@
  @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 @@
+@@ -695,7 +691,6 @@ timidity_OBJECTS = $(am_timidity_OBJECTS
  @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 \
@@ -58,7 +58,7 @@
  @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 @@
+@@ -749,7 +744,6 @@ timidity_OBJECTS = $(am_timidity_OBJECTS
  @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 \
@@ -66,7 +66,7 @@
  @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 @@
+@@ -803,7 +797,6 @@ timidity_OBJECTS = $(am_timidity_OBJECTS
  @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 \
@@ -74,7 +74,7 @@
  @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 @@
+@@ -1538,9 +1531,8 @@ install-binPROGRAMS: $(bin_PROGRAMS)
  	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
  	  if test -f $$p \
  	  ; then \