3 files changed, 31 insertions, 12 deletions
diff --git a/source/l/libmsn/libmsn.SlackBuild b/source/l/libmsn/libmsn.SlackBuild
index 5de598ef2..2689d910c 100755
--- a/source/l/libmsn/libmsn.SlackBuild
+++ b/source/l/libmsn/libmsn.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libmsn
 
-# Copyright 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 
 # Redistribution and use of this script, with or without modification, is
@@ -23,21 +23,20 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=libmsn
-VERSION=4.1
-BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:--j6}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
+NUMJOBS=${NUMJOBS:--j7}
 
 # Automatically determine the architecture we're building on:
+MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
-    arm*) export ARCH=arm ;;
+  case "$MARCH" in
+    i?86)    export ARCH=i486 ;;
+    armv7hl) export ARCH=$MARCH ;;
+    arm*)    export ARCH=arm ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
-       *) export ARCH=$( uname -m ) ;;
+    *)       export ARCH=$MARCH ;;
   esac
 fi
 
@@ -50,17 +49,27 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+  SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
+  LIBDIRSUFFIX=""
 else
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
 tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
 cd $PKGNAM-$VERSION || exit 1
+
+zcat $CWD/libmsn.gcc47.diff.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/l/libmsn/libmsn.gcc47.diff b/source/l/libmsn/libmsn.gcc47.diff
new file mode 100644
index 000000000..34df7005e
--- /dev/null
+++ b/source/l/libmsn/libmsn.gcc47.diff
@@ -0,0 +1,10 @@
+--- ./msn/util.cpp.orig	2009-07-22 14:57:10.000000000 -0500
++++ ./msn/util.cpp	2012-04-05 10:45:40.604000070 -0500
+@@ -30,6 +30,7 @@
+ #include <openssl/rand.h>
+ #include <cstring>
+ #include <sys/timeb.h>
++#include <unistd.h>
+ #include "md5.h"
+ #include "libsiren/siren7.h"
+ 
diff --git a/source/l/libmsn/slack-desc b/source/l/libmsn/slack-desc
index 8fe1410c5..b026146d3 100644
--- a/source/l/libmsn/slack-desc
+++ b/source/l/libmsn/slack-desc
@@ -11,9 +11,9 @@ libmsn:
 libmsn: Libmsn is a reusable, open-source, fully documented library for
 libmsn: connecting to Microsoft's MSN Messenger service. 
 libmsn:
+libmsn: Homepage:  http://sourceforge.net/projects/libmsn/
 libmsn:
 libmsn:
 libmsn:
 libmsn:
-libmsn: Homepage:  http://sourceforge.net/projects/libmsn/
 libmsn: