Date: Sat, 11 Mar 2000 11:48:26 +0900 From: Yoichi ASAI <yatt@msc.biglobe.ne.jp> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/17354: Update: audio/timidity++ Message-ID: <20000311114826G.yatt@msc.biglobe.ne.jp>
next in thread | raw e-mail | index | archive | help
>Number: 17354
>Category: ports
>Synopsis: Update: audio/timidity++
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 13 08:10:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: Yoichi ASAI
>Release: FreeBSD 3.3-RELEASE i386
>Organization:
Personal
>Environment:
>Description:
Update for audio/timidity++. ${PATCHESDIR}/patch-aa no longer exists.
>How-To-Repeat:
>Fix:
diff -urN timidity++.orig/Makefile timidity++/Makefile
--- timidity++.orig/Makefile Wed Oct 13 19:13:00 1999
+++ timidity++/Makefile Thu Mar 2 20:57:33 2000
@@ -6,8 +6,8 @@
# $FreeBSD: ports/audio/timidity++/Makefile,v 1.17 1999/10/13 06:47:35 flathill Exp $
#
-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 @@
# 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 @@
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 -urN timidity++.orig/files/md5 timidity++/files/md5
--- timidity++.orig/files/md5 Sat Sep 11 07:12:00 1999
+++ timidity++/files/md5 Thu Mar 2 20:52:33 2000
@@ -1 +1 @@
-MD5 (timidity/TiMidity++-1.3.10.tar.gz) = 03c22253688d1ffd8479a4851fb3fbf3
+MD5 (timidity/TiMidity++-2.9.0.tar.bz2) = 9a2e7eb5e7a7d9a1ff3c19a65b748b11
diff -urN timidity++.orig/patches/patch-aa timidity++/patches/patch-aa
--- timidity++.orig/patches/patch-aa Sat Sep 11 07:12:00 1999
+++ timidity++/patches/patch-aa Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- interface/gtk_i.c.orig Sat Jul 10 23:38:39 1999
-+++ interface/gtk_i.c Sat Jul 10 23:39:13 1999
-@@ -505,6 +505,8 @@
- GtkItemFactory *ifactory;
- GtkAccelGroup *ag;
-
-+ gtk_set_locale();
-+
- ag = gtk_accel_group_get_default();
- ifactory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "<Main>", ag);
- gtk_item_factory_create_items(ifactory,
diff -urN timidity++.orig/patches/patch-ab timidity++/patches/patch-ab
--- timidity++.orig/patches/patch-ab Mon Sep 20 11:33:00 1999
+++ timidity++/patches/patch-ab Thu Mar 2 20:52:33 2000
@@ -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 -urN timidity++.orig/patches/patch-ac timidity++/patches/patch-ac
--- timidity++.orig/patches/patch-ac Mon Sep 20 11:33:00 1999
+++ timidity++/patches/patch-ac Thu Mar 2 20:52:33 2000
@@ -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 -urN timidity++.orig/patches/patch-ad timidity++/patches/patch-ad
--- timidity++.orig/patches/patch-ad Wed Oct 13 15:47:00 1999
+++ timidity++/patches/patch-ad Thu Mar 2 20:52:33 2000
@@ -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 -urN timidity++.orig/pkg/DESCR timidity++/pkg/DESCR
--- timidity++.orig/pkg/DESCR Sat Sep 11 07:12:00 1999
+++ timidity++/pkg/DESCR Thu Mar 2 20:52:33 2000
@@ -7,7 +7,7 @@
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 -urN timidity++.orig/pkg/INSTALL timidity++/pkg/INSTALL
--- timidity++.orig/pkg/INSTALL Sat Sep 11 02:08:00 1999
+++ timidity++/pkg/INSTALL Thu Mar 2 20:52:33 2000
@@ -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 -urN timidity++.orig/pkg/MESSAGE timidity++/pkg/MESSAGE
--- timidity++.orig/pkg/MESSAGE Thu Jan 1 09:00:00 1970
+++ timidity++/pkg/MESSAGE Thu Mar 2 20:52:33 2000
@@ -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 -urN timidity++.orig/pkg/PLIST timidity++/pkg/PLIST
--- timidity++.orig/pkg/PLIST Sun Feb 27 20:13:00 2000
+++ timidity++/pkg/PLIST Thu Mar 2 20:52:33 2000
@@ -3,8 +3,7 @@
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
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000311114826G.yatt>