* Update the glib to 2.34.3 and gtk20 to 2.24.17 and gtk30 to 3.6.4 which

  are the latest stable releases.
* Update vala to the newest stable release 0.18.1, also update a few ports
  in the gtk/gnome stack.
* The c++ bindings ports for glib, atk, gconf, etc, have now USE_GNOME toggles.
* Remove pkg-config run depends from glib20 and freetype2. This doesn't
  eliminate pkg-config run dependency completely, a second phase is needed
  and is planned.
* Support for .:run. and .:build. for USE_GNOME components was added.
  Currently only libxml2 and libxslt support this mechanism.
* Updates of the telepathy stack and empathy.
* Trim makefile headers, convert ports to new options, trim off library
  versions for some ports.
* Fix other ports so they build with the new glib version.

Thanks to miwi and crees for helping out with some exp-runs.
Approved by:	portmgr (miwi & bapt)
Obtained from:	gnome team repo

4 files changed, 30 insertions, 31 deletions

diff --git a/net-im/farsight2/Makefile b/net-im/farsight2/Makefile
index 135a1ede1794..1f5ee13c4744 100644
--- a/net-im/farsight2/Makefile
+++ b/net-im/farsight2/Makefile
@@ -1,36 +1,29 @@
-# New ports collection makefile for:	farsight2
-# Date created:				27 February 2009
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#
+#    $MCom: ports/net-im/farsight2/Makefile,v 1.10 2012/06/13 09:31:14 kwm Exp $
 
 PORTNAME=	farsight2
-PORTVERSION=	0.0.22
-PORTREVISION=	1
+PORTVERSION=	0.0.31
 CATEGORIES=	net-im devel
 MASTER_SITES=	http://farsight.freedesktop.org/releases/farsight2/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Collection of GStreamer modules and libraries for videoconferencing
 
-LIB_DEPENDS=	nice.0:${PORTSDIR}/net-im/libnice
+LIB_DEPENDS=	nice:${PORTSDIR}/net-im/libnice
 
+CONFLICTS=	farstream-[0-9]*
+
+FETCH_ARGS=	-Fpr
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
-USE_GNOME=	gnomehack pkgconfig glib20 ltverhack \
-		pygtk2
+USE_GNOME=	gnomehack glib20 ltverhack
+USE_PKGCONFIG=	build
 USE_GSTREAMER=	core good bad python
 USE_AUTOTOOLS=	libtool
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 702000
-BROKEN=		does not build on FreeBSD 7.X prior 7.2
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/farsight2/distinfo b/net-im/farsight2/distinfo
index b604007cbc31..07486ea0dd1a 100644
--- a/net-im/farsight2/distinfo
+++ b/net-im/farsight2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (farsight2-0.0.22.tar.gz) = 3ae59aa61a8071c9fad111e5fd606aabc27961eb4192f8729987a27dae6b3974
-SIZE (farsight2-0.0.22.tar.gz) = 1117646
+SHA256 (farsight2-0.0.31.tar.gz) = 55ce219c67a93bc55bcf30d6a5bfcadf09e1c5349d179b2da9ccb74c42271f9b
+SIZE (farsight2-0.0.31.tar.gz) = 1231416
diff --git a/net-im/farsight2/files/patch-transmitters_shm_fs-shm-transmitter.c b/net-im/farsight2/files/patch-transmitters_shm_fs-shm-transmitter.c
deleted file mode 100644
index eb06175ea5a8..000000000000
--- a/net-im/farsight2/files/patch-transmitters_shm_fs-shm-transmitter.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- transmitters/shm/fs-shm-transmitter.c.orig	2010-11-26 23:51:31.000000000 -0500
-+++ transmitters/shm/fs-shm-transmitter.c	2010-11-26 23:50:40.000000000 -0500
-@@ -52,7 +52,9 @@
- # define close closesocket
- #else /*G_OS_WIN32*/
- # include <netdb.h>
-+# include <sys/types.h>
- # include <sys/socket.h>
-+# include <netinet/in.h>
- # include <netinet/ip.h>
- # include <arpa/inet.h>
- #endif /*G_OS_WIN32*/
diff --git a/net-im/farsight2/pkg-plist b/net-im/farsight2/pkg-plist
index 08365a4f44e8..36e9477ee231 100644
--- a/net-im/farsight2/pkg-plist
+++ b/net-im/farsight2/pkg-plist
@@ -7,10 +7,12 @@ include/gstreamer-0.10/gst/farsight/fs-enum-types.h
 include/gstreamer-0.10/gst/farsight/fs-interfaces.h
 include/gstreamer-0.10/gst/farsight/fs-participant.h
 include/gstreamer-0.10/gst/farsight/fs-plugin.h
