Presenting GNOME 2.28.1 for FreeBSD. The official release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.28/ .
Officially, this is mostly a polishing release in preparation for GNOME 3.0
due in about a year.

On the FreeBSD front, though, a lot went into this release.  Major thanks
goes to kwm and avl who did a lot of the porting work for this release.
In particular, kwm brought in Evolution MAPI support for better Microsoft
Exchange integration.  Avl made sure that the new gobject introspection
repository ports were nicely compartmentalized so that large dependencies
aren't brought in wholesale.

But, every GNOME team member (ahze, avl, bland, kwm, mezz, and myself)
contributed to this release.

Other major improvements include an updated HAL with better volume
probing code, ufsid integration, and support for volume names containing
spaces (big thanks to J.R. Oldroyd); a new WebKit; updated AbiWord;
an updated Gimp; and a preview of the new GNOME Shell project (thanks to
Pawel Worach).

The FreeBSD GNOME Team would like to that the following additional
contributors to this release whose patches and testing really helped
make it a success:

Andrius Morkunas
Dominique Goncalves
Eric L. Chen
J.R. Oldroyd
Joseph S. Atkinson
Li
Pawel Worach
Romain Tartière
Thomas Vogt
Yasuda Keisuke
Rui Paulo
Martin Wilke
(and an extra shout out to miwi and pav for pointyhat runs)

We would like to send this release out to Alexander Loginov (avl) in
hopes that he feels better soon.

PR:		136676
		136967
		138872 (obsolete with new epiphany-webkit)
		139160
		134737
		139941
		140097
		140838
		140929

7 files changed, 81 insertions, 121 deletions

diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile
index 9ca1076b4f3c..13a1cd8b548f 100644
--- a/net-im/telepathy-mission-control/Makefile
+++ b/net-im/telepathy-mission-control/Makefile
@@ -3,13 +3,12 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/net-im/telepathy-mission-control/Makefile,v 1.4 2008/03/20 03:20:54 marcus Exp $
+#    $MCom: ports/net-im/telepathy-mission-control/Makefile,v 1.8 2009/10/24 15:26:03 marcus Exp $
 
 PORTNAME=	telepathy-mission-control
-PORTVERSION=	4.67
-PORTREVISION=	1
+PORTVERSION=	5.2.6
 CATEGORIES=	net-im devel
-MASTER_SITES=	SF/mission-control/mission-control/${PORTVERSION}
+MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-mission-control/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Telepathy component to apps to abstract details of connection managers
@@ -23,6 +22,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
+MAN1=		mc-account-convert.1 mc-tool.1 mc-wait-for-name.1
+MAN8=		mission-control-5.8
+
+PLIST_SUB=	VERSION=${PORTVERSION}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/gtk-doc/html|/${DOCSDIR}|' \
 		${WRKSRC}/configure
