4 files changed, 53 insertions, 29 deletions
diff --git a/network/freerdp/README b/network/freerdp/README
index da4ec169ab..45627de6fc 100644
--- a/network/freerdp/README
+++ b/network/freerdp/README
@@ -1,2 +1,4 @@
-FreeRDP is a fork of the rdesktop project that intends to rapidly start
-moving forward and implement features that rdesktop lacks the most.
+FreeRDP is a free implementation of the Remote Desktop Protocol (RDP),
+released under the Apache license.
+
+This requires ffmpeg.
diff --git a/network/freerdp/freerdp.SlackBuild b/network/freerdp/freerdp.SlackBuild
index 2a0ce7ffd3..abe6b5d96c 100644
--- a/network/freerdp/freerdp.SlackBuild
+++ b/network/freerdp/freerdp.SlackBuild
@@ -3,14 +3,37 @@
 # Slackware build script for freerdp
 # free implementation of the Remote Desktop Protocol
 
-# Written by Niels Horn <niels.horn@gmail.com>
-# Revision date: 2010/11/18
+# Copyright 2010,2012 Niels Horn, Rio de Janeiro, RJ, Brazil
+# 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.
+
+# Revision date: 2012/02/17
 
 PRGNAM=freerdp
-VERSION=${VERSION:-0.8.2}
+VERSION=${VERSION:-1.0.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# This is a bit messy, but that's how upstream serves it...
+TARNAME=FreeRDP-$VERSION.tar.gz
+UNTARNAME=$(tar tf $TARNAME 2>/dev/null | head -n 1 | tr -d \/)
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -43,9 +66,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $UNTARNAME
+tar xvf $CWD/$TARNAME
+cd $UNTARNAME
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -53,30 +76,29 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --disable-static \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make VERBOSE=1
+  make install DESTDIR=$PKG
+cd ..
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+# Need to move man, cmake flag does not work
+mv $PKG/usr/share/man $PKG/usr/
+
 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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README \
+  ChangeLog LICENSE README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/network/freerdp/freerdp.info b/network/freerdp/freerdp.info
index 7ca4269f78..faf5c67ca8 100644
--- a/network/freerdp/freerdp.info
+++ b/network/freerdp/freerdp.info
@@ -1,8 +1,8 @@
 PRGNAM="freerdp"
-VERSION="0.8.2"
+VERSION="1.0.1"
 HOMEPAGE="http://www.freerdp.com/"
-DOWNLOAD="http://downloads.sourceforge.net/freerdp/freerdp-0.8.2.tar.gz"
-MD5SUM="cde590336292c977dfc1b4b7badf24d2"
+DOWNLOAD="http://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-1.0.1.tar.gz"
+MD5SUM="1282189a87893bf196da20382e45f6c1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Niels Horn"
diff --git a/network/freerdp/slack-desc b/network/freerdp/slack-desc
index 6b260f93f7..858e77932c 100644
--- a/network/freerdp/slack-desc
+++ b/network/freerdp/slack-desc
@@ -8,12 +8,12 @@
        |-----handy-ruler------------------------------------------------------|
 freerdp: freerdp (Free implementation of the RDP protocol)
 freerdp:
-freerdp: FreeRDP is a fork of the rdesktop project that intends to rapidly
-freerdp: start moving forward and implement features that rdesktop lacks the
-freerdp: most.
+freerdp: FreeRDP is a free implementation of the Remote Desktop Protocol (RDP),
+freerdp: released under the Apache license.
 freerdp:
 freerdp: Homepage: http://www.freerdp.com/
 freerdp:
 freerdp:
 freerdp:
 freerdp:
+freerdp: