3 files changed, 18 insertions, 53 deletions

diff --git a/audio/timidity++-tcltk/Makefile b/audio/timidity++-tcltk/Makefile
index 5ba7980b172b..16d395c0b2bd 100644
--- a/audio/timidity++-tcltk/Makefile
+++ b/audio/timidity++-tcltk/Makefile
@@ -6,56 +6,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=	TiMidity++-1.3.10
-PKGNAME=	timidity++-tcltk-1.3.10
-CATEGORIES=	audio
-MASTER_SITES=	http://www.goice.co.jp/member/mo/timidity/dist/
+INTERFACE=	tcltk
 
-MAINTAINER=	yatt@msc.biglobe.ne.jp
+MASTERDIR=	${.CURDIR}/../../audio/timidity++-emacs
 
-RUN_DEPENDS=	${PREFIX}/bin/timidity:${PORTSDIR}/audio/timidity++
-LIB_DEPENDS=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
-
-USE_XLIB=	yes
-USE_AUTOCONF=	yes
-
-MASTERDIR=	${.CURDIR}/../../audio/timidity++ 
-PKGDIR=		${.CURDIR}/pkg 
-
-DIST_SUBDIR=	timidity
-
-.include <bsd.port.pre.mk>
-
-CONFIGURE_ARGS= --prefix=${PREFIX} --with-x \
-		--disable-ncurses --disable-vt100 --enable-tcltk=dynamic \
-		--disable-emacs --disable-xaw --disable-xskin \
-		--disable-motif --disable-slang --disable-gtk \
-		--enable-network --enable-spectrogram --enable-wrd \
-		--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
-.if ${PORTOBJFORMAT} == "elf"
-CONFIGURE_ENV+=	LDFLAGS=-export-dynamic
-.endif
-
-TIMID_DIR=	${PREFIX}/lib/timidity
-LINK=		tkmidi
-DOCFILES=       README.tk
-DOCLANG=	C
-
-do-build:
-	cd ${WRKSRC}/interface; ${MAKE}
-
-do-install:
-	cd ${WRKSRC}/interface; ${MAKE} ${INSTALL_TARGET}
-	${LN} -sf ${PREFIX}/bin/timidity ${PREFIX}/bin/${LINK}
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/timidity/C
-	${INSTALL_DATA} ${WRKSRC}/doc/C/${DOCFILES} \
-	${PREFIX}/share/doc/timidity/C
-.endif
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/timidity++-tcltk/pkg-descr b/audio/timidity++-tcltk/pkg-descr
index 01691e13e981..a99cded3b7db 100644
--- a/audio/timidity++-tcltk/pkg-descr
+++ b/audio/timidity++-tcltk/pkg-descr
@@ -3,7 +3,7 @@ This port allows you to operate TiMidity++ with Tcl/Tk interface.
 Formerly, the original version of this program was written by Tuuka
 Toivonen(until version 0.2i).
 Now, Masanao Izumo and many hackers are developing "TiMidity++".
-Official site is
-http://www.goice.co.jp/member/mo/timidity/
+
+WWW: http://www.goice.co.jp/member/mo/timidity/
 
 Yoichi Asai <yatt@msc.biglobe.ne.jp>
diff --git a/audio/timidity++-tcltk/pkg-plist b/audio/timidity++-tcltk/pkg-plist
index c2b1151846c5..d86633fefc68 100644
--- a/audio/timidity++-tcltk/pkg-plist
+++ b/audio/timidity++-tcltk/pkg-plist
@@ -1,4 +1,15 @@
 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
@@ -6,3 +17,5 @@ lib/timidity/tclIndex
 lib/timidity/tkmidity.tcl
 lib/timidity/tkpanel.tcl
 share/doc/timidity/C/README.tk
+share/doc/timidity/ja/README.tk
+@dirrm lib/timidity/bitmaps