summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/eawpats/Makefile5
-rw-r--r--audio/timidity++/Makefile29
-rw-r--r--audio/timidity++/files/patch-configure9
-rw-r--r--audio/timidity++/files/patch-playmidi9
-rw-r--r--audio/timidity++/pkg-message4
-rw-r--r--audio/timidity++/pkg-plist12
6 files changed, 39 insertions, 29 deletions
diff --git a/audio/eawpats/Makefile b/audio/eawpats/Makefile
index 711ede77d21a..38cdd14ba2f4 100644
--- a/audio/eawpats/Makefile
+++ b/audio/eawpats/Makefile
@@ -7,7 +7,7 @@
PORTNAME= eawpats
PORTVERSION= 12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GENTOO}
MASTER_SITE_SUBDIR= distfiles
@@ -16,9 +16,6 @@ DISTNAME= eawpats12_full
MAINTAINER= lennox@cs.columbia.edu
COMMENT= Eric A. Welsh's collection of Gravis Ultrasound MIDI patches
-# Not useful without timidity.
-RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity++
-
RESTRICTED= Some of the patches are marked no-commercial-use
NO_BUILD= yes
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index 9a62bbfa7c94..4c9af985fd18 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -7,15 +7,17 @@
PORTNAME= timidity++
PORTVERSION= 2.13.2
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= timidity
+MASTER_SITE_SUBDIR=timidity
DISTNAME= TiMidity++-${PORTVERSION}
MAINTAINER= nork@FreeBSD.org
COMMENT= Software MIDI player
-LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis
+RUN_DEPENDS= ${LOCALBASE}/share/timidity/timidity.cfg:${PORTSDIR}/audio/eawpats
CONFLICTS= timidity-0.*
@@ -29,7 +31,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS?=--enable-interface=ncurses,vt100,server
CONFIGURE_ARGS+=--program-transform-name= --enable-network
-.if ${CONFIGURE_ARGS:M*ncurses*} != ""
+.if ${.CURDIR} == ${MASTERDIR}
MANLANG= "" ja
MAN1= timidity.1
MAN5= timidity.cfg.5
@@ -52,7 +54,7 @@ CONFIGURE_ARGS+=--without-x --disable-spectrogram --disable-wrd --disable-dynami
.else
CONFIGURE_ARGS+=--with-x --enable-spectrogram --enable-wrd --enable-dynamic
USE_XLIB= yes
-LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png:${PORTSDIR}/graphics/png
.endif
.if ${OSVERSION} >= 450002
@@ -79,11 +81,9 @@ CONFIGURE_ENV= LDFLAGS=-export-dynamic
.endif
pre-install:
-.for dir in ${PREFIX}/share/timidity ${PREFIX}/${TIMID_LIBDIR}
- @[ -d ${dir} ] || ${MKDIR} ${dir}
-.endfor
+ @${MKDIR} ${PREFIX}/share/timidity ${PREFIX}/${TIMID_LIBDIR}
-.if ${CONFIGURE_ARGS:M*ncurses*} != ""
+.if ${.CURDIR} == ${MASTERDIR}
post-install::
${INSTALL_MAN} ${WRKSRC}/doc/ja_JP.eucJP/timidity.1 \
${PREFIX}/man/ja/man1
@@ -99,12 +99,11 @@ do-install:
.if !defined(NOPORTDOCS)
post-install::
-.for lang in ${DOCLANG}
- ${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
+. for lang in ${DOCLANG}
+ ${MKDIR} ${PREFIX}/share/doc/${lang:C,^C$,,:C,ja_.*,ja/,}timidity++
+ cd ${WRKSRC}/doc/${lang} && ${INSTALL_DATA} ${DOCFILES} \
+ ${PREFIX}/share/doc/${lang:C,^C$,,:C,ja_.*,ja/,}timidity++/
+. endfor
.endif
.if defined(LINK)
@@ -114,7 +113,7 @@ post-install::
.if exists(${PKGMESSAGE})
post-install::
- @${CAT} ${PKGMESSAGE}
+ @${SED} -e 's,/usr/local,${PREFIX},g' ${PKGMESSAGE}
.endif
.include <bsd.port.post.mk>
diff --git a/audio/timidity++/files/patch-configure b/audio/timidity++/files/patch-configure
new file mode 100644
index 000000000000..56fa5f6d0229
--- /dev/null
+++ b/audio/timidity++/files/patch-configure
@@ -0,0 +1,9 @@
+--- configure Sun Oct 3 08:39:51 2004
++++ configure Sat Sep 10 14:30:53 2005
+@@ -16677,5 +16677,5 @@
+ done
+ LIBS="$LIBS $tcl_lib"
+- for l in tk tk8.4 tk8.3 tk8.0jp tk4.2jp tk80jp tk42jp tk8.0 tk4.2 tk80 tk42; do
++ for l in tk tk84 tk83 tk8.0jp tk4.2jp tk80jp tk42jp tk8.0 tk4.2 tk80 tk42; do
+ case "x$tk_lib" in x) as_ac_Lib=`echo "ac_cv_lib_$l''_Tk_Init" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for Tk_Init in -l$l" >&5
diff --git a/audio/timidity++/files/patch-playmidi b/audio/timidity++/files/patch-playmidi
new file mode 100644
index 000000000000..53b52405a316
--- /dev/null
+++ b/audio/timidity++/files/patch-playmidi
@@ -0,0 +1,9 @@
+--- timidity/playmidi.c Sat Aug 28 01:38:18 2004
++++ timidity/playmidi.c Sat Sep 10 17:07:45 2005
+@@ -4160,5 +4162,5 @@
+ case 0x20: /* Delay Send Level to Reverb */
+ ctl->cmsg(CMSG_INFO,VERB_NOISY,"Delay Send Level to Reverb (%d)",val);
+- if (delay_status_gs.send_reverb = val) {
++ if (delay_status_gs.send_reverb != val) {
+ delay_status_gs.send_reverb = val;
+ recompute_delay_status_gs();
diff --git a/audio/timidity++/pkg-message b/audio/timidity++/pkg-message
deleted file mode 100644
index 503aa8682662..000000000000
--- a/audio/timidity++/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-========================================================================
-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 5be749b4c6d7..dfafbc80c6ca 100644
--- a/audio/timidity++/pkg-plist
+++ b/audio/timidity++/pkg-plist
@@ -4,12 +4,12 @@ bin/timidity
%%PORTDOCS%%%%DOCSDIR%%/README.m2m
%%PORTDOCS%%%%DOCSDIR%%/README.mts
%%PORTDOCS%%%%DOCSDIR%%/README.sf
-%%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%%share/doc/ja/timidity++/README.alsaseq
+%%PORTDOCS%%share/doc/ja/timidity++/README.dl
+%%PORTDOCS%%share/doc/ja/timidity++/README.m2m
+%%PORTDOCS%%share/doc/ja/timidity++/README.mts
+%%PORTDOCS%%share/doc/ja/timidity++/README.sf
+%%PORTDOCS%%@dirrm share/doc/ja/timidity++/
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@exec mkdir -p %D/%%TIMID_LIBDIR%%
@exec mkdir -p %D/share/timidity
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-29 16:56:36 +0000