update to 0.0.21

changes: bugfixes

7 files changed, 27 insertions, 50 deletions

diff --git a/multimedia/farsight2/Makefile b/multimedia/farsight2/Makefile
index e44b801329e..7c8db320bcf 100644
--- a/multimedia/farsight2/Makefile
+++ b/multimedia/farsight2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:04 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/08/05 18:55:18 drochner Exp $
 #
 
-DISTNAME=	farsight2-0.0.17
-PKGREVISION=	4
+DISTNAME=	farsight2-0.0.21
 CATEGORIES=	chat multimedia
 MASTER_SITES=	http://farsight.freedesktop.org/releases/farsight2/
 
@@ -30,12 +29,8 @@ BUILDLINK_API_DEPENDS.pygobject+=	${PYPKGPREFIX}-gobject>=2.16
 .include "../../lang/python/extension.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.16.0
 .include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gst-plugins0.10-bad+=	gst-plugins0.10-bad>=0.10.12
-.include "../../multimedia/gst-plugins0.10-bad/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gst-plugins0.10-base+=	gst-plugins0.10-base>=0.10.23
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gst-plugins0.10-good+=	gst-plugins0.10-good>=0.10.7
-.include "../../multimedia/gst-plugins0.10-good/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gstreamer0.10+=	gstreamer0.10>=0.10.23
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gst-python+=	${PYPKGPREFIX}-gstreamer0.10>=0.10.10
diff --git a/multimedia/farsight2/PLIST b/multimedia/farsight2/PLIST
index 49e836f2004..2f278975327 100644
--- a/multimedia/farsight2/PLIST
+++ b/multimedia/farsight2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/08/17 21:13:04 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/08/05 18:55:18 drochner Exp $
 include/gstreamer-0.10/gst/farsight/fs-base-conference.h
 include/gstreamer-0.10/gst/farsight/fs-candidate.h
 include/gstreamer-0.10/gst/farsight/fs-codec.h
@@ -27,7 +27,6 @@ share/gtk-doc/html/farsight2-libs-0.10/FsBaseConference.html
 share/gtk-doc/html/farsight2-libs-0.10/FsConference.html
 share/gtk-doc/html/farsight2-libs-0.10/FsElementAddedNotifier.html
 share/gtk-doc/html/farsight2-libs-0.10/FsParticipant.html
-share/gtk-doc/html/farsight2-libs-0.10/FsSession.html
 share/gtk-doc/html/farsight2-libs-0.10/FsStream.html
 share/gtk-doc/html/farsight2-libs-0.10/FsStreamTransmitter.html
 share/gtk-doc/html/farsight2-libs-0.10/FsTransmitter.html
@@ -43,6 +42,7 @@ share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-FsCandidate.html
 share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-FsCodec.html
 share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-FsPlugin.html
 share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-Network-interfaces-discovery.html
+share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-fs-session.html
 share/gtk-doc/html/farsight2-libs-0.10/home.png
 share/gtk-doc/html/farsight2-libs-0.10/index.html
 share/gtk-doc/html/farsight2-libs-0.10/index.sgml
diff --git a/multimedia/farsight2/distinfo b/multimedia/farsight2/distinfo
index 662577f96fa..42e2f0186f4 100644
--- a/multimedia/farsight2/distinfo
+++ b/multimedia/farsight2/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.7 2010/06/16 12:11:10 obache Exp $
+$NetBSD: distinfo,v 1.8 2010/08/05 18:55:18 drochner Exp $
 
-SHA1 (farsight2-0.0.17.tar.gz) = 6e4b3376b9f33ab659b231bbbb2155d4e1b202cc
-RMD160 (farsight2-0.0.17.tar.gz) = bd6238a3376d0448e32fd0c50b80ccb3220132e2
-Size (farsight2-0.0.17.tar.gz) = 1025565 bytes
-SHA1 (patch-aa) = f3e9c2de47d8c73a6e28b4c63feaded395f2a2ac
+SHA1 (farsight2-0.0.21.tar.gz) = baf51f52eeeb81214b376ce1b9f33a22ccac7298
+RMD160 (farsight2-0.0.21.tar.gz) = 198feb04be765cae836c09cc3492842e1788e56b
+Size (farsight2-0.0.21.tar.gz) = 1090456 bytes
+SHA1 (patch-aa) = 8bca15a47ff97f751cb04247369129090f64d892
 SHA1 (patch-ab) = 27fd12ad2d1774cbeb7c11a4cee5b40e5ea97853
-SHA1 (patch-ac) = ff7eabcbbad1a81eb10ff91ea459d439866edaee
-SHA1 (patch-ad) = cfeac35e148d96e122a280d4adca54b23c369cf9
+SHA1 (patch-ac) = bb2b6a6eeb807d19b420eeec07f6b0b92203bff7
 SHA1 (patch-ai) = 6459729f80f592a2a333d683b05a139b499f46c6
