Index: audio/timidity++/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/timidity++/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- audio/timidity++/Makefile	11 Oct 2003 14:36:37 -0000	1.40
+++ audio/timidity++/Makefile	30 May 2004 08:54:53 -0000
@@ -6,85 +6,112 @@
 #
 
 PORTNAME=	timidity++
-PORTVERSION=	2.11.3
-PORTREVISION=	1
-CATEGORIES=	audio
-MASTER_SITES=	http://www.timidity.jp/dist/
+PORTVERSION=	2.13.0
+PORTREVISION?=	0
+CATEGORIES+=	audio
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	timidity
 DISTNAME=	TiMidity++-${PORTVERSION}
+DIST_SUBDIR=	timidity
 
-MAINTAINER?=	yatt@luna2.org
+MAINTAINER?=	nork@FreeBSD.org
 COMMENT?=	Software MIDI player
 
-CONFLICTS=	timidity-0.*
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
+
+CONFLICTS+=	timidity-0.*
 
 # If you don't have X11, type "make -DWITHOUT_X11" or uncomment this.
 #WITHOUT_X11=	yes
-
-SLAVEDIRS=	audio/timidity++-emacs
-# rest are included by timidity++-emacs port
-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
+USE_GMAKE=	yes
 USE_BZIP2=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-.if !defined(WITHOUT_X11)
-USE_XLIB=	yes
-LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
-.endif
 
-DIST_SUBDIR=	timidity
+CONFIGURE_ARGS?=--enable-interface=ncurses,vt100,server
+CONFIGURE_ARGS+=--program-transform-name= --enable-network
 
-.if !defined(WITHOUT_X11)
-CONFIGURE_ARGS=	--with-x --enable-ncurses --enable-vt100 \
-		--enable-dynamic --enable-server \
-		--enable-network --enable-spectrogram --enable-wrd \
-		--program-transform-name=
+.if ${CONFIGURE_ARGS:M*ncurses*} != ""
+MANLANG=	"" ja
+MAN1=		timidity.1
+MAN5=		timidity.cfg.5
 .else
