diff options
| -rw-r--r-- | haskell/haskell-GLUT/haskell-GLUT.SlackBuild | 19 | ||||
| -rw-r--r-- | haskell/haskell-GLUT/haskell-GLUT.info | 14 |
2 files changed, 17 insertions, 16 deletions
diff --git a/haskell/haskell-GLUT/haskell-GLUT.SlackBuild b/haskell/haskell-GLUT/haskell-GLUT.SlackBuild index d365013865..9836a98b5a 100644 --- a/haskell/haskell-GLUT/haskell-GLUT.SlackBuild +++ b/haskell/haskell-GLUT/haskell-GLUT.SlackBuild @@ -1,8 +1,9 @@ #!/bin/sh -# Slackware build script for GLUT +# Slackware build script for haskell-GLUT # Copyright 2015 Mikko Värri, Finland +# Updated 2018 David Spencer, Baildon, West Yorkshire, U.K. # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=haskell-GLUT -VERSION=${VERSION:-2.7.0.7} +VERSION=${VERSION:-2.7.0.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -33,7 +34,7 @@ GHC_VERSION=$(ghc --numeric-version) if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -44,8 +45,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" @@ -68,10 +69,10 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.gz cd $SRCNAM-$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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -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 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/haskell/haskell-GLUT/haskell-GLUT.info b/haskell/haskell-GLUT/haskell-GLUT.info index 3f4556f7f4..ec2218341c 100644 --- a/haskell/haskell-GLUT/haskell-GLUT.info +++ b/haskell/haskell-GLUT/haskell-GLUT.info @@ -1,10 +1,10 @@ PRGNAM="haskell-GLUT" -VERSION="2.7.0.7" -HOMEPAGE="http://hackage.haskell.org/package/GLUT" -DOWNLOAD="http://hackage.haskell.org/package/GLUT-2.7.0.7/GLUT-2.7.0.7.tar.gz" -MD5SUM="5cb7a07d53e369ec92515f91ceb6a03c" +VERSION="2.7.0.12" +HOMEPAGE="https://hackage.haskell.org/package/GLUT" +DOWNLOAD="https://hackage.haskell.org/package/GLUT-2.7.0.12/GLUT-2.7.0.12.tar.gz" +MD5SUM="296b6ee02a6b004f4c0c406fc9b35544" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="ghc haskell-OpenGL haskell-random" -MAINTAINER="Mikko Värri" -EMAIL="vmj@linuxbox.fi" +REQUIRES="haskell-OpenGL haskell-random" +MAINTAINER="David Spencer" +EMAIL="baildon.research@googlemail.com" |