CVS commit: pkgsrc/audio/solfege

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Aug  9 09:04:54 UTC 2020

Modified Files:
        pkgsrc/audio/solfege: Makefile

Log Message:
Add missing dependency on py-sqlite3. On macOS, add dependency on
timidity for MIDI, and remove the one on vorbis-tools (I've never needed
to try playing an .ogg in GNU Solfege). Basic functionality once again
works nearly by default on macOS, modulo needing to install patches for
timidity. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/audio/solfege/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/solfege/Makefile
diff -u pkgsrc/audio/solfege/Makefile:1.76 pkgsrc/audio/solfege/Makefile:1.77
--- pkgsrc/audio/solfege/Makefile:1.76  Wed Jul  8 13:57:42 2020
+++ pkgsrc/audio/solfege/Makefile       Sun Aug  9 09:04:54 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.76 2020/07/08 13:57:42 schmonz Exp $
+# $NetBSD: Makefile,v 1.77 2020/08/09 09:04:54 schmonz Exp $
 
 DISTNAME=              solfege-3.22.2
-PKGREVISION=           5
+PKGREVISION=           6
 CATEGORIES=            audio
 MASTER_SITES=          ${MASTER_SITE_GNU:=solfege/}
 EXTRACT_SUFX=          .tar.xz
@@ -11,6 +11,8 @@ HOMEPAGE=             https://www.gnu.org/software/
 COMMENT=               Practice several musical ear training exercises
 LICENSE=               gnu-gpl-v3
 
+DEPENDS+=              ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
+
 BUILD_DEPENDS+=                docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 BUILD_DEPENDS+=                txt2man-[0-9]*:../../converters/txt2man
 
@@ -37,7 +39,7 @@ SUBST_VARS.sound=     WAVPLAYER
 SUBST_VARS.sound+=     MIDIPLAYER
 SUBST_VARS.sound+=     MP3PLAYER
 SUBST_VARS.sound+=     OGGPLAYER
-SUBST_MESSAGE.sound=   Setting default audio player.
+SUBST_MESSAGE.sound=   Setting default audio players.
 
 EGDIR=                 ${PREFIX}/share/examples/solfege
 CONF_FILES+=           ${EGDIR}/solfege ${PKG_SYSCONFDIR}/solfege
@@ -54,10 +56,10 @@ MP3PLAYER=  ${PREFIX}/bin/mpg123
 OGGPLAYER=     ${PREFIX}/bin/ogg123
 .elif ${OPSYS} == "Darwin"
 WAVPLAYER=     /usr/bin/afplay
-MIDIPLAYER=    /usr/bin/afplay
+DEPENDS+=      timidity-[0-9]*:../../audio/timidity
+MIDIPLAYER=    ${PREFIX}/bin/timidity
 MP3PLAYER=     /usr/bin/afplay
 OGGPLAYER=     ${PREFIX}/bin/ogg123
-DEPENDS+=      vorbis-tools-[0-9]*:../../audio/vorbis-tools
 .endif
 
 post-install: