Attachment 130169 Details for Bug 174176 – audio_timidity++.diff

[patch] audio_timidity++.diff

audio_timidity++.diff (text/x-diff), 37.85 KB, created by tkato432 on 2013-12-27 17:57:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2013-12-27 17:57:37 UTC

Size: 37.85 KB

patch

obsolete

>diff -urN /usr/ports/audio/timidity++/Makefile audio/timidity++/Makefile
>--- /usr/ports/audio/timidity++/Makefile	2013-12-12 02:41:53.000000000 +0900
>+++ audio/timidity++/Makefile	2013-12-28 00:00:00.000000000 +0900
>@@ -2,8 +2,8 @@
> # $FreeBSD: head/audio/timidity++/Makefile 336166 2013-12-11 14:35:36Z bapt $
> 
> PORTNAME=	timidity++
>-PORTVERSION=	2.13.2
>-PORTREVISION?=	11
>+PORTVERSION=	2.14.0
>+PORTREVISION?=	0
> CATEGORIES+=	audio
> MASTER_SITES=	SF/timidity/TiMidity%2B%2B/TiMidity%2B%2B-${PORTVERSION}
> DISTNAME=	TiMidity++-${PORTVERSION}
>@@ -11,84 +11,89 @@
> MAINTAINER?=	ports@FreeBSD.org
> COMMENT?=	Software MIDI player
> 
>+LICENSE=	GPLv2 # (or later)
>+
> .if !defined(PKGNAMESUFFIX)
>-LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis	\
>-		libarc.so:${PORTSDIR}/archivers/libarc
>-RUN_DEPENDS=	${LOCALBASE}/share/timidity/timidity.cfg:${PORTSDIR}/audio/eawpats
>+LIB_DEPENDS+=	libarc.so:${PORTSDIR}/archivers/libarc \
>+		libvorbis.so:${PORTSDIR}/audio/libvorbis
>+RUN_DEPENDS+=	eawpats>0:${PORTSDIR}/audio/eawpats
>+
>+OPTIONS_DEFINE=	EAWPLUS ESOUND X11 DOCS
>+OPTIONS_DEFAULT=X11
>+EAWPLUS_DESC=	Collection of Gravis Ultrasound MIDI patches
> 
>-CONFLICTS=	timidity-0.*
>+CONFLICTS_INSTALL=	timidity-[0-9]*
> .endif
> 
>-USES=		gmake
>-NO_STAGE=	yes
> USE_BZIP2=	yes
>+USES=		gmake
> GNU_CONFIGURE=	yes
>+CONFIGURE_ENV+=	SHLD="${CC} -shared"
> 
>+CPPFLAGS+=	-I${LOCALBASE}/include/libarc -I${LOCALBASE}/include
>+LDFLAGS+=	-Wl,--export-dynamic
> 
>-PLIST_SUB+=	TIMID_LIBDIR=${TIMID_LIBDIR} EUCJP_LOCALE=${EUCJP_LOCALE}
>+PLIST_SUB+=	TIMID_LIBDIR="${TIMID_LIBDIR}" EUCJP_LOCALE="${EUCJP_LOCALE}"
> 
>-EUCJP_LOCALE=	ja_JP.eucJP
> TIMID_LIBDIR=	lib/timidity
>+EUCJP_LOCALE=	ja_JP.eucJP
> 
> .include <bsd.port.options.mk>
> 
>-.if !defined(PKGNAMESUFFIX)
>-WANT_GNOME=	yes
>-EXTRACT_AFTER_ARGS=	--exclude '*/libarc/*'	\
>-		--exclude '*/utils/mblock.h' --exclude '*/utils/memb.h'
>-
>+.if defined(PKGNAMESUFFIX)
>+.include "Makefile.interface"
>+.else
>+USES+=		ncurses
> CONFIGURE_ARGS=	--enable-interface=ncurses,vt100,server \
>-		--program-transform-name= --enable-network
>-CPPFLAGS+=	-I${LOCALBASE}/include/libarc
>-LDFLAGS+=	-export-dynamic
>+		--enable-network
> 
> DOCFILES=	README.alsaseq README.dl README.m2m README.mts README.sf
>-DOCLANG=	C ja_JP.eucJP
>-
>-MANLANG=	"" ja
>-MAN1=		timidity.1
>-MAN5=		timidity.cfg.5
> 
>-.if defined(WITHOUT_X11)
>-CONFIGURE_ARGS+=--without-x --disable-spectrogram --disable-wrd --disable-dynamic
>-.else
>-CONFIGURE_ARGS+=--with-x    --enable-spectrogram  --enable-wrd  --enable-dynamic
>-USE_XORG=	x11 xext
>-LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png
>-CPPFLAGS+=	-I${LOCALBASE}/include/libpng15
>+.if ${PORT_OPTIONS:MEAWPLUS}
>+RUN_DEPENDS+=	eawplus>0:${PORTSDIR}/audio/eawplus
> .endif
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${HAVE_GNOME:Mesound}!=""
>-USE_GNOME=	esound
>+.if ${PORT_OPTIONS:MESOUND}
>+USE_GNOME+=	esound
> CONFIGURE_ARGS+=--enable-audio=oss,esd,vorbis
> .else
> CONFIGURE_ARGS+=--enable-audio=oss,vorbis
> .endif
> 
>-pre-su-install:
>-	@${MKDIR} ${PREFIX}/share/timidity ${PREFIX}/${TIMID_LIBDIR}
>+.if ${PORT_OPTIONS:MX11}
>+LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png
>+USE_XORG=	x11 xext
>+CONFIGURE_ARGS+=--with-x \
>+		--enable-spectrogram \
>+		--enable-wrd \
>+		--enable-dynamic
>+CPPFLAGS+=	$$(libpng-config --I_opts)
>+.else
>+CONFIGURE_ARGS+=--without-x \
>+		--disable-spectrogram \
>+		--disable-wrd \
>+		--disable-dynamic
>+.endif
> 
>-post-install::
>-	${INSTALL_MAN} ${WRKSRC}/doc/ja_JP.eucJP/timidity.1 \
>-		${PREFIX}/man/ja/man1
>-	${INSTALL_MAN} ${WRKSRC}/doc/ja_JP.eucJP/timidity.cfg.5 \
>-		${PREFIX}/man/ja/man5
>-.else # defined(PKGNAMESUFFIX)
>-.include "${MASTERDIR}/Makefile.interface"
>-.endif # !defined(PKGNAMESUFFIX)
>+post-extract:
>+	@${RM} -f ${WRKSRC}/libarc/*.h
>+	@${RM} -f ${WRKSRC}/utils/mblock.h
>+
>+pre-su-install:
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/${TIMID_LIBDIR}
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/timidity 
> 
> post-install::
>-.if !defined(NOPORTDOCS) && defined(DOCFILES)
>-.for lang in ${DOCLANG}
>-	${MKDIR} ${PREFIX}/share/doc/${lang:C,^C$,,:C,ja_.*,ja/,}timidity++
>-	cd ${WRKSRC}/doc/${lang} && ${INSTALL_DATA} ${DOCFILES}	\
>-	    ${PREFIX}/share/doc/${lang:C,^C$,,:C,ja_.*,ja/,}timidity++/
>-.endfor
>-.endif
>-.if exists(${PKGMESSAGE})
>-	@${CAT} ${PKGMESSAGE}
>-.endif
>+	(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})
> 
>-.include <bsd.port.post.mk>
>+.endif # PKGNAMESUFFIX
>+.include <bsd.port.mk>
>diff -urN /usr/ports/audio/timidity++/Makefile.interface audio/timidity++/Makefile.interface
>--- /usr/ports/audio/timidity++/Makefile.interface	2013-11-06 21:52:30.000000000 +0900
>+++ audio/timidity++/Makefile.interface	2013-12-28 00:00:00.000000000 +0900
>@@ -2,11 +2,13 @@
> 
> # Shared by timidity++ interface ports
> 
>-RUN_DEPENDS+=	${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++
>+BUILD_DEPENDS+=	libarc>0:${PORTSDIR}/archivers/libarc
>+RUN_DEPENDS+=	timidity++>0:${PORTSDIR}/audio/timidity++
> 
>-SLAVEDIRS=	audio/timidity++-gtk audio/timidity++-motif \
>-		audio/timidity++-slang audio/timidity++-tcltk \
>-		audio/timidity++-xaw audio/timidity++-xskin \
>+SLAVEDIRS=	audio/timidity++-emacs audio/timidity++-gtk \
>+		audio/timidity++-motif audio/timidity++-slang \
>+		audio/timidity++-tcltk audio/timidity++-xaw \
>+		audio/timidity++-xskin \
> 		japanese/timidity++-slang japanese/timidity++-tcltk
> 
> INTERFACE=	${PKGNAMESUFFIX:S/^-//}
>@@ -14,34 +16,35 @@
> DESCR=		${.CURDIR}/pkg-descr
> 
> .if exists(${.CURDIR}/pkg-plist)
>-PLIST=		${.CURDIR}/pkg-plist	
>+PLIST=		${.CURDIR}/pkg-plist
> .else
> PLIST=		${NONEXISTENT}
> .endif
>+
> .if exists(${.CURDIR}/pkg-message)
> PKGMESSAGE=	${.CURDIR}/pkg-message
> .else
> PKGMESSAGE=	${NONEXISTENT}
> .endif
> 
>-CONFIGURE_ENV+=	SHLD="${CC} -shared ${LDFLAGS}"
>-LDFLAGS+=	-export-dynamic
>-
>-CONFIGURE_ARGS+=--enable-dynamic=${INTERFACE}
>-
> BUILD_WRKSRC=	${WRKSRC}/interface
> INSTALL_WRKSRC=	${WRKSRC}/interface
> 
>+CONFIGURE_ARGS+=--enable-dynamic=${INTERFACE}
>+
> # interface section
> 
> .if ${INTERFACE} == "emacs"
>-ELISPDIR=	share/emacs/site-lisp
>+CONFIGURE_ARGS+=--with-lispdir=${PREFIX}/share/emacs/site-lisp
> .endif
> 
> .if ${INTERFACE} == "gtk"
> LINK=		gtkmidi
> 
>-USE_GNOME=	gtk12
>+USES+=		pkgconfig
>+USE_GNOME=	gtk20
>+
>+DESKTOP_ENTRIES="GtkMidi" "" "" "${LINK}" "GTK;AudioVideo;Audio;Midi;" ""
> .endif
> 
> .if ${INTERFACE} == "motif"
>@@ -49,52 +52,64 @@
> 
> USES+=		motif
> 
>-CONFIGURE_ENV+=	MOTIFLIB="${MOTIFLIB}"
>+DESKTOP_ENTRIES="XmMidi" "" "" "${LINK}" "Motif;AudioVideo;Audio;Midi;" ""
> .endif
> 
> .if ${INTERFACE} == "slang"
>-CONFIGURE_ARGS+=--with-includes=${LOCALBASE}/include \
>+.if defined(JAPANESE)
>+LIB_DEPENDS+=	libslang.so:${PORTSDIR}/japanese/libslang
>+.else
>+LIB_DEPENDS+=	libslang.so:${PORTSDIR}/devel/libslang2
>+.endif
>+
>+CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
>+CONFIGURE_ARGS+=\
>+		--with-includes=${LOCALBASE}/include \
> 		--with-libraries=${LOCALBASE}/lib \
> 		--enable-ncurses
>-
>-LDFLAGS+=	-L${LOCALBASE}/lib
>-LIB_DEPENDS+=	slang.2:${PORTSDIR}/japanese/libslang
> .endif
> 
> .if ${INTERFACE} == "tcltk"
> LINK=		tkmidi
> 
>-USE_XORG=	x11
>-
>-DOCFILES=	README.tk
>-DOCLANG=	C ja_JP.eucJP
>-
> .if defined(JAPANESE)
>-LIB_DEPENDS+=	tk80jp.1:${PORTSDIR}/japanese/tk80
>-
>-CONFIGURE_ARGS+=	--with-tcl-includes=${LOCALBASE}/include/tcl8.0jp \
>+LIB_DEPENDS+=	libtk80jp.so:${PORTSDIR}/japanese/tk80
>+CONFIGURE_ARGS+=\
>+		--with-tcl-includes=${LOCALBASE}/include/tcl8.0jp \
> 		--with-tk-includes=${LOCALBASE}/include/tk8.0jp \
>-		--with-tcl-libs=${LOCALBASE}/lib --with-tk-libs=${LOCALBASE}/lib
>-CONFIGURE_ENV+=	WISH=wish8.0jp
>+		--with-tcl-libs=${LOCALBASE}/lib \
>+		--with-tk-libs=${LOCALBASE}/lib
>+WISH=		${LOCALBASE}/bin/wish8.0jp
> .else
>-LIB_DEPENDS+=	tk84:${PORTSDIR}/x11-toolkits/tk84
>-
>-CONFIGURE_ARGS+=	--with-tcl-includes=${LOCALBASE}/include/tcl8.4 \
>-		--with-tk-includes=${LOCALBASE}/include/tk8.4 \
>-		--with-tcl-libs=${LOCALBASE}/lib --with-tk-libs=${LOCALBASE}/lib
>-CONFIGURE_ENV+=	WISH=wish8.4
>+USES+=		tk
>+CONFIGURE_ARGS+=\
>+		--with-tcl-includes=${TCL_INCLUDEDIR} \
>+		--with-tk-includes=${TK_INCLUDEDIR} \
>+		--with-tcl-libs=${LOCALBASE}/lib \
>+		--with-tk-libs=${LOCALBASE}/lib
> .endif
>+
>+USES+=		shebangfix
>+SHEBANG_FILES=	interface/tkmidity.ptcl interface/tkpanel.tcl
>+SHEBANG_LANG=	wish
>+wish_OLD_CMD=	/usr/bin/wish
>+wish_CMD=	${WISH}
>+USE_XORG=	x11
>+CONFIGURE_ENV+=	WISH="${WISH}"
>+
>+LDFLAGS+=	-L${LOCALBASE}/lib -lX11
>+
>+DESKTOP_ENTRIES="TkMidi" "" "" "${LINK}" "AudioVideo;Audio;Midi;" ""
> .endif
> 
> .if ${INTERFACE} == "xaw"
> LINK=		xawmidi
> 
>-LIB_DEPENDS+=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
>-USE_XORG=	xaw
>+LIB_DEPENDS+=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
> 
>-DOCFILES=	README.xaw
>-DOCLANG=	C ja_JP.eucJP
>+USE_XORG=	x11 xext xmu xt sm ice xpm
> 
>+DESKTOP_ENTRIES="XawMidi" "" "" "${LINK}" "AudioVideo;Audio;Midi;" ""
> .endif
> 
> .if ${INTERFACE} == "xskin"
>@@ -102,24 +117,64 @@
> 
> USE_XORG=	x11
> 
>-DOCFILES=	README.xskin
>-DOCLANG=	C ja_JP.eucJP
>+DESKTOP_ENTRIES="XSkinMidi" "" "" "${LINK}" "AudioVideo;Audio;Midi;" ""
> .endif
> 
>-.include <bsd.port.pre.mk>
>+post-extract:
>+	@${RM} -f ${WRKSRC}/libarc/*.h
>+	@${RM} -f ${WRKSRC}/utils/mblock.h
> 
>-post-install::
>-.if ${INTERFACE} == "emacs"
>-	@${MKDIR} ${PREFIX}/${ELISPDIR}
>-	${INSTALL_DATA} ${WRKSRC}/interface/timidity.el ${PREFIX}/${ELISPDIR}
>+post-patch:
>+.if ${INTERFACE} == "slang"
>+	@${REINPLACE_CMD} -e \
>+		's|"-lslang"|"-lslang $$LIBS"|' ${WRKSRC}/configure
>+.endif
>+.if ${INTERFACE} == "tcltk"
>+.if defined(JAPANESE)
>+	@${REINPLACE_CMD} -e \
>+		's|in tcl.*;|in tcl80jp;| ; \
>+		 s|in tk.*;|in tk80jp;|' ${WRKSRC}/configure
>+.else
>+	@${REINPLACE_CMD} -e \
>+		's|in tcl.*;|in tcl${TCL_VER:S|.||};| ; \
>+		 s|in tk.*;|in tk${TK_VER:S|.||};|' ${WRKSRC}/configure
>+.endif
>+.endif
>+
>+post-install:
>+.if ${INTERFACE} == "tcltk"
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	(cd ${WRKSRC}/doc/C && ${INSTALL_DATA} README.tk \
>+		${STAGEDIR}${DOCSDIR})
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME}
>+	(cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_DATA} README.tk \
>+		${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME})
> .endif
>+#
> .if ${INTERFACE} == "xaw"
>-	@${MKDIR} ${PREFIX}/lib/X11/${EUCJP_LOCALE}/app-defaults
>-	${INSTALL_DATA} ${WRKSRC}/TiMidity.ad \
>-		${PREFIX}/lib/X11/app-defaults/TiMidity
>-	${INSTALL_DATA} ${WRKSRC}/TiMidity-uj.ad \
>-		${PREFIX}/lib/X11/${EUCJP_LOCALE}/app-defaults/TiMidity
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/app-defaults
>+	cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} TiMidity.ad \
>+		${STAGEDIR}${PREFIX}/lib/X11/app-defaults/TiMidity
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/${EUCJP_LOCALE}/app-defaults
>+	cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} TiMidity-uj.ad \
>+		${STAGEDIR}${PREFIX}/lib/X11/${EUCJP_LOCALE}/app-defaults/TiMidity
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	(cd ${WRKSRC}/doc/C && ${INSTALL_DATA} README.xaw \
>+		${STAGEDIR}${DOCSDIR})
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME}
>+	(cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_DATA} README.xaw \
>+		${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME})
>+.endif
>+#
>+.if ${INTERFACE} == "xskin"
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	(cd ${WRKSRC}/doc/C && ${INSTALL_DATA} README.xskin \
>+		${STAGEDIR}${DOCSDIR})
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME}
>+	(cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_DATA} README.xskin \
>+		${STAGEDIR}${PREFIX}/share/doc/ja/${PORTNAME})
> .endif
>+#
> .if defined(LINK)
>-	${LN} -sf ${PREFIX}/bin/timidity ${PREFIX}/bin/${LINK}
>+	${LN} -sf timidity ${STAGEDIR}${PREFIX}/bin/${LINK}
> .endif
>diff -urN /usr/ports/audio/timidity++/distinfo audio/timidity++/distinfo
>--- /usr/ports/audio/timidity++/distinfo	2013-11-06 21:52:30.000000000 +0900
>+++ audio/timidity++/distinfo	2013-12-28 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (TiMidity++-2.13.2.tar.bz2) = 0a8524b789b57eaf944c3d9bce32c21a4e893016b22a02a24cd0a4c6afee7260
>-SIZE (TiMidity++-2.13.2.tar.bz2) = 1581230
>+SHA256 (TiMidity++-2.14.0.tar.bz2) = f97fb643f049e9c2e5ef5b034ea9eeb582f0175dce37bc5df843cc85090f6476
>+SIZE (TiMidity++-2.14.0.tar.bz2) = 1611424
>diff -urN /usr/ports/audio/timidity++/files/patch-Makefile.in audio/timidity++/files/patch-Makefile.in
>--- /usr/ports/audio/timidity++/files/patch-Makefile.in	2013-11-06 21:52:30.000000000 +0900
>+++ audio/timidity++/files/patch-Makefile.in	2013-12-28 00:00:00.000000000 +0900
>@@ -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 -urN /usr/ports/audio/timidity++/files/patch-configure audio/timidity++/files/patch-configure
>--- /usr/ports/audio/timidity++/files/patch-configure	2013-11-06 21:52:30.000000000 +0900
>+++ audio/timidity++/files/patch-configure	1970-01-01 09:00:00.000000000 +0900
>@@ -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/M akefile 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 -urN /usr/ports/audio/timidity++/files/patch-dynamic audio/timidity++/files/patch-dynamic
>--- /usr/ports/audio/timidity++/files/patch-dynamic	2013-11-06 21:52:30.000000000 +0900
>+++ audio/timidity++/files/patch-dynamic	1970-01-01 09:00:00.000000000 +0900
>@@ -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 -urN /usr/ports/audio/timidity++/files/patch-interface__Makefile.in audio/timidity++/files/patch-interface__Makefile.in
>--- /usr/ports/audio/timidity++/files/patch-interface__Makefile.in	1970-01-01 09:00:00.000000000 +0900
>+++ audio/timidity++/files/patch-interface__Makefile.in	2013-12-28 00:00:00.000000000 +0900
>@@ -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 -urN /usr/ports/audio/timidity++/files/patch-interface__tk_c.c audio/timidity++/files/patch-interface__tk_c.c
>--- /usr/ports/audio/timidity++/files/patch-interface__tk_c.c	1970-01-01 09:00:00.000000000 +0900
>+++ audio/timidity++/files/patch-interface__tk_c.c	2013-12-28 00:00:00.000000000 +0900
>@@ -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 -urN /usr/ports/audio/timidity++/files/patch-playmidi audio/timidity++/files/patch-playmidi
>--- /usr/ports/audio/timidity++/files/patch-playmidi	2013-11-06 21:52:30.000000000 +0900
>+++ audio/timidity++/files/patch-playmidi	1970-01-01 09:00:00.000000000 +0900
>@@ -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 -urN /usr/ports/audio/timidity++/files/patch-timidity__Makefile.in audio/timidity++/files/patch-timidity__Makefile.in
>--- /usr/ports/audio/timidity++/files/patch-timidity__Makefile.in	1970-01-01 09:00:00.000000000 +0900
>+++ audio/timidity++/files/patch-timidity__Makefile.in	2013-12-28 00:00:00.000000000 +0900
>@@ -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 -urN /usr/ports/audio/timidity++/files/patch-x_sherry.c audio/timidity++/files/patch-x_sherry.c
>--- /usr/ports/audio/timidity++/files/patch-x_sherry.c	2013-11-06 21:52:30.000000000 +0900
>+++ audio/timidity++/files/patch-x_sherry.c	1970-01-01 09:00:00.000000000 +0900
>@@ -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 -urN /usr/ports/audio/timidity++/files/patch-xaw_i.c audio/timidity++/files/patch-xaw_i.c
>--- /usr/ports/audio/timidity++/files/patch-xaw_i.c	2013-11-06 21:52:30.000000000 +0900
>+++ audio/timidity++/files/patch-xaw_i.c	1970-01-01 09:00:00.000000000 +0900
>@@ -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:
>diff -urN /usr/ports/audio/timidity++/pkg-descr audio/timidity++/pkg-descr
>--- /usr/ports/audio/timidity++/pkg-descr	2013-11-06 21:52:30.000000000 +0900
>+++ audio/timidity++/pkg-descr	2013-12-28 00:00:00.000000000 +0900
>@@ -9,4 +9,3 @@
> Now, Masanao Izumo and many hackers are developing "TiMidity++".
> 
> WWW: http://timidity.sourceforge.net/
>-WWW: http://www.linet.gr.jp/~tamuki/
>diff -urN /usr/ports/audio/timidity++/pkg-plist audio/timidity++/pkg-plist
>--- /usr/ports/audio/timidity++/pkg-plist	2013-11-06 21:52:30.000000000 +0900
>+++ audio/timidity++/pkg-plist	2013-12-28 00:00:00.000000000 +0900
>@@ -1,16 +1,20 @@
> bin/timidity
>-%%PORTDOCS%%%%DOCSDIR%%/README.alsaseq
>-%%PORTDOCS%%%%DOCSDIR%%/README.dl
>-%%PORTDOCS%%%%DOCSDIR%%/README.m2m
>-%%PORTDOCS%%%%DOCSDIR%%/README.mts
>-%%PORTDOCS%%%%DOCSDIR%%/README.sf
>+man/ja/man1/timidity.1.gz
>+man/ja/man5/timidity.cfg.5.gz
>+man/man1/timidity.1.gz
>+man/man5/timidity.cfg.5.gz
> %%PORTDOCS%%share/doc/ja/timidity++/README.alsaseq
> %%PORTDOCS%%share/doc/ja/timidity++/README.dl
> %%PORTDOCS%%share/doc/ja/timidity++/README.m2m
> %%PORTDOCS%%share/doc/ja/timidity++/README.mts
> %%PORTDOCS%%share/doc/ja/timidity++/README.sf
>-%%PORTDOCS%%@dirrm share/doc/ja/timidity++/
>+%%PORTDOCS%%%%DOCSDIR%%/README.alsaseq
>+%%PORTDOCS%%%%DOCSDIR%%/README.dl
>+%%PORTDOCS%%%%DOCSDIR%%/README.m2m
>+%%PORTDOCS%%%%DOCSDIR%%/README.mts
>+%%PORTDOCS%%%%DOCSDIR%%/README.sf
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>+%%PORTDOCS%%@dirrm share/doc/ja/timidity++
> @exec mkdir -p %D/%%TIMID_LIBDIR%%
> @exec mkdir -p %D/share/timidity
> @dirrmtry %%TIMID_LIBDIR%%

Actions: View | Diff

Attachments on bug 174176: 130108 | 130109 | 130110 | 130111 | 130112 | 130113 | 130114 | 130115 | 130116 | 130117 | 130118 | 130119 | 130120 | 130121 | 130122 | 130123 | 130124 | 130125 | 130126 | 130127 | 130128 | 130129 | 130130 | 130131 | 130132 | 130133 | 130134 | 130135 | 130136 | 130137 | 130138 | 130139 | 130140 | 130141 | 130142 | 130143 | 130144 | 130145 | 130146 | 130147 | 130148 | 130149 | 130150 | 130151 | 130152 | 130153 | 130154 | 130155 | 130156 | 130157 | 130158 | 130159 | 130160 | 130161 | 130162 | 130163 | 130164 | 130165 | 130166 | 130167 | 130168 | 130169 | 130170 | 130171 | 130172 | 130173 | 130174 | 130175 | 130176 | 130177 | 130178 | 130179 | 130180 | 130181 | 130182 | 130183 | 130184 | 130185 | 130186 | 130187 | 130188 | 130189 | 130190 | 130191 | 130192 | 130193 | 130194 | 130195 | 130196 | 130197 | 130198 | 130199 | 130200 | 130201 | 130202 | 130203 | 130204 | 130205 | 130206 | 130207 | 130208 | 130209 | 130210 | 130211 | 130212 | 130213 | 130214 | 130215 | 130216 | 130217 | 130218 | 130219 | 130220 | 130221 | 130222 | 130223 | 130224 | 130225 | 130226 | 130227 | 130228 | 130229 | 130230 | 130231 | 130232 | 130233 | 130234 | 130235 | 130236 | 130237 | 130238 | 130239 | 130240 | 130241 | 130242 | 130243 | 130244 | 130245 | 130246 | 130247 | 130248 | 130249 | 130250 | 130251 | 130252 | 130253 | 130254 | 130255 | 130256 | 130257 | 130258 | 130259 | 130260 | 130261 | 130262 | 130263 | 130264 | 130265 | 130266 | 130267 | 130268