-SHA1 (patch-aj) = 816318707d1463df27b37734baedadb338452fb0
+SHA1 (patch-aj) = c8f92433243a5741403721bb248e4471a23583eb
 SHA1 (patch-ak) = 591ab7b6afefc84443280b01c765492007686ff6
diff --git a/multimedia/farsight2/patches/patch-aa b/multimedia/farsight2/patches/patch-aa
index a3bc8ffb5f4..ca8398fd3be 100644
--- a/multimedia/farsight2/patches/patch-aa
+++ b/multimedia/farsight2/patches/patch-aa
@@ -1,10 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2010/06/16 12:11:10 obache Exp $
+$NetBSD: patch-aa,v 1.3 2010/08/05 18:55:18 drochner Exp $
 
-https://bugs.freedesktop.org/show_bug.cgi?id=23378
-
---- configure.orig	2010-01-05 17:15:11.000000000 +0000
+--- configure.orig	2010-06-01 21:12:47.000000000 +0000
 +++ configure
-@@ -15753,7 +15753,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -14450,7 +14450,7 @@ rm -f core conftest.err conftest.$ac_obj
  $as_echo "$flag_ok" >&6; }
  
  
@@ -12,4 +10,4 @@ https://bugs.freedesktop.org/show_bug.cgi?id=23378
 +        if test "x$ERROR_CFLAGS" = "x"
      then
  
-   { $as_echo "$as_me:$LINENO: checking to see if compiler understands -errwarn=%all" >&5
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -errwarn=%all" >&5
diff --git a/multimedia/farsight2/patches/patch-ac b/multimedia/farsight2/patches/patch-ac
index d7fb8453820..daab73f57e9 100644
--- a/multimedia/farsight2/patches/patch-ac
+++ b/multimedia/farsight2/patches/patch-ac
@@ -1,8 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/08/17 21:13:04 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2010/08/05 18:55:18 drochner Exp $
 
-https://bugs.freedesktop.org/show_bug.cgi?id=23378
-
---- common/glib-gen.mak.orig	2009-07-21 01:09:25.000000000 +0000
+--- common/glib-gen.mak.orig	2010-05-18 21:07:38.000000000 +0000
 +++ common/glib-gen.mak
 @@ -26,7 +26,7 @@ enum_headers=$(foreach h,$(glib_enum_hea
  	$^ > $@
@@ -10,6 +8,6 @@ https://bugs.freedesktop.org/show_bug.cgi?id=23378
  %-enumtypes.c: $(glib_enum_headers)
 -	@if test "x$(glib_enum_headers)" == "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi
 +	@if test "x$(glib_enum_headers)" = "x"; then echo "ERROR: glib_enum_headers is empty, please fix Makefile"; exit 1; fi
- 	glib-mkenums \
+ 	$(AM_V_GEN)glib-mkenums \
  	--fhead "#include \"$*-enumtypes.h\"\n$(enum_headers)" \
  	--fprod "\n/* enumerations from \"@filename@\" */" \
diff --git a/multimedia/farsight2/patches/patch-ad b/multimedia/farsight2/patches/patch-ad
deleted file mode 100644
index b8a486d04d0..00000000000
--- a/multimedia/farsight2/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2010/05/05 21:51:49 wiz Exp $
-
---- transmitters/nice/fs-nice-stream-transmitter.c.orig	2009-12-27 16:38:04.000000000 +0000
-+++ transmitters/nice/fs-nice-stream-transmitter.c
-@@ -46,7 +46,7 @@
- #include <string.h>
- #include <sys/types.h>
- 
--#include <udp-bsd.h>
-+#include <pseudotcp.h>
- 
- #define GST_CAT_DEFAULT fs_nice_transmitter_debug
- 
diff --git a/multimedia/farsight2/patches/patch-aj b/multimedia/farsight2/patches/patch-aj
index d9ac2f288e3..30eaa642511 100644
--- a/multimedia/farsight2/patches/patch-aj
+++ b/multimedia/farsight2/patches/patch-aj
@@ -1,12 +1,12 @@
-$NetBSD: patch-aj,v 1.1 2009/08/27 18:39:19 hasso Exp $
+$NetBSD: patch-aj,v 1.2 2010/08/05 18:55:18 drochner Exp $
 
---- gst-libs/gst/farsight/fs-interfaces.c.orig	2009-08-27 21:16:13 +0300
-+++ gst-libs/gst/farsight/fs-interfaces.c	2009-08-27 21:16:41 +0300
-@@ -49,6 +49,7 @@ GST_DEBUG_CATEGORY_EXTERN (fs_base_confe
- #include <net/if.h>
- #include <net/if_arp.h>
- #include <arpa/inet.h>
+--- gst-libs/gst/farsight/fs-interfaces.c.orig	2010-05-31 19:20:03.000000000 +0000
++++ gst-libs/gst/farsight/fs-interfaces.c
+@@ -44,6 +44,7 @@
+  #include <sys/socket.h>
+  #include <ifaddrs.h>
+ #endif
 +#include <netinet/in.h>
  
- /**
-  * SECTION:fs-interfaces
+ #include <gst/gst.h>
+