graphics/lilypond: Updated for version 2.18.2.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

3 files changed, 28 insertions, 17 deletions

diff --git a/graphics/lilypond/README b/graphics/lilypond/README
index 9462224d1a..033b3da404 100644
--- a/graphics/lilypond/README
+++ b/graphics/lilypond/README
@@ -1,2 +1,10 @@
 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.
diff --git a/graphics/lilypond/lilypond.SlackBuild b/graphics/lilypond/lilypond.SlackBuild
index 428f16b0c4..027ae1fe62 100644
--- a/graphics/lilypond/lilypond.SlackBuild
+++ b/graphics/lilypond/lilypond.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for lilypond
 
-# Copyright 2012-2013 Kyle Guinn <elyk03@gmail.com>, USA
+# Copyright 2012-2014 Kyle Guinn <elyk03@gmail.com>, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=lilypond
-VERSION=${VERSION:-2.16.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.18.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -40,7 +40,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCS="AUTHORS* COPYING* DEDICATION HACKING INSTALL* LICENSE* NEWS* README* ROADMAP THANKS"
+DOCS="AUTHORS* COPYING* DEDICATION HACKING INSTALL* LICENSE* NEWS* README* ROADMAP"
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -65,11 +65,7 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+chmod -R u+w,go-w,a+rX-st .
 
 sed -i 's|GUILE_CFLAGS=.*|GUILE_CFLAGS="`pkg-config --cflags guile-1.8`"|' configure
 sed -i 's|GUILE_LDFLAGS=.*|GUILE_LDFLAGS="`pkg-config --libs guile-1.8`"|' configure
@@ -88,7 +84,8 @@ LDFLAGS="-lX11 -lpthread" \
   --infodir=/usr/info \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
-  --disable-debugging
+  --disable-debugging \
+  --enable-documentation=${ENABLE_DOCS:-no}
 
 make
 make install DESTDIR=$PKG
@@ -96,10 +93,16 @@ make install DESTDIR=$PKG
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+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 {} +
 
-rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*.info*
+  rm -f $PKG/usr/info/dir
+  find $PKG/usr/info -name '*.info*' -type f -execdir gzip -9 {} +
+fi
 
 # Move the vim syntax highlighting files to where vim can find them.
 mkdir -p $PKG/usr/share/vim
diff --git a/graphics/lilypond/lilypond.info b/graphics/lilypond/lilypond.info
index 9aaaf0ccbd..902bcd5c1f 100644
--- a/graphics/lilypond/lilypond.info
+++ b/graphics/lilypond/lilypond.info
@@ -1,10 +1,10 @@
 PRGNAM="lilypond"
-VERSION="2.16.2"
+VERSION="2.18.2"
 HOMEPAGE="http://www.lilypond.org/"
-DOWNLOAD="http://download.linuxaudio.org/lilypond/sources/v2.16/lilypond-2.16.2.tar.gz"
-MD5SUM="6db27f17d47e4f66a3b0716c65db3041"
+DOWNLOAD="http://download.linuxaudio.org/lilypond/sources/v2.18/lilypond-2.18.2.tar.gz"
+MD5SUM="3c4bcbb708d12644668b32bfe82ebf25"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="fontforge mftrace guile1.8"
+REQUIRES="%README% fontforge mftrace guile1.8"
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"