aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/timidity++/Makefile121
-rw-r--r--audio/timidity++/distinfo4
-rw-r--r--audio/timidity++/files/patch-Makefile.in14
-rw-r--r--audio/timidity++/files/patch-ab20
-rw-r--r--audio/timidity++/files/patch-ac46
-rw-r--r--audio/timidity++/files/patch-ad11
-rw-r--r--audio/timidity++/files/patch-ae14
-rw-r--r--audio/timidity++/pkg-descr3
-rw-r--r--audio/timidity++/pkg-message2
-rw-r--r--audio/timidity++/pkg-plist17
10 files changed, 104 insertions, 148 deletions
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index 9db7b43706c1..f6623ae39004 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -6,89 +6,114 @@
#
PORTNAME= timidity++
-PORTVERSION= 2.11.3
-PORTREVISION= 1
+PORTVERSION= 2.13.2
CATEGORIES= audio
-MASTER_SITES= http://www.timidity.jp/dist/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= timidity
DISTNAME= TiMidity++-${PORTVERSION}
-MAINTAINER?= yatt@luna2.org
-COMMENT?= Software MIDI player
+MAINTAINER= nork@FreeBSD.org
+COMMENT= Software MIDI player
+
+LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis
CONFLICTS= timidity-0.*
# If you don't have X11, type "make -DWITHOUT_X11" or uncomment this.
#WITHOUT_X11= yes
-
-SLAVEDIRS= audio/timidity++-emacs
-# rest are included by timidity++-emacs port
-SLAVEDIRS+= audio/timidity++-gtk audio/timidity++-motif \
- audio/timidity++-slang audio/timidity++-tcltk \
- audio/timidity++-xaw audio/timidity++-xskin \
- japanese/timidity++-slang japanese/timidity++-tcltk
+USE_GMAKE= yes
USE_BZIP2= yes
WANT_GNOME= yes
GNU_CONFIGURE= yes
-.if !defined(WITHOUT_X11)
-USE_XLIB= yes
-LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png
-.endif
-DIST_SUBDIR= timidity
+CONFIGURE_ARGS?=--enable-interface=ncurses,vt100,server
+CONFIGURE_ARGS+=--program-transform-name= --enable-network
-.if !defined(WITHOUT_X11)
-CONFIGURE_ARGS= --with-x --enable-ncurses --enable-vt100 \
- --enable-dynamic --enable-server \
- --enable-network --enable-spectrogram --enable-wrd \
- --program-transform-name=
+.if ${CONFIGURE_ARGS:M*ncurses*} != ""
+MANLANG= "" ja
+MAN1= timidity.1
+MAN5= timidity.cfg.5
.else
-CONFIGURE_ARGS= --enable-ncurses --enable-vt100 \
- --enable-network --disable-spectrogram --disable-wrd \
- --program-transform-name=
+RUN_DEPENDS+= ${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++
.endif
-MAN1= timidity.1
-MAN5= timidity.cfg.5
+PLIST_SUB= EUCJP_LOCALE=${EUCJP_LOCALE} TIMID_LIBDIR=${TIMID_LIBDIR} \
+ ELISPDIR=share/emacs/site-lisp
-MANLANG= "" ja
-DOCFILES= README.dl README.sf
-DOCLANG= C ja_JP.ujis
+DOCFILES?= README.alsaseq README.dl README.m2m README.mts README.sf
+DOCLANG?= C ja_JP.eucJP
+
+TIMID_LIBDIR= lib/timidity
.include <bsd.port.pre.mk>
-.if ${OSVERSION} > 600006
-BROKEN= "Depends on libxpg4 which was removed from FreeBSD 6.0"
+.if defined(WITHOUT_X11)
+CONFIGURE_ARGS+=--without-x --disable-spectrogram --disable-wrd --disable-dynamic
+.else
+CONFIGURE_ARGS+=--with-x --enable-spectrogram --enable-wrd --enable-dynamic
+USE_XLIB= yes
+LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png
+.endif
+
+.if ${OSVERSION} >= 450002
+EUCJP_LOCALE= ja_JP.eucJP
+.else
+EUCJP_LOCALE= ja_JP.EUC
.endif
+#.if ${OSVERSION} > 600006
+#BROKEN= "Depends on libxpg4 which was removed from FreeBSD 6.0"
+#.endif
+
.if ${HAVE_GNOME:Mesound}!=""
USE_GNOME= esound
-CONFIGURE_ARGS+=--enable-audio=oss,esd
-PKGNAMESUFFIX= -esound
+CONFIGURE_ARGS+=--enable-audio=oss,esd,vorbis
+PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-esound
.else
-CONFIGURE_ARGS+=--enable-audio=oss
+CONFIGURE_ARGS+=--enable-audio=oss,vorbis
.endif
.if ${PORTOBJFORMAT} == "elf"
CONFIGURE_ENV= LDFLAGS=-export-dynamic
.endif
-post-install:
- ${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
+pre-install:
+.for dir in ${PREFIX}/share/timidity ${PREFIX}/${TIMID_LIBDIR}
+ @[ -d ${dir} ] || ${MKDIR} ${dir}
+.endfor
+
+.if ${CONFIGURE_ARGS:M*ncurses*} != ""
+post-install::
+ ${INSTALL_MAN} ${WRKSRC}/doc/ja_JP.eucJP/timidity.1 \
+ ${PREFIX}/man/ja/man1
+ ${INSTALL_MAN} ${WRKSRC}/doc/ja_JP.eucJP/timidity.cfg.5 \
+ ${PREFIX}/man/ja/man5
+.else
+do-build:
+ @cd ${WRKSRC}/interface; ${MAKE} ${ALL_TARGET}
+
+do-install:
+ @cd ${WRKSRC}/interface; ${MAKE} ${INSTALL_TARGET}
+.endif
+
.if !defined(NOPORTDOCS)
+post-install::
.for lang in ${DOCLANG}
- @${MKDIR} \
- ${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/`echo ${lang} | ${SED} -e 's/^C$$//' -e 's/_JP.ujis$$//'`/timidity++; \
- done;
+ ${MKDIR} ${DOCSDIR}/`echo ${lang} | ${SED} -e 's/^C$$//' -e 's/_JP.eucJP$$//'`
+.for file in ${DOCFILES}
+ ${INSTALL_DATA} ${WRKSRC}/doc/${lang}/${file} ${DOCSDIR}/`echo ${lang} | ${SED} -e 's/^C$$//' -e 's/_JP.eucJP$$//'`
+.endfor
.endfor
.endif
- ${SETENV} PKG_PREFIX=${PREFIX} \
- ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
+.if defined(LINK)
+post-install::
+ ${LN} -sf ${PREFIX}/bin/timidity ${PREFIX}/bin/${LINK}
+.endif
+
+.if exists(${PKGMESSAGE})
+post-install::
@${CAT} ${PKGMESSAGE}
+.endif
.include <bsd.port.post.mk>
diff --git a/audio/timidity++/distinfo b/audio/timidity++/distinfo
index f2058d2d4339..b24e96e6cbed 100644
--- a/audio/timidity++/distinfo
+++ b/audio/timidity++/distinfo
@@ -1,2 +1,2 @@
-MD5 (timidity/TiMidity++-2.11.3.tar.bz2) = 72f6624d467b61c69b8ec9ce002c21a8
-SIZE (timidity/TiMidity++-2.11.3.tar.bz2) = 964222
+MD5 (TiMidity++-2.13.2.tar.bz2) = a82ceeb2245e22f4de2b41da21eaee32
+SIZE (TiMidity++-2.13.2.tar.bz2) = 1581230
diff --git a/audio/timidity++/files/patch-Makefile.in b/audio/timidity++/files/patch-Makefile.in
new file mode 100644
index 000000000000..cb0212519bdc
--- /dev/null
+++ b/audio/timidity++/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+--- timidity/Makefile.in.orig Mon Mar 29 04:04:22 2004
++++ timidity/Makefile.in Tue May 18 23:38:06 2004
+@@ -576,9 +576,8 @@
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+ ; then \
+- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
+- echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+- $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
++ echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$p"; \
++ $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$p || exit 1; \
+ else :; fi; \
+ done
+
diff --git a/audio/timidity++/files/patch-ab b/audio/timidity++/files/patch-ab
deleted file mode 100644
index 0b99e678fc03..000000000000
--- a/audio/timidity++/files/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
---- timidity/timidity.c.orig Tue Jul 4 02:53:35 2000
-+++ timidity/timidity.c Fri Jul 21 19:57:23 2000
-@@ -43,7 +43,7 @@
- #endif /* BORLANDC_EXCEPTION */
- #include <signal.h>
-
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) && !defined(__alpha__)
- #include <floatingpoint.h> /* For FP exceptions */
- #endif
-
-@@ -2754,7 +2754,7 @@
- int i;
- static int drums[] = DEFAULT_DRUMCHANNELS;
- static int is_first = 1;
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) && !defined(__alpha__)
- fp_except_t fpexp;
-
- fpexp = fpgetmask();
diff --git a/audio/timidity++/files/patch-ac b/audio/timidity++/files/patch-ac
deleted file mode 100644
index fc20afd309d4..000000000000
--- a/audio/timidity++/files/patch-ac
+++ /dev/null
@@ -1,46 +0,0 @@
---- timidity/timidity.h.orig Fri Jan 11 23:36:13 2002
-+++ timidity/timidity.h Fri Apr 5 15:37:51 2002
-@@ -450,8 +450,19 @@
- #define LE_SHORT(x) (x)
- #define LE_LONG(x) (x)
- #ifdef __FreeBSD__
--#define BE_SHORT(x) __byte_swap_word(x)
--#define BE_LONG(x) __byte_swap_long(x)
-+# include <osreldate.h>
-+# if __FreeBSD_version <= 500000
-+# define BE_SHORT(x) __byte_swap_word(x)
-+# define BE_LONG(x) __byte_swap_long(x)
-+# else
-+# if __FreeBSD_version <= 500028
-+# define BE_SHORT(x) __uint8_swap_uint16(x)
-+# define BE_LONG(x) __uint8_swap_uint32(x)
-+# else
-+# define BE_SHORT(x) __bswap16(x)
-+# define BE_LONG(x) __bswap32(x)
-+# endif
-+# endif
- #else
- #define BE_SHORT(x) XCHG_SHORT(x)
- #define BE_LONG(x) XCHG_LONG(x)
-@@ -460,8 +471,19 @@
- #define BE_SHORT(x) (x)
- #define BE_LONG(x) (x)
- #ifdef __FreeBSD__
--#define LE_SHORT(x) __byte_swap_word(x)
--#define LE_LONG(x) __byte_swap_long(x)
-+# include <osreldate.h>
-+# if __FreeBSD_version <= 500000
-+# define LE_SHORT(x) __byte_swap_word(x)
-+# define LE_LONG(x) __byte_swap_long(x)
-+# else
-+# if __FreeBSD_version <= 500028
-+# define LE_SHORT(x) __uint8_swap_uint16(x)
-+# define LE_LONG(x) __uint8_swap_uint32(x)
-+# else
-+# define LE_SHORT(x) __bswap16(x)
-+# define LE_LONG(x) __bswap32(x)
-+# endif
-+# endif
- #else
- #define LE_SHORT(x) XCHG_SHORT(x)
- #define LE_LONG(x) XCHG_LONG(x)
diff --git a/audio/timidity++/files/patch-ad b/audio/timidity++/files/patch-ad
deleted file mode 100644
index 589abcc7c3af..000000000000
--- a/audio/timidity++/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/'`
-
- install.tk: $(ALLTCLF) install.bitmaps
- test -d $(DESTDIR)$(TCL_DIR) || mkdir -p $(DESTDIR)$(TCL_DIR)
diff --git a/audio/timidity++/files/patch-ae b/audio/timidity++/files/patch-ae
deleted file mode 100644
index b755f69a8819..000000000000
--- a/audio/timidity++/files/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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-descr b/audio/timidity++/pkg-descr
index d4a7770dc37c..e1b22815fd15 100644
--- a/audio/timidity++/pkg-descr
+++ b/audio/timidity++/pkg-descr
@@ -8,6 +8,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++".
-WWW: http://www.goice.co.jp/member/mo/timidity/
+WWW: http://timidity.sourceforge.net/
+WWW: http://www.linet.gr.jp/~tamuki/
Yoichi Asai <yatt@msc.biglobe.ne.jp>
diff --git a/audio/timidity++/pkg-message b/audio/timidity++/pkg-message
index 1daa07f2fecc..503aa8682662 100644
--- a/audio/timidity++/pkg-message
+++ b/audio/timidity++/pkg-message
@@ -1,6 +1,4 @@
-
========================================================================
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 a3922979fbd6..5be749b4c6d7 100644
--- a/audio/timidity++/pkg-plist
+++ b/audio/timidity++/pkg-plist
@@ -1,8 +1,17 @@
bin/timidity
+%%PORTDOCS%%%%DOCSDIR%%/README.alsaseq
%%PORTDOCS%%%%DOCSDIR%%/README.dl
+%%PORTDOCS%%%%DOCSDIR%%/README.m2m
+%%PORTDOCS%%%%DOCSDIR%%/README.mts
%%PORTDOCS%%%%DOCSDIR%%/README.sf
-%%PORTDOCS%%share/doc/ja/timidity++/README.dl
-%%PORTDOCS%%share/doc/ja/timidity++/README.sf
-@dirrm lib/timidity
-%%PORTDOCS%%@dirrm share/doc/ja/timidity++
+%%PORTDOCS%%%%DOCSDIR%%/ja/README.alsaseq
+%%PORTDOCS%%%%DOCSDIR%%/ja/README.dl
+%%PORTDOCS%%%%DOCSDIR%%/ja/README.m2m
+%%PORTDOCS%%%%DOCSDIR%%/ja/README.mts
+%%PORTDOCS%%%%DOCSDIR%%/ja/README.sf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ja
%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@exec mkdir -p %D/%%TIMID_LIBDIR%%
+@exec mkdir -p %D/share/timidity
+@unexec rmdir %D/%%TIMID_LIBDIR%% 2>/dev/null || true
+@unexec rmdir %D/share/timidity 2>/dev/null || true
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 10:13:55 +0000