update to 2.9.0

PR:		17354
Submitted by:	maintainer

9 files changed, 63 insertions, 57 deletions

diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index 9d244f82b90..5cffd2c3c71 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -6,8 +6,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=	TiMidity++-1.3.10
-PKGNAME=	timidity++-1.3.10
+DISTNAME=	TiMidity++-2.9.0
+PKGNAME=	timidity++-2.9.0
 CATEGORIES=	audio
 MASTER_SITES=	http://www.goice.co.jp/member/mo/timidity/dist/
 
@@ -16,53 +16,50 @@ MAINTAINER=	yatt@msc.biglobe.ne.jp
 # If you don't have X11, type "make -DNO_X11" or uncomment this.
 #NO_X11=	yes
 
-# If you don't require Japanese docs, uncomment this.
-#NO_USE_JAPANESE=	yes
-
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
 .if !defined(NO_X11)
 USE_XLIB=	yes
+LIB_DEPENDS+=	png.3:${PORTSDIR}/graphics/png
 .endif
-USE_AUTOCONF=	yes
 
 DIST_SUBDIR=	timidity
-
-PLIST_SUB=	TIMID_DIR=${TIMID_DIR}
-
-.include <bsd.port.pre.mk>
+INSTALL_TARGET=	install install.man
 
 .if !defined(NO_X11)
-CONFIGURE_ARGS=	--prefix=${PREFIX} --with-x --enable-audio \
-		--enable-ncurses --enable-vt100 \
-		--enable-dynamic=dynamic \
+CONFIGURE_ARGS=	--with-x --enable-ncurses --enable-vt100 \
+		--enable-dynamic --enable-server \
 		--enable-network --enable-spectrogram --enable-wrd
 .else
-CONFIGURE_ARGS= --prefix=${PREFIX} --enable-audio \
-		--enable-ncurses --enable-vt100 \
-		--disable-tcltk --disable-emacs --disable-xaw --disable-xskin \
-		--disable-motif --disable-slang --disable-gtk \
+CONFIGURE_ARGS= --enable-ncurses --enable-vt100 \
 		--enable-network --disable-spectrogram --disable-wrd
 .endif
-.if ${PORTOBJFORMAT} == "elf"
-CONFIGURE_ENV= LDFLAGS=-export-dynamic
+
+.if defined(USE_ESOUND)
+LIB_DEPENDS+=	esd.2:${PORTSDIR}/audio/esound
+CONFIGURE_ARGS+=	--enable-audio=oss,esd
+.else
+CONFIGURE_ARGS+=	--enable-audio=oss
 .endif
 
 MAN1=		timidity.1
 MAN5=		timidity.cfg.5
-MANLANG=	""
-.if !defined(NO_USE_JAPANESE)
-MANLANG+=	ja
-.endif
 
 DOCFILES=	README.dl README.sf
-DOCLANG=	C
-.if !defined(NO_USE_JAPANESE)
-DOCLANG+=	ja_JP.ujis
-.endif
+DOCLANG=	C ja_JP.ujis
+
+.include <bsd.port.pre.mk>
 
-TIMID_DIR=	${PREFIX}/lib/timidity
+.if ${PORTOBJFORMAT} == "elf"
+CONFIGURE_ENV=	LDFLAGS=-export-dynamic
+.endif
 
 post-install:
