3 files changed, 10 insertions, 39 deletions
diff --git a/multimedia/farsight2/do_not_use_udp-bsd_h.patch b/multimedia/farsight2/do_not_use_udp-bsd_h.patch
deleted file mode 100644
index 72607f2c10efe..0000000000000
--- a/multimedia/farsight2/do_not_use_udp-bsd_h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: farsight2-0.0.17/transmitters/nice/fs-nice-stream-transmitter.c
-===================================================================
---- farsight2-0.0.17.orig/transmitters/nice/fs-nice-stream-transmitter.c
-+++ farsight2-0.0.17/transmitters/nice/fs-nice-stream-transmitter.c
-@@ -46,8 +46,6 @@
- #include <string.h>
- #include <sys/types.h>
- 
--#include <udp-bsd.h>
--
- #define GST_CAT_DEFAULT fs_nice_transmitter_debug
- 
- /* Signals */
diff --git a/multimedia/farsight2/farsight2.SlackBuild b/multimedia/farsight2/farsight2.SlackBuild
index b0cef04480073..9138380c0c58e 100644
--- a/multimedia/farsight2/farsight2.SlackBuild
+++ b/multimedia/farsight2/farsight2.SlackBuild
@@ -1,12 +1,9 @@
 #!/bin/sh
 
 # Slackware build script for farsight2
-
-# Copyright 2009  David Woodfall <dave@unrealize.co.uk>
+# Copyright 2010  David Woodfall <dave@dawoodfall.net>
 # All rights reserved.
 #
-# aka dive in #slackware on freenode.net
-#
 # Redistribution and use of this script, with or without modification, is
 # permitted provided that the following conditions are met:
 #
@@ -22,21 +19,17 @@
 # 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. FURTHERMORE I AM NOT LIABLE IF
-# YOUR DATA IS DESTROYED, YOUR HOUSE BURNS DOWN OR YOUR DOG RUNS OFF.
-
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=farsight2
-VERSION=${VERSION:-0.0.17}
+VERSION=${VERSION:-0.0.19}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -60,7 +53,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -75,10 +68,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Patch Farsight2 to not use udp-bsd.h from libnice; it is no longer needed
-# with libnice-0.0.11:  https://bugs.freedesktop.org/show_bug.cgi?id=27260
-patch -p1 < $CWD/do_not_use_udp-bsd_h.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -96,14 +85,9 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-find $PKG -name perllocal.pod \
-  -o -name ".packlist" \
-  -o -name "*.bs" \
-  | xargs rm -f
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog  NEWS INSTALL README \
+  README AUTHORS INSTALL ChangeLog COPYING NEWS \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/multimedia/farsight2/farsight2.info b/multimedia/farsight2/farsight2.info
index aafb1b87250eb..50ab165bd8559 100644
--- a/multimedia/farsight2/farsight2.info
+++ b/multimedia/farsight2/farsight2.info
@@ -1,10 +1,10 @@
 PRGNAM="farsight2"
-VERSION="0.0.17"
+VERSION="0.0.19"
 HOMEPAGE="http://farsight.freedesktop.org/wiki/"
-DOWNLOAD="http://farsight.freedesktop.org/releases/farsight2/farsight2-0.0.17.tar.gz"
-MD5SUM="b109d133d39dd682a224a47e31c5eac7"
+DOWNLOAD="http://farsight.freedesktop.org/releases/farsight2/farsight2-0.0.19.tar.gz"
+MD5SUM="0ce00833b1baaab2b9d8b6dbba56fbfd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="David Woodfall"
-EMAIL="info@davidwoodfall.co.uk"
-APPROVED="dsomero"
+EMAIL="dave@dawoodfall.net"
+APPROVED="rworkman"