2 files changed, 37 insertions, 49 deletions
diff --git a/development/mlton/mlton.SlackBuild b/development/mlton/mlton.SlackBuild
index cdccf0131f6ef..0621e040fdb0e 100644
--- a/development/mlton/mlton.SlackBuild
+++ b/development/mlton/mlton.SlackBuild
@@ -1,28 +1,31 @@
 #!/bin/sh
 
-# Copyright 2011,2012  Jockey S. Kyd, Shanghai, CHN
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
+# Slackware build script for mlton
+# Originally by Jockey S. Kyd (jockey dot kyd at gmail dot com)
+
+# Modified by Ryan P.C. McQuen, WA, ryan.q@linux.com
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version, with the following exception:
+# the text of the GPL license may be omitted..
+
+# This program is distributed in the hope that it will be useful, but
+# without any warranty; without even the implied warranty of
+# merchantability or fitness for a particular purpose. Compiling,
+# interpreting, executing or merely reading the text of the program
+# may result in lapses of consciousness and/or very being, up to and
+# including the end of all existence and the Universe as we know it.
+# See the GNU General Public License for more details.
+
+# You may have received a copy of the GNU General Public License
+# along with this program (most likely, a file named COPYING).  If
+# not, see <http://www.gnu.org/licenses/>.
+
 
 PRGNAM=mlton
-VERSION=20100608
+VERSION=${VERSION:-20130715}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -48,16 +51,7 @@ case "$ARCH" in
           exit 1 ;;
 esac
 
-# pick the tarball with dynamically linked distribution preferred
 DIST=$PRGNAM-$VERSION-1.$TARARCH-linux
-if [ ! -f $CWD/$DIST.tgz ]; then
-  # no dynamically linked version, hence pick static linked one
-  DIST=$PRGNAM-$VERSION-1.$TARARCH-linux.static
-  if [ ! -f $CWD/$DIST.tgz ]; then
-    printf "No tarball found.\n" 1>&2
-    exit 1
-  fi
-fi
 
 set -e
 rm -rf $PKG
@@ -66,18 +60,16 @@ cd $PKG
 tar xvf $CWD/$DIST.tgz
 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 {} \;
 
 [ "$LIBDIRSUFFIX" = "64" ] && mv $PKG/usr/lib{,64}
 sed -i "s|^lib=.*$|lib='/usr/lib$LIBDIRSUFFIX/mlton'|" $PKG/usr/bin/mlton
 
-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
+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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/development/mlton/mlton.info b/development/mlton/mlton.info
index 179d03892139e..b7b9157b63706 100644
--- a/development/mlton/mlton.info
+++ b/development/mlton/mlton.info
@@ -1,14 +1,10 @@
 PRGNAM="mlton"
-VERSION="20100608"
+VERSION="20130715"
 HOMEPAGE="http://mlton.org/"
-DOWNLOAD="http://downloads.sourceforge.net/mlton/mlton-20100608-1.x86-linux.tgz \
-          http://downloads.sourceforge.net/mlton/mlton-20100608-1.x86-linux.static.tgz"
-MD5SUM="6c2cd50709b3309b0ec435002fb1e4cf \
-        dc6101f8923b23cd2875a74e353f520e"
-DOWNLOAD_x86_64="http://downloads.sourceforge.net/mlton/mlton-20100608-1.amd64-linux.tgz \
-                 http://downloads.sourceforge.net/mlton/mlton-20100608-1.amd64-linux.static.tgz"
-MD5SUM_x86_64="3598a53e45d0806d359203bb36405710 \
-               546b8941c35a93df4866ef91129e0f35"
+DOWNLOAD="http://sourceforge.net/projects/mlton/files/mlton/20130715/mlton-20130715-1.x86-linux.tgz"
+MD5SUM="154211021262403bcc535a408e46c2d9"
+DOWNLOAD_x86_64="http://sourceforge.net/projects/mlton/files/mlton/20130715/mlton-20130715-1.amd64-linux.tgz"
+MD5SUM_x86_64="8f81fd906ee17a2893c2e7b6f5c6b702"
 REQUIRES=""
-MAINTAINER="Jockey S. Kyd"
-EMAIL="jockey.kyd@gmail.com"
+MAINTAINER="Ryan P.C. McQuen"
+EMAIL="ryan.q@linux.com"