diff --git a/net-im/telepathy-mission-control/distinfo b/net-im/telepathy-mission-control/distinfo
index 5897861fc072..42da40bbef76 100644
--- a/net-im/telepathy-mission-control/distinfo
+++ b/net-im/telepathy-mission-control/distinfo
@@ -1,3 +1,3 @@
-MD5 (telepathy-mission-control-4.67.tar.gz) = 0a547e7af4a33355bac3638dd2e40859
-SHA256 (telepathy-mission-control-4.67.tar.gz) = 326b82519a49a238a476c028097bde5820c4b58af500dbb5b715cdfd6fe0bfcd
-SIZE (telepathy-mission-control-4.67.tar.gz) = 659444
+MD5 (telepathy-mission-control-5.2.6.tar.gz) = 21763710a1db21d71905a4e7c64a1742
+SHA256 (telepathy-mission-control-5.2.6.tar.gz) = 801be8354cda8d2cc1f79ea8ee4ad89795cae954cd719358121474271be6f08d
+SIZE (telepathy-mission-control-5.2.6.tar.gz) = 1049164
diff --git a/net-im/telepathy-mission-control/files/patch-src_Makefile.in b/net-im/telepathy-mission-control/files/patch-src_Makefile.in
deleted file mode 100644
index c81711665058..000000000000
--- a/net-im/telepathy-mission-control/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/Makefile.in.orig	2008-07-20 01:57:35.000000000 -0400
-+++ src/Makefile.in	2008-07-20 01:57:38.000000000 -0400
-@@ -291,7 +291,6 @@ BUILT_SOURCES = \
- CLEANFILES = $(BUILT_SOURCES)
- lib_LTLIBRARIES = libmissioncontrol-server.la
- libmissioncontrol_server_la_LIBADD = $(GCONF_LIBS) $(TELEPATHY_LIBS) \
--	-ldl \
- 	$(top_builddir)/libmissioncontrol/libmissioncontrol-client.la
- 
- 
diff --git a/net-im/telepathy-mission-control/files/patch-src_mcd-debug.c b/net-im/telepathy-mission-control/files/patch-src_mcd-debug.c
deleted file mode 100644
index bcd2581e3ef9..000000000000
--- a/net-im/telepathy-mission-control/files/patch-src_mcd-debug.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mcd-debug.c.orig	2009-03-24 23:45:42.000000000 -0400
-+++ src/mcd-debug.c	2009-03-24 23:46:43.000000000 -0400
-@@ -119,7 +119,7 @@ void mcd_debug_init ()
- 	mc_debug = atoi (mc_debug_str);
- }
- 
--inline gint mcd_debug_get_level ()
-+gint mcd_debug_get_level ()
- {
-     return mc_debug;
- }
diff --git a/net-im/telepathy-mission-control/files/patch-src_mcd-debug.h b/net-im/telepathy-mission-control/files/patch-src_mcd-debug.h
deleted file mode 100644
index 249ad641dc88..000000000000
--- a/net-im/telepathy-mission-control/files/patch-src_mcd-debug.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mcd-debug.h.orig	2009-03-24 23:45:58.000000000 -0400
-+++ src/mcd-debug.h	2009-03-24 23:46:32.000000000 -0400
-@@ -35,7 +35,7 @@ G_BEGIN_DECLS
- 
- void mcd_debug_init ();
- 
--inline gint mcd_debug_get_level ();
-+gint mcd_debug_get_level ();
- 
- void mcd_debug_ref (gpointer obj, const gchar *filename, gint linenum);
- void mcd_debug_unref (gpointer obj, const gchar *filename, gint linenum);
diff --git a/net-im/telepathy-mission-control/files/patch-util_mc-tool.c b/net-im/telepathy-mission-control/files/patch-util_mc-tool.c
new file mode 100644
index 000000000000..c599bea27191
--- /dev/null
+++ b/net-im/telepathy-mission-control/files/patch-util_mc-tool.c
@@ -0,0 +1,35 @@
+--- util/mc-tool.c.orig	2009-09-22 22:49:32.000000000 -0400
++++ util/mc-tool.c	2009-09-22 22:50:39.000000000 -0400
+@@ -1103,7 +1103,7 @@ main (int argc, char **argv)
+     McAccountManager *am = NULL;
+     McAccount *a = NULL;
+     DBusGConnection *dbus_conn;
+-    TpDBusDaemon *daemon;
++    TpDBusDaemon *td_daemon;
+ 
+     g_type_init ();
+ 
+@@ -1114,19 +1114,19 @@ main (int argc, char **argv)
+     command.common.ret = 1;
+ 
+     dbus_conn = tp_get_bus ();
+-    daemon = tp_dbus_daemon_new (dbus_conn);
++    td_daemon = tp_dbus_daemon_new (dbus_conn);
+     dbus_g_connection_unref (dbus_conn);
+ 
+     if (command.common.account == NULL) {
+-	am = mc_account_manager_new (daemon);
++	am = mc_account_manager_new (td_daemon);
+ 	mc_account_manager_call_when_ready (am, manager_ready, NULL);
+     }
+     else {
+ 	command.common.account = prefix (command.common.account);
+-	a = mc_account_new (daemon, command.common.account);
++	a = mc_account_new (td_daemon, command.common.account);
+ 	mc_account_call_when_ready (a, account_ready, NULL);
+     }
+-    g_object_unref (daemon);
++    g_object_unref (td_daemon);
+ 
+     main_loop = g_main_loop_new (NULL, FALSE);
+     g_main_loop_run (main_loop);
diff --git a/net-im/telepathy-mission-control/pkg-plist b/net-im/telepathy-mission-control/pkg-plist
index 49af223c2ca0..00187ce891ec 100644
--- a/net-im/telepathy-mission-control/pkg-plist
+++ b/net-im/telepathy-mission-control/pkg-plist
@@ -1,73 +1,48 @@
-bin/mc-account
-include/libmcclient/_gen/cli-Account.h
-include/libmcclient/_gen/cli-Account_Manager.h
+bin/mc-account-convert
+bin/mc-tool
+bin/mc-wait-for-name
+include/libmcclient/_gen/cli-account-manager.h
+include/libmcclient/_gen/cli-account.h
+include/libmcclient/_gen/cli-dispatch-operation.h
 include/libmcclient/_gen/enums.h
 include/libmcclient/_gen/gtypes.h
 include/libmcclient/_gen/interfaces.h
