Update to GNOME 2.4.0. For all the goodies on what's changed, known issues,

future plans, etc., please see http://www.gnome.org/start/2.4/.

This commit represents work done by adamw, bland, and myself as well as
many other contributers:

Koop Mast <einekoai@chello.nl>
Akifyev Sergey <asa@gascom.ru>
Franz Klammer <klammer@webonaut.com>
Øyvind Kolbu <oyvind@kebab.gaffel.nu>
Thomas E. Zander <riggs@rrr.de>
Jeremy Messenger <mezz7@cox.net>

Without these contirbuters, and our faithful users, GNOME 2.4.0 would not
be possible.

Please check the FreeBSD GNOME site for any FreeBSD gotchas, as well as
general FAQs and documentation (GNOME 2.4 updates to be posted soon).  The
best way to upgrade so that you get all shared library dependencies is:

portupgrade -rf -m BATCH=yes atk
portupgrade -R -m BATCH=yes gnome2

Approved by:	portmgr (kris, will, myself implicitly)
Requested by:	re as well as many other users

5 files changed, 24 insertions, 23 deletions

diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 339eeb40cea6..6837c81a3e93 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -6,16 +6,15 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.6.2
+PORTVERSION=	0.6.3
 CATEGORIES=	multimedia
-#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-#MASTER_SITE_SUBDIR=	${PORTNAME}
-MASTER_SITES=	http://gstreamer.net/releases/${PORTVERSION}/src/
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.6
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Development framework for creating media applications
 
-BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
 USE_X_PREFIX=	yes
@@ -27,6 +26,7 @@ WANT_GNOME=	yes
 USE_GNOME=	gnomehack \
 		gnomeprefix \
 		glib20 \
+		pkgconfig \
 		libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --disable-tests \
diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo
index d6774301ed85..3f25c2c82e79 100644
--- a/multimedia/gstreamer/distinfo
+++ b/multimedia/gstreamer/distinfo
@@ -1 +1 @@
-MD5 (gstreamer-0.6.2.tar.bz2) = 56de8c6b9128cfd9f9758ed13ec8abeb
+MD5 (gnome2/gstreamer-0.6.3.tar.bz2) = f9e9401c709074dc7bd600b0f3baab37
diff --git a/multimedia/gstreamer/files/patch-configure b/multimedia/gstreamer/files/patch-configure
deleted file mode 100644
index 805a86c3b3d9..000000000000
--- a/multimedia/gstreamer/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Jan 22 09:17:40 2003
-+++ configure	Wed Jan 29 14:49:56 2003
-@@ -7712,7 +7713,7 @@
- if test "x$COMPILER" = "xforte"; then
-   GST_ERROR=
- else
--  if test "x$GST_CVS"="xyes"; then
-+  if test "x$GST_CVS" = "xyes"; then
-     GST_ERROR="-Wall -Werror"
-   else
-     GST_ERROR="-Wall"
diff --git a/multimedia/gstreamer/files/patch-gst::gstthreaddummy.c b/multimedia/gstreamer/files/patch-gst::gstthreaddummy.c
new file mode 100644
index 000000000000..479a05ba9c9b
--- /dev/null
+++ b/multimedia/gstreamer/files/patch-gst::gstthreaddummy.c
@@ -0,0 +1,12 @@
+--- gst/gstthreaddummy.c.orig	Sat Aug 30 19:30:10 2003
++++ gst/gstthreaddummy.c	Sat Aug 30 19:30:34 2003
+@@ -17,7 +17,9 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#include <sys/types.h>
+ #include <sys/time.h>
++#include <unistd.h>
+ #include <glib.h>
+ #include "gstlog.h"
+ 
diff --git a/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in b/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in
index fd554c27807f..02dae54758d0 100644
--- a/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in
+++ b/multimedia/gstreamer/files/patch-libs::ext::cothreads::tests::Makefile.in
@@ -1,11 +1,11 @@
---- libs/ext/cothreads/tests/Makefile.in.orig	Sat Sep 28 23:05:55 2002
-+++ libs/ext/cothreads/tests/Makefile.in	Sat Sep 28 23:06:23 2002
-@@ -83,7 +83,7 @@
+--- libs/ext/cothreads/tests/Makefile.in.orig	Sat Aug 30 19:28:04 2003
++++ libs/ext/cothreads/tests/Makefile.in	Sat Aug 30 19:28:39 2003
+@@ -68,7 +68,7 @@
  GLIB_CFLAGS = @GLIB_CFLAGS@
  GLIB_LIBS = @GLIB_LIBS@
  GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
 -GTHREAD_LIBS = @GTHREAD_LIBS@
 +GTHREAD_LIBS = -lc @GTHREAD_LIBS@
- INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@