Index: branches/2020Q1/audio/timidity++/Makefile
===================================================================
--- branches/2020Q1/audio/timidity++/Makefile	(revision 527631)
+++ branches/2020Q1/audio/timidity++/Makefile	(revision 527632)
@@ -1,86 +1,85 @@
 # Created by: Yoichi Asai <yatt@luna2.org>
 # $FreeBSD$
 
 PORTNAME=	timidity++
-PORTVERSION=	2.14.0
-PORTREVISION?=	5
+PORTVERSION=	2.15.0
 CATEGORIES+=	audio
 MASTER_SITES=	SF/timidity/TiMidity%2B%2B/TiMidity%2B%2B-${PORTVERSION}
 DISTNAME=	TiMidity++-${PORTVERSION}
 
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	Software MIDI player
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libarc.so:archivers/libarc
 .if !defined(PKGNAMESUFFIX)
 LIB_DEPENDS+=	libvorbis.so:audio/libvorbis \
 		libogg.so:audio/libogg
 RUN_DEPENDS=	eawpats>0:audio/eawpats
 .endif
 
 USES=		gmake tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	SHLD="${CC} -shared"
 
 CPPFLAGS+=	-I${LOCALBASE}/include/libarc -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -Wl,--export-dynamic
 
 PLIST_SUB+=	TIMID_LIBDIR="${TIMID_LIBDIR}" EUCJP_LOCALE="${EUCJP_LOCALE}"
 
 .if !defined(PKGNAMESUFFIX)
 OPTIONS_DEFINE=		DOCS EAWPLUS X11
 OPTIONS_DEFAULT=	X11
 CONFIGURE_ARGS+=	--enable-audio=oss,vorbis
 EAWPLUS_DESC=		Collection of Gravis Ultrasound MIDI patches
 EAWPLUS_RUN_DEPENDS=	eawplus>0:audio/eawplus
 X11_LIB_DEPENDS=	libpng.so:graphics/png
 X11_USES=		xorg
 X11_USE=		xorg=x11,xext
 X11_CONFIGURE_ON=	--with-x --enable-spectrogram --enable-wrd \
 			--enable-dynamic
 X11_CONFIGURE_OFF=	--without-x --disable-spectrogram --disable-wrd \
 			--disable-dynamic
 X11_CPPFLAGS=		$$(libpng-config --I_opts)
 .endif
 
 TIMID_LIBDIR=	lib/timidity
 EUCJP_LOCALE=	ja_JP.eucJP
 
 .include <bsd.port.options.mk>
 
 .if defined(PKGNAMESUFFIX)
 .include "Makefile.interface"
 .else
 USES+=		ncurses
 CONFIGURE_ARGS+=--enable-interface=ncurses,vt100,server \
 		--enable-network
 
 CONFLICTS_INSTALL=	timidity-[0-9]*
 
 DOCFILES=	README.alsaseq README.dl README.m2m README.mts README.sf
 
 pre-patch:
 	@${RM} ${WRKSRC}/libarc/*.h
 	@${RM} ${WRKSRC}/utils/mblock.h
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${TIMID_LIBDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/timidity
 
 post-install::
 	(cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_MAN} timidity.1 \
 		${STAGEDIR}${MANPREFIX}/man/ja/man1)
 	(cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_MAN} timidity.cfg.5 \
 		${STAGEDIR}${MANPREFIX}/man/ja/man5)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc/C && ${INSTALL_DATA} ${DOCFILES} \
 		${STAGEDIR}${DOCSDIR})
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME}
 	(cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_DATA} ${DOCFILES} \
 		${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME})
 	@${RMDIR} ${STAGEDIR}${PREFIX}/share/timidity
 
 .endif # PKGNAMESUFFIX
 .include <bsd.port.mk>
Index: branches/2020Q1/audio/timidity++/distinfo
===================================================================
--- branches/2020Q1/audio/timidity++/distinfo	(revision 527631)
+++ branches/2020Q1/audio/timidity++/distinfo	(revision 527632)
@@ -1,2 +1,3 @@
-SHA256 (TiMidity++-2.14.0.tar.bz2) = f97fb643f049e9c2e5ef5b034ea9eeb582f0175dce37bc5df843cc85090f6476
-SIZE (TiMidity++-2.14.0.tar.bz2) = 1611424
+TIMESTAMP = 1582712338
+SHA256 (TiMidity++-2.15.0.tar.bz2) = 161fc0395af16b51f7117ad007c3e434c825a308fa29ad44b626ee8f9bb1c8f5
+SIZE (TiMidity++-2.15.0.tar.bz2) = 1624751
Index: branches/2020Q1/audio/timidity++/files/patch-interface_tk__c.c
===================================================================
--- branches/2020Q1/audio/timidity++/files/patch-interface_tk__c.c	(revision 527631)
+++ branches/2020Q1/audio/timidity++/files/patch-interface_tk__c.c	(nonexistent)
@@ -1,11 +0,0 @@
---- interface/tk_c.c.orig	2011-12-03 15:49:19 UTC
-+++ interface/tk_c.c
-@@ -913,7 +913,7 @@ static char *v_eval(char *fmt, ...)
- 	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)

Property changes on: branches/2020Q1/audio/timidity++/files/patch-interface_tk__c.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2020Q1/audio/timidity++-tcltk/Makefile
===================================================================
--- branches/2020Q1/audio/timidity++-tcltk/Makefile	(revision 527631)
+++ branches/2020Q1/audio/timidity++-tcltk/Makefile	(revision 527632)
@@ -1,13 +1,15 @@
 # Created by: Yoichi Asai <yatt@msc.biglobe.ne.jp>
 # $FreeBSD$
 
 PKGNAMESUFFIX=	-tcltk
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tcl/Tk interface for TiMidity++
 
+BROKEN=		fails to build: /bin/sh: tclsh: not found
+
 OPTIONS_DEFINE=	DOCS
 
 MASTERDIR=	${.CURDIR}/../../audio/timidity++
 
 .include "${MASTERDIR}/Makefile"
Index: branches/2020Q1
===================================================================
--- branches/2020Q1	(revision 527631)
+++ branches/2020Q1	(revision 527632)

Property changes on: branches/2020Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r527618-527619