-	@${MKDIR} ${TIMID_DIR}
+	@${MKDIR} ${PREFIX}/man/ja/man1 ${PREFIX}/man/ja/man1
+	${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
 .if !defined(NOPORTDOCS)
 .for lang in ${DOCLANG}
 	@${MKDIR} \
@@ -73,12 +70,8 @@ post-install:
 	done;
 .endfor
 .endif
-.if !defined(NO_USE_JAPANESE)
-	@${MKDIR} ${PREFIX}/man/ja/man1; ${MKDIR} ${PREFIX}/man/ja/man5
-	${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
-.endif
+	${SETENV} PKG_PREFIX=${PREFIX} \
+	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/audio/timidity++/distinfo b/audio/timidity++/distinfo
index ed98de383af..98190fcc9bc 100644
--- a/audio/timidity++/distinfo
+++ b/audio/timidity++/distinfo
@@ -1 +1 @@
-MD5 (timidity/TiMidity++-1.3.10.tar.gz) = 03c22253688d1ffd8479a4851fb3fbf3
+MD5 (timidity/TiMidity++-2.9.0.tar.bz2) = 9a2e7eb5e7a7d9a1ff3c19a65b748b11
diff --git a/audio/timidity++/files/patch-ab b/audio/timidity++/files/patch-ab
index 49143651ffb..1115e700f10 100644
--- a/audio/timidity++/files/patch-ab
+++ b/audio/timidity++/files/patch-ab
@@ -1,11 +1,11 @@
---- timidity/timidity.c.orig	Sat Sep 18 15:39:51 1999
-+++ timidity/timidity.c	Sat Sep 18 15:40:21 1999
-@@ -2444,7 +2444,7 @@
- {
-     int i;
-     static int drums[] = DEFAULT_DRUMCHANNELS;
+--- timidity/timidity.c.orig	Fri Nov 19 10:11:24 1999
++++ timidity/timidity.c	Wed Nov 24 17:15:31 1999
+@@ -45,7 +45,7 @@
+ #endif /* BORLANDC_EXCEPTION */
+ #include <signal.h>
+ 
 -#if defined(__FreeBSD__)
 +#if defined(__FreeBSD__) && !defined(__alpha__)
-     fp_except_t fpexp;
+ #include <floatingpoint.h> /* For FP exceptions */
+ #endif
  
-     fpexp = fpgetmask();
diff --git a/audio/timidity++/files/patch-ac b/audio/timidity++/files/patch-ac
index 1303806452e..037f3dab7f4 100644
--- a/audio/timidity++/files/patch-ac
+++ b/audio/timidity++/files/patch-ac
@@ -1,6 +1,6 @@
---- timidity/timidity.h.orig	Sat Sep 18 15:42:24 1999
-+++ timidity/timidity.h	Sat Sep 18 15:42:51 1999
-@@ -434,7 +434,7 @@
+--- timidity/timidity.h.orig	Thu Nov  4 21:14:15 1999
++++ timidity/timidity.h	Wed Nov 24 17:15:31 1999
+@@ -441,7 +441,7 @@
  #ifdef LITTLE_ENDIAN
  #define LE_SHORT(x) (x)
  #define LE_LONG(x) (x)
diff --git a/audio/timidity++/files/patch-ad b/audio/timidity++/files/patch-ad
index 06b701a9d71..589abcc7c3a 100644
--- a/audio/timidity++/files/patch-ad
+++ b/audio/timidity++/files/patch-ad
@@ -1,9 +1,9 @@
---- interface/Makefile.in.orig	Wed Oct 13 15:00:42 1999
-+++ interface/Makefile.in	Wed Oct 13 15:01:15 1999
-@@ -632,7 +632,7 @@
- 	rm -f *.$(so)
+--- 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 @@
  
  tclIndex: $(TCLF)
+ 	rm -f tclIndex
 -	echo 'auto_mkindex . *.tcl; exit' | $(WISH)
 +	echo 'auto_mkindex . *.tcl; exit' | `echo $(WISH) | sed 's/wish/tclsh/'`
  
diff --git a/audio/timidity++/pkg-descr b/audio/timidity++/pkg-descr
index 57654cce100..d4a7770dc37 100644
--- a/audio/timidity++/pkg-descr
+++ b/audio/timidity++/pkg-descr
@@ -7,7 +7,7 @@ In addition to this port, "Gravis Ultra Sound" compatible patch files
 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++/pkg-install b/audio/timidity++/pkg-install
index eaf48971a69..e04f7562170 100644
--- a/audio/timidity++/pkg-install
+++ b/audio/timidity++/pkg-install
@@ -1 +1,9 @@
-mkdir -p /usr/local/lib/timidity
+#!/bin/sh
+
+PREFIX=${PKG_PREFIX:-/usr/local}
+
+[ "x$1" = "x" ] && exit 1
+if [ "x$2" = "xPOST-INSTALL" ]; then
+	mkdir -p ${PREFIX}/lib/timidity
+	mkdir -p ${PREFIX}/share/timidity
+fi
diff --git a/audio/timidity++/pkg-message b/audio/timidity++/pkg-message
new file mode 100644
index 00000000000..1daa07f2fec
--- /dev/null
+++ b/audio/timidity++/pkg-message
@@ -0,0 +1,6 @@
+
+========================================================================
+You need "Gravis Ultra Sound" compatible patch files to play MIDI files.
+See  http://www.goice.co.jp/member/mo/timidity/link.html
+========================================================================
+
diff --git a/audio/timidity++/pkg-plist b/audio/timidity++/pkg-plist
index 92f757d4cdd..3ce65bf82fb 100644
--- a/audio/timidity++/pkg-plist
+++ b/audio/timidity++/pkg-plist
@@ -3,8 +3,7 @@ share/doc/timidity/C/README.dl
 share/doc/timidity/C/README.sf
 share/doc/timidity/ja/README.dl
 share/doc/timidity/ja/README.sf
+@dirrm lib/timidity
 @dirrm share/doc/timidity/C
 @dirrm share/doc/timidity/ja
 @dirrm share/doc/timidity
-@exec mkdir %D/lib/timidity
-@dirrm lib/timidity