+include/libmcclient/_gen/mc-quark.h
+include/libmcclient/_gen/svc-client.h
 include/libmcclient/dbus-api.h
 include/libmcclient/mc-account-manager.h
 include/libmcclient/mc-account.h
+include/libmcclient/mc-dispatch-operation.h
+include/libmcclient/mc-enums.h
+include/libmcclient/mc-errors.h
+include/libmcclient/mc-gtypes.h
+include/libmcclient/mc-interfaces.h
+include/libmcclient/mc-profile.h
 include/libmcclient/mc-signals-marshal.h
-include/libmissioncontrol/_gen/cli-nmc4.h
-include/libmissioncontrol/_gen/enums.h
-include/libmissioncontrol/_gen/gtypes.h
-include/libmissioncontrol/_gen/interfaces.h
-include/libmissioncontrol/_gen/svc-nmc4.h
-include/libmissioncontrol/cli-nmc4.h
-include/libmissioncontrol/dbus-api.h
-include/libmissioncontrol/mc-account-monitor.h
-include/libmissioncontrol/mc-account.h
-include/libmissioncontrol/mc-enum-types.h
-include/libmissioncontrol/mc-manager.h
-include/libmissioncontrol/mc-profile.h
-include/libmissioncontrol/mc-protocol.h
-include/libmissioncontrol/mc-signals-marshal.h
-include/libmissioncontrol/mc.h
-include/libmissioncontrol/mission-control-signals-marshal.h
-include/libmissioncontrol/mission-control.h
-include/libmissioncontrol/svc-nmc4.h
-include/mission-control/_gen/enums.h
-include/mission-control/_gen/gtypes.h
-include/mission-control/_gen/interfaces.h
-include/mission-control/_gen/svc-Account.h
-include/mission-control/_gen/svc-Account_Manager.h
-include/mission-control/mcd-account-manager.h
-include/mission-control/mcd-account-priv.h
-include/mission-control/mcd-account.h
-include/mission-control/mcd-chan-handler.h
-include/mission-control/mcd-channel.h
-include/mission-control/mcd-connection.h
-include/mission-control/mcd-controller.h
-include/mission-control/mcd-debug.h
-include/mission-control/mcd-dispatcher-context.h
-include/mission-control/mcd-dispatcher.h
-include/mission-control/mcd-enum-types.h
-include/mission-control/mcd-manager.h
-include/mission-control/mcd-master.h
-include/mission-control/mcd-mission.h
-include/mission-control/mcd-operation.h
-include/mission-control/mcd-presence-frame.h
-include/mission-control/mcd-provisioning-factory.h
-include/mission-control/mcd-provisioning.h
-include/mission-control/mcd-proxy.h
-include/mission-control/mcd-service.h
+include/libmcclient/mc-svc-client.h
 lib/libmcclient.a
 lib/libmcclient.la
 lib/libmcclient.so
-lib/libmcclient.so.5
-lib/libmissioncontrol-client.a
-lib/libmissioncontrol-client.la
-lib/libmissioncontrol-client.so
-lib/libmissioncontrol-client.so.0
-lib/libmissioncontrol-server.a
-lib/libmissioncontrol-server.la
-lib/libmissioncontrol-server.so
-lib/libmissioncontrol-server.so.1
+lib/libmcclient-%%VERSION%%.so
 libdata/pkgconfig/libmcclient.pc
