CVS commit: pkgsrc/audio/solfege

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Mar 22 09:37:10 UTC 2025

Modified Files:
        pkgsrc/audio/solfege: Makefile PLIST

Log Message:
solfege: disable lilypond use

lilypond dumps core and causes processes that use 100% CPU when building
this.

Enable for bulk builds again.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/audio/solfege/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/audio/solfege/PLIST

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.101 pkgsrc/audio/solfege/Makefile:1.102
--- pkgsrc/audio/solfege/Makefile:1.101 Fri Dec 27 08:19:23 2024
+++ pkgsrc/audio/solfege/Makefile       Sat Mar 22 09:37:10 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.101 2024/12/27 08:19:23 wiz Exp $
+# $NetBSD: Makefile,v 1.102 2025/03/22 09:37:10 wiz Exp $
 
 DISTNAME=              solfege-3.23.4
-PKGREVISION=           11
+PKGREVISION=           12
 CATEGORIES=            audio
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=solfege/}
 
@@ -10,11 +10,10 @@ HOMEPAGE=           https://www.gnu.org/software/
 COMMENT=               Practice several musical ear training exercises
 LICENSE=               gnu-gpl-v3
 
-DEPENDS+=              ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
-
 TOOL_DEPENDS+=         docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-TOOL_DEPENDS+=         lilypond-[0-9]*:../../print/lilypond
+#TOOL_DEPENDS+=                lilypond-[0-9]*:../../print/lilypond
 TOOL_DEPENDS+=         txt2man-[0-9]*:../../converters/txt2man
