diff options
Diffstat (limited to 'graphics/lilypond')
| -rw-r--r-- | graphics/lilypond/lilypond.SlackBuild | 19 | ||||
| -rw-r--r-- | graphics/lilypond/lilypond.info | 2 |
2 files changed, 8 insertions, 13 deletions
diff --git a/graphics/lilypond/lilypond.SlackBuild b/graphics/lilypond/lilypond.SlackBuild index 267d53fb8792..3126e327436b 100644 --- a/graphics/lilypond/lilypond.SlackBuild +++ b/graphics/lilypond/lilypond.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for lilypond -# Copyright 2012-2014 Kyle Guinn <elyk03@gmail.com>, USA +# Copyright 2012-2016 Kyle Guinn <elyk03@gmail.com>, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=lilypond VERSION=${VERSION:-2.18.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -72,14 +72,13 @@ chmod -R u+w,go-w,a+rX-st . # This appears to detect the fontforge build date, which should be good enough. patch -p1 < $CWD/patches/detect-fontforge.diff -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 +# Move the vim syntax highlighting files to where vim can find them. +sed -i '/^vimdir/s|=.*|= $(datadir)/vim/vimfiles|' config.make.in -export GUILE=/usr/bin/guile1.8 -export GUILE_CONFIG=/usr/bin/guile-config1.8 +# configure searches for naming variants like guile1.8-config but not this: +GUILE_CONFIG=guile-config1.8 \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="-lX11 -lpthread" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -95,7 +94,7 @@ LDFLAGS="-lX11 -lpthread" \ make make install DESTDIR=$PKG -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ +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 @@ -109,10 +108,6 @@ else 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 -mv $PKG/usr/share/$PRGNAM/$VERSION/vim $PKG/usr/share/vim/vimfiles - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/graphics/lilypond/lilypond.info b/graphics/lilypond/lilypond.info index e98f3c54fccb..b3864d97c94b 100644 --- a/graphics/lilypond/lilypond.info +++ b/graphics/lilypond/lilypond.info @@ -5,6 +5,6 @@ DOWNLOAD="http://download.linuxaudio.org/lilypond/sources/v2.18/lilypond-2.18.2. MD5SUM="3c4bcbb708d12644668b32bfe82ebf25" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="fontforge mftrace guile1.8" +REQUIRES="fontforge t1utils guile1.8" MAINTAINER="Kyle Guinn" EMAIL="elyk03@gmail.com" |