9 files changed, 40 insertions, 26 deletions

diff --git a/audio/timidity++-emacs/Makefile b/audio/timidity++-emacs/Makefile
index a08759ac7a41..64576ce74495 100644
--- a/audio/timidity++-emacs/Makefile
+++ b/audio/timidity++-emacs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	timidity++
-PORTVERSION=	2.10.4
+PORTVERSION=	2.11.3
 CATEGORIES+=	audio
 MASTER_SITES=	http://www.goice.co.jp/member/mo/timidity/dist/
 PKGNAMESUFFIX=	-${INTERFACE}
@@ -78,7 +78,7 @@ CONFIGURE_ENV=	WISH=wish8.0
 LINK=		xawmidi
 DOCFILES=	README.xaw
 DOCLANG=	C ja_JP.ujis
-INTERFACE_DEPS=	Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
+INTERFACE_DEPS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 .elif ${INTERFACE} == "xskin"
 LINK=		xskinmidi
 DOCFILES=	README.xskin
@@ -124,9 +124,9 @@ post-install:
 .if !defined(NOPORTDOCS)
 .for lang in ${DOCLANG}
 	@${MKDIR} \
-	${PREFIX}/share/doc/timidity/`echo ${lang} | ${SED} 's/_JP.ujis//'`
+	${PREFIX}/share/doc/`echo ${lang} | ${SED} -e 's/^C$$//' -e 's/_JP.ujis$$//'`/timidity++
 	${INSTALL_DATA} ${WRKSRC}/doc/${lang}/${DOCFILES} \
-	${PREFIX}/share/doc/timidity/`echo ${lang} | ${SED} 's/_JP.ujis//'`
+	${PREFIX}/share/doc/`echo ${lang} | ${SED} -e 's/^C$$//' -e 's/_JP.ujis$$//'`/timidity++
 .endfor
 .endif
 .endif
diff --git a/audio/timidity++-tcltk/pkg-plist b/audio/timidity++-tcltk/pkg-plist
index d86633fefc68..eb813568ed40 100644
--- a/audio/timidity++-tcltk/pkg-plist
+++ b/audio/timidity++-tcltk/pkg-plist
@@ -16,6 +16,6 @@ lib/timidity/misc.tcl
 lib/timidity/tclIndex
 lib/timidity/tkmidity.tcl
 lib/timidity/tkpanel.tcl
-share/doc/timidity/C/README.tk
-share/doc/timidity/ja/README.tk
+%%PORTDOCS%%share/doc/timidity++/README.tk
+%%PORTDOCS%%share/doc/ja/timidity++/README.tk
 @dirrm lib/timidity/bitmaps
diff --git a/audio/timidity++-xaw/pkg-plist b/audio/timidity++-xaw/pkg-plist
index 938b5318bfcc..d3b1ba8947df 100644
--- a/audio/timidity++-xaw/pkg-plist
+++ b/audio/timidity++-xaw/pkg-plist
@@ -15,6 +15,6 @@ 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
+%%PORTDOCS%%share/doc/timidity++/README.xaw
+%%PORTDOCS%%share/doc/ja/timidity++/README.xaw
 @dirrm lib/timidity/bitmaps
diff --git a/audio/timidity++-xskin/pkg-plist b/audio/timidity++-xskin/pkg-plist
index 496be43ec7bd..7a618b3ee12a 100644
--- a/audio/timidity++-xskin/pkg-plist
+++ b/audio/timidity++-xskin/pkg-plist
@@ -1,4 +1,4 @@
 bin/xskinmidi
 lib/timidity/interface_i.so
-share/doc/timidity/C/README.xskin
-share/doc/timidity/ja/README.xskin
+%%PORTDOCS%%share/doc/timidity++/README.xskin
+%%PORTDOCS%%share/doc/ja/timidity++/README.xskin
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index 1b4a4b7433f6..74ac746a571f 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	timidity++
-PORTVERSION=	2.10.4
+PORTVERSION=	2.11.3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.goice.co.jp/member/mo/timidity/dist/
 DISTNAME=	TiMidity++-${PORTVERSION}
