4 files changed, 52 insertions, 18 deletions
diff --git a/libraries/libmspack/README b/libraries/libmspack/README
index a956365782..9529166e60 100644
--- a/libraries/libmspack/README
+++ b/libraries/libmspack/README
@@ -1,6 +1,4 @@
-The purpose of libmspack is to provide both compression and
-decompression of some loosely related file formats used by
-Microsoft. The intention is to support all of the following
-formats: COMPRESS.EXE (.??_), Microsoft Help (.HLP),
-Microsoft Cabinet (.CAB), HTML Help (.CHM), Microsoft eBook
-(.LIT).
+The purpose of libmspack is to provide both compression and decompression
+of some loosely related file formats used by Microsoft. The intention is to 
+support all of the following formats: COMPRESS.EXE (.??_), Microsoft Help 
+(.HLP), Microsoft Cabinet (.CAB), HTML Help (.CHM), Microsoft eBook (.LIT).
diff --git a/libraries/libmspack/libmspack.SlackBuild b/libraries/libmspack/libmspack.SlackBuild
index 8a1b2f1e13..77a85207c4 100644
--- a/libraries/libmspack/libmspack.SlackBuild
+++ b/libraries/libmspack/libmspack.SlackBuild
@@ -1,9 +1,26 @@
 #!/bin/sh
-
+#
 # Slackware build script for libmspack
-# Written by Erik Hanson  erik@slackbuilds.org
-
-set -eu
+#
+# Copyright 2009  Erik W. Hanson, Minneapolis, MN, USA
+# 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.
 
 PRGNAM=libmspack
 VERSION=0.0.20060920alpha
@@ -18,12 +35,17 @@ 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 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -eu
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
@@ -36,21 +58,25 @@ chmod -R u+w,go+r-w,a-s .
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var/lib \
   --mandir=/usr/man \
-  --disable-static
+  --disable-static \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/install
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION 
 cp -a AUTHORS COPYING.LIB INSTALL NEWS README TODO \
       $PKG/usr/doc/$PRGNAM-$VERSION
-cp -ar doc $PKG/usr/doc/$PRGNAM-$VERSION/html
+cp -a doc $PKG/usr/doc/$PRGNAM-$VERSION/html
 rm $PKG/usr/doc/$PRGNAM-$VERSION/html/{Makefile,Doxyfile,.cvsignore}
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libmspack/libmspack.info b/libraries/libmspack/libmspack.info
index aeff651de5..dca6cb4b28 100644
--- a/libraries/libmspack/libmspack.info
+++ b/libraries/libmspack/libmspack.info
@@ -3,6 +3,8 @@ VERSION="0.0.20060920alpha"
 HOMEPAGE="http://www.cabextract.org.uk/libmspack/"
 DOWNLOAD="http://www.cabextract.org.uk/libmspack/libmspack-0.0.20060920alpha.tar.gz"
 MD5SUM="72003dfa5da2e843e3d5ae0c18f7c969"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
-APPROVED="David Somero"
-\ No newline at end of file
+APPROVED="dsomero"
diff --git a/libraries/libmspack/slack-desc b/libraries/libmspack/slack-desc
index 3d4ca20b44..b051e51dab 100644
--- a/libraries/libmspack/slack-desc
+++ b/libraries/libmspack/slack-desc
@@ -1,11 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+         |-----handy-ruler------------------------------------------------------|
 libmspack: libmspack (A library for Microsoft compression formats)
 libmspack: 
 libmspack: The purpose of libmspack is to provide both compression and
 libmspack: decompression of some loosely related file formats used by
 libmspack: Microsoft. The intention is to support all of the following
 libmspack: formats: COMPRESS.EXE (.??_), Microsoft Help (.HLP),
-libmspack: Microsoft Cabinet (.CAB), HTML Help (.CHM), Microsoft eBook
-libmspack: (.LIT).
+libmspack: Microsoft Cabinet (.CAB), HTML Help (.CHM), Microsoft eBook (.LIT).
+libmspack:
+libmspack: Homepage: http://www.cabextract.org.uk/libmspack/
 libmspack:
-libmspack: http://www.cabextract.org.uk/libmspack/
 libmspack: