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

6 files changed, 52 insertions, 103 deletions

diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile
index 90f8d3e99ea7..8b3cc573225c 100644
--- a/mail/evolution-mapi/Makefile
+++ b/mail/evolution-mapi/Makefile
@@ -1,37 +1,32 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/mail/evolution-mapi/Makefile,v 1.23 2010/11/16 09:58:56 kwm Exp $
+#   $MCom: ports/trunk/mail/evolution-mapi/Makefile 19979 2014-10-17 05:16:24Z gusi $
 
 PORTNAME=	evolution-mapi
-PORTVERSION=	0.32.2
-PORTREVISION=	1
+PORTVERSION=	3.12.7
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Evolution plugin to connect to Microsoft Exchange servers
 
-BUILD_DEPENDS=	${PKGFILES}:${PORTSDIR}/mail/evolution
+BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
+		evolution>=3.0.0:${PORTSDIR}/mail/evolution
 LIB_DEPENDS=	libmapi.so:${PORTSDIR}/mail/libmapi
-RUN_DEPENDS=	${PKGFILES}:${PORTSDIR}/mail/evolution
+RUN_DEPENDS=	evolution>=3.0.0:${PORTSDIR}/mail/evolution
 
-PKGFILES=	${LOCALBASE}/libdata/pkgconfig/evolution-plugin.pc
-
-IGNORE=		doesn't build with current libmapi
-
-USES=		gettext tar:bzip2 gmake
-USE_GNOME=	evolutiondataserver
+USES=		gettext gmake libtool pkgconfig tar:xz
+USE_GNOME=	intltool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include -Wno-error=format-nonliteral
+CFLAGS+=	-I${LOCALBASE}/include -Wno-error=format-nonliteral
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
 
-EVO_VERSION=	2.32
-EDS_VERSION=	1.2
-PLIST_SUB=	EVO_VERSION=${EVO_VERSION} EDS_VERSION=${EDS_VERSION}
-
-.include <bsd.port.pre.mk>
+VERSION=	3.12
+PLIST_SUB=	VERSION=${VERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g' \
@@ -39,4 +34,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
 	    	${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/evolution-mapi/distinfo b/mail/evolution-mapi/distinfo
index 0edfdd74d31c..a977c15f9115 100644
--- a/mail/evolution-mapi/distinfo
+++ b/mail/evolution-mapi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/evolution-mapi-0.32.2.tar.bz2) = 0a955a60cbdbe210b6cb7363a7c9a8b8916b4808bc53671e0444d32399871625
-SIZE (gnome2/evolution-mapi-0.32.2.tar.bz2) = 557850
+SHA256 (gnome3/evolution-mapi-3.12.7.tar.xz) = 81909579e836b47925da9bc5de4426047d584fe9dcec49e1a9acb0de4bfb210c
+SIZE (gnome3/evolution-mapi-3.12.7.tar.xz) = 595644
diff --git a/mail/evolution-mapi/files/patch-src_account-setup-eplugin_exchange-mapi-account-setup.c b/mail/evolution-mapi/files/patch-src_account-setup-eplugin_exchange-mapi-account-setup.c
deleted file mode 100644
index b4123235e567..000000000000
--- a/mail/evolution-mapi/files/patch-src_account-setup-eplugin_exchange-mapi-account-setup.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/account-setup-eplugin/exchange-mapi-account-setup.c.orig	2010-03-08 04:03:24.000000000 -0500
-+++ src/account-setup-eplugin/exchange-mapi-account-setup.c	2010-03-13 17:49:17.000000000 -0500
-@@ -696,3 +696,21 @@ exchange_mapi_cal_commit (EPlugin *epl, 
- 	// Update the folder list in the plugin and ExchangeMAPIFolder
- 	return;
- }
-+
-+const char *g_module_check_init (gpointer module);
-+const char *
-+g_module_check_init (gpointer module) {
-+	return NULL;
-+}
-+
-+void g_module_unload (gpointer module);
-+void
-+g_module_unload (gpointer module) {
-+	return;
-+}
-+
-+GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *plugin);
-+GtkWidget *
-+e_plugin_lib_get_configure_widget (EPlugin *plugin) {
-+	return NULL;
-+}
diff --git a/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-cal-utils.c b/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-cal-utils.c
new file mode 100644
index 000000000000..6e801e49e0cb
--- /dev/null
+++ b/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-cal-utils.c
@@ -0,0 +1,10 @@
+--- src/libexchangemapi/e-mapi-cal-utils.c.orig	2014-03-24 09:28:56.000000000 +0000
++++ src/libexchangemapi/e-mapi-cal-utils.c	2014-05-07 09:56:54.788424673 +0000
+@@ -462,6 +462,7 @@
+ 	gchar *start = NULL, *end = NULL;
+ 	time_t start_date, end_date;
+ 	icalcomponent *icalcomp = NULL;
++	int daylight;
+ 
+ 	if (!bin)
+ 		return;
diff --git a/mail/evolution-mapi/files/patch-src_libexchangemapi_exchnage-mapi-cal-utils.c b/mail/evolution-mapi/files/patch-src_libexchangemapi_exchnage-mapi-cal-utils.c
deleted file mode 100644
index 5801861bd60a..000000000000
--- a/mail/evolution-mapi/files/patch-src_libexchangemapi_exchnage-mapi-cal-utils.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/libexchangemapi/exchange-mapi-cal-utils.c.orig	2010-06-07 16:59:16.000000000 +0200
-+++ src/libexchangemapi/exchange-mapi-cal-utils.c	2010-06-07 17:01:25.000000000 +0200
-@@ -2175,6 +2175,7 @@ populate_freebusy_data (struct Binary_r 
- 	gchar *start = NULL, *end = NULL;
- 	time_t start_date, end_date;
- 	icalcomponent *icalcomp = NULL;
-+	int daylight = 0;
- 
- 	if (!bin)
- 		return;
diff --git a/mail/evolution-mapi/pkg-plist b/mail/evolution-mapi/pkg-plist
index 6e36162bb260..03e3f18fc145 100644
--- a/mail/evolution-mapi/pkg-plist
+++ b/mail/evolution-mapi/pkg-plist
@@ -1,25 +1,28 @@
-include/evolution-data-server-%%EVO_VERSION%%/mapi/em-operation-queue.h
-include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-cal-recur-utils.h
-include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-cal-tz-utils.h
-include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-cal-utils.h
-include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-connection.h
-include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-defs.h
-include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-folder.h
-include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-mail-utils.h
-include/evolution-data-server-%%EVO_VERSION%%/mapi/exchange-mapi-utils.h
-lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelmapi.la
-lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelmapi.so
-lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelmapi.urls
-lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendmapi.la
-lib/evolution-data-server-%%EDS_VERSION%%/extensions/libebookbackendmapi.so
-lib/evolution-data-server-%%EDS_VERSION%%/extensions/libecalbackendmapi.la
-lib/evolution-data-server-%%EDS_VERSION%%/extensions/libecalbackendmapi.so
-lib/evolution/%%EVO_VERSION%%/plugins/liborg-gnome-exchange-mapi.la
-lib/evolution/%%EVO_VERSION%%/plugins/liborg-gnome-exchange-mapi.so
-lib/evolution/%%EVO_VERSION%%/plugins/org-gnome-exchange-mapi.eplug
-lib/libexchangemapi-1.0.la
+include/evolution-data-server/mapi/e-mapi-book-utils.h
+include/evolution-data-server/mapi/e-mapi-cal-recur-utils.h
+include/evolution-data-server/mapi/e-mapi-cal-tz-utils.h
+include/evolution-data-server/mapi/e-mapi-cal-utils.h
+include/evolution-data-server/mapi/e-mapi-connection.h
+include/evolution-data-server/mapi/e-mapi-debug.h
+include/evolution-data-server/mapi/e-mapi-defs.h
+include/evolution-data-server/mapi/e-mapi-fast-transfer.h
+include/evolution-data-server/mapi/e-mapi-folder.h
+include/evolution-data-server/mapi/e-mapi-mail-utils.h
+include/evolution-data-server/mapi/e-mapi-operation-queue.h
+include/evolution-data-server/mapi/e-mapi-utils.h
+lib/evolution/%%VERSION%%/modules/module-mapi-configuration.so
+lib/evolution-data-server/addressbook-backends/libebookbackendmapi.so
+lib/evolution-data-server/calendar-backends/libecalbackendmapi.so
+lib/evolution-data-server/camel-providers/libcamelmapi.urls
+lib/evolution-data-server/camel-providers/libcamelmapi.so
+lib/evolution-data-server/registry-modules/module-mapi-backend.so
 lib/libexchangemapi-1.0.so
 lib/libexchangemapi-1.0.so.0
+lib/libexchangemapi-1.0.so.0.0.0
+libdata/pkgconfig/libexchangemapi-1.0.pc
+share/appdata/evolution-mapi.metainfo.xml
+share/evolution-data-server/mapi/tz-ical-to-mapi
+share/evolution-data-server/mapi/tz-mapi-to-ical
 share/locale/as/LC_MESSAGES/evolution-mapi.mo
 share/locale/ast/LC_MESSAGES/evolution-mapi.mo
 share/locale/bg/LC_MESSAGES/evolution-mapi.mo
@@ -31,8 +34,9 @@ share/locale/cs/LC_MESSAGES/evolution-mapi.mo
 share/locale/da/LC_MESSAGES/evolution-mapi.mo
 share/locale/de/LC_MESSAGES/evolution-mapi.mo
 share/locale/el/LC_MESSAGES/evolution-mapi.mo
-share/locale/en_GB/LC_MESSAGES/evolution-mapi.mo
 share/locale/en@shaw/LC_MESSAGES/evolution-mapi.mo
+share/locale/en_GB/LC_MESSAGES/evolution-mapi.mo
+share/locale/eo/LC_MESSAGES/evolution-mapi.mo
 share/locale/es/LC_MESSAGES/evolution-mapi.mo
 share/locale/et/LC_MESSAGES/evolution-mapi.mo
 share/locale/eu/LC_MESSAGES/evolution-mapi.mo
@@ -73,35 +77,9 @@ share/locale/ta/LC_MESSAGES/evolution-mapi.mo
 share/locale/te/LC_MESSAGES/evolution-mapi.mo
 share/locale/th/LC_MESSAGES/evolution-mapi.mo
 share/locale/tr/LC_MESSAGES/evolution-mapi.mo
+share/locale/ug/LC_MESSAGES/evolution-mapi.mo
 share/locale/uk/LC_MESSAGES/evolution-mapi.mo
 share/locale/vi/LC_MESSAGES/evolution-mapi.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-mapi.mo
 share/locale/zh_HK/LC_MESSAGES/evolution-mapi.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-mapi.mo
-libdata/pkgconfig/libexchangemapi-1.0.pc
-share/evolution-data-server-%%EVO_VERSION%%/mapi/tz-mapi-to-ical
-share/evolution-data-server-%%EVO_VERSION%%/mapi/tz-ical-to-mapi
-@dirrm share/evolution-data-server-%%EVO_VERSION%%/mapi
-@dirrm include/evolution-data-server-%%EVO_VERSION%%/mapi
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/si/LC_MESSAGES
-@dirrmtry share/locale/si
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/mai/LC_MESSAGES
-@dirrmtry share/locale/mai
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as