Update timidity++ to latest version available on sourceforge, the new home for this project. I used some (slightly modified) patches provided by nork@FreeBSD.org (who was supposed to be taking over maintainership of this port as of last summer), which he posted in response to a send-pr I had sent. The port now downloads, compiles, installs and runs perfectly, even on my amd64 CURRENT box. :-) Fix: Port diff attached. --- timidity++.diff begins here --- How-To-Repeat: Previous version of port was badly broken, at least on certain architectures. The original home site for this port is no longer functional.
Responsible Changed From-To: freebsd-ports-bugs->flz I'll handle this one.
Patch doesn't apply cleanly. Could you re-send the diff against latest port version ? -- Florent Thoumie flz@xbsd.org
Le Lundi 11 avril 2005 à 21:10 -0500, Conrad J. Sabatier a écrit : > On Mon, 11 Apr 2005 23:50:11 +0200, Florent Thoumie <flz@xbsd.org> > wrote: > > > Patch doesn't apply cleanly. > > Could you re-send the diff against latest port version ? > > > > -- > > Florent Thoumie > > flz@xbsd.org > > > > I'm having some problems, it seems, getting clean diffs against the > "files" dir, as there are fewer patch files now. Could I just send you > the complete new port directory and maybe you could figure it out? I've > attached the "shar" file to this e-mail. Try with $ diff -ruN old_dir new_dir You should always use this when sending patches. Thanks for your quick answer. PS: Keep GNATS CC'ed so that all your mail go in the audit trail. -- Florent Thoumie flz@xbsd.org
On Tue, Apr 12, 2005 at 11:48:47AM +0200, Florent Thoumie wrote: > Le Lundi 11 avril 2005 à 21:10 -0500, Conrad J. Sabatier a écrit : > > On Mon, 11 Apr 2005 23:50:11 +0200, Florent Thoumie <flz@xbsd.org> > > wrote: > > > > > Patch doesn't apply cleanly. > > > Could you re-send the diff against latest port version ? > > > > > > -- > > > Florent Thoumie > > > flz@xbsd.org > > > > > > > I'm having some problems, it seems, getting clean diffs against the > > "files" dir, as there are fewer patch files now. Could I just send you > > the complete new port directory and maybe you could figure it out? I've > > attached the "shar" file to this e-mail. > > Try with $ diff -ruN old_dir new_dir > > You should always use this when sending patches. That's what I did. Very strange. > Thanks for your quick answer. You're welcome. :-) And likewise to you. :-) > PS: Keep GNATS CC'ed so that all your mail go in the audit > trail. Perhaps you could take a look at the patches I used to update the port and see what you can do with them? They were posted in response to an earlier send-pr I did last July. See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/68909 One of the problems seems to be due to the fact that, after applying the above patches, some of the patch files under the port's "files" dir ended up empty, so I deleted them and renamed the remaining files to patch-aa, patch-ab, etc. Perhaps that wasn't such a good idea. :-) Let me know how you'd like to proceed with this. Thanks. -- Conrad J. Sabatier <conrads@cox.net> -- "In Unix veritas"
On Tue, Apr 12, 2005 at 11:48:47AM +0200, Florent Thoumie wrote: > Le Lundi 11 avril 2005 à 21:10 -0500, Conrad J. Sabatier a écrit : > > On Mon, 11 Apr 2005 23:50:11 +0200, Florent Thoumie <flz@xbsd.org> > > wrote: > > > > > Patch doesn't apply cleanly. > > > Could you re-send the diff against latest port version ? > > > > > > -- > > > Florent Thoumie > > > flz@xbsd.org > > > > > > > I'm having some problems, it seems, getting clean diffs against the > > "files" dir, as there are fewer patch files now. Could I just send you > > the complete new port directory and maybe you could figure it out? I've > > attached the "shar" file to this e-mail. > > Try with $ diff -ruN old_dir new_dir > > You should always use this when sending patches. > > Thanks for your quick answer. > > PS: Keep GNATS CC'ed so that all your mail go in the audit > trail. Hmmm, I just tried applying the last set of diffs again, and they worked fine. I'm confused now. :-) I've attached them to this mail. Please try them again and let me know what you're seeing. Thanks.
State Changed From-To: open->closed Committed, thanks!
On Mon, 11 Apr 2005 15:42:46 -0500 (CDT) "Conrad J. Sabatier" <conrads@cox.net> wrote: > >Number: 79802 > >Category: ports > >Synopsis: update and unbreak timidity++ Thanks for your submitting. I didn't commit this patch. Because I can't fix timidity++'s slave ports:-(. I have old patches for these ports. Anyone, please brush up these patches. Index: audio/timidity++-emacs/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/timidity++-emacs/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- audio/timidity++-emacs/Makefile 4 Feb 2004 05:18:41 -0000 1.24 +++ audio/timidity++-emacs/Makefile 26 May 2004 14:15:53 -0000 @@ -5,145 +5,23 @@ # $FreeBSD: ports/audio/timidity++-emacs/Makefile,v 1.24 2004/02/04 05:18:41 marcus Exp $ # -PORTNAME= timidity++ -PORTVERSION= 2.11.3 -PORTREVISION= 1 -CATEGORIES+= audio -MASTER_SITES= http://www.timidity.jp/dist/ -PKGNAMESUFFIX= -${INTERFACE} -DISTNAME= TiMidity++-${PORTVERSION} - -MAINTAINER?= yatt@luna2.org -COMMENT?= Emacs interface for TiMidity++ - -RUN_DEPENDS= ${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++ -LIB_DEPENDS= ${INTERFACE_DEPS} - -SLAVEDIRS= 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?= emacs - -USE_BZIP2= yes -GNU_CONFIGURE= yes -USE_GMAKE= yes -.if !${INTERFACE} == "emacs" && !${INTERFACE} == "slang" -USE_XLIB= yes -.endif - -CONFIGURE_ARGS= --enable-dynamic=${INTERFACE} - +PORTREVISION= 0 +CATEGORIES= elisp +PKGNAMESUFFIX= -emacs + +MAINTAINER= nork@FreeBSD.org +COMMENT= Emacs interface for TiMidity++ + +CONFIGURE_ARGS= --enable-dynamic=emacs +DOCFILES= #none# + +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist +PKGMESSAGE= ${.CURDIR}/pkg-message MASTERDIR= ${.CURDIR}/../../audio/timidity++ -PKGDIR= ${.CURDIR} -PLIST_SUB= TIMID_LIBDIR=${TIMID_LIBDIR} -DIST_SUBDIR= timidity - -TIMID_LIBDIR= ${PREFIX}/lib/timidity - -.if ${INTERFACE} == "emacs" -ELISPDIR= ${PREFIX}/share/emacs/site-lisp -.elif ${INTERFACE} == "gtk" -LINK= gtkmidi -USE_GNOME= gtk12 -CONFIGURE_ENV= SHLD="gcc -shared" -.elif ${INTERFACE} == "motif" -LINK= xmmidi -USE_MOTIF= yes -CONFIGURE_ENV= MOTIFLIB="${MOTIFLIB}" -.elif ${INTERFACE} == "slang" -.if defined(JAPANESE) -INTERFACE_DEPS= slang.2:${PORTSDIR}/japanese/libslang -.else -INTERFACE_DEPS= slang.1:${PORTSDIR}/devel/libslang -.endif -CONFIGURE_ARGS+= --enable-ncurses -.elif ${INTERFACE} == "tcltk" -LINK= tkmidi -DOCFILES= README.tk -DOCLANG= C ja_JP.ujis -.if defined(JAPANESE) -INTERFACE_DEPS= tk80jp.1:${PORTSDIR}/japanese/tk80 -CONFIGURE_ARGS+= --with-tcl-includes=${PREFIX}/include/tcl8.0jp \ - --with-tk-includes=${PREFIX}/include/tk8.0jp \ - --with-tcl-libs=${PREFIX}/lib --with-tk-libs=${PREFIX}/lib -CONFIGURE_ENV= WISH=wish8.0jp -.else -INTERFACE_DEPS= tk80.1:${PORTSDIR}/x11-toolkits/tk80 -CONFIGURE_ARGS+= --with-tcl-includes=${PREFIX}/include/tcl8.0 \ - --with-tk-includes=${PREFIX}/include/tk8.0 \ - --with-tcl-libs=${PREFIX}/lib --with-tk-libs=${PREFIX}/lib -CONFIGURE_ENV= WISH=wish8.0 -.endif -.elif ${INTERFACE} == "xaw" -LINK= xawmidi -DOCFILES= README.xaw -DOCLANG= C ja_JP.ujis -INTERFACE_DEPS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d -.elif ${INTERFACE} == "xskin" -LINK= xskinmidi -DOCFILES= README.xskin -DOCLANG= C ja_JP.ujis -.else -NO_BUILD= yes -NO_INSTALL= yes -.endif - -.include <bsd.port.pre.mk> - -.if ${PORTOBJFORMAT} == "elf" -CONFIGURE_ENV+= LDFLAGS=-export-dynamic -.endif - -.if ${OSVERSION} >= 450002 -EUCJP_LOCALE= ja_JP.eucJP -.else -EUCJP_LOCALE= ja_JP.EUC -.endif -PLIST_SUB= EUCJP_LOCALE=${EUCJP_LOCALE} - -.if ${INTERFACE} == "motif" -post-configure: - @${MV} ${WRKSRC}/interface/Makefile ${WRKSRC}/interface/Makefile.orig - @${SED} -e 's^m_so_libs = $$^m_so_libs = -L${X11BASE}/lib ${MOTIFLIB} -lXt -lXext -lSM -lICE -lX11 ^' \ - -e 's^dynamic_targets = $$^dynamic_targets = interface_m.so^' \ - ${WRKSRC}/interface/Makefile.orig > ${WRKSRC}/interface/Makefile -.endif - -do-build: - @cd ${WRKSRC}/interface; ${MAKE} ${ALL_TARGET} - -do-install: - @cd ${WRKSRC}/interface; ${MAKE} ${INSTALL_TARGET} -post-install: -.if ${INTERFACE} == "emacs" - @${MKDIR} ${ELISPDIR} - ${INSTALL_DATA} ${WRKSRC}/interface/timidity.el ${ELISPDIR} -.endif -.if ${INTERFACE} == "xaw" - @${MKDIR} ${X11BASE}/lib/X11/${EUCJP_LOCALE}/app-defaults - ${INSTALL_DATA} ${WRKSRC}/TiMidity.ad \ - ${X11BASE}/lib/X11/app-defaults/TiMidity - ${INSTALL_DATA} ${WRKSRC}/TiMidity-uj.ad \ - ${X11BASE}/lib/X11/${EUCJP_LOCALE}/app-defaults/TiMidity -.endif -.if defined(DOCFILES) -.if !defined(NOPORTDOCS) -.for lang in ${DOCLANG} - @${MKDIR} \ - ${PREFIX}/share/doc/`echo ${lang} | ${SED} -e 's/^C$$//' -e 's/_JP.ujis$$//'`/timidity++ - ${INSTALL_DATA} ${WRKSRC}/doc/${lang}/${DOCFILES} \ - ${PREFIX}/share/doc/`echo ${lang} | ${SED} -e 's/^C$$//' -e 's/_JP.ujis$$//'`/timidity++ -.endfor -.endif -.endif -.if defined(LINK) - ${LN} -sf ${PREFIX}/bin/timidity ${PREFIX}/bin/${LINK} -.endif -.if exists(${PKGMESSAGE}) - @${CAT} ${PKGMESSAGE} -.endif +post-install:: + @${MKDIR} ${PREFIX}/${ELISPDIR} + ${INSTALL_DATA} ${WRKSRC}/interface/timidity.el ${PREFIX}/${ELISPDIR} .include <bsd.port.post.mk> Index: audio/timidity++-emacs/pkg-descr =================================================================== RCS file: /home/ncvs/ports/audio/timidity++-emacs/pkg-descr,v retrieving revision 1.2 diff -u -r1.2 pkg-descr --- audio/timidity++-emacs/pkg-descr 6 Apr 2000 07:05:54 -0000 1.2 +++ audio/timidity++-emacs/pkg-descr 18 May 2004 14:52:12 -0000 @@ -5,6 +5,6 @@ Toivonen(until version 0.2i). Now, Masanao Izumo and many hackers are developing "TiMidity++". -WWW: http://www.goice.co.jp/member/mo/timidity/ +WWW: http://timidity.sourceforge.net/ Yoichi Asai <yatt@msc.biglobe.ne.jp> Index: audio/timidity++-emacs/pkg-plist =================================================================== RCS file: /home/ncvs/ports/audio/timidity++-emacs/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- audio/timidity++-emacs/pkg-plist 6 Apr 2000 07:05:55 -0000 1.2 +++ audio/timidity++-emacs/pkg-plist 19 May 2004 16:57:48 -0000 @@ -1,2 +1,2 @@ -lib/timidity/interface_e.so -share/emacs/site-lisp/timidity.el +%%TIMID_LIBDIR%%/interface_e.so +%%ELISPDIR%%/timidity.el Index: audio/timidity++-gtk/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/timidity++-gtk/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- audio/timidity++-gtk/Makefile 21 Feb 2003 10:56:06 -0000 1.4 +++ audio/timidity++-gtk/Makefile 26 May 2004 14:16:02 -0000 @@ -5,11 +5,21 @@ # $FreeBSD: ports/audio/timidity++-gtk/Makefile,v 1.4 2003/02/21 10:56:06 knu Exp $ # -INTERFACE= gtk +PORTREVISION= 0 +PKGNAMESUFFIX= -gtk -MAINTAINER= yatt@luna2.org +MAINTAINER= nork@FreeBSD.org COMMENT= Gtk interface for TiMidity++ -MASTERDIR= ${.CURDIR}/../../audio/timidity++-emacs +LINK= gtkmidi +USE_XLIB= yes +USE_GNOME= gtk12 +CONFIGURE_ENV= SHLD="gcc -shared" +CONFIGURE_ARGS= --enable-dynamic=gtk +DOCFILES= #none# + +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist +MASTERDIR= ${.CURDIR}/../../audio/timidity++ .include "${MASTERDIR}/Makefile" Index: audio/timidity++-gtk/pkg-descr =================================================================== RCS file: /home/ncvs/ports/audio/timidity++-gtk/pkg-descr,v retrieving revision 1.2 diff -u -r1.2 pkg-descr --- audio/timidity++-gtk/pkg-descr 6 Apr 2000 07:15:45 -0000 1.2 +++ audio/timidity++-gtk/pkg-descr 19 May 2004 16:50:26 -0000 @@ -4,6 +4,6 @@ Toivonen(until version 0.2i). Now, Masanao Izumo and many hackers are developing "TiMidity++". -WWW: http://www.goice.co.jp/member/mo/timidity/ +WWW: http://timidity.sourceforge.net/ Yoichi Asai <yatt@msc.biglobe.ne.jp> Index: audio/timidity++-gtk/pkg-plist =================================================================== RCS file: /home/ncvs/ports/audio/timidity++-gtk/pkg-plist,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 pkg-plist --- audio/timidity++-gtk/pkg-plist 12 Oct 1999 16:20:56 -0000 1.1.1.1 +++ audio/timidity++-gtk/pkg-plist 19 May 2004 16:37:29 -0000 @@ -1,2 +1,2 @@ bin/gtkmidi -lib/timidity/interface_g.so +%%TIMID_LIBDIR%%/interface_g.so Index: audio/timidity++-motif/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/timidity++-motif/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- audio/timidity++-motif/Makefile 21 Feb 2003 10:56:07 -0000 1.6 +++ audio/timidity++-motif/Makefile 26 May 2004 14:16:07 -0000 @@ -5,11 +5,27 @@ # $FreeBSD: ports/audio/timidity++-motif/Makefile,v 1.6 2003/02/21 10:56:07 knu Exp $ # -INTERFACE= motif +PORTREVISION= 0 +PKGNAMESUFFIX= -motif -MAINTAINER= yatt@luna2.org +MAINTAINER= nork@FreeBSD.org COMMENT= Motif interface for TiMidity++ -MASTERDIR= ${.CURDIR}/../../audio/timidity++-emacs +LINK= xmmidi +USE_XLIB= yes +USE_MOTIF= yes +CONFIGURE_ENV= MOTIFLIB="${MOTIFLIB}" +CONFIGURE_ARGS= --enable-dynamic=motif +DOCFILES= #none# + +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist +MASTERDIR= ${.CURDIR}/../../audio/timidity++ + +post-configure: + @${MV} ${WRKSRC}/interface/Makefile ${WRKSRC}/interface/Makefile.orig + @${SED} -e 's^m_so_libs = $$^m_so_libs = -L${X11BASE}/lib ${MOTIFLIB} -lXt -lXext -lSM -lICE -lX11 ^' \ + -e 's^dynamic_targets = $$^dynamic_targets = interface_m.so^' \ + ${WRKSRC}/interface/Makefile.orig > ${WRKSRC}/interface/Makefile .include "${MASTERDIR}/Makefile" Index: audio/timidity++-motif/pkg-descr =================================================================== RCS file: /home/ncvs/ports/audio/timidity++-motif/pkg-descr,v retrieving revision 1.3 diff -u -r1.3 pkg-descr --- audio/timidity++-motif/pkg-descr 6 Apr 2000 07:12:00 -0000 1.3 +++ audio/timidity++-motif/pkg-descr 19 May 2004 16:48:45 -0000 @@ -4,6 +4,6 @@ Toivonen(until version 0.2i). Now, Masanao Izumo and many hackers are developing "TiMidity++". -WWW: http://www.goice.co.jp/member/mo/timidity/ +WWW: http://timidity.sourceforge.net/ Yoichi Asai <yatt@msc.biglobe.ne.jp> Index: audio/timidity++-motif/pkg-plist =================================================================== RCS file: /home/ncvs/ports/audio/timidity++-motif/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- audio/timidity++-motif/pkg-plist 12 Oct 1999 16:18:21 -0000 1.2 +++ audio/timidity++-motif/pkg-plist 19 May 2004 16:37:10 -0000 @@ -1,2 +1,2 @@ bin/xmmidi -lib/timidity/interface_m.so +%%TIMID_LIBDIR%%/interface_m.so Index: audio/timidity++-slang/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/timidity++-slang/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- audio/timidity++-slang/Makefile 6 Feb 2004 13:10:51 -0000 1.5 +++ audio/timidity++-slang/Makefile 26 May 2004 14:16:12 -0000 @@ -5,12 +5,19 @@ # $FreeBSD: ports/audio/timidity++-slang/Makefile,v 1.5 2004/02/06 13:10:51 trevor Exp $ # -INTERFACE= slang +PORTREVISION= 0 +PKGNAMESUFFIX= -slang -MAINTAINER= yatt@luna2.org +MAINTAINER= nork@FreeBSD.org COMMENT= Slang interface for TiMidity++ -MASTERDIR= ${.CURDIR}/../../audio/timidity++-emacs -PLIST_FILES= lib/timidity/interface_s.so +LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang +CONFIGURE_ARGS= --enable-dynamic=slang +DOCFILES= #none# + +PLIST_FILES= ${TIMID_LIBDIR}/interface_s.so + +DESCR= ${.CURDIR}/pkg-descr +MASTERDIR= ${.CURDIR}/../../audio/timidity++ .include "${MASTERDIR}/Makefile" Index: audio/timidity++-slang/pkg-descr =================================================================== RCS file: /home/ncvs/ports/audio/timidity++-slang/pkg-descr,v retrieving revision 1.2 diff -u -r1.2 pkg-descr --- audio/timidity++-slang/pkg-descr 6 Apr 2000 07:13:39 -0000 1.2 +++ audio/timidity++-slang/pkg-descr 19 May 2004 16:51:56 -0000 @@ -4,6 +4,6 @@ Toivonen(until version 0.2i). Now, Masanao Izumo and many hackers are developing "TiMidity++". -WWW: http://www.goice.co.jp/member/mo/timidity/ +WWW: http://timidity.sourceforge.net/ Yoichi Asai <yatt@msc.biglobe.ne.jp> Index: audio/timidity++-tcltk/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/timidity++-tcltk/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- audio/timidity++-tcltk/Makefile 21 Feb 2003 10:56:07 -0000 1.4 +++ audio/timidity++-tcltk/Makefile 26 May 2004 14:16:17 -0000 @@ -5,11 +5,24 @@ # $FreeBSD: ports/audio/timidity++-tcltk/Makefile,v 1.4 2003/02/21 10:56:07 knu Exp $ # -INTERFACE= tcltk +PORTREVISION= 0 +PKGNAMESUFFIX= -tcltk -MAINTAINER= yatt@luna2.org +MAINTAINER= nork@FreeBSD.org COMMENT= Tcl/Tk interface for TiMidity++ -MASTERDIR= ${.CURDIR}/../../audio/timidity++-emacs +LINK= tkmidi +USE_XLIB= yes +LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80 +CONFIGURE_ARGS= --enable-dynamic=tcltk \ + --with-tk-includes=${PREFIX}/include/tk8.0 \ + --with-tcl-includes=${PREFIX}/include/tcl8.0 \ + --with-tcl-libs=${PREFIX}/lib --with-tk-libs=${PREFIX}/lib +CONFIGURE_ENV= WISH=wish8.0 +DOCFILES= README.tk + +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist +MASTERDIR= ${.CURDIR}/../../audio/timidity++ .include "${MASTERDIR}/Makefile" Index: audio/timidity++-tcltk/pkg-descr =================================================================== RCS file: /home/ncvs/ports/audio/timidity++-tcltk/pkg-descr,v retrieving revision 1.2 diff -u -r1.2 pkg-descr --- audio/timidity++-tcltk/pkg-descr 6 Apr 2000 07:16:56 -0000 1.2 +++ audio/timidity++-tcltk/pkg-descr 19 May 2004 16:28:36 -0000 @@ -4,6 +4,6 @@ Toivonen(until version 0.2i). Now, Masanao Izumo and many hackers are developing "TiMidity++". -WWW: http://www.goice.co.jp/member/mo/timidity/ +WWW: http://timidity.sourceforge.net/ Yoichi Asai <yatt@msc.biglobe.ne.jp> Index: audio/timidity++-tcltk/pkg-plist =================================================================== RCS file: /home/ncvs/ports/audio/timidity++-tcltk/pkg-plist,v retrieving revision 1.5 diff -u -r1.5 pkg-plist --- audio/timidity++-tcltk/pkg-plist 27 Oct 2003 09:32:46 -0000 1.5 +++ audio/timidity++-tcltk/pkg-plist 19 May 2004 16:38:04 -0000 @@ -1,21 +1,21 @@ bin/tkmidi -lib/timidity/bitmaps/back.xbm -lib/timidity/bitmaps/fwrd.xbm -lib/timidity/bitmaps/next.xbm -lib/timidity/bitmaps/pause.xbm -lib/timidity/bitmaps/play.xbm -lib/timidity/bitmaps/prev.xbm -lib/timidity/bitmaps/quit.xbm -lib/timidity/bitmaps/random.xbm -lib/timidity/bitmaps/repeat.xbm -lib/timidity/bitmaps/stop.xbm -lib/timidity/bitmaps/timidity.xbm -lib/timidity/browser.tcl -lib/timidity/interface_k.so -lib/timidity/misc.tcl -lib/timidity/tclIndex -lib/timidity/tkmidity.tcl -lib/timidity/tkpanel.tcl +%%TIMID_LIBDIR%%/bitmaps/back.xbm +%%TIMID_LIBDIR%%/bitmaps/fwrd.xbm +%%TIMID_LIBDIR%%/bitmaps/next.xbm +%%TIMID_LIBDIR%%/bitmaps/pause.xbm +%%TIMID_LIBDIR%%/bitmaps/play.xbm +%%TIMID_LIBDIR%%/bitmaps/prev.xbm +%%TIMID_LIBDIR%%/bitmaps/quit.xbm +%%TIMID_LIBDIR%%/bitmaps/random.xbm +%%TIMID_LIBDIR%%/bitmaps/repeat.xbm +%%TIMID_LIBDIR%%/bitmaps/stop.xbm +%%TIMID_LIBDIR%%/bitmaps/timidity.xbm +%%TIMID_LIBDIR%%/browser.tcl +%%TIMID_LIBDIR%%/interface_k.so +%%TIMID_LIBDIR%%/misc.tcl +%%TIMID_LIBDIR%%/tclIndex +%%TIMID_LIBDIR%%/tkmidity.tcl +%%TIMID_LIBDIR%%/tkpanel.tcl %%PORTDOCS%%%%DOCSDIR%%/README.tk -%%PORTDOCS%%share/doc/ja/timidity++/README.tk -@dirrm lib/timidity/bitmaps +%%PORTDOCS%%%%DOCSDIR%%/ja/README.tk +@dirrm %%TIMID_LIBDIR%%/bitmaps Index: audio/timidity++-xaw/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/timidity++-xaw/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- audio/timidity++-xaw/Makefile 21 Feb 2003 10:56:07 -0000 1.5 +++ audio/timidity++-xaw/Makefile 30 May 2004 09:19:05 -0000 @@ -5,11 +5,28 @@ # $FreeBSD: ports/audio/timidity++-xaw/Makefile,v 1.5 2003/02/21 10:56:07 knu Exp $ # -INTERFACE= xaw +PORTREVISION= 0 +PKGNAMESUFFIX= -xaw -MAINTAINER= yatt@luna2.org +MAINTAINER= nork@FreeBSD.org COMMENT= Xaw interface for TiMidity++ -MASTERDIR= ${.CURDIR}/../../audio/timidity++-emacs +LINK= xawmidi +USE_XLIB= yes +LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d +CONFIGURE_ARGS= --enable-dynamic=xaw +DOCFILES= README.xaw +INSTALL_TARGET= install.xaw + +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist +MASTERDIR= ${.CURDIR}/../../audio/timidity++ + +post-install:: + @${MKDIR} ${X11BASE}/lib/X11/${EUCJP_LOCALE}/app-defaults + ${INSTALL_DATA} ${WRKSRC}/TiMidity.ad \ + ${X11BASE}/lib/X11/app-defaults/TiMidity + ${INSTALL_DATA} ${WRKSRC}/TiMidity-uj.ad \ + ${X11BASE}/lib/X11/${EUCJP_LOCALE}/app-defaults/TiMidity .include "${MASTERDIR}/Makefile" Index: audio/timidity++-xaw/pkg-descr =================================================================== RCS file: /home/ncvs/ports/audio/timidity++-xaw/pkg-descr,v retrieving revision 1.2 diff -u -r1.2 pkg-descr --- audio/timidity++-xaw/pkg-descr 6 Apr 2000 07:18:17 -0000 1.2 +++ audio/timidity++-xaw/pkg-descr 19 May 2004 16:45:54 -0000 @@ -4,6 +4,6 @@ Toivonen(until version 0.2i). Now, Masanao Izumo and many hackers are developing "TiMidity++". -WWW: http://www.goice.co.jp/member/mo/timidity/ +WWW: http://timidity.sourceforege.net/ Yoichi Asai <yatt@msc.biglobe.ne.jp> Index: audio/timidity++-xaw/pkg-plist =================================================================== RCS file: /home/ncvs/ports/audio/timidity++-xaw/pkg-plist,v retrieving revision 1.6 diff -u -r1.6 pkg-plist --- audio/timidity++-xaw/pkg-plist 27 Oct 2003 09:30:14 -0000 1.6 +++ audio/timidity++-xaw/pkg-plist 30 May 2004 09:14:53 -0000 @@ -1,23 +1,22 @@ -@cwd /usr/X11R6 +@cwd %%X11BASE%% lib/X11/app-defaults/TiMidity lib/X11/%%EUCJP_LOCALE%%/app-defaults/TiMidity -@cwd /usr/local +@cwd %%LOCALBASE%% bin/xawmidi -lib/timidity/bitmaps/back.xbm -lib/timidity/bitmaps/fwrd.xbm -lib/timidity/bitmaps/next.xbm -lib/timidity/bitmaps/pause.xbm -lib/timidity/bitmaps/play.xbm -lib/timidity/bitmaps/prev.xbm -lib/timidity/bitmaps/quit.xbm -lib/timidity/bitmaps/random.xbm -lib/timidity/bitmaps/repeat.xbm -lib/timidity/bitmaps/stop.xbm -lib/timidity/bitmaps/timidity.xbm -lib/timidity/interface_a.so +%%TIMID_LIBDIR%%/bitmaps/back.xbm +%%TIMID_LIBDIR%%/bitmaps/fwrd.xbm +%%TIMID_LIBDIR%%/bitmaps/next.xbm +%%TIMID_LIBDIR%%/bitmaps/pause.xbm +%%TIMID_LIBDIR%%/bitmaps/play.xbm +%%TIMID_LIBDIR%%/bitmaps/prev.xbm +%%TIMID_LIBDIR%%/bitmaps/quit.xbm +%%TIMID_LIBDIR%%/bitmaps/random.xbm +%%TIMID_LIBDIR%%/bitmaps/repeat.xbm +%%TIMID_LIBDIR%%/bitmaps/stop.xbm +%%TIMID_LIBDIR%%/bitmaps/timidity.xbm +%%TIMID_LIBDIR%%/interface_a.so %%PORTDOCS%%%%DOCSDIR%%/README.xaw -%%PORTDOCS%%share/doc/ja/timidity++/README.xaw -@dirrm lib/timidity/bitmaps -@cwd /usr/X11R6 -@unexec rmdir %D/lib/X11/%%EUCJP_LOCALE%%/app-defaults 2>/dev/null || true -@unexec rmdir %D/lib/X11/%%EUCJP_LOCALE%% 2>/dev/null || true +%%PORTDOCS%%%%DOCSDIR%%/ja/README.xaw +@dirrm %%TIMID_LIBDIR%%/bitmaps +@unexec rmdir %%X11BASE%%/lib/X11/%%EUCJP_LOCALE%%/app-defaults 2>/dev/null || true +@unexec rmdir %%X11BASE%%/lib/X11/%%EUCJP_LOCALE%% 2>/dev/null || true Index: audio/timidity++-xskin/Makefile =================================================================== RCS file: /home/ncvs/ports/audio/timidity++-xskin/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- audio/timidity++-xskin/Makefile 21 Feb 2003 10:56:07 -0000 1.4 +++ audio/timidity++-xskin/Makefile 26 May 2004 14:16:24 -0000 @@ -5,11 +5,20 @@ # $FreeBSD: ports/audio/timidity++-xskin/Makefile,v 1.4 2003/02/21 10:56:07 knu Exp $ # -INTERFACE= xskin +PORTREVISION= 0 +PKGNAMESUFFIX= -xskin -MAINTAINER= yatt@luna2.org +MAINTAINER= nork@FreeBSD.org COMMENT= X11AMP skin interface for TiMidity++ -MASTERDIR= ${.CURDIR}/../../audio/timidity++-emacs +LINK= xskinmidi +USE_XLIB= yes +CONFIGURE_ARGS= --enable-dynamic=xskin +DOCFILES= README.xskin + +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist +PKGMESSAGE= ${.CURDIR}/pkg-message +MASTERDIR= ${.CURDIR}/../../audio/timidity++ .include "${MASTERDIR}/Makefile" Index: audio/timidity++-xskin/pkg-descr =================================================================== RCS file: /home/ncvs/ports/audio/timidity++-xskin/pkg-descr,v retrieving revision 1.2 diff -u -r1.2 pkg-descr --- audio/timidity++-xskin/pkg-descr 6 Apr 2000 07:19:29 -0000 1.2 +++ audio/timidity++-xskin/pkg-descr 19 May 2004 16:42:27 -0000 @@ -8,6 +8,6 @@ Toivonen(until version 0.2i). Now, Masanao Izumo and many hackers are developing "TiMidity++". -WWW: http://www.goice.co.jp/member/mo/timidity/ +WWW: http://timidity.sourceforge.net/ Yoichi Asai <yatt@msc.biglobe.ne.jp> Index: audio/timidity++-xskin/pkg-plist =================================================================== RCS file: /home/ncvs/ports/audio/timidity++-xskin/pkg-plist,v retrieving revision 1.4 diff -u -r1.4 pkg-plist --- audio/timidity++-xskin/pkg-plist 27 Oct 2003 09:09:40 -0000 1.4 +++ audio/timidity++-xskin/pkg-plist 19 May 2004 16:38:28 -0000 @@ -1,4 +1,4 @@ bin/xskinmidi -lib/timidity/interface_i.so +%%TIMID_LIBDIR%%/interface_i.so %%PORTDOCS%%%%DOCSDIR%%/README.xskin -%%PORTDOCS%%share/doc/ja/timidity++/README.xskin +%%PORTDOCS%%%%DOCSDIR%%/ja/README.xskin Index: japanese/timidity++-slang/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/timidity++-slang/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- japanese/timidity++-slang/Makefile 6 Feb 2004 13:11:35 -0000 1.6 +++ japanese/timidity++-slang/Makefile 26 May 2004 14:16:34 -0000 @@ -5,15 +5,20 @@ # $FreeBSD: ports/japanese/timidity++-slang/Makefile,v 1.6 2004/02/06 13:11:35 trevor Exp $ # +PORTREVISION= 0 CATEGORIES= japanese +PKGNAMESUFFIX= -slang -MAINTAINER= yatt@luna2.org +MAINTAINER= nork@FreeBSD.org COMMENT= Slang interface for TiMidity++ with Japanese support -INTERFACE= slang -JAPANESE= yes -PLIST_FILES= lib/timidity/interface_s.so +LIB_DEPENDS= slang.2:${PORTSDIR}/japanese/libslang +CONFIGURE_ARGS= --enable-dynamic=slang +DOCFILES= #none# -MASTERDIR= ${.CURDIR}/../../audio/timidity++-emacs +PLIST_FILES= ${TIMID_LIBDIR}/interface_s.so + +DESCR= ${.CURDIR}/pkg-descr +MASTERDIR= ${.CURDIR}/../../audio/timidity++ .include "${MASTERDIR}/Makefile" Index: japanese/timidity++-slang/pkg-descr =================================================================== RCS file: /home/ncvs/ports/japanese/timidity++-slang/pkg-descr,v retrieving revision 1.2 diff -u -r1.2 pkg-descr --- japanese/timidity++-slang/pkg-descr 6 Apr 2000 07:14:42 -0000 1.2 +++ japanese/timidity++-slang/pkg-descr 19 May 2004 16:55:19 -0000 @@ -4,6 +4,6 @@ Toivonen(until version 0.2i). Now, Masanao Izumo and many hackers are developing "TiMidity++". -WWW: http://www.goice.co.jp/member/mo/timidity/ +WWW: http://timidity.sourceforge.net/ Yoichi Asai <yatt@msc.biglobe.ne.jp> Index: japanese/timidity++-tcltk/Makefile =================================================================== RCS file: /home/ncvs/ports/japanese/timidity++-tcltk/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- japanese/timidity++-tcltk/Makefile 21 Feb 2003 10:56:07 -0000 1.5 +++ japanese/timidity++-tcltk/Makefile 26 May 2004 14:16:40 -0000 @@ -5,14 +5,25 @@ # $FreeBSD: ports/japanese/timidity++-tcltk/Makefile,v 1.5 2003/02/21 10:56:07 knu Exp $ # +PORTREVISION= 0 CATEGORIES= japanese +PKGNAMESUFFIX= -tcltk -MAINTAINER= yatt@luna2.org +MAINTAINER= nork@FreeBSD.org COMMENT= Tcl/Tk interface for TiMidity++ with Japanese support -INTERFACE= tcltk -JAPANESE= yes +LINK= tkmidi +USE_XLIB= yes +LIB_DEPENDS= tk80jp.1:${PORTSDIR}/japanese/tk80 +CONFIGURE_ENV= WISH=wish8.0jp +CONFIGURE_ARGS= --enable-dynamic=tcltk \ + --with-tcl-includes=${PREFIX}/include/tcl8.0jp \ + --with-tk-includes=${PREFIX}/include/tk8.0jp \ + --with-tcl-libs=${PREFIX}/lib --with-tk-libs=${PREFIX}/lib +DOCFILES= README.tk -MASTERDIR= ${.CURDIR}/../../audio/timidity++-emacs +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist +MASTERDIR= ${.CURDIR}/../../audio/timidity++ .include "${MASTERDIR}/Makefile" Index: japanese/timidity++-tcltk/pkg-descr =================================================================== RCS file: /home/ncvs/ports/japanese/timidity++-tcltk/pkg-descr,v retrieving revision 1.2 diff -u -r1.2 pkg-descr --- japanese/timidity++-tcltk/pkg-descr 6 Apr 2000 07:21:49 -0000 1.2 +++ japanese/timidity++-tcltk/pkg-descr 19 May 2004 16:28:33 -0000 @@ -4,6 +4,6 @@ Toivonen(until version 0.2i). Now, Masanao Izumo and many hackers are developing "TiMidity++". -WWW: http://www.goice.co.jp/member/mo/timidity/ +WWW: http://timidity.sourceforge.net/ Yoichi Asai <yatt@msc.biglobe.ne.jp> Index: japanese/timidity++-tcltk/pkg-plist =================================================================== RCS file: /home/ncvs/ports/japanese/timidity++-tcltk/pkg-plist,v retrieving revision 1.3 diff -u -r1.3 pkg-plist --- japanese/timidity++-tcltk/pkg-plist 21 Jan 2002 03:32:00 -0000 1.3 +++ japanese/timidity++-tcltk/pkg-plist 19 May 2004 16:38:21 -0000 @@ -1,21 +1,21 @@ bin/tkmidi -lib/timidity/bitmaps/back.xbm -lib/timidity/bitmaps/fwrd.xbm -lib/timidity/bitmaps/next.xbm -lib/timidity/bitmaps/pause.xbm -lib/timidity/bitmaps/play.xbm -lib/timidity/bitmaps/prev.xbm -lib/timidity/bitmaps/quit.xbm -lib/timidity/bitmaps/random.xbm -lib/timidity/bitmaps/repeat.xbm -lib/timidity/bitmaps/stop.xbm -lib/timidity/bitmaps/timidity.xbm -lib/timidity/browser.tcl -lib/timidity/interface_k.so -lib/timidity/misc.tcl -lib/timidity/tclIndex -lib/timidity/tkmidity.tcl -lib/timidity/tkpanel.tcl -%%PORTDOCS%%share/doc/timidity++/README.tk -%%PORTDOCS%%share/doc/ja/timidity++/README.tk -@dirrm lib/timidity/bitmaps +%%TIMID_LIBDIR%%/bitmaps/back.xbm +%%TIMID_LIBDIR%%/bitmaps/fwrd.xbm +%%TIMID_LIBDIR%%/bitmaps/next.xbm +%%TIMID_LIBDIR%%/bitmaps/pause.xbm +%%TIMID_LIBDIR%%/bitmaps/play.xbm +%%TIMID_LIBDIR%%/bitmaps/prev.xbm +%%TIMID_LIBDIR%%/bitmaps/quit.xbm +%%TIMID_LIBDIR%%/bitmaps/random.xbm +%%TIMID_LIBDIR%%/bitmaps/repeat.xbm +%%TIMID_LIBDIR%%/bitmaps/stop.xbm +%%TIMID_LIBDIR%%/bitmaps/timidity.xbm +%%TIMID_LIBDIR%%/browser.tcl +%%TIMID_LIBDIR%%/interface_k.so +%%TIMID_LIBDIR%%/misc.tcl +%%TIMID_LIBDIR%%/tclIndex +%%TIMID_LIBDIR%%/tkmidity.tcl +%%TIMID_LIBDIR%%/tkpanel.tcl +%%PORTDOCS%%%%DOCSDIR%%/README.tk +%%PORTDOCS%%%%DOCSDIR%%/ja/README.tk +@dirrm %%TIMID_LIBDIR%%/bitmaps
On Thu, 14 Apr 2005 00:41:39 +0900 (JST), Norikatsu Shigemura <nork@freebsd.org> wrote: > On Mon, 11 Apr 2005 15:42:46 -0500 (CDT) > "Conrad J. Sabatier" <conrads@cox.net> wrote: > > >Number: 79802 > > >Category: ports > > >Synopsis: update and unbreak timidity++ > > Thanks for your submitting. You're welcome. And thank *you* for providing those patches in response to my original problem report. They were a tremendous help. I'm just sorry it took me so long to get back to them. :-) > I didn't commit this patch. Because I can't fix timidity++'s > slave ports:-(. I have old patches for these ports. > > Anyone, please brush up these patches. I'll try to see if I can do anything with these, too. In the meantime, at least the main timidity++ port is now up-to-date and working great! So nice to be able to play MIDI files once again. :-) Thanks again so much! Conrad P.S. If you're interested in the current state of development of *real* MIDI support in the kernel, perhaps you should get in touch with Mat Kanner (mat@cnd.mcgill.ca), who's currently working on this. -- Conrad J. Sabatier <conrads@cox.net> -- "In Unix veritas"