-libdata/pkgconfig/libmissioncontrol.pc
-libdata/pkgconfig/mission-control.pc
-libexec/mission-control
-share/dbus-1/services/org.freedesktop.Telepathy.MissionControl.service
+libexec/mission-control-5
+share/dbus-1/services/org.freedesktop.Telepathy.AccountManager.service
+share/dbus-1/services/org.freedesktop.Telepathy.MissionControl5.service
+share/doc/libmcclient/McProfile.html
+share/doc/libmcclient/ch-account-manager.html
+share/doc/libmcclient/ch-account.html
+share/doc/libmcclient/ch-profile.html
+share/doc/libmcclient/home.png
+share/doc/libmcclient/index.html
+share/doc/libmcclient/index.sgml
+share/doc/libmcclient/left.png
+share/doc/libmcclient/libmcclient-mc-account-manager.html
+share/doc/libmcclient/libmcclient-mc-account.html
+share/doc/libmcclient/libmcclient.devhelp
+share/doc/libmcclient/libmcclient.devhelp2
+share/doc/libmcclient/right.png
+share/doc/libmcclient/style.css
+share/doc/libmcclient/up.png
 share/doc/libmissioncontrol-server/McdChannel.html
 share/doc/libmissioncontrol-server/McdController.html
 share/doc/libmissioncontrol-server/McdDispatcher.html
@@ -75,7 +50,6 @@ share/doc/libmissioncontrol-server/McdManager.html
 share/doc/libmissioncontrol-server/McdMaster.html
 share/doc/libmissioncontrol-server/McdMission.html
 share/doc/libmissioncontrol-server/McdOperation.html
-share/doc/libmissioncontrol-server/McdPresenceFrame.html
 share/doc/libmissioncontrol-server/McdProxy.html
 share/doc/libmissioncontrol-server/McdService.html
 share/doc/libmissioncontrol-server/ch01.html
@@ -83,7 +57,6 @@ share/doc/libmissioncontrol-server/home.png
 share/doc/libmissioncontrol-server/index.html
 share/doc/libmissioncontrol-server/index.sgml
 share/doc/libmissioncontrol-server/left.png
-share/doc/libmissioncontrol-server/libmissioncontrol-server-mcd-chan-handler.html
 share/doc/libmissioncontrol-server/libmissioncontrol-server-mcd-connection.html
 share/doc/libmissioncontrol-server/libmissioncontrol-server-mcd-debug.html
 share/doc/libmissioncontrol-server/libmissioncontrol-server-mcd-dispatcher-context.html
@@ -93,27 +66,7 @@ share/doc/libmissioncontrol-server/libmissioncontrol-server.devhelp2
 share/doc/libmissioncontrol-server/right.png
 share/doc/libmissioncontrol-server/style.css
 share/doc/libmissioncontrol-server/up.png
-share/doc/libmissioncontrol/McAccount.html
-share/doc/libmissioncontrol/McAccountMonitor.html
-share/doc/libmissioncontrol/McManager.html
-share/doc/libmissioncontrol/McProfile.html
-share/doc/libmissioncontrol/McProtocol.html
-share/doc/libmissioncontrol/ch01.html
-share/doc/libmissioncontrol/home.png
-share/doc/libmissioncontrol/index.html
-share/doc/libmissioncontrol/index.sgml
-share/doc/libmissioncontrol/left.png
-share/doc/libmissioncontrol/libmissioncontrol-mission-control.html
-share/doc/libmissioncontrol/libmissioncontrol.devhelp
-share/doc/libmissioncontrol/libmissioncontrol.devhelp2
-share/doc/libmissioncontrol/right.png
-share/doc/libmissioncontrol/style.css
-share/doc/libmissioncontrol/up.png
 @dirrm share/doc/libmissioncontrol-server
-@dirrm share/doc/libmissioncontrol
-@dirrm include/mission-control/_gen
-@dirrm include/mission-control
-@dirrm include/libmissioncontrol/_gen
-@dirrm include/libmissioncontrol
+@dirrm share/doc/libmcclient
 @dirrm include/libmcclient/_gen
 @dirrm include/libmcclient