Attachment #130119 for bug #174176

View | Details | Raw Unified | Return to bug 174176 | Differences between

and this patch

Lines 1-13 Link Here

(-)audio/timidity++/Makefile (-52 / +55 lines)
1	# New ports collection makefile for: TiMidity++	1	# Created by: Yoichi Asai <yatt@luna2.org>
2	# Date created: 27 Feb 1999
3	# Whom: Yoichi Asai <yatt@luna2.org>
4	#
5	# $FreeBSD: head/audio/timidity++/Makefile 303586 2012-09-03 04:00:32Z eadler $	2	# $FreeBSD: head/audio/timidity++/Makefile 303586 2012-09-03 04:00:32Z eadler $
6	#
7		3
8	PORTNAME= timidity++	4	PORTNAME= timidity++
9	PORTVERSION= 2.13.2	5	PORTVERSION= 2.14.0
10	PORTREVISION?= 11	6	PORTREVISION?= 0
11	CATEGORIES+= audio	7	CATEGORIES+= audio
12	MASTER_SITES= SF/timidity/TiMidity%2B%2B/TiMidity%2B%2B-${PORTVERSION}	8	MASTER_SITES= SF/timidity/TiMidity%2B%2B/TiMidity%2B%2B-${PORTVERSION}
13	DISTNAME= TiMidity++-${PORTVERSION}	9	DISTNAME= TiMidity++-${PORTVERSION}
Lines 15-96 Link Here
15	MAINTAINER?= ports@FreeBSD.org	11	MAINTAINER?= ports@FreeBSD.org
16	COMMENT?= Software MIDI player	12	COMMENT?= Software MIDI player
17		13
		14	LICENSE= GPLv2 # (or later)
		15
18	.if !defined(PKGNAMESUFFIX)	16	.if !defined(PKGNAMESUFFIX)
19	LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \	17	LIB_DEPENDS+= arc:${PORTSDIR}/archivers/libarc \
20	arc:${PORTSDIR}/archivers/libarc	18	vorbis:${PORTSDIR}/audio/libvorbis
21	RUN_DEPENDS= ${LOCALBASE}/share/timidity/timidity.cfg:${PORTSDIR}/audio/eawpats	19	RUN_DEPENDS+= ${LOCALBASE}/share/timidity/timidity.cfg:${PORTSDIR}/audio/eawpats
		20
		21	OPTIONS_DEFINE= X11 ESOUND DOCS
		22	OPTIONS_DEFAULT=X11
22		23
23	CONFLICTS= timidity-0.*	24	CONFLICTS_INSTALL= timidity-[0-9]*
24	.endif	25	.endif
25		26
26	USE_BZIP2= yes	27	USE_BZIP2= yes
27	GNU_CONFIGURE= yes
28	USE_GMAKE= yes	28	USE_GMAKE= yes
29		29	GNU_CONFIGURE= yes
		30	CONFIGURE_ENV+= SHLD="${CC} -shared"
30	MAKE_JOBS_SAFE= yes	31	MAKE_JOBS_SAFE= yes
31		32
32	PLIST_SUB+= TIMID_LIBDIR=${TIMID_LIBDIR} EUCJP_LOCALE=${EUCJP_LOCALE}	33	CPPFLAGS+= -I${LOCALBASE}/include/libarc -I${LOCALBASE}/include
		34	LDFLAGS+= -Wl,--export-dynamic
		35
		36	PLIST_SUB+= TIMID_LIBDIR="${TIMID_LIBDIR}" EUCJP_LOCALE="${EUCJP_LOCALE}"
33		37
34	EUCJP_LOCALE= ja_JP.eucJP
35	TIMID_LIBDIR= lib/timidity	38	TIMID_LIBDIR= lib/timidity
		39	EUCJP_LOCALE= ja_JP.eucJP
36		40
37	.if !defined(PKGNAMESUFFIX)	41	.include <bsd.port.options.mk>
38	WANT_GNOME= yes
39	EXTRACT_AFTER_ARGS=\| ${TAR} -xpf - --exclude '/libarc/' \
40	--exclude '/utils/mblock.h' --exclude '/utils/memb.h'
41		42
		43	.if defined(PKGNAMESUFFIX)
		44	.include "Makefile.interface"
		45	.else
		46	USE_NCURSES= yes
42	CONFIGURE_ARGS= --enable-interface=ncurses,vt100,server \	47	CONFIGURE_ARGS= --enable-interface=ncurses,vt100,server \
43	--program-transform-name= --enable-network	48	--enable-network
44	CPPFLAGS+= -I${LOCALBASE}/include/libarc
45	LDFLAGS+= -export-dynamic
46
47	DOCFILES= README.alsaseq README.dl README.m2m README.mts README.sf
48	DOCLANG= C ja_JP.eucJP
49
50	.include <bsd.port.pre.mk>
51		49
52	MANLANG= "" ja	50	MANLANG= "" ja
53	MAN1= timidity.1	51	MAN1= timidity.1
54	MAN5= timidity.cfg.5	52	MAN5= timidity.cfg.5
55		53
56	.if defined(WITHOUT_X11)	54	DOCFILES= README.alsaseq README.dl README.m2m README.mts README.sf
57	CONFIGURE_ARGS+=--without-x --disable-spectrogram --disable-wrd --disable-dynamic	55
58	.else	56	.if ${PORT_OPTIONS:MX11}
59	CONFIGURE_ARGS+=--with-x --enable-spectrogram --enable-wrd --enable-dynamic
60	USE_XORG= x11 xext
61	LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png	57	LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
62	CPPFLAGS+= -I${LOCALBASE}/include/libpng15	58	USE_XORG= x11 xext
		59	CONFIGURE_ARGS+=--with-x \
		60	--enable-spectrogram \
		61	--enable-wrd \
		62	--enable-dynamic
		63	CPPFLAGS+= $$(libpng-config --I_opts)
		64	.else
		65	CONFIGURE_ARGS+=--without-x \
		66	--disable-spectrogram \
		67	--disable-wrd \
		68	--disable-dynamic
