summaryrefslogtreecommitdiffstats
path: root/haskell/haskell-GLUT
diff options
context:
space:
mode:
Diffstat (limited to 'haskell/haskell-GLUT')
-rw-r--r--haskell/haskell-GLUT/haskell-GLUT.SlackBuild20
-rw-r--r--haskell/haskell-GLUT/haskell-GLUT.info6
2 files changed, 18 insertions, 8 deletions
diff --git a/haskell/haskell-GLUT/haskell-GLUT.SlackBuild b/haskell/haskell-GLUT/haskell-GLUT.SlackBuild
index 9836a98b5a..a089077e4c 100644
--- a/haskell/haskell-GLUT/haskell-GLUT.SlackBuild
+++ b/haskell/haskell-GLUT/haskell-GLUT.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# Slackware build script for haskell-GLUT
@@ -23,10 +23,13 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+
PRGNAM=haskell-GLUT
-VERSION=${VERSION:-2.7.0.12}
+VERSION=${VERSION:-2.7.0.16}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
SRCNAM="$( echo $PRGNAM | cut -d- -f2- )"
@@ -40,7 +43,14 @@ if [ -z "$ARCH" ]; then
esac
fi
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+ exit 0
+fi
+
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -90,7 +100,7 @@ runghc Setup copy --destdir=$PKG
runghc Setup register --gen-pkg-config
PKGCONFD=/usr/lib${LIBDIRSUFFIX}/ghc-${GHC_VERSION}/package.conf.d
-PKGID=$( grep -E "^id: " $SRCNAM-$VERSION.conf | cut -d" " -f2 )
+PKGID=$( grep -E "^id: " $SRCNAM-$VERSION.conf | sed "s/[[:space:]][[:space:]]*/ /" | cut -d" " -f2 )
mkdir -p $PKG/$PKGCONFD
mv $SRCNAM-$VERSION.conf $PKG/$PKGCONFD/$PKGID.conf
@@ -106,4 +116,4 @@ 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}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/haskell/haskell-GLUT/haskell-GLUT.info b/haskell/haskell-GLUT/haskell-GLUT.info
index ec2218341c..c1af1768d5 100644
--- a/haskell/haskell-GLUT/haskell-GLUT.info
+++ b/haskell/haskell-GLUT/haskell-GLUT.info
@@ -1,8 +1,8 @@
PRGNAM="haskell-GLUT"
-VERSION="2.7.0.12"
+VERSION="2.7.0.16"
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="https://hackage.haskell.org/package/GLUT-2.7.0.16/GLUT-2.7.0.16.tar.gz"
+MD5SUM="b0a5586c9c20a800e82ae17aeaa2d21b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="haskell-OpenGL haskell-random"