1 files changed, 17 insertions, 44 deletions
diff --git a/office/lout/lout.SlackBuild b/office/lout/lout.SlackBuild
index 55fa5f4939..d857f6a0b3 100644
--- a/office/lout/lout.SlackBuild
+++ b/office/lout/lout.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for lout
 
@@ -23,38 +23,34 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=lout
-VERSION=${VERSION:-3.40}
+VERSION=${VERSION:-3.43}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   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}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e 
 
 rm -rf $PKG
@@ -64,14 +60,6 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$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 {} \;
-
-patch -p1 < $CWD/install-fix.patch
-
 # fixed man page content
 sed -i "s/local\/lib/share/g" man/$PRGNAM.1
 
@@ -94,33 +82,18 @@ export ZLIB=-lz
 export ZLIBPATH=
 
 make -e all
-
-export PREFIX=$PKG/usr
-export BINDIR=$PREFIX/bin
-export LOUTLIBDIR=$PREFIX/share/$PRGNAM
-export LOUTDOCDIR=$PREFIX/doc/$PRGNAM-$VERSION
-export MANDIR=$PREFIX/man/man1/
-
-mkdir -p $BINDIR
-mkdir -p $LOUTDOCDIR
-mkdir -p $MANDIR
-mkdir -p $PREFIX/share
-
-make -e allinstall
+make -e allinstall DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
+chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/README
 cp $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/
-cp $CWD/$PRGNAM-$VERSION-user.ps.gz $PKG/usr/doc/$PRGNAM-$VERSION/
-find $PKG/usr/doc/$PRGNAM-$VERSION -name "*.ps" | xargs gzip
 
 mkdir -p $PKG/install
 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