summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
Diffstat (limited to 'graphics')
-rw-r--r--graphics/lilypond/README7
-rw-r--r--graphics/lilypond/lilypond.SlackBuild25
-rw-r--r--graphics/lilypond/lilypond.info8
-rw-r--r--graphics/lilypond/slack-desc4
4 files changed, 26 insertions, 18 deletions
diff --git a/graphics/lilypond/README b/graphics/lilypond/README
index a613fa9c2a..fbec96f207 100644
--- a/graphics/lilypond/README
+++ b/graphics/lilypond/README
@@ -1,5 +1,4 @@
-LilyPond is a music typesetter. It produces beautiful sheet music using a
-description file as input.
+LilyPond is a music typesetter. It produces beautiful
+sheet music using a description file as input.
-You will need to have FontForge and mftrace installed in order to build
-LilyPond, both of which are available at slackbuilds.org.
+This requires fontforge and mftrace.
diff --git a/graphics/lilypond/lilypond.SlackBuild b/graphics/lilypond/lilypond.SlackBuild
index 6f02ce859c..6335dd635f 100644
--- a/graphics/lilypond/lilypond.SlackBuild
+++ b/graphics/lilypond/lilypond.SlackBuild
@@ -3,14 +3,21 @@
# Slackware build script for lilypond
# Written by Kyle Guinn <elyk03@gmail.com>
-set -e
-
PRGNAM=lilypond
-VERSION=2.12.2
-ARCH=${ARCH:-i486}
+VERSION=2.12.3
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -25,8 +32,13 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
+set -e
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
@@ -54,10 +66,7 @@ make install DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-( cd $PKG/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
rm -f $PKG/usr/info/dir
gzip -9 $PKG/usr/info/*.info*
diff --git a/graphics/lilypond/lilypond.info b/graphics/lilypond/lilypond.info
index 4987e77a9e..5b238baaa5 100644
--- a/graphics/lilypond/lilypond.info
+++ b/graphics/lilypond/lilypond.info
@@ -1,10 +1,10 @@
PRGNAM="lilypond"
-VERSION="2.12.2"
+VERSION="2.12.3"
HOMEPAGE="http://lilypond.org/web/"
-DOWNLOAD="http://download.linuxaudio.org/lilypond/sources/v2.12/lilypond-2.12.2.tar.gz"
-MD5SUM="681dfbecf8a3710d1400cf9488be716b"
+DOWNLOAD="http://download.linuxaudio.org/lilypond/sources/v2.12/lilypond-2.12.3.tar.gz"
+MD5SUM="2303bf5f2ea8d4628f33a68f016f3866"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Kyle Guinn"
EMAIL="elyk03@gmail.com"
-APPROVED="rworkman,pprkut"
+APPROVED="rworkman"
diff --git a/graphics/lilypond/slack-desc b/graphics/lilypond/slack-desc
index fd9072a5e9..4365640a65 100644
--- a/graphics/lilypond/slack-desc
+++ b/graphics/lilypond/slack-desc
@@ -8,8 +8,8 @@
|-----handy-ruler------------------------------------------------------|
lilypond: LilyPond (music typesetter)
lilypond:
-lilypond: LilyPond is a music typesetter. It produces beautiful sheet music
-lilypond: using a description file as input.
+lilypond: LilyPond is a music typesetter. It produces beautiful
+lilypond: sheet music using a description file as input.
lilypond:
lilypond:
lilypond: