From 22be892ecd0d5a60d01147481ad2c000f824eff8 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Sun, 26 Mar 2017 09:46:46 -0400 Subject: multimedia/musique: New maintainer, minor fixes. Signed-off-by: B. Watson --- multimedia/musique/musique.SlackBuild | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'multimedia/musique/musique.SlackBuild') diff --git a/multimedia/musique/musique.SlackBuild b/multimedia/musique/musique.SlackBuild index 2e48eace2c..179804670e 100644 --- a/multimedia/musique/musique.SlackBuild +++ b/multimedia/musique/musique.SlackBuild @@ -1,7 +1,9 @@ #!/bin/sh # Slackware build script for musique -# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org + +# Formerly maintained by Ryan P.C. McQuen +# Now maintained by B. Watson # Copyright 2010, 2012 Binh Nguyen # All rights reserved. @@ -23,14 +25,22 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20170326 bkw: +# - take over maintenance. +# - i486=>i586. +# - don't install INSTALL to docdir. +# - actually use SLKCFLAGS. +# - add some notes to README. +# - BUILD=2. + PRGNAM=musique VERSION=${VERSION:-1.4} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -41,8 +51,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -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" @@ -66,20 +76,19 @@ cd $PRGNAM 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 \ + -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 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ +# I don't see how to force our flags via qmake, hence the sed stuff. qmake PREFIX=/usr - +sed -i "/C.*FLAGS/s,-O2,$SLKCFLAGS," Makefile make make INSTALL_ROOT=$PKG install - -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 +strip $PKG/usr/bin/$PRGNAM mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGES COPYING INSTALL TODO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a CHANGES COPYING TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install -- cgit v1.2.3-65-gdbad