3 files changed, 21 insertions, 65 deletions

diff --git a/audio/timidity++-xaw/Makefile b/audio/timidity++-xaw/Makefile
index 269475e1d636..a86d65b3cd81 100644
--- a/audio/timidity++-xaw/Makefile
+++ b/audio/timidity++-xaw/Makefile
@@ -6,65 +6,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=	TiMidity++-1.3.10
-PKGNAME=	timidity++-xaw-1.3.10
-CATEGORIES=	audio
-MASTER_SITES=	http://www.goice.co.jp/member/mo/timidity/dist/
+INTERFACE=	xaw
 
-MAINTAINER=	yatt@msc.biglobe.ne.jp
+MASTERDIR=	${.CURDIR}/../../audio/timidity++-emacs
 
-RUN_DEPENDS=	${PREFIX}/bin/timidity:${PORTSDIR}/audio/timidity++
-LIB_DEPENDS=	Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
-
-# If you don't require Japanese docs, uncomment this.
-#NO_USE_JAPANESE=	yes
-
-USE_XLIB=	yes
-USE_AUTOCONF=	yes
-
-FILESDIR=	${.CURDIR}/../../audio/timidity++/files
-
-DIST_SUBDIR=	timidity
-
-.include <bsd.port.pre.mk>
-
-CONFIGURE_ARGS= --prefix=${PREFIX} --with-x \
-		--disable-ncurses --disable-vt100 --disable-tcltk \
-		--disable-emacs --enable-xaw=dynamic --disable-xskin \
-		--disable-motif --disable-slang --disable-gtk \
-		--enable-network --enable-spectrogram --enable-wrd
-.if ${PORTOBJFORMAT} == "elf"
-CONFIGURE_ENV=	LDFLAGS=-export-dynamic
-.endif
-
-TIMID_DIR=	${PREFIX}/lib/timidity
-LINK=		xawmidi
-DOCFILES=       README.xaw
-DOCLANG=        C
-.if !defined(NO_USE_JAPANESE)
-DOCLANG+=       ja_JP.ujis
-.endif
-
-do-build:
-	cd ${WRKSRC}/interface; ${MAKE}
-
-do-install:
-	cd ${WRKSRC}/interface; ${MAKE} ${INSTALL_TARGET}
-	${LN} -sf ${PREFIX}/bin/timidity ${PREFIX}/bin/${LINK}
-	@${MKDIR} ${X11BASE}/lib/X11/ja_JP.EUC/app-defaults
-	${INSTALL_DATA} ${WRKSRC}/TiMidity.ad \
-	${X11BASE}/lib/X11/app-defaults/TiMidity
-	${INSTALL_DATA} ${WRKSRC}/TiMidity-uj.ad \
-	${X11BASE}/lib/X11/ja_JP.EUC/app-defaults/TiMidity
-
-post-install:
-.if !defined(NOPORTDOCS)
-.for lang in ${DOCLANG}
-	@${MKDIR} \
-	${PREFIX}/share/doc/timidity/`echo ${lang} | ${SED} 's/_JP.ujis//'`
-	${INSTALL_DATA} ${WRKSRC}/doc/${lang}/${DOCFILES} \
-	${PREFIX}/share/doc/timidity/`echo ${lang} | ${SED} 's/_JP.ujis//'`
-.endfor
-.endif
-
-.include <bsd.port.post.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/timidity++-xaw/pkg-descr b/audio/timidity++-xaw/pkg-descr
index 35febe7fe1a9..b8c04f1ab7f0 100644
--- a/audio/timidity++-xaw/pkg-descr
+++ b/audio/timidity++-xaw/pkg-descr
@@ -3,7 +3,7 @@ This port allows you to operate TiMidity++ with Xaw 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++-xaw/pkg-plist b/audio/timidity++-xaw/pkg-plist
index 1755333f2503..938b5318bfcc 100644
--- a/audio/timidity++-xaw/pkg-plist
+++ b/audio/timidity++-xaw/pkg-plist
@@ -1,7 +1,20 @@
+@cwd /usr/X11R6
+lib/X11/app-defaults/TiMidity
+lib/X11/ja_JP.EUC/app-defaults/TiMidity
+@cwd /usr/local
 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
 share/doc/timidity/C/README.xaw
 share/doc/timidity/ja/README.xaw
-@cwd /usr/X11R6
-lib/X11/app-defaults/TiMidity
-lib/X11/ja_JP.EUC/app-defaults/TiMidity
+@dirrm lib/timidity/bitmaps