63	.endif	69	.endif
64		70
65	.if ${HAVE_GNOME:Mesound}!=""	71	.if ${PORT_OPTIONS:MESOUND}
66	USE_GNOME= esound	72	USE_GNOME+= esound
67	CONFIGURE_ARGS+=--enable-audio=oss,esd,vorbis	73	CONFIGURE_ARGS+=--enable-audio=oss,esd,vorbis
68	.else	74	.else
69	CONFIGURE_ARGS+=--enable-audio=oss,vorbis	75	CONFIGURE_ARGS+=--enable-audio=oss,vorbis
70	.endif	76	.endif
71		77
		78	post-extract:
		79	@${RM} -f ${WRKSRC}/libarc/*.h
		80	@${RM} -f ${WRKSRC}/utils/mblock.h
		81
72	pre-su-install:	82	pre-su-install:
73	@${MKDIR} ${PREFIX}/share/timidity ${PREFIX}/${TIMID_LIBDIR}	83	@${MKDIR} ${PREFIX}/share/timidity ${PREFIX}/${TIMID_LIBDIR}
74		84
75	post-install::	85	post-install::
76	${INSTALL_MAN} ${WRKSRC}/doc/ja_JP.eucJP/timidity.1 \	86	${INSTALL_MAN} ${WRKSRC}/doc/ja_JP.eucJP/timidity.1 \
77	${PREFIX}/man/ja/man1	87	${MANPREFIX}/man/ja/man1
78	${INSTALL_MAN} ${WRKSRC}/doc/ja_JP.eucJP/timidity.cfg.5 \	88	${INSTALL_MAN} ${WRKSRC}/doc/ja_JP.eucJP/timidity.cfg.5 \
79	${PREFIX}/man/ja/man5	89	${MANPREFIX}/man/ja/man5
80	.else # defined(PKGNAMESUFFIX)	90	.if ${PORT_OPTIONS:MDOCS}
81	.include "${MASTERDIR}/Makefile.interface"	91	@${MKDIR} ${DOCSDIR}
82	.endif # !defined(PKGNAMESUFFIX)	92	(cd ${WRKSRC}/doc/C && ${INSTALL_DATA} ${DOCFILES} ${DOCSDIR})
83		93	@${MKDIR} ${PREFIX}/share/doc/ja/${PORTNAME}
84	post-install::	94	(cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_DATA} ${DOCFILES} \
85	.if !defined(NOPORTDOCS) && defined(DOCFILES)	95	${PREFIX}/share/doc/ja/${PORTNAME})
86	.for lang in ${DOCLANG}
87	${MKDIR} ${PREFIX}/share/doc/${lang:C,^C$,,:C,ja_.*,ja/,}timidity++
88	cd ${WRKSRC}/doc/${lang} && ${INSTALL_DATA} ${DOCFILES} \
89	${PREFIX}/share/doc/${lang:C,^C$,,:C,ja_.*,ja/,}timidity++/
90	.endfor
91	.endif
92	.if exists(${PKGMESSAGE})
93	@${CAT} ${PKGMESSAGE}
94	.endif	96	.endif
95		97
96	.include <bsd.port.post.mk>	98	.endif # PKGNAMESUFFIX
		99	.include <bsd.port.mk>





# Shared by timidity++ interface ports

BUILD_DEPENDS+=	${LOCALBASE}/include/libarc/arc.h:${PORTSDIR}/archivers/libarc
RUN_DEPENDS+=	${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++

SLAVEDIRS=	audio/timidity++-gtk audio/timidity++-motif \

DESCR=		${.CURDIR}/pkg-descr

.if exists(${.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
ELISPDIR=	share/emacs/site-lisp
.endif

.if ${INTERFACE} == "gtk"
LINK=		gtkmidi

USE_GNOME=	gtk20
.endif

.if ${INTERFACE} == "motif"
LINK=		xmmidi

USE_MOTIF=	yes

CONFIGURE_ENV+=	MOTIFLIB="${MOTIFLIB}"
.endif

.if ${INTERFACE} == "slang"
.if defined(JAPANESE)
LIB_DEPENDS+=	slang:${PORTSDIR}/japanese/libslang
.else
LIB_DEPENDS+=	slang:${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:${PORTSDIR}/japanese/tk80
CONFIGURE_ENV+=	WISH="wish8.0jp"
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
.else
USE_TK_BUILD=	yes
USE_TK=		yes
CONFIGURE_ENV+=	WISH="${WISH}"
CONFIGURE_ARGS+=\
		--with-tcl-includes=${TCL_INCLUDEDIR} \
		--with-tk-includes=${TK_INCLUDEDIR} \
		--with-tcl-libs=${LOCALBASE}/lib \
		--with-tk-libs=${LOCALBASE}/lib
.endif

USE_XORG=	x11

LDFLAGS+=	-L${LOCALBASE}/lib -lX11
.endif

.if ${INTERFACE} == "xaw"
LINK=		xawmidi

LIB_DEPENDS+=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
USE_XORG=	xaw

DOCFILES=	README.xaw
DOCLANG=	C ja_JP.eucJP

USE_XORG=	x11 xext xmu xt sm ice xpm
.endif

.if ${INTERFACE} == "xskin"
LINK=		xskinmidi

USE_XORG=	x11

DOCFILES=	README.xskin
DOCLANG=	C ja_JP.eucJP
.endif

post-extract:
	@${RM} -f ${WRKSRC}/libarc/*.h
	@${RM} -f ${WRKSRC}/utils/mblock.h

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"
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${DOCSDIR}
	(cd ${WRKSRC}/doc/C && ${INSTALL_DATA} README.tk ${DOCSDIR})
	@${MKDIR} ${PREFIX}/share/doc/ja/${PORTNAME}
	(cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_DATA} README.tk \
		${PREFIX}/share/doc/ja/${PORTNAME})
.endif
.endif
#
.if ${INTERFACE} == "xaw"
	@${MKDIR} ${PREFIX}/lib/X11/app-defaults
	cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} TiMidity.ad \
		${PREFIX}/lib/X11/app-defaults/TiMidity
	@${MKDIR} ${PREFIX}/lib/X11/${EUCJP_LOCALE}/app-defaults
	cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} TiMidity-uj.ad \
		${PREFIX}/lib/X11/${EUCJP_LOCALE}/app-defaults/TiMidity
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${DOCSDIR}
	(cd ${WRKSRC}/doc/C && ${INSTALL_DATA} README.xaw ${DOCSDIR})
	@${MKDIR} ${PREFIX}/share/doc/ja/${PORTNAME}
	(cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_DATA} README.xaw \
		${PREFIX}/share/doc/ja/${PORTNAME})
.endif
.endif
#
.if ${INTERFACE} == "xskin"
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${DOCSDIR}
	(cd ${WRKSRC}/doc/C && ${INSTALL_DATA} README.xskin ${DOCSDIR})
	@${MKDIR} ${PREFIX}/share/doc/ja/${PORTNAME}
	(cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_DATA} README.xskin \
		${PREFIX}/share/doc/ja/${PORTNAME})
.endif
.endif
#
.if defined(LINK)
	${LN} -sf timidity ${PREFIX}/bin/${LINK}
.endif
#
.if exists(${.CURDIR}/pkg-message)
	@${CAT} ${PKGMESSAGE}
.endif

Lines 1-2 Link Here

(-)audio/timidity++/distinfo (-2 / +2 lines)
1	SHA256 (TiMidity++-2.13.2.tar.bz2) = 0a8524b789b57eaf944c3d9bce32c21a4e893016b22a02a24cd0a4c6afee7260	1	SHA256 (TiMidity++-2.14.0.tar.bz2) = f97fb643f049e9c2e5ef5b034ea9eeb582f0175dce37bc5df843cc85090f6476
2	SIZE (TiMidity++-2.13.2.tar.bz2) = 1581230	2	SIZE (TiMidity++-2.14.0.tar.bz2) = 1611424




--- 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 \
+@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
 




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 \




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);
 }
 

Line 0 Link Here

(-)audio/timidity++/files/patch-interface__Makefile.in (+10 lines)
	1	--- interface/Makefile.in.orig 2012-06-28 23:14:25.000000000 +0900
	2	+++ interface/Makefile.in 2012-10-13 00:59:03.000000000 +0900
	3	@@ -340,7 +340,6 @@
	4
	5	INCLUDES = \
	6	-I$(top_srcdir)/timidity \
	7	- -I$(top_srcdir)/libarc \
	8	-I$(top_srcdir)/utils
	9
	10

Lines 1-11 Link Here

(-)audio/timidity++/files/patch-playmidi (-11 lines)
1	http://timidity-docs.sourceforge.jp/cgi-bin/kagemai-en/guest.cgi?project=timidity-bugs-en&action=view_report&id=55
2
3	--- timidity/playmidi.c Sat Aug 28 01:38:18 2004
4	+++ timidity/playmidi.c Sat Sep 10 17:07:45 2005
5	@@ -4160,5 +4162,5 @@
6	case 0x20: /* Delay Send Level to Reverb */
7	ctl->cmsg(CMSG_INFO,VERB_NOISY,"Delay Send Level to Reverb (%d)",val);
8	- if (delay_status_gs.send_reverb = val) {
9	+ if (delay_status_gs.send_reverb != val) {
10	delay_status_gs.send_reverb = val;
11	recompute_delay_status_gs();




--- 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
 




--- 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);
 	/*???*/




--- 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:

Lines 9-12 Link Here

(-)audio/timidity++/pkg-descr (-1 lines)
9	Now, Masanao Izumo and many hackers are developing "TiMidity++".	9	Now, Masanao Izumo and many hackers are developing "TiMidity++".
10		10
11	WWW: http://timidity.sourceforge.net/	11	WWW: http://timidity.sourceforge.net/
12	WWW: http://www.linet.gr.jp/~tamuki/

Return to bug 174176

Lines 2-7 Link Here

(-)audio/timidity++/Makefile.interface (-49 / +91 lines)
2		2
3	# Shared by timidity++ interface ports	3	# Shared by timidity++ interface ports
4		4
		5	BUILD_DEPENDS+= ${LOCALBASE}/include/libarc/arc.h:${PORTSDIR}/archivers/libarc
5	RUN_DEPENDS+= ${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++	6	RUN_DEPENDS+= ${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++
6		7
7	SLAVEDIRS= audio/timidity++-gtk audio/timidity++-motif \	8	SLAVEDIRS= audio/timidity++-gtk audio/timidity++-motif \
Lines 14-125 Link Here
14	DESCR= ${.CURDIR}/pkg-descr	15	DESCR= ${.CURDIR}/pkg-descr
15		16
16	.if exists(${.CURDIR}/pkg-plist)	17	.if exists(${.CURDIR}/pkg-plist)
17	PLIST= ${.CURDIR}/pkg-plist	18	PLIST= ${.CURDIR}/pkg-plist
18	.else	19	.else
19	PLIST= ${NONEXISTENT}	20	PLIST= ${NONEXISTENT}
20	.endif	21	.endif
		22
21	.if exists(${.CURDIR}/pkg-message)	23	.if exists(${.CURDIR}/pkg-message)
22	PKGMESSAGE= ${.CURDIR}/pkg-message	24	PKGMESSAGE= ${.CURDIR}/pkg-message
23	.else	25	.else
24	PKGMESSAGE= ${NONEXISTENT}	26	PKGMESSAGE= ${NONEXISTENT}
25	.endif	27	.endif
26		28
27	CONFIGURE_ENV+= SHLD="${CC} -shared ${LDFLAGS}"
28	LDFLAGS+= -export-dynamic
29
30	CONFIGURE_ARGS+=--enable-dynamic=${INTERFACE}
31
32	BUILD_WRKSRC= ${WRKSRC}/interface	29	BUILD_WRKSRC= ${WRKSRC}/interface
33	INSTALL_WRKSRC= ${WRKSRC}/interface	30	INSTALL_WRKSRC= ${WRKSRC}/interface
34		31
35	# interface section	32	CONFIGURE_ARGS+=--enable-dynamic=${INTERFACE}
36		33
37	.if ${INTERFACE} == "emacs"	34	# interface section
38	ELISPDIR= share/emacs/site-lisp
39	.endif
40		35
41	.if ${INTERFACE} == "gtk"	36	.if ${INTERFACE} == "gtk"
42	LINK= gtkmidi	37	LINK= gtkmidi
43		38
44	USE_GNOME= gtk12	39	USE_GNOME= gtk20
45	.endif	40	.endif
46		41
47	.if ${INTERFACE} == "motif"	42	.if ${INTERFACE} == "motif"
48	LINK= xmmidi	43	LINK= xmmidi
49		44
50	USE_MOTIF= yes	45	USE_MOTIF= yes
51
52	CONFIGURE_ENV+= MOTIFLIB="${MOTIFLIB}"
53	.endif	46	.endif
54		47
55	.if ${INTERFACE} == "slang"	48	.if ${INTERFACE} == "slang"
56	CONFIGURE_ARGS+=--with-includes=${LOCALBASE}/include \	49	.if defined(JAPANESE)
		50	LIB_DEPENDS+= slang:${PORTSDIR}/japanese/libslang
		51	.else
		52	LIB_DEPENDS+= slang:${PORTSDIR}/devel/libslang2
		53	.endif
		54
		55	CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib"
		56	CONFIGURE_ARGS+=\
		57	--with-includes=${LOCALBASE}/include \
57	--with-libraries=${LOCALBASE}/lib \	58	--with-libraries=${LOCALBASE}/lib \
58	--enable-ncurses	59	--enable-ncurses
59
60	LDFLAGS+= -L${LOCALBASE}/lib
61	LIB_DEPENDS+= slang.2:${PORTSDIR}/japanese/libslang
62	.endif	60	.endif
63		61
64	.if ${INTERFACE} == "tcltk"	62	.if ${INTERFACE} == "tcltk"
65	LINK= tkmidi	63	LINK= tkmidi
66		64
67	USE_XORG= x11
68
69	DOCFILES= README.tk
70	DOCLANG= C ja_JP.eucJP
71
72	.if defined(JAPANESE)	65	.if defined(JAPANESE)
73	LIB_DEPENDS+= tk80jp.1:${PORTSDIR}/japanese/tk80	66	LIB_DEPENDS+= tk80jp:${PORTSDIR}/japanese/tk80
74		67	CONFIGURE_ENV+= WISH="wish8.0jp"
75	CONFIGURE_ARGS+= --with-tcl-includes=${LOCALBASE}/include/tcl8.0jp \	68	CONFIGURE_ARGS+=\
		69	--with-tcl-includes=${LOCALBASE}/include/tcl8.0jp \
76	--with-tk-includes=${LOCALBASE}/include/tk8.0jp \	70	--with-tk-includes=${LOCALBASE}/include/tk8.0jp \
77	--with-tcl-libs=${LOCALBASE}/lib --with-tk-libs=${LOCALBASE}/lib	71	--with-tcl-libs=${LOCALBASE}/lib \
78	CONFIGURE_ENV+= WISH=wish8.0jp	72	--with-tk-libs=${LOCALBASE}/lib
79	.else	73	.else
80	LIB_DEPENDS+= tk84:${PORTSDIR}/x11-toolkits/tk84	74	USE_TK_BUILD= yes
81		75	USE_TK= yes
82	CONFIGURE_ARGS+= --with-tcl-includes=${LOCALBASE}/include/tcl8.4 \	76	CONFIGURE_ENV+= WISH="${WISH}"
83	--with-tk-includes=${LOCALBASE}/include/tk8.4 \	77	CONFIGURE_ARGS+=\
84	--with-tcl-libs=${LOCALBASE}/lib --with-tk-libs=${LOCALBASE}/lib	78	--with-tcl-includes=${TCL_INCLUDEDIR} \
85	CONFIGURE_ENV+= WISH=wish8.4	79	--with-tk-includes=${TK_INCLUDEDIR} \
		80	--with-tcl-libs=${LOCALBASE}/lib \
		81	--with-tk-libs=${LOCALBASE}/lib
86	.endif	82	.endif
		83
		84	USE_XORG= x11
		85
		86	LDFLAGS+= -L${LOCALBASE}/lib -lX11
87	.endif	87	.endif
88		88
89	.if ${INTERFACE} == "xaw"	89	.if ${INTERFACE} == "xaw"
90	LINK= xawmidi	90	LINK= xawmidi
91		91
92	LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d	92	LIB_DEPENDS+= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
93	USE_XORG= xaw
94
95	DOCFILES= README.xaw
96	DOCLANG= C ja_JP.eucJP
97		93
		94	USE_XORG= x11 xext xmu xt sm ice xpm
98	.endif	95	.endif
99		96
100	.if ${INTERFACE} == "xskin"	97	.if ${INTERFACE} == "xskin"
101	LINK= xskinmidi	98	LINK= xskinmidi
102		99
103	USE_XORG= x11	100	USE_XORG= x11
104
105	DOCFILES= README.xskin
106	DOCLANG= C ja_JP.eucJP
107	.endif	101	.endif
108		102
109	.include <bsd.port.pre.mk>	103	post-extract:
		104	@${RM} -f ${WRKSRC}/libarc/*.h
		105	@${RM} -f ${WRKSRC}/utils/mblock.h
110		106
111	post-install::	107	post-patch:
112	.if ${INTERFACE} == "emacs"	108	.if ${INTERFACE} == "slang"
113	@${MKDIR} ${PREFIX}/${ELISPDIR}	109	@${REINPLACE_CMD} -e \
114	${INSTALL_DATA} ${WRKSRC}/interface/timidity.el ${PREFIX}/${ELISPDIR}	110	's\|"-lslang"\|"-lslang $$LIBS"\|' ${WRKSRC}/configure
115	.endif	111	.endif
		112	.if ${INTERFACE} == "tcltk"
		113	.if defined(JAPANESE)
		114	@${REINPLACE_CMD} -e \
		115	's\|in tcl.*;\|in tcl80jp;\| ; \
		116	s\|in tk.*;\|in tk80jp;\|' ${WRKSRC}/configure
		117	.else
		118	@${REINPLACE_CMD} -e \
		119	's\|in tcl.*;\|in tcl${TCL_VER:S\|.\|\|};\| ; \
		120	s\|in tk.*;\|in tk${TK_VER:S\|.\|\|};\|' ${WRKSRC}/configure
		121	.endif
		122	.endif
		123
		124	post-install:
		125	.if ${INTERFACE} == "tcltk"
		126	.if ${PORT_OPTIONS:MDOCS}
		127	@${MKDIR} ${DOCSDIR}
		128	(cd ${WRKSRC}/doc/C && ${INSTALL_DATA} README.tk ${DOCSDIR})
		129	@${MKDIR} ${PREFIX}/share/doc/ja/${PORTNAME}
		130	(cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_DATA} README.tk \
		131	${PREFIX}/share/doc/ja/${PORTNAME})
		132	.endif
		133	.endif
		134	#
116	.if ${INTERFACE} == "xaw"	135	.if ${INTERFACE} == "xaw"
117	@${MKDIR} ${PREFIX}/lib/X11/${EUCJP_LOCALE}/app-defaults	136	@${MKDIR} ${PREFIX}/lib/X11/app-defaults
118	${INSTALL_DATA} ${WRKSRC}/TiMidity.ad \	137	cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} TiMidity.ad \
119	${PREFIX}/lib/X11/app-defaults/TiMidity	138	${PREFIX}/lib/X11/app-defaults/TiMidity
120	${INSTALL_DATA} ${WRKSRC}/TiMidity-uj.ad \	139	@${MKDIR} ${PREFIX}/lib/X11/${EUCJP_LOCALE}/app-defaults
		140	cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} TiMidity-uj.ad \
121	${PREFIX}/lib/X11/${EUCJP_LOCALE}/app-defaults/TiMidity	141	${PREFIX}/lib/X11/${EUCJP_LOCALE}/app-defaults/TiMidity
		142	.if ${PORT_OPTIONS:MDOCS}
		143	@${MKDIR} ${DOCSDIR}
		144	(cd ${WRKSRC}/doc/C && ${INSTALL_DATA} README.xaw ${DOCSDIR})
		145	@${MKDIR} ${PREFIX}/share/doc/ja/${PORTNAME}
		146	(cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_DATA} README.xaw \
		147	${PREFIX}/share/doc/ja/${PORTNAME})
		148	.endif
122	.endif	149	.endif
		150	#
		151	.if ${INTERFACE} == "xskin"
		152	.if ${PORT_OPTIONS:MDOCS}
		153	@${MKDIR} ${DOCSDIR}
		154	(cd ${WRKSRC}/doc/C && ${INSTALL_DATA} README.xskin ${DOCSDIR})
		155	@${MKDIR} ${PREFIX}/share/doc/ja/${PORTNAME}
		156	(cd ${WRKSRC}/doc/ja_JP.eucJP && ${INSTALL_DATA} README.xskin \
		157	${PREFIX}/share/doc/ja/${PORTNAME})
		158	.endif
		159	.endif
		160	#
123	.if defined(LINK)	161	.if defined(LINK)
124	${LN} -sf ${PREFIX}/bin/timidity ${PREFIX}/bin/${LINK}	162	${LN} -sf timidity ${PREFIX}/bin/${LINK}
		163	.endif
		164	#
		165	.if exists(${.CURDIR}/pkg-message)
		166	@${CAT} ${PKGMESSAGE}
125	.endif	167	.endif

Lines 1-37 Link Here

(-)audio/timidity++/files/patch-Makefile.in (-37 / +10 lines)
1	http://timidity-docs.sourceforge.jp/cgi-bin/kagemai-en/guest.cgi?project=timidity-bugs-en&action=view_report&id=56	1	--- Makefile.in.orig 2012-06-28 23:14:25.000000000 +0900
2		2	+++ Makefile.in 2012-10-01 02:41:14.000000000 +0900
3	Plus another patch...	3	@@ -284,7 +284,6 @@
4		4	SUBDIRS = \
5	--- timidity/Makefile.in Sun Oct 3 08:39:54 2004	5	autoconf \
6	+++ timidity/Makefile.in Thu Sep 22 03:11:09 2005	6	utils \
7	@@ -478,5 +477,5 @@	7	- libarc \
8	@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \	8	libunimod \
9	@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \	9	interface \
10	-@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \	10	timidity \
11	+@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ -larc \
12	@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \
13	@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \
14	@@ -509,5 +507,4 @@
15	@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
16	@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \
17	-@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \
18	@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \
19	@BORLANDC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \
20	@@ -585,5 +583,4 @@
21	@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \
22	@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \
23	-@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \
24	@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \
25	@BORLANDC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a
26	@@ -576,9 +576,8 @@
27	p1=`echo $$p\|sed 's/$(EXEEXT)$$//'`; \
28	if test -f $$p \
29	; then \
30	- f=`echo "$$p1" \| sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
31	- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
32	- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f \|\| exit 1; \
33	+ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$p"; \
34	+ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$p \|\| exit 1; \
35	else :; fi; \
36	done
37

Lines 1-33 Link Here

(-)audio/timidity++/files/patch-configure (-33 lines)
1	http://timidity-docs.sourceforge.jp/cgi-bin/kagemai-en/guest.cgi?project=timidity-bugs-en&action=view_report&id=58
2
3	--- configure Sun Oct 3 08:39:51 2004
4	+++ configure Thu Sep 22 02:49:01 2005
5	@@ -16605,5 +16605,5 @@
6	tcl_lib=
7	tk_lib=
8	- for l in tcl tcl8.4 tcl8.3 tcl8.0jp tcl7.6jp tcl80jp tcl76jp tcl8.0 tcl7.6 tcl80 tcl76; do
9	+ for l in tcl84 tcl83 tcl8.0jp tcl7.6jp tcl80jp tcl76jp tcl8.0 tcl7.6 tcl80 tcl76; do
10	case "x$tcl_lib" in x) as_ac_Lib=`echo "ac_cv_lib_$l''_Tcl_Init" \| $as_tr_sh`
11	echo "$as_me:$LINENO: checking for Tcl_Init in -l$l" >&5
12	@@ -16677,5 +16677,5 @@
13	done
14	LIBS="$LIBS $tcl_lib"
15	- for l in tk tk8.4 tk8.3 tk8.0jp tk4.2jp tk80jp tk42jp tk8.0 tk4.2 tk80 tk42; do
16	+ for l in tk tk84 tk83 tk8.0jp tk4.2jp tk80jp tk42jp tk8.0 tk4.2 tk80 tk42; do
17	case "x$tk_lib" in x) as_ac_Lib=`echo "ac_cv_lib_$l''_Tk_Init" \| $as_tr_sh`
18	echo "$as_me:$LINENO: checking for Tk_Init in -l$l" >&5
19	@@ -19522,5 +19522,5 @@
20
21
22	- 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"
23	+ 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"
24
25	cat >confcache <<\_ACEOF
26	--- Makefile.in Wed Sep 22 13:23:32 2004
27	+++ Makefile.in Thu Sep 22 02:49:17 2005
28	@@ -268,5 +268,4 @@
29	autoconf \
30	utils \
31	- libarc \
32	libunimod \
33	interface \

Lines 1-230 Link Here

(-)audio/timidity++/files/patch-dynamic (-230 lines)
1	http://timidity-docs.sourceforge.jp/cgi-bin/kagemai-en/guest.cgi?project=timidity-bugs-en&action=view_report&id=54
2
3	--- interface/Makefile.in Sun Oct 3 08:39:54 2004
4	+++ interface/Makefile.in Thu Sep 22 00:01:34 2005
5	@@ -1240,5 +1240,5 @@
6	@NEEDDLOPEN_TRUE@install.dynamics: $(dynamic_targets)
7	@NEEDDLOPEN_TRUE@ test -d $(DESTDIR)$(SHLIB_DIR) \|\| mkdir -p $(DESTDIR)$(SHLIB_DIR)
8	-@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
9	+@NEEDDLOPEN_TRUE@ for f in $(dynamic_targets) ''; do case ".$$f" in .);; *) $(INSTALL_PROGRAM) $$f $(DESTDIR)$(SHLIB_DIR);; esac; done
10
11	@NEEDDLOPEN_TRUE@.c.$(so):
12	--- timidity/timidity.c Sat Oct 2 06:46:17 2004
13	+++ timidity/timidity.c Thu Sep 22 02:32:24 2005
14	@@ -386,5 +386,5 @@
15	static inline int parse_opt_c(char *);
16	static inline int parse_opt_D(const char *);
17	-static inline int parse_opt_d(const char *);
18	+static inline int parse_opt_d(char *);
19	static inline int parse_opt_E(char *);
20	static inline int parse_opt_mod_wheel(const char *);
21	@@ -418,5 +418,5 @@
22	#ifdef IA_DYNAMIC
23	static inline void list_dyna_interface(FILE , char , char *);
24	-static inline char *dynamic_interface_info(int);
25	+static inline const char *dynamic_interface_info(int);
26	char *dynamic_interface_module(int);
27	#endif
28	@@ -501,4 +501,5 @@
29	#ifdef IA_DYNAMIC
30	MAIN_INTERFACE char dynamic_interface_id;
31	+ControlMode *ctl_load(int id);
32	#endif /* IA_DYNAMIC */
33
34	@@ -2929,11 +2930,9 @@
35	}
36
37	-static inline int parse_opt_d(const char *arg)
38	+static inline int parse_opt_d(char *arg)
39	{
40	/* dynamic lib root */
41	#ifdef IA_DYNAMIC
42	- if (dynamic_lib_root)
43	- free(dynamic_lib_root);
44	- dynamic_lib_root = safe_strdup(arg);
45	+ dynamic_lib_root = arg;
46	return 0;
47	#else
48	@@ -3935,5 +3934,6 @@
49	{
50	URL url;
51	- char fname[BUFSIZ], *info;
52	+ char fname[63];
53	+ const char *info;
54	int id;
55
56	@@ -3946,6 +3946,5 @@
57	continue;
58	mark[id] = 1;
59	- if ((info = dynamic_interface_info(id)) == NULL)
60	- info = dynamic_interface_module(id);
61	+ info = dynamic_interface_info(id);
62	if (info != NULL)
63	fprintf(fp, " -i%c %s" NLS, id, info);
64	@@ -3954,39 +3953,27 @@
65	}
66
67	-static inline char *dynamic_interface_info(int id)
68	+static inline const char *
69	+dynamic_interface_info(int id)
70	{
71	- static char libinfo[MAXPATHLEN];
72	- int fd, n;
73	- char *nl;
74	-
75	- sprintf(libinfo, "%s" PATH_STRING "interface_%c.txt",
76	- dynamic_lib_root, id);
77	- if ((fd = open(libinfo, 0)) < 0)
78	- return NULL;
79	- n = read(fd, libinfo, sizeof(libinfo) - 1);
80	- close(fd);
81	- if (n <= 0)
82	- return NULL;
83	- libinfo[n] = '\0';
84	- if ((nl = strchr(libinfo, '\n')) == libinfo)
85	+ ControlMode *actl;
86	+
87	+ actl = ctl_load(id);
88	+ if (actl == NULL)
89	return NULL;
90	- if (nl != NULL) {
91	- *nl = '\0';
92	- if (*(nl - 1) == '\r')
93	- *(nl - 1) = '\0';
94	- }
95	- return libinfo;
96	+
97	+ return actl->id_name;
98	}
99
100	-char *dynamic_interface_module(int id)
101	+char *
102	+dynamic_interface_module(int id)
103	{
104	- static char shared_library[MAXPATHLEN];
105	- int fd;
106	+ char *shared_library;
107
108	+ shared_library = malloc(strlen(dynamic_lib_root) +
109	+ sizeof(PATH_STRING) - 1 + sizeof("interface_X") - 1 +
110	+ sizeof(SHARED_LIB_EXT) - 1 + 1);
111	- sprintf(shared_library, "%s" PATH_STRING "interface_%c%s",
112	- dynamic_lib_root, id, SHARED_LIB_EXT);
113	+ sprintf(shared_library, "%s" PATH_STRING "interface_%c" SHARED_LIB_EXT,
114	+ dynamic_lib_root, id);
115	- if ((fd = open(shared_library, 0)) < 0)
116	- return NULL;
117	- close(fd);
118	+
119	return shared_library;
120	}
121	@@ -4012,5 +3996,5 @@
122	#ifdef IA_DYNAMIC
123	if (cmp->id_character == dynamic_interface_id
124	- && dynamic_interface_module(*arg)) {
125	+ && ctl_load(*arg)) {
126	/* Dynamic interface loader */
127	found = 1;
128	--- interface/dynamic_c.c Tue Jan 15 05:53:20 2002
129	+++ interface/dynamic_c.c Thu Sep 22 01:17:11 2005
130	@@ -80,40 +80,66 @@
131	}
132
133	-static int ctl_open(int using_stdin, int using_stdout)
134	+ControlMode *
135	+ctl_load(int id)
136	{
137	- ControlMode ( inferface_loader)(void);
138	- char *path;
139	- char buff[256];
140	- int id;
141	-
142	- if(dynamic_control_mode.opened)
143	- return 0;
144	- dynamic_control_mode.opened = 1;
145	-
146	- id = dynamic_control_mode.id_character;
147	- path = dynamic_interface_module(id);
148	- if(path == NULL)
149	- {
150	- fprintf(stderr, "FATAL ERROR: dynamic_c.c: ctl_open()\n");
151	- exit(1);
152	- }
153	-
154	- if((libhandle = dl_load_file(path)) == NULL)
155	- return -1;
156	-
157	- sprintf(buff, "interface_%c_loader", id);
158	- if((inferface_loader = (ControlMode ()(void))
159	- dl_find_symbol(libhandle, buff)) == NULL)
160	- return -1;
161	-
162	- ctl = inferface_loader();
163	-
164	- ctl->verbosity = dynamic_control_mode.verbosity;
165	- ctl->trace_playing = dynamic_control_mode.trace_playing;
166	- ctl->flags = dynamic_control_mode.flags;
167	- ctl_close_hook = ctl->close;
168	- ctl->close = dynamic_control_mode.close; /* ctl_close() */
169	+ static int last_id;
170	+ static ControlMode *last_ctl;
171	+ ControlMode ( inferface_loader)(void);
172	+ char *path;
173	+ char buff[sizeof("interface_%_loader")];
174	+
175	+ if (last_id == id)
176	+ return last_ctl; /* success */
177	+ if (last_id) {
178	+ dl_free(libhandle);
179	+ last_ctl = NULL;
180	+ }
181	+
182	+ last_id = id;
183	+ path = dynamic_interface_module(id);
184	+ if(path == NULL) {
185	+ fprintf(stderr, "FATAL ERROR: dynamic_c.c: ctl_load()\n");
186	+ exit(1);
187	+ }
188	+
189	+ libhandle = dl_load_file(path);
190	+ free(path);
191	+ if (libhandle == NULL)
192	+ return NULL;
193	+
194	+ sprintf(buff, "interface_%c_loader", id);
195	+ if((inferface_loader = (ControlMode ()(void))
196	+ dl_find_symbol(libhandle, buff)) == NULL) {
197	+ dl_free(libhandle);
198	+ return NULL;
199	+ }
200
201	- return ctl->open(using_stdin, using_stdout);
202	+ last_ctl = inferface_loader();
203	+
204	+ return last_ctl;
205	+}
206	+
207	+static int
208	+ctl_open(int using_stdin, int using_stdout)
209	+{
210	+ int id;
211	+ ControlMode *newctl;
212	+
213	+ if(dynamic_control_mode.opened)
214	+ return 0;
215	+ dynamic_control_mode.opened = 1;
216	+
217	+ id = dynamic_control_mode.id_character;
218	+ newctl = ctl_load(id);
219	+ if (newctl == NULL)
220	+ return 0;
221	+
222	+ ctl = newctl;
223	+ ctl->verbosity = dynamic_control_mode.verbosity;
224	+ ctl->trace_playing = dynamic_control_mode.trace_playing;
225	+ ctl->flags = dynamic_control_mode.flags;
226	+ ctl_close_hook = ctl->close;
227	+ ctl->close = dynamic_control_mode.close; /* ctl_close() */
228	+ return ctl->open(using_stdin, using_stdout);
229	}
230

Line 0 Link Here

(-)audio/timidity++/files/patch-timidity__Makefile.in (+88 lines)
		1	--- timidity/Makefile.in.orig 2012-06-28 23:14:25.000000000 +0900
		2	+++ timidity/Makefile.in 2012-10-01 03:09:08.000000000 +0900
		3	@@ -336,7 +336,6 @@
		4
		5	INCLUDES = \
		6	-I$(top_srcdir) \
		7	- -I$(top_srcdir)/libarc \
		8	-I$(top_srcdir)/libunimod \
		9	-I$(top_srcdir)/interface \
		10	-I$(top_srcdir)/utils \
		11	@@ -497,7 +496,7 @@
		12	@VCPP_TRUE@timidity_LDADD = \
		13	@VCPP_TRUE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \
		14	@VCPP_TRUE@ $(top_builddir)/interface/interface.lib \
		15	-@VCPP_TRUE@ $(top_builddir)/libarc/arc.lib \
		16	+@VCPP_TRUE@ -larc \
		17	@VCPP_TRUE@ $(top_builddir)/libunimod/unimod.lib \
		18	@VCPP_TRUE@ $(top_builddir)/utils/utils.lib \
		19	@VCPP_TRUE@ $(W32GUI_RES)
		20	@@ -528,7 +527,7 @@
		21	@BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_LDADD = \
		22	@BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \
		23	@BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \
		24	-@BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \
		25	+@BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ -larc \
		26	@BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \
		27	@BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \
		28	@BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(W32GUI_RES)
		29	@@ -558,7 +557,6 @@
		30
		31	@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
		32	@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ $(top_builddir)/interface/interface.lib \
		33	-@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ $(top_builddir)/libarc/arc.lib \
		34	@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ $(top_builddir)/libunimod/unimod.lib \
		35	@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ $(top_builddir)/utils/utils.lib \
		36	@BORLANDC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_TRUE@ $(W32GUI_RES)
		37	@@ -573,7 +571,6 @@
		38
		39	@BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_dep = $(SYSEXTRAS:.c=.$(OBJEXT)) \
		40	@BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \
		41	-@BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \
		42	@BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \
		43	@BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \
		44	@BORLANDC_FALSE@@DMC_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(W32GUI_RES)
		45	@@ -648,7 +645,6 @@
		46	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \
		47	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \
		48	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \
		49	-@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \
		50	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \
		51	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a
		52	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_TRUE@@WATCOM_C_TRUE@timidity_DEPENDENCIES = \
		53	@@ -695,7 +691,6 @@
		54	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \
		55	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \
		56	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \
		57	-@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \
		58	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \
		59	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \
		60	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_FALSE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/w32g_res.res
		61	@@ -749,7 +744,6 @@
		62	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \
		63	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \
		64	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \
65	-@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \
66	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \
67	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \
68	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_FALSE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/w32g_res.res
69	@@ -803,7 +797,6 @@
70	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@timidity_DEPENDENCIES = \
71	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(SYSEXTRAS:.c=.$(OBJEXT)) \
72	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/libinterface.a \
73	-@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libarc/libarc.a \
74	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/libunimod/libunimod.a \
75	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/utils/libutils.a \
76	@BORLANDC_FALSE@@DMC_FALSE@@ENABLE_W32GUI_TRUE@@ENABLE_W32G_SYN_TRUE@@POCC_FALSE@@VCPP_FALSE@@WATCOM_C_FALSE@ $(top_builddir)/interface/w32g_res.res
77	@@ -1538,9 +1531,8 @@
78	p1=`echo $$p\|sed 's/$(EXEEXT)$$//'`; \
79	if test -f $$p \
80	; then \
81	- f=`echo "$$p1" \| sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
82	- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
83	- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f \|\| exit 1; \
84	+ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$p"; \
85	+ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$p \|\| exit 1; \
86	else :; fi; \
87	done
88

Lines 1-28 Link Here

(-)audio/timidity++/files/patch-x_sherry.c (-28 lines)
1	--- interface/x_sherry.c.orig 2002-07-14 23:19:32.000000000 +0200
2	+++ interface/x_sherry.c 2012-04-27 13:12:58.000000000 +0200
3	@@ -34,6 +34,7 @@
4	#endif
5	#include <stdlib.h>
6	#include <png.h>
7	+#include <pngpriv.h>
8
9	#include "timidity.h"
10	#include "common.h"
11	@@ -909,7 +910,7 @@
12	{
13	if(png_get_valid(pngPtr, infoPtr, PNG_INFO_hIST))
14	png_get_hIST(pngPtr, infoPtr, &hist);
15	- png_set_dither(pngPtr, palette,
16	+ png_set_quantize(pngPtr, palette,
17	numPalette, MAX_SCREEN_COLORS, hist, 1);
18	}
19	}
20	@@ -934,7 +935,7 @@
21	}
22	}
23	}
24	- png_set_dither(pngPtr, stdColorCube,
25	+ png_set_quantize(pngPtr, stdColorCube,
26	676, MAX_SCREEN_COLORS,
27	NULL, 1);
28	/???/

Lines 1-38 Link Here

(-)audio/timidity++/files/patch-xaw_i.c (-38 lines)
1	--- interface/xaw_i.c.orig 2004-09-27 08:40:14.000000000 +0900
2	+++ interface/xaw_i.c 2007-07-04 01:31:24.000000000 +0900
3	@@ -261,7 +261,7 @@
4	String bitmapdir = XAW_BITMAP_DIR;
5	Boolean arrangetitle,savelist;
6	static char **current_flist = NULL;
7	-static int voices = 0, last_voice = 0, voices_num_width;
8	+static int xaw_i_voices = 0, last_voice = 0, voices_num_width;
9	static int maxentry_on_a_menu = 0,submenu_n = 0;
10	#define OPTIONS_WINDOW 1
11	#define FLIST_WINDOW 2
12	@@ -1329,7 +1329,7 @@
13	c= *(local_buf+1);
14	n= atoi(local_buf+2);
15	if(c == 'L')
16	- voices = n;
17	+ xaw_i_voices = n;
18	else
19	last_voice = n;
20	if(IsTracePlaying()) drawVoices();
21	@@ -2070,7 +2070,7 @@
22	XSetForeground(disp, gct, tracecolor);
23	XFillRectangle(disp,XtWindow(trace),gct,voices_num_width +4,
24	MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+1,VOICENUM_WIDTH,TRACE_FOOT);
25	- sprintf(local_buf, "%3d/%d", last_voice, voices);
26	+ sprintf(local_buf, "%3d/%d", last_voice, xaw_i_voices);
27	XSetForeground(disp, gct, capcolor);
28	XDrawString(disp, XtWindow(trace),gct,voices_num_width+6,
29	MAX_XAW_MIDI_CHANNELS*BAR_SPACE+TRACEV_OFS+16,local_buf,strlen(local_buf));
30	@@ -2326,7 +2326,7 @@
31	if (c == LF \|\| c == EOF \|\| i > SSIZE) break;
32	*p++ = c;
33	}
34	- *p = (char)NULL;
35	+ *p = '\0';
36	if (0 != strncasecmp(s, "set ", 4)) continue;
37	switch (configcmp(s+4, &k)) {
38	case S_RepeatPlay: