4 files changed, 42 insertions, 43 deletions
diff --git a/graphics/lilypond/README b/graphics/lilypond/README
index 033b3da404..84c8c4cd96 100644
--- a/graphics/lilypond/README
+++ b/graphics/lilypond/README
@@ -1,10 +1,4 @@
 LilyPond is a music typesetter.  It produces beautiful
 sheet music using a description file as input.
 
-To enable documentation (man and info pages), first install dblatex and a
-newer version of texi2html than shipped with Slackware, then run the script as
-
-  # ENABLE_DOCS=yes ./lilypond.SlackBuild
-
-The documentation is disabled by default since SBo's texi2html package
-conflicts with Slackware's tetex package.
+extractpdfmark is an optional dependency.
diff --git a/graphics/lilypond/doinst.sh b/graphics/lilypond/doinst.sh
new file mode 100644
index 0000000000..1bef502028
--- /dev/null
+++ b/graphics/lilypond/doinst.sh
@@ -0,0 +1,6 @@
+if [ -x /usr/bin/install-info -a -d usr/info ]; then
+  ( cd usr/info
+    rm -f dir
+    for i in *.info*; do /usr/bin/install-info $i dir 2>/dev/null; done
+  )
+fi
diff --git a/graphics/lilypond/lilypond.SlackBuild b/graphics/lilypond/lilypond.SlackBuild
index 70e31a9fb4..825747fadc 100644
--- a/graphics/lilypond/lilypond.SlackBuild
+++ b/graphics/lilypond/lilypond.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lilypond
 
-# Copyright 2012-2020 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2012-2024 Kyle Guinn <elyk03@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,28 +22,35 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lilypond
-VERSION=${VERSION:-2.18.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.24.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$(uname -m) ;;
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="AUTHORS* COPYING* DEDICATION HACKING INSTALL* LICENSE* NEWS* README* ROADMAP"
+DOCS="AUTHORS* COPYING* DEDICATION INSTALL* LICENSE* NEWS* README* ROADMAP"
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -70,38 +77,28 @@ chmod -R u+w,go-w,a+rX-st .
 # Move the vim syntax highlighting files to where vim can find them.
 sed -i '/^vimdir/s|=.*|= $(datadir)/vim/vimfiles|' config.make.in
 
-# configure searches for naming variants like guile1.8-config but not this:
-GUILE_CONFIG=guile-config1.8 \
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libdir=\${exec_prefix}/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --mandir=/usr/man \
-  --infodir=/usr/info \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --mandir=\${prefix}/man \
+  --infodir=\${prefix}/info \
+  --docdir=\${prefix}/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
-  --disable-debugging \
-  --enable-documentation=${ENABLE_DOCS:-no}
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
 
-make
-make install DESTDIR=$PKG
+make all bytecode
+make install install-bytecode DESTDIR=$PKG
 
 find $PKG -exec file {} + | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-if [ "x${ENABLE_DOCS:-no}" = "xno" ]; then
-  # These are (or should be) empty.
-  rmdir $PKG/usr/man/man1
-  rmdir $PKG/usr/man
-else
-  find $PKG/usr/man -type f -execdir gzip -9 {} +
+find $PKG/usr/man -type f -execdir gzip -9 {} +
 
-  rm -f $PKG/usr/info/dir
-  find $PKG/usr/info -name '*.info*' -type f -execdir gzip -9 {} +
-fi
+rm -f $PKG/usr/info/dir
+find $PKG/usr/info -name '*.info*' -type f -execdir gzip -9 {} +
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
@@ -109,6 +106,8 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/doinst.sh > $PKG/install/douninst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/graphics/lilypond/lilypond.info b/graphics/lilypond/lilypond.info
index b3864d97c9..b4df6b9b50 100644
--- a/graphics/lilypond/lilypond.info
+++ b/graphics/lilypond/lilypond.info
@@ -1,10 +1,10 @@
 PRGNAM="lilypond"
-VERSION="2.18.2"
-HOMEPAGE="http://www.lilypond.org/"
-DOWNLOAD="http://download.linuxaudio.org/lilypond/sources/v2.18/lilypond-2.18.2.tar.gz"
-MD5SUM="3c4bcbb708d12644668b32bfe82ebf25"
+VERSION="2.24.3"
+HOMEPAGE="https://lilypond.org/"
+DOWNLOAD="https://lilypond.org/download/sources/v2.24/lilypond-2.24.3.tar.gz"
+MD5SUM="4e968f826586b7a5ac24f54f6007166a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="fontforge t1utils guile1.8"
+REQUIRES="fontforge texi2html"
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"