@@ -31,15 +31,16 @@ LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
 .endif
 
 DIST_SUBDIR=	timidity
-INSTALL_TARGET=	install install.man
 
 .if !defined(WITHOUT_X11)
 CONFIGURE_ARGS=	--with-x --enable-ncurses --enable-vt100 \
 		--enable-dynamic --enable-server \
-		--enable-network --enable-spectrogram --enable-wrd
+		--enable-network --enable-spectrogram --enable-wrd \
+		--program-transform-name=
 .else
 CONFIGURE_ARGS=	--enable-ncurses --enable-vt100 \
-		--enable-network --disable-spectrogram --disable-wrd
+		--enable-network --disable-spectrogram --disable-wrd \
+		--program-transform-name=
 .endif
 
 MAN1=		timidity.1
@@ -70,10 +71,10 @@ post-install:
 .if !defined(NOPORTDOCS)
 .for lang in ${DOCLANG}
 	@${MKDIR} \
-	${PREFIX}/share/doc/timidity/`echo ${lang} | ${SED} 's/_JP.ujis//'`
+	${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/timidity/`echo ${lang} | ${SED} 's/_JP.ujis//'`; \
+	${PREFIX}/share/doc/`echo ${lang} | ${SED} -e 's/^C$$//' -e 's/_JP.ujis$$//'`/timidity++; \
 	done;
 .endfor
 .endif
diff --git a/audio/timidity++/distinfo b/audio/timidity++/distinfo
index 160b72e53e30..dce9495d4adf 100644
--- a/audio/timidity++/distinfo
+++ b/audio/timidity++/distinfo
@@ -1 +1 @@
-MD5 (timidity/TiMidity++-2.10.4.tar.bz2) = 8e69753b7e71055e61aeb3c234048f1e
+MD5 (timidity/TiMidity++-2.11.3.tar.bz2) = 72f6624d467b61c69b8ec9ce002c21a8
diff --git a/audio/timidity++/files/patch-ae b/audio/timidity++/files/patch-ae
new file mode 100644
index 000000000000..b755f69a8819
--- /dev/null
+++ b/audio/timidity++/files/patch-ae
@@ -0,0 +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 @@
+ 	  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; \
+ 	  else :; fi; \
+ 	done
+ 
diff --git a/audio/timidity++/pkg-plist b/audio/timidity++/pkg-plist
index 8b11705a5738..d41c081cd304 100644
--- a/audio/timidity++/pkg-plist
+++ b/audio/timidity++/pkg-plist
@@ -1,10 +1,9 @@
 bin/timidity
-share/doc/timidity/C/README.dl
-share/doc/timidity/C/README.sf
-share/doc/timidity/ja/README.dl
-share/doc/timidity/ja/README.sf
+%%PORTDOCS%%share/doc/timidity++/README.dl
+%%PORTDOCS%%share/doc/timidity++/README.sf
+%%PORTDOCS%%share/doc/ja/timidity++/README.dl
+%%PORTDOCS%%share/doc/ja/timidity++/README.sf
 @dirrm lib/timidity
-@dirrm share/doc/timidity/C
-@dirrm share/doc/timidity/ja
-@dirrm share/doc/timidity
+%%PORTDOCS%%@dirrm share/doc/ja/timidity++
+%%PORTDOCS%%@dirrm share/doc/timidity++
 @dirrm share/timidity
diff --git a/japanese/timidity++-tcltk/pkg-plist b/japanese/timidity++-tcltk/pkg-plist
index d86633fefc68..eb813568ed40 100644
--- a/japanese/timidity++-tcltk/pkg-plist
+++ b/japanese/timidity++-tcltk/pkg-plist
@@ -16,6 +16,6 @@ lib/timidity/misc.tcl
 lib/timidity/tclIndex
 lib/timidity/tkmidity.tcl
 lib/timidity/tkpanel.tcl
-share/doc/timidity/C/README.tk
-share/doc/timidity/ja/README.tk
+%%PORTDOCS%%share/doc/timidity++/README.tk
+%%PORTDOCS%%share/doc/ja/timidity++/README.tk
 @dirrm lib/timidity/bitmaps