1 files changed, 15 insertions, 23 deletions
diff --git a/network/freerdp/freerdp.SlackBuild b/network/freerdp/freerdp.SlackBuild
index 7a21c3eabd..fc852a9cb2 100644
--- a/network/freerdp/freerdp.SlackBuild
+++ b/network/freerdp/freerdp.SlackBuild
@@ -4,6 +4,7 @@
 # free implementation of the Remote Desktop Protocol
 
 # Copyright 2010,2012 Niels Horn, Rio de Janeiro, RJ, Brazil
+# Copyright 2015 Philip van der Hoeven, Almere, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,16 +24,14 @@
 #  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:-20131115_ea18d2b}
+VERSION=${VERSION:-1.2.0_beta1_android9}
 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 \/)
+TARNAME=${VERSION%_*}+${VERSION##*_}
+TARNAME=${TARNAME/_/-}.tar.gz
+DIRNAME=FreeRDP-${VERSION//_/-}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -66,21 +65,15 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-#rm -rf $UNTARNAME
-#tar xvf $CWD/$TARNAME
-#cd $UNTARNAME
-rm -fR $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM-$VERSION
+rm -rf $DIRNAME
+tar xvf $CWD/$TARNAME
+cd $DIRNAME
 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 {} \;
-
-# http://sourceforge.net/mailarchive/forum.php?thread_name=520BE6FD.5080803%40macports.org&forum_name=freerdp-devel
-patch -p0 < $CWD/patch-ffmpeg-2.0.diff
+ \( -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 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 mkdir -p build
 cd build
@@ -88,12 +81,13 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DWITH_CUPS=ON \
     -DCMAKE_BUILD_TYPE=Release ..
   make VERBOSE=1
   make install DESTDIR=$PKG
 cd ..
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 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
@@ -103,9 +97,7 @@ 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 \
-  ChangeLog LICENSE README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog LICENSE README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install