-CONFIGURE_ARGS=	--enable-ncurses --enable-vt100 \
-		--enable-network --disable-spectrogram --disable-wrd \
-		--program-transform-name=
+RUN_DEPENDS=	${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++
 .endif
 
-MAN1=		timidity.1
-MAN5=		timidity.cfg.5
+PLIST_SUB=	EUCJP_LOCALE=${EUCJP_LOCALE} TIMID_LIBDIR=${TIMID_LIBDIR} \
+		ELISPDIR=share/emacs/site-lisp
 
-MANLANG=	"" ja
-DOCFILES=	README.dl README.sf
-DOCLANG=	C ja_JP.ujis
+DOCFILES?=	README.alsaseq README.dl README.m2m README.mts README.sf
+DOCLANG?=	C ja_JP.eucJP
+
+TIMID_LIBDIR=	lib/timidity
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=--without-x --disable-spectrogram --disable-wrd --disable-dynamic
+.else
+CONFIGURE_ARGS+=--with-x    --enable-spectrogram  --enable-wrd  --enable-dynamic
+USE_XLIB=	yes
+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
+.endif
+
+.if ${OSVERSION} >= 450002
+EUCJP_LOCALE=	ja_JP.eucJP
+.else
+EUCJP_LOCALE=	ja_JP.EUC
+.endif
+
 .if ${HAVE_GNOME:Mesound}!=""
 USE_GNOME=	esound
-CONFIGURE_ARGS+=--enable-audio=oss,esd
-PKGNAMESUFFIX=	-esound
+CONFIGURE_ARGS+=--enable-audio=oss,esd,vorbis
+PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-esound
 .else
-CONFIGURE_ARGS+=--enable-audio=oss
+CONFIGURE_ARGS+=--enable-audio=oss,vorbis
 .endif
 
 .if ${PORTOBJFORMAT} == "elf"
 CONFIGURE_ENV=	LDFLAGS=-export-dynamic
 .endif
 
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/ja_JP.ujis/timidity.1 \
-	${PREFIX}/man/ja/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/ja_JP.ujis/timidity.cfg.5 \
-	${PREFIX}/man/ja/man5
+pre-install:
+.for dir in ${PREFIX}/share/timidity ${PREFIX}/${TIMID_LIBDIR}
+	@[ -d ${dir} ] || ${MKDIR} ${dir}
+.endfor
+
+.if ${CONFIGURE_ARGS:M*ncurses*} != ""
+post-install::
+	${INSTALL_MAN} ${WRKSRC}/doc/ja_JP.eucJP/timidity.1 \
+		${PREFIX}/man/ja/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/ja_JP.eucJP/timidity.cfg.5 \
+		${PREFIX}/man/ja/man5
+.else
+do-build:
+	@cd ${WRKSRC}/interface; ${MAKE} ${ALL_TARGET}
+
+do-install:
+	@cd ${WRKSRC}/interface; ${MAKE} ${INSTALL_TARGET}
+.endif
+
 .if !defined(NOPORTDOCS)
+post-install::
 .for lang in ${DOCLANG}
-	@${MKDIR} \
-	${PREFIX}/share/doc/`echo ${lang} | ${SED} -e 's/^C$$//' -e 's/_JP.ujis$$//'`/timidity++
-	for f in ${DOCFILES}; do \
-	${INSTALL_DATA} ${WRKSRC}/doc/${lang}/$$f \
-	${PREFIX}/share/doc/`echo ${lang} | ${SED} -e 's/^C$$//' -e 's/_JP.ujis$$//'`/timidity++; \
-	done;
+	${MKDIR} ${DOCSDIR}/`echo ${lang} | ${SED} -e 's/^C$$//' -e 's/_JP.eucJP$$//'`
+.for file in ${DOCFILES}
+	${INSTALL_DATA} ${WRKSRC}/doc/${lang}/${file} ${DOCSDIR}/`echo ${lang} | ${SED} -e 's/^C$$//' -e 's/_JP.eucJP$$//'`
+.endfor
 .endfor
 .endif
-	${SETENV} PKG_PREFIX=${PREFIX} \
-	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
+.if defined(LINK)
+post-install::
+	${LN} -sf ${PREFIX}/bin/timidity ${PREFIX}/bin/${LINK}
+.endif
+
+.if exists(${PKGMESSAGE})
+post-install::
 	@${CAT} ${PKGMESSAGE}
+.endif
 
 .include <bsd.port.post.mk>
Index: audio/timidity++/distinfo
===================================================================
RCS file: /home/ncvs/ports/audio/timidity++/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- audio/timidity++/distinfo	31 Mar 2004 03:06:12 -0000	1.15
+++ audio/timidity++/distinfo	17 May 2004 15:25:50 -0000
@@ -1,2 +1,2 @@
-MD5 (timidity/TiMidity++-2.11.3.tar.bz2) = 72f6624d467b61c69b8ec9ce002c21a8
-SIZE (timidity/TiMidity++-2.11.3.tar.bz2) = 964222
+MD5 (timidity/TiMidity++-2.13.0.tar.bz2) = 63284981e1ac81fce2b53cc4b1f4c468
+SIZE (timidity/TiMidity++-2.13.0.tar.bz2) = 1418739
Index: audio/timidity++/pkg-descr
===================================================================
RCS file: /home/ncvs/ports/audio/timidity++/pkg-descr,v
retrieving revision 1.4
diff -u -r1.4 pkg-descr
--- audio/timidity++/pkg-descr	31 Mar 2000 21:21:02 -0000	1.4
+++ audio/timidity++/pkg-descr	21 May 2004 19:06:24 -0000
@@ -8,6 +8,7 @@
 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/
+WWW: http://www.linet.gr.jp/~tamuki/
 
 Yoichi Asai <yatt@msc.biglobe.ne.jp>
Index: audio/timidity++/pkg-install
===================================================================
RCS file: audio/timidity++/pkg-install
diff -N audio/timidity++/pkg-install
--- audio/timidity++/pkg-install	19 Nov 2002 15:50:16 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-PREFIX=${PKG_PREFIX:-/usr/local}
-
-[ "x$1" = "x" ] && exit 1
-if [ "x$2" = "xPOST-INSTALL" ]; then
-	mkdir -p ${PREFIX}/lib/timidity
-fi
Index: audio/timidity++/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/audio/timidity++/pkg-plist,v
retrieving revision 1.11
diff -u -r1.11 pkg-plist
--- audio/timidity++/pkg-plist	21 Oct 2003 11:24:01 -0000	1.11
+++ audio/timidity++/pkg-plist	19 May 2004 16:34:20 -0000
@@ -1,8 +1,17 @@
 bin/timidity
+@unexec rmdir %D/%%TIMID_LIBDIR%% 2>/dev/null || true
+@unexec mkdir %D/%%TIMID_LIBDIR%% 2>/dev/null || true
+@unexec rmdir %D/share/timidity 2>/dev/null || true
+@unexec mkdir %D/share/timidity 2>/dev/null || true
+%%PORTDOCS%%%%DOCSDIR%%/README.alsaseq
 %%PORTDOCS%%%%DOCSDIR%%/README.dl
+%%PORTDOCS%%%%DOCSDIR%%/README.m2m
+%%PORTDOCS%%%%DOCSDIR%%/README.mts
 %%PORTDOCS%%%%DOCSDIR%%/README.sf
-%%PORTDOCS%%share/doc/ja/timidity++/README.dl
-%%PORTDOCS%%share/doc/ja/timidity++/README.sf
-@dirrm lib/timidity
-%%PORTDOCS%%@dirrm share/doc/ja/timidity++
+%%PORTDOCS%%%%DOCSDIR%%/ja/README.alsaseq
+%%PORTDOCS%%%%DOCSDIR%%/ja/README.dl
+%%PORTDOCS%%%%DOCSDIR%%/ja/README.m2m
+%%PORTDOCS%%%%DOCSDIR%%/ja/README.mts
+%%PORTDOCS%%%%DOCSDIR%%/ja/README.sf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ja
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: audio/timidity++/files/patch-ab
===================================================================
RCS file: audio/timidity++/files/patch-ab
diff -N audio/timidity++/files/patch-ab
--- audio/timidity++/files/patch-ab	21 Aug 2000 00:53:22 -0000	1.7
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
---- timidity/timidity.c.orig	Tue Jul  4 02:53:35 2000
-+++ timidity/timidity.c	Fri Jul 21 19:57:23 2000
-@@ -43,7 +43,7 @@
- #endif /* BORLANDC_EXCEPTION */
- #include <signal.h>
- 
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) && !defined(__alpha__)
- #include <floatingpoint.h> /* For FP exceptions */
- #endif
- 
-@@ -2754,7 +2754,7 @@
-     int i;
-     static int drums[] = DEFAULT_DRUMCHANNELS;
-     static int is_first = 1;
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) && !defined(__alpha__)
-     fp_except_t fpexp;
- 
-     fpexp = fpgetmask();
Index: audio/timidity++/files/patch-ac
===================================================================
RCS file: audio/timidity++/files/patch-ac
diff -N audio/timidity++/files/patch-ac
--- audio/timidity++/files/patch-ac	27 Apr 2002 02:22:51 -0000	1.7
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,46 +0,0 @@
---- timidity/timidity.h.orig	Fri Jan 11 23:36:13 2002
-+++ timidity/timidity.h	Fri Apr  5 15:37:51 2002
-@@ -450,8 +450,19 @@
- #define LE_SHORT(x) (x)
- #define LE_LONG(x) (x)
- #ifdef __FreeBSD__
--#define BE_SHORT(x) __byte_swap_word(x)
--#define BE_LONG(x) __byte_swap_long(x)
-+#  include <osreldate.h>
-+#  if __FreeBSD_version <= 500000
-+#    define BE_SHORT(x) __byte_swap_word(x)
-+#    define BE_LONG(x) __byte_swap_long(x)
-+#  else
-+#    if __FreeBSD_version <= 500028
-+#      define BE_SHORT(x) __uint8_swap_uint16(x)
-+#      define BE_LONG(x) __uint8_swap_uint32(x)
-+#    else
-+#      define BE_SHORT(x) __bswap16(x)
-+#      define BE_LONG(x) __bswap32(x)
-+#    endif
-+#  endif
- #else
- #define BE_SHORT(x) XCHG_SHORT(x)
- #define BE_LONG(x) XCHG_LONG(x)
-@@ -460,8 +471,19 @@
- #define BE_SHORT(x) (x)
- #define BE_LONG(x) (x)
- #ifdef __FreeBSD__
--#define LE_SHORT(x) __byte_swap_word(x)
--#define LE_LONG(x) __byte_swap_long(x)
-+#  include <osreldate.h>
-+#  if __FreeBSD_version <= 500000
-+#    define LE_SHORT(x) __byte_swap_word(x)
-+#    define LE_LONG(x) __byte_swap_long(x)
-+#  else
-+#    if __FreeBSD_version <= 500028
-+#      define LE_SHORT(x) __uint8_swap_uint16(x)
-+#      define LE_LONG(x) __uint8_swap_uint32(x)
-+#    else
-+#      define LE_SHORT(x) __bswap16(x)
-+#      define LE_LONG(x) __bswap32(x)
-+#    endif
-+#  endif
- #else
- #define LE_SHORT(x) XCHG_SHORT(x)
- #define LE_LONG(x) XCHG_LONG(x)
Index: audio/timidity++/files/patch-ad
===================================================================
RCS file: /home/ncvs/ports/audio/timidity++/files/patch-ad,v
retrieving revision 1.2
diff -u -r1.2 patch-ad
--- audio/timidity++/files/patch-ad	31 Mar 2000 21:21:01 -0000	1.2
+++ audio/timidity++/files/patch-ad	18 May 2004 14:31:36 -0000
@@ -1,8 +1,8 @@
---- interface/Makefile.in.orig	Wed Nov 24 12:25:38 1999
-+++ interface/Makefile.in	Wed Nov 24 17:40:48 1999
-@@ -583,7 +583,7 @@
+--- interface/Makefile.in.orig	Mon Mar 29 04:04:22 2004
++++ interface/Makefile.in	Tue May 18 23:31:12 2004
+@@ -1017,7 +1017,7 @@
  