+include/gstreamer-0.10/gst/farsight/fs-rtp.h
 include/gstreamer-0.10/gst/farsight/fs-session.h
 include/gstreamer-0.10/gst/farsight/fs-stream-transmitter.h
 include/gstreamer-0.10/gst/farsight/fs-stream.h
 include/gstreamer-0.10/gst/farsight/fs-transmitter.h
+include/gstreamer-0.10/gst/farsight/fs-utils.h
 lib/farsight2-0.0/libmulticast-transmitter.a
 lib/farsight2-0.0/libmulticast-transmitter.la
 lib/farsight2-0.0/libmulticast-transmitter.so
@@ -29,6 +31,9 @@ lib/gstreamer-0.10/libfsfunnel.so
 lib/gstreamer-0.10/libfsmsnconference.a
 lib/gstreamer-0.10/libfsmsnconference.la
 lib/gstreamer-0.10/libfsmsnconference.so
+lib/gstreamer-0.10/libfsrawconference.a
+lib/gstreamer-0.10/libfsrawconference.la
+lib/gstreamer-0.10/libfsrawconference.so
 lib/gstreamer-0.10/libfsrtcpfilter.a
 lib/gstreamer-0.10/libfsrtcpfilter.la
 lib/gstreamer-0.10/libfsrtcpfilter.so
@@ -46,6 +51,8 @@ lib/libgstfarsight-0.10.so.0
 %%PYTHON_SITELIBDIR%%/farsight.la
 %%PYTHON_SITELIBDIR%%/farsight.so
 libdata/pkgconfig/farsight2-0.10.pc
+share/farsight2/0.0/fsrtpconference/default-codec-preferences
+share/farsight2/0.0/fsrtpconference/default-element-properties
 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
@@ -59,12 +66,15 @@ share/gtk-doc/html/farsight2-libs-0.10/ch03.html
 share/gtk-doc/html/farsight2-libs-0.10/ch04.html
 share/gtk-doc/html/farsight2-libs-0.10/ch05.html
 share/gtk-doc/html/farsight2-libs-0.10/ch06.html
+share/gtk-doc/html/farsight2-libs-0.10/ch07.html
 share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-0.10.devhelp
 share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-0.10.devhelp2
 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-RTP-Specific-types.html
+share/gtk-doc/html/farsight2-libs-0.10/farsight2-libs-Utility-functions.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
@@ -89,11 +99,16 @@ share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsMsnSession.html
 share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsMsnStream.html
 share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsMulticastStreamTransmitter.html
 share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsNiceStreamTransmitter.html
+share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRawConference.html
+share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRawParticipant.html
+share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRawSession.html
+share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRawStream.html
 share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRawUdpStreamTransmitter.html
 share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRtpConference.html
 share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRtpParticipant.html
 share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRtpSession.html
 share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsRtpStream.html
+share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-FsShmStreamTransmitter.html
 share/gtk-doc/html/farsight2-plugins-0.10/farsight2-plugins-GstVideoanyrate.html
 share/gtk-doc/html/farsight2-plugins-0.10/home.png
 share/gtk-doc/html/farsight2-plugins-0.10/index.html
@@ -109,5 +124,8 @@ share/gtk-doc/html/farsight2-plugins-0.10/up.png
 @dirrm share/gtk-doc/html/farsight2-libs-0.10
 @dirrmtry share/gtk-doc/html
 @dirrmtry share/gtk-doc
+@dirrm share/farsight2/0.0/fsrtpconference
+@dirrm share/farsight2/0.0
+@dirrm share/farsight2
 @dirrm lib/farsight2-0.0
 @dirrm include/gstreamer-0.10/gst/farsight