diff options
| -rw-r--r-- | haskell/haskell-X11-xft/haskell-X11-xft.SlackBuild | 23 | ||||
| -rw-r--r-- | haskell/haskell-X11-xft/haskell-X11-xft.info | 8 | ||||
| -rw-r--r-- | haskell/haskell-X11-xft/slack-desc | 2 |
3 files changed, 17 insertions, 16 deletions
diff --git a/haskell/haskell-X11-xft/haskell-X11-xft.SlackBuild b/haskell/haskell-X11-xft/haskell-X11-xft.SlackBuild index 4730cf77d60f6..a81476ba1c987 100644 --- a/haskell/haskell-X11-xft/haskell-X11-xft.SlackBuild +++ b/haskell/haskell-X11-xft/haskell-X11-xft.SlackBuild @@ -1,8 +1,9 @@ #!/bin/sh -# Slackware build script for X11-xft +# Slackware build script for haskell-X11-xft # Copyright 2012 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 @@ -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,19 +69,19 @@ 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" \ runghc Setup configure \ --prefix=/usr \ - --enable-shared \ - --enable-library-profiling \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --libsubdir=ghc-${GHC_VERSION}/$SRCNAM-$VERSION \ + --enable-shared \ + --enable-library-profiling \ --docdir=/usr/doc/$PRGNAM-$VERSION runghc Setup build @@ -101,8 +102,8 @@ cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install -cat $CWD/doinst.sh > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/haskell/haskell-X11-xft/haskell-X11-xft.info b/haskell/haskell-X11-xft/haskell-X11-xft.info index c2b7a2bf1026a..fdd8c6aa487e7 100644 --- a/haskell/haskell-X11-xft/haskell-X11-xft.info +++ b/haskell/haskell-X11-xft/haskell-X11-xft.info @@ -1,10 +1,10 @@ PRGNAM="haskell-X11-xft" VERSION="0.3.1" -HOMEPAGE="http://hackage.haskell.org/package/X11-xft" -DOWNLOAD="http://hackage.haskell.org/packages/archive/X11-xft/0.3.1/X11-xft-0.3.1.tar.gz" +HOMEPAGE="https://hackage.haskell.org/package/X11-xft" +DOWNLOAD="https://hackage.haskell.org/packages/archive/X11-xft/0.3.1/X11-xft-0.3.1.tar.gz" MD5SUM="ad885150a59f63de328e73abe5ffc79e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="haskell-X11 haskell-utf8-string" -MAINTAINER="Mikko Värri" -EMAIL="vmj@linuxbox.fi" +MAINTAINER="David Spencer" +EMAIL="baildon.research@googlemail.com" diff --git a/haskell/haskell-X11-xft/slack-desc b/haskell/haskell-X11-xft/slack-desc index e983dcaf0eca1..f7f864495d75d 100644 --- a/haskell/haskell-X11-xft/slack-desc +++ b/haskell/haskell-X11-xft/slack-desc @@ -11,7 +11,7 @@ haskell-X11-xft: haskell-X11-xft: Haskell bindings to the Xft, X Free Type interface library, haskell-X11-xft: and some Xrender parts. haskell-X11-xft: -haskell-X11-xft: http://hackage.haskell.org/package/X11-xft +haskell-X11-xft: https://hackage.haskell.org/package/X11-xft haskell-X11-xft: haskell-X11-xft: haskell-X11-xft: |