- tclIndex: $(TCLF)
+ tclIndex: $(TCLSRCS)
  	rm -f tclIndex
 -	echo 'auto_mkindex . *.tcl; exit' | $(WISH)
 +	echo 'auto_mkindex . *.tcl; exit' | `echo $(WISH) | sed 's/wish/tclsh/'`
Index: audio/timidity++/files/patch-ae
===================================================================
RCS file: /home/ncvs/ports/audio/timidity++/files/patch-ae,v
retrieving revision 1.1
diff -u -r1.1 patch-ae
--- audio/timidity++/files/patch-ae	21 Jan 2002 03:32:00 -0000	1.1
+++ audio/timidity++/files/patch-ae	18 May 2004 14:38:35 -0000
@@ -1,14 +1,14 @@
---- timidity/Makefile.in.orig	Fri Jan 18 08:43:16 2002
-+++ timidity/Makefile.in	Sun Jan 20 15:27:17 2002
-@@ -363,9 +363,8 @@
+--- timidity/Makefile.in.orig	Mon Mar 29 04:04:22 2004
++++ timidity/Makefile.in	Tue May 18 23:38:06 2004
+@@ -576,9 +576,8 @@
  	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
  	  if test -f $$p \
  	  ; then \
--	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
--	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
--	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p"; \
-+	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$p; \
+-	    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
  
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