+DEPENDS+=              ${PYPKGPREFIX}-gobject3-[0-9]*:../../devel/py-gobject3
 
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
@@ -23,13 +22,14 @@ CONFIGURE_ARGS+=    --sysconfdir=${PKG_SYSC
 CONFIGURE_ARGS+=       --disable-oss-sound
 CONFIGURE_ARGS+=       --enable-docbook-stylesheet=${PREFIX}/share/xsl/docbook/html/chunk.xsl
 CONFIGURE_ARGS+=       --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
+# lilypond dumps core and causes 100%-CPU-using-processes
+CONFIGURE_ARGS+=       ac_cv_path_LILYPOND=""
 
 USE_TOOLS+=            gmake gm4 makeinfo pkg-config msgfmt bash:run
 
 REPLACE_BASH=          exercises/standard/lesson-files/bin/csound-play-harmonic-interval.sh
 
 REPLACE_PYTHON=        *.py */*.py */*/*.py *.py.in */*.py.in */*/*.py.in
-PYTHON_VERSIONS_INCOMPATIBLE= 27
 
 SUBST_CLASSES+=                sound
 SUBST_STAGE.sound=     do-configure
@@ -70,9 +70,6 @@ MP3PLAYER=    /usr/bin/afplay
 OGGPLAYER=     ${PREFIX}/bin/ogg123
 .endif
 
-# hanging lilypond
-NOT_FOR_BULK_PLATFORM  += NetBSD-10.0-*
-
 post-install:
        find ${DESTDIR}${PREFIX} -type d -name __pycache__ | xargs rm -rf
 

Index: pkgsrc/audio/solfege/PLIST
diff -u pkgsrc/audio/solfege/PLIST:1.13 pkgsrc/audio/solfege/PLIST:1.14
--- pkgsrc/audio/solfege/PLIST:1.13     Mon Jan 16 19:45:27 2023
+++ pkgsrc/audio/solfege/PLIST  Sat Mar 22 09:37:10 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2023/01/16 19:45:27 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.14 2025/03/22 09:37:10 wiz Exp $
 bin/solfege
 man/man1/solfege.1
 share/applications/solfege.desktop
@@ -849,19 +849,6 @@ share/solfege/help/C/figures/statistics.
 share/solfege/help/C/figures/toneinkey.png
 share/solfege/help/C/figures/trainingset-editor.png
 share/solfege/help/C/figures/twelvetone.png
-share/solfege/help/C/ly/inverting-intervals.png
-share/solfege/help/C/ly/theory-intervals-1.png
-share/solfege/help/C/ly/theory-intervals-fifths-1.png
-share/solfege/help/C/ly/theory-intervals-fifths-2.png
-share/solfege/help/C/ly/theory-intervals-fifths.png
-share/solfege/help/C/ly/theory-intervals-fourths.png
-share/solfege/help/C/ly/theory-intervals-seconds-1.png
-share/solfege/help/C/ly/theory-intervals-seconds-2.png
-share/solfege/help/C/ly/theory-intervals-seconds-3.png
-share/solfege/help/C/ly/theory-intervals-seconds.png
-share/solfege/help/C/ly/theory-intervals-sevenths.png
-share/solfege/help/C/ly/theory-intervals-sixths.png
-share/solfege/help/C/ly/theory-intervals-thirds.png
 share/solfege/help/C/scales/aug.html
 share/solfege/help/C/scales/beb.html
 share/solfege/help/C/scales/blu.html
@@ -1121,14 +1108,6 @@ share/solfege/help/C/scales/nem.html
 share/solfege/help/C/scales/pen.html
 share/solfege/help/C/scales/sim.html
 share/solfege/help/C/scales/who.html
-share/solfege/help/de/ly/inverting-intervals.png
-share/solfege/help/de/ly/theory-intervals-1.png
-share/solfege/help/de/ly/theory-intervals-fifths.png
-share/solfege/help/de/ly/theory-intervals-fourths.png
-share/solfege/help/de/ly/theory-intervals-seconds.png
-share/solfege/help/de/ly/theory-intervals-sevenths.png
-share/solfege/help/de/ly/theory-intervals-sixths.png
-share/solfege/help/de/ly/theory-intervals-thirds.png
 share/solfege/help/eo/figures/chord.png
 share/solfege/help/eo/figures/dictation.png
 share/solfege/help/eo/figures/ear-training-test-printout-editor.png
@@ -1158,22 +1137,6 @@ share/solfege/help/eo/figures/singinterv
 share/solfege/help/eo/figures/statistics.png
 share/solfege/help/eo/figures/trainingset-editor.png
 share/solfege/help/eo/figures/twelvetone.png
-share/solfege/help/eo/ly/inverting-intervals.png
-share/solfege/help/eo/ly/theory-intervals-1.png
-share/solfege/help/eo/ly/theory-intervals-fifths.png
-share/solfege/help/eo/ly/theory-intervals-fourths.png
-share/solfege/help/eo/ly/theory-intervals-seconds.png
-share/solfege/help/eo/ly/theory-intervals-sevenths.png
-share/solfege/help/eo/ly/theory-intervals-sixths.png
-share/solfege/help/eo/ly/theory-intervals-thirds.png
-share/solfege/help/es/ly/inverting-intervals.png
-share/solfege/help/es/ly/theory-intervals-1.png
-share/solfege/help/es/ly/theory-intervals-fifths.png
-share/solfege/help/es/ly/theory-intervals-fourths.png
-share/solfege/help/es/ly/theory-intervals-seconds.png
-share/solfege/help/es/ly/theory-intervals-sevenths.png
-share/solfege/help/es/ly/theory-intervals-sixths.png
-share/solfege/help/es/ly/theory-intervals-thirds.png
 share/solfege/help/et/figures/chord.png
 share/solfege/help/et/figures/dictation.png
 share/solfege/help/et/figures/ear-training-test-printout-editor.png
@@ -1203,14 +1166,6 @@ share/solfege/help/et/figures/singinterv
 share/solfege/help/et/figures/statistics.png
 share/solfege/help/et/figures/trainingset-editor.png
 share/solfege/help/et/figures/twelvetone.png
-share/solfege/help/et/ly/inverting-intervals.png
-share/solfege/help/et/ly/theory-intervals-1.png
-share/solfege/help/et/ly/theory-intervals-fifths.png
-share/solfege/help/et/ly/theory-intervals-fourths.png
-share/solfege/help/et/ly/theory-intervals-seconds.png
-share/solfege/help/et/ly/theory-intervals-sevenths.png
-share/solfege/help/et/ly/theory-intervals-sixths.png
-share/solfege/help/et/ly/theory-intervals-thirds.png
 share/solfege/help/fr/figures/chord.png
 share/solfege/help/fr/figures/dictation.png
 share/solfege/help/fr/figures/ear-training-test-printout-editor.png
@@ -1240,22 +1195,6 @@ share/solfege/help/fr/figures/singinterv
 share/solfege/help/fr/figures/statistics.png
 share/solfege/help/fr/figures/trainingset-editor.png
 share/solfege/help/fr/figures/twelvetone.png
-share/solfege/help/fr/ly/inverting-intervals.png
-share/solfege/help/fr/ly/theory-intervals-1.png
-share/solfege/help/fr/ly/theory-intervals-fifths.png
-share/solfege/help/fr/ly/theory-intervals-fourths.png
-share/solfege/help/fr/ly/theory-intervals-seconds.png
-share/solfege/help/fr/ly/theory-intervals-sevenths.png
-share/solfege/help/fr/ly/theory-intervals-sixths.png
-share/solfege/help/fr/ly/theory-intervals-thirds.png
-share/solfege/help/gl/ly/inverting-intervals.png
-share/solfege/help/gl/ly/theory-intervals-1.png
-share/solfege/help/gl/ly/theory-intervals-fifths.png
-share/solfege/help/gl/ly/theory-intervals-fourths.png
-share/solfege/help/gl/ly/theory-intervals-seconds.png
-share/solfege/help/gl/ly/theory-intervals-sevenths.png
-share/solfege/help/gl/ly/theory-intervals-sixths.png
-share/solfege/help/gl/ly/theory-intervals-thirds.png
 share/solfege/help/nb/figures/chord.png
 share/solfege/help/nb/figures/dictation.png
 share/solfege/help/nb/figures/ear-training-test-printout-editor.png
@@ -1286,14 +1225,6 @@ share/solfege/help/nb/figures/singinterv
 share/solfege/help/nb/figures/statistics.png
 share/solfege/help/nb/figures/trainingset-editor.png
 share/solfege/help/nb/figures/twelvetone.png
-share/solfege/help/nb/ly/inverting-intervals.png
-share/solfege/help/nb/ly/theory-intervals-1.png
-share/solfege/help/nb/ly/theory-intervals-fifths.png
-share/solfege/help/nb/ly/theory-intervals-fourths.png
-share/solfege/help/nb/ly/theory-intervals-seconds.png
-share/solfege/help/nb/ly/theory-intervals-sevenths.png
-share/solfege/help/nb/ly/theory-intervals-sixths.png
-share/solfege/help/nb/ly/theory-intervals-thirds.png
 share/solfege/help/nl/figures/chord.png
 share/solfege/help/nl/figures/dictation.png
 share/solfege/help/nl/figures/ear-training-test-printout-editor.png
@@ -1323,14 +1254,6 @@ share/solfege/help/nl/figures/singinterv
 share/solfege/help/nl/figures/statistics.png
 share/solfege/help/nl/figures/trainingset-editor.png
 share/solfege/help/nl/figures/twelvetone.png
-share/solfege/help/nl/ly/inverting-intervals.png
-share/solfege/help/nl/ly/theory-intervals-1.png
-share/solfege/help/nl/ly/theory-intervals-fifths.png
-share/solfege/help/nl/ly/theory-intervals-fourths.png
-share/solfege/help/nl/ly/theory-intervals-seconds.png
-share/solfege/help/nl/ly/theory-intervals-sevenths.png
-share/solfege/help/nl/ly/theory-intervals-sixths.png
-share/solfege/help/nl/ly/theory-intervals-thirds.png
 share/solfege/help/pl/figures/chord.png
 share/solfege/help/pl/figures/dictation.png
 share/solfege/help/pl/figures/ear-training-test-printout-editor.png
@@ -1360,14 +1283,6 @@ share/solfege/help/pl/figures/singinterv
 share/solfege/help/pl/figures/statistics.png
 share/solfege/help/pl/figures/trainingset-editor.png
 share/solfege/help/pl/figures/twelvetone.png
-share/solfege/help/pl/ly/inverting-intervals.png
-share/solfege/help/pl/ly/theory-intervals-1.png
-share/solfege/help/pl/ly/theory-intervals-fifths.png
-share/solfege/help/pl/ly/theory-intervals-fourths.png
-share/solfege/help/pl/ly/theory-intervals-seconds.png
-share/solfege/help/pl/ly/theory-intervals-sevenths.png
-share/solfege/help/pl/ly/theory-intervals-sixths.png
-share/solfege/help/pl/ly/theory-intervals-thirds.png
 share/solfege/help/pt_BR/figures/chord.png
 share/solfege/help/pt_BR/figures/dictation.png
 share/solfege/help/pt_BR/figures/ear-training-test-printout-editor.png
@@ -1397,22 +1312,6 @@ share/solfege/help/pt_BR/figures/singint
 share/solfege/help/pt_BR/figures/statistics.png
 share/solfege/help/pt_BR/figures/trainingset-editor.png
 share/solfege/help/pt_BR/figures/twelvetone.png
-share/solfege/help/pt_BR/ly/inverting-intervals.png
-share/solfege/help/pt_BR/ly/theory-intervals-1.png
-share/solfege/help/pt_BR/ly/theory-intervals-fifths.png
-share/solfege/help/pt_BR/ly/theory-intervals-fourths.png
-share/solfege/help/pt_BR/ly/theory-intervals-seconds.png
-share/solfege/help/pt_BR/ly/theory-intervals-sevenths.png
-share/solfege/help/pt_BR/ly/theory-intervals-sixths.png
-share/solfege/help/pt_BR/ly/theory-intervals-thirds.png
-share/solfege/help/ru/ly/inverting-intervals.png
-share/solfege/help/ru/ly/theory-intervals-1.png
-share/solfege/help/ru/ly/theory-intervals-fifths.png
-share/solfege/help/ru/ly/theory-intervals-fourths.png
-share/solfege/help/ru/ly/theory-intervals-seconds.png
-share/solfege/help/ru/ly/theory-intervals-sevenths.png
-share/solfege/help/ru/ly/theory-intervals-sixths.png
-share/solfege/help/ru/ly/theory-intervals-thirds.png
 share/solfege/help/style.css
 share/solfege/help/tr/figures/chord.png
 share/solfege/help/tr/figures/dictation.png
@@ -1443,14 +1342,6 @@ share/solfege/help/tr/figures/singinterv
 share/solfege/help/tr/figures/statistics.png
 share/solfege/help/tr/figures/trainingset-editor.png
 share/solfege/help/tr/figures/twelvetone.png
-share/solfege/help/tr/ly/inverting-intervals.png
-share/solfege/help/tr/ly/theory-intervals-1.png
-share/solfege/help/tr/ly/theory-intervals-fifths.png
-share/solfege/help/tr/ly/theory-intervals-fourths.png
-share/solfege/help/tr/ly/theory-intervals-seconds.png
-share/solfege/help/tr/ly/theory-intervals-sevenths.png
-share/solfege/help/tr/ly/theory-intervals-sixths.png
-share/solfege/help/tr/ly/theory-intervals-thirds.png
 share/solfege/solfege.css
 share/solfege/solfege/__init__.py
 share/solfege/solfege/_version.py