libraries/libmcrypt: Updated for version 2.5.8

3 files changed, 24 insertions, 8 deletions

diff --git a/libraries/libmcrypt/libmcrypt.SlackBuild b/libraries/libmcrypt/libmcrypt.SlackBuild
index 96c25166be663..fcd447575bbe6 100644
--- a/libraries/libmcrypt/libmcrypt.SlackBuild
+++ b/libraries/libmcrypt/libmcrypt.SlackBuild
@@ -17,10 +17,13 @@ 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 -e # Exit on most errors
@@ -29,7 +32,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -42,6 +45,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -50,14 +54,17 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-static=no \
   --program-prefix="" \
   --program-suffix="" \
-  --disable-posix-threads
+  --disable-posix-threads \
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 ( cd $PKG/usr/man
@@ -66,7 +73,9 @@ make install DESTDIR=$PKG
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS INSTALL KNOWN-BUGS NEWS README THANKS TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS INSTALL KNOWN-BUGS NEWS README THANKS TODO \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/libmcrypt/libmcrypt.info b/libraries/libmcrypt/libmcrypt.info
index 963030766b957..72674ccacd137 100644
--- a/libraries/libmcrypt/libmcrypt.info
+++ b/libraries/libmcrypt/libmcrypt.info
@@ -5,4 +5,4 @@ DOWNLOAD="http://downloads.sourceforge.net/mcrypt/libmcrypt-2.5.8.tar.bz2"
 MD5SUM="c4f491dd411a09e9de3b8702ea6f73eb"
 MAINTAINER="Frank Gingras"
 EMAIL="francois.gingras@gmail.com"
-APPROVED="David Somero"
+APPROVED="dsomero,rworkman"
diff --git a/libraries/libmcrypt/slack-desc b/libraries/libmcrypt/slack-desc
index 1b948f6dbe766..48e43b38d0f1f 100644
--- a/libraries/libmcrypt/slack-desc
+++ b/libraries/libmcrypt/slack-desc
@@ -1,3 +1,10 @@
+# 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------------------------------------------------------|
 libmcrypt: libmcrypt (encryption functions for MCrypt)
 libmcrypt:
@@ -6,7 +13,7 @@ libmcrypt: to be a replacement for the old UNIX crypt. It uses well-known and
 libmcrypt: well-tested algorithms like BLOWFISH, AES, ARCFOUR, CAST-128, and
 libmcrypt: more in several modes or operation.
 libmcrypt:
-libmcrypt: 
+libmcrypt: Homepage: http://freshmeat.net/projects/mcrypt/
+libmcrypt:
 libmcrypt:
-libmcrypt: It can be obtained from http://freshmeat.net/projects/mcrypt/
 libmcrypt: