The FreeBSD GNOME team proudly presents GNOME 3.14 and Cinnamon 2.2.

Gnome 3.14.1 and Cinnamon 2.2.16 are supported on FreeBSD 9.3-RELEASE and up.

This commit removes the old GNOME 2 desktop, bindings and some ports that
can't be compiled. A few ports where updated to more recent versions to
allow them to compile with this update.

Apart from updating ports to newer versions

GDM is more integrated with gnome-shell now, and handles several things for
the GNOME desktop such as screen locking. If you want to use GNOME 3 via
startx, you will have to add your own lock screen/screensaver. For example xscreensaver
can be used for sessions started without GDM.

Shell Extensions can be installed via https://extensions.gnome.org/ , we have
ported a few that can't be installed via this way.
The old gnome-utils and gnome-games ports where split up into single ports
and where converted to meta-ports.
gnome-terminal requires a UTF-8 locale to run, gdm handles this already, but
if you use startx you need to do this yourself.

Upgrade instructions:

Delete the old and conflicting packages:
# pkg delete clutter gnome-utils gnome-panel gnome-keyring vala-vapigen \
    guile gcalctool gnome-media libgnomekbd
# pkg delete gnome-screensaver gnome-applets bug-buddy evolution-exchange \
    evolution-webcal gnome-system-tools seahorse-plugins gnome-control-center

For package users the following lines will be enough:
# pkg upgrade
# pkg install gnome3

For ports users should do the following:
# portmaster -a
# portmaster x11/gnome3

We are currently aware of two issues. The first issue is a bug in the
file monitoring code in the glib20 port. This bug causes glib programs
to crash when files in a monitored directory are added or removed.
Upstream is aware of the problem, but since the problem is quite complex
there is no solution yet. This problem isn't restricted to BSD.

The second issue is that on certain video cards totem will display a
purple/pink overlay on the video. It not clear yet where the issues
comes from.

Major thanks goes to Gustau Perez for being a driving force behind getting
GNOME 3 up to speed again. Also thanks to Antoine Brodin for running the exp-runs.

This update was also made possible by:
	Joe Maloney
	Kris Moore
	Beeblebrox
	Ryan Lortie
	Antoine Jacoutot
	and everyone I missed

4 files changed, 30 insertions, 32 deletions

diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile
index 9b03ce63951d..46b7e1069385 100644
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -1,33 +1,28 @@
 # Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/multimedia/clutter-gst/Makefile,v 1.6 2010/06/29 21:14:02 kwm Exp $
+#   $MCom: ports-experimental/trunk/multimedia/clutter-gst/Makefile 19553 2014-04-20 07:23:27Z gusi $
 
 PORTNAME=	clutter-gst
-PORTVERSION=	1.3.4
-PORTREVISION=	3
+PORTVERSION=	2.0.12
 CATEGORIES=	multimedia
-MASTER_SITES=	http://source.clutter-project.org/sources/${PORTNAME}/${PORTVERSION:R}/
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Clutter GStreamer integration
 
-LIB_DEPENDS=	libclutter-glx-1.0.so:${PORTSDIR}/graphics/clutter
+LIB_DEPENDS=	libclutter-1.0.so:${PORTSDIR}/graphics/clutter
 
-USES=		gmake libtool pathfix pkgconfig tar:bzip2
+USES=		gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME=	introspection gnomeprefix
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomeprefix
-USE_GSTREAMER=	yes
 USE_GL=		gl
+USE_GSTREAMER1=	yes
 USE_XORG=	xp x11
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-silent-rules
+MAKE_ENV=	XDG_CACHE_HOME=${WRKDIR}
 
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 INSTALL_TARGET=	install-strip
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
-		${WRKSRC}/clutter-gst/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/multimedia/clutter-gst/distinfo b/multimedia/clutter-gst/distinfo
index 8f99a82708f8..222926b6a8a9 100644
--- a/multimedia/clutter-gst/distinfo
+++ b/multimedia/clutter-gst/distinfo
@@ -1,2 +1,2 @@
-SHA256 (clutter-gst-1.3.4.tar.bz2) = de4ce6d3313be3074c6afc6f20276ef06f1a460b3a6755fc5c6e048685de137a
-SIZE (clutter-gst-1.3.4.tar.bz2) = 446018
+SHA256 (clutter-gst-2.0.12.tar.xz) = c2f1453692b0c3ff6a500113bc1d2c95d2bde11caca0809610a6d1424bbbffb5
+SIZE (clutter-gst-2.0.12.tar.xz) = 356164
diff --git a/multimedia/clutter-gst/pkg-descr b/multimedia/clutter-gst/pkg-descr
index e45e23ccdb1f..369054818768 100644
--- a/multimedia/clutter-gst/pkg-descr
+++ b/multimedia/clutter-gst/pkg-descr
@@ -13,4 +13,4 @@ about anything else media-related. Its plugin-based architecture means
 that new data types or processing capabilities can be added simply by
 installing new plug-ins.
 
-WWW:	http://clutter-project.org/
+WWW: http://clutter-project.org/
diff --git a/multimedia/clutter-gst/pkg-plist b/multimedia/clutter-gst/pkg-plist
index be150f69dc78..d58853a53d0d 100644
--- a/multimedia/clutter-gst/pkg-plist
+++ b/multimedia/clutter-gst/pkg-plist
@@ -1,31 +1,34 @@
-include/clutter-1.0/clutter-gst/clutter-gst-enum-types.h
-include/clutter-1.0/clutter-gst/clutter-gst-util.h
-include/clutter-1.0/clutter-gst/clutter-gst-version.h
-include/clutter-1.0/clutter-gst/clutter-gst-video-sink.h
-include/clutter-1.0/clutter-gst/clutter-gst-video-texture.h
-include/clutter-1.0/clutter-gst/clutter-gst.h
-lib/libclutter-gst-1.0.so
-lib/libclutter-gst-1.0.so.0
-lib/libclutter-gst-1.0.so.0.304.0
-lib/girepository-1.0/ClutterGst-1.0.typelib
-libdata/pkgconfig/clutter-gst-1.0.pc
+include/clutter-gst-2.0/clutter-gst/clutter-gst-enum-types.h
+include/clutter-gst-2.0/clutter-gst/clutter-gst-player.h
+include/clutter-gst-2.0/clutter-gst/clutter-gst-types.h
+include/clutter-gst-2.0/clutter-gst/clutter-gst-util.h
+include/clutter-gst-2.0/clutter-gst/clutter-gst-version.h
+include/clutter-gst-2.0/clutter-gst/clutter-gst-video-sink.h
+include/clutter-gst-2.0/clutter-gst/clutter-gst-video-texture.h
+include/clutter-gst-2.0/clutter-gst/clutter-gst.h
+lib/girepository-1.0/ClutterGst-2.0.typelib
+lib/gstreamer-1.0/libgstclutter.so
+lib/libclutter-gst-2.0.so
+lib/libclutter-gst-2.0.so.0
+lib/libclutter-gst-2.0.so.0.12.0
+libdata/pkgconfig/clutter-gst-2.0.pc
+%%DOCSDIR%%/ClutterGstPlayer.html
 %%DOCSDIR%%/ClutterGstVideoSink.html
 %%DOCSDIR%%/ClutterGstVideoTexture.html
 %%DOCSDIR%%/ch01.html
 %%DOCSDIR%%/ch02.html
 %%DOCSDIR%%/clutter-gst-Utilities.html
 %%DOCSDIR%%/clutter-gst-Versioning-Macros.html
-%%DOCSDIR%%/clutter-gst.devhelp
 %%DOCSDIR%%/clutter-gst.devhelp2
 %%DOCSDIR%%/home.png
 %%DOCSDIR%%/index.html
 %%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left-insensitive.png
 %%DOCSDIR%%/left.png
 %%DOCSDIR%%/license.html
+%%DOCSDIR%%/right-insensitive.png
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
+%%DOCSDIR%%/up-insensitive.png
 %%DOCSDIR%%/up.png
-share/gir-1.0/ClutterGst-1.0.gir
-@dirrmtry %%DOCSDIR%%
-@dirrm include/clutter-1.0/clutter-gst
-@dirrmtry include/clutter-1.0
+share/gir-1.0/ClutterGst-2.0.gir