8 files changed, 55 insertions, 26 deletions

diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index cf342af08f2d..612664f49da5 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/deskbar-applet/Makefile,v 1.99 2009/03/18 04:27:55 marcus Exp $
+#   $MCom: ports-stable/deskutils/deskbar-applet/Makefile,v 1.3 2009/04/15 15:18:16 kwm Exp $
 #
 
 PORTNAME=	deskbar-applet
-PORTVERSION=	2.26.0
+PORTVERSION=	2.26.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/deskutils/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo
index b038a7cfb542..11f67455645f 100644
--- a/deskutils/deskbar-applet/distinfo
+++ b/deskutils/deskbar-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/deskbar-applet-2.26.0.tar.bz2) = 168044d1312bf30e71f2ed587d2bffb6
-SHA256 (gnome2/deskbar-applet-2.26.0.tar.bz2) = 547c80dc1a21b0f4e8b866601623b902448ac81780c2d29a25299a0953e1bc17
-SIZE (gnome2/deskbar-applet-2.26.0.tar.bz2) = 969825
+MD5 (gnome2/deskbar-applet-2.26.1.tar.bz2) = d7747abc1baa951bba684f9ab1db9699
+SHA256 (gnome2/deskbar-applet-2.26.1.tar.bz2) = a7d0b46f52cdbf3667cdd477bfa979e7895e29a1c21452f6e5a762cefc0414a8
+SIZE (gnome2/deskbar-applet-2.26.1.tar.bz2) = 1027265
diff --git a/deskutils/nautilus-sendto/Makefile b/deskutils/nautilus-sendto/Makefile
index c9361fb2cf1c..9663e2ca1f31 100644
--- a/deskutils/nautilus-sendto/Makefile
+++ b/deskutils/nautilus-sendto/Makefile
@@ -3,19 +3,20 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/deskutils/nautilus-sendto/Makefile,v 1.16 2008/02/10 19:57:54 marcus Exp $
+#    $MCom: ports-stable/deskutils/nautilus-sendto/Makefile,v 1.4 2009/04/20 06:12:55 marcus Exp $
 
 PORTNAME=	nautilus-sendto
-PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTVERSION=	1.1.4.1
 CATEGORIES=	deskutils
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Integration between nautilus, evolution, and pidgin
 
-BUILD_DEPENDS=	evolution:${PORTSDIR}/mail/evolution
-RUN_DEPENDS=	evolution:${PORTSDIR}/mail/evolution
+BUILD_DEPENDS=	evolution:${PORTSDIR}/mail/evolution \
+    		empathy:${PORTSDIR}/net-im/empathy
+RUN_DEPENDS=	evolution:${PORTSDIR}/mail/evolution \
+    		empathy:${PORTSDIR}/net-im/empathy
 
 MAN1=		nautilus-sendto.1
 GCONF_SCHEMAS=	nst.schemas
diff --git a/deskutils/nautilus-sendto/distinfo b/deskutils/nautilus-sendto/distinfo
index f5929c3d10c2..d9c87aabdbc5 100644
--- a/deskutils/nautilus-sendto/distinfo
+++ b/deskutils/nautilus-sendto/distinfo
@@ -1,3 +1,3 @@
-MD5 (nautilus-sendto-1.0.1.tar.bz2) = 33f2a9b27a7641967f97493453ca60ac
-SHA256 (nautilus-sendto-1.0.1.tar.bz2) = 6b3dc8393de520b5bf3aa3249874be473add312514fed222a6091f9523d05915
-SIZE (nautilus-sendto-1.0.1.tar.bz2) = 367316
+MD5 (nautilus-sendto-1.1.4.1.tar.bz2) = c4b66eb6fd24eff0b2240b832085a20e
+SHA256 (nautilus-sendto-1.1.4.1.tar.bz2) = b432d5f8cbddcd4699e3b726f0bef5c004d4271189ff34d8085477b8b0cb1175
+SIZE (nautilus-sendto-1.1.4.1.tar.bz2) = 363299
diff --git a/deskutils/nautilus-sendto/pkg-plist b/deskutils/nautilus-sendto/pkg-plist
index 21596e9e0599..5e7d10d6a8e3 100644
--- a/deskutils/nautilus-sendto/pkg-plist
+++ b/deskutils/nautilus-sendto/pkg-plist
@@ -1,20 +1,23 @@
 bin/nautilus-sendto
 lib/nautilus-sendto/plugins/libnstbluetooth.la
 lib/nautilus-sendto/plugins/libnstbluetooth.so
+lib/nautilus-sendto/plugins/libnstburn.la
+lib/nautilus-sendto/plugins/libnstburn.so
+lib/nautilus-sendto/plugins/libnstempathy.la
+lib/nautilus-sendto/plugins/libnstempathy.so
 lib/nautilus-sendto/plugins/libnstevolution.la
 lib/nautilus-sendto/plugins/libnstevolution.so
 %%PIDGIN%%lib/nautilus-sendto/plugins/libnstpidgin.la
 %%PIDGIN%%lib/nautilus-sendto/plugins/libnstpidgin.so
-lib/nautilus-sendto/plugins/libnstsylpheed.la
-lib/nautilus-sendto/plugins/libnstsylpheed.so
-lib/nautilus-sendto/plugins/libnstthunderbird.la
-lib/nautilus-sendto/plugins/libnstthunderbird.so
+lib/nautilus-sendto/plugins/libnstremovable_devices.la
+lib/nautilus-sendto/plugins/libnstremovable_devices.so
 lib/nautilus/extensions-2.0/libnautilus-sendto.la
 lib/nautilus/extensions-2.0/libnautilus-sendto.so
 %%PIDGIN%%lib/pidgin/nautilus.la
 %%PIDGIN%%lib/pidgin/nautilus.so
 share/nautilus-sendto/glade/nautilus-sendto.glade
 share/locale/ar/LC_MESSAGES/nautilus-sendto.mo
+share/locale/ast/LC_MESSAGES/nautilus-sendto.mo
 share/locale/be@latin/LC_MESSAGES/nautilus-sendto.mo
 share/locale/be/LC_MESSAGES/nautilus-sendto.mo
 share/locale/bg/LC_MESSAGES/nautilus-sendto.mo
@@ -40,6 +43,7 @@ share/locale/ka/LC_MESSAGES/nautilus-sendto.mo
 share/locale/ko/LC_MESSAGES/nautilus-sendto.mo
 share/locale/lt/LC_MESSAGES/nautilus-sendto.mo
 share/locale/mk/LC_MESSAGES/nautilus-sendto.mo
+share/locale/mr/LC_MESSAGES/nautilus-sendto.mo
 share/locale/nb/LC_MESSAGES/nautilus-sendto.mo
 share/locale/ne/LC_MESSAGES/nautilus-sendto.mo
 share/locale/nl/LC_MESSAGES/nautilus-sendto.mo
@@ -69,7 +73,11 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-sendto.mo
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile
index 5b87af18e1a9..c7bcfda0c2ab 100644
--- a/deskutils/planner/Makefile
+++ b/deskutils/planner/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/planner/Makefile,v 1.4 2007/05/19 21:36:03 marcus Exp $
+#   $MCom: ports-stable/deskutils/planner/Makefile,v 1.4 2009/04/16 00:34:24 kwm Exp $
 #
 
 PORTNAME=	planner
-PORTVERSION=	0.14.3
+PORTVERSION=	0.14.4
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -27,7 +27,7 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static \
 		--disable-python \
-		--disable-dotnet
+		--disable-python-plugin
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -35,16 +35,28 @@ GCONF_SCHEMAS=	planner.schemas
 
 MAN1=		planner.1
 
+OPTIONS=	GDA "Enable database support (though libgda)" off \
+		EVO "Enable evolution data server support" off
+
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mlibgda2}!=""
-USE_GNOME+=	libgda2
-CONFIGURE_ARGS+=--enable-database=yes
+
+.if defined(WITH_GDA)
+USE_GNOME+=	libgda3
+CONFIGURE_ARGS+=--with-database=gda3
 PLIST_SUB+=	GDA=""
 .else
 PLIST_SUB+=	GDA="@comment "
 .endif
 
+.if defined(WITH_EVO)
+USE_GNOME+=	evolutiondataserver
+CONFIGURE_ARGS+=--enable-eds --enable-eds-backend
+PLIST_SUB+=	EVO=""
+.else
+PLIST_SUB+=	EVO="@comment "
+.endif
+
 post-install:
 	@-update-desktop-database
 
diff --git a/deskutils/planner/distinfo b/deskutils/planner/distinfo
index dba03ac8822e..10aad8483f79 100644
--- a/deskutils/planner/distinfo
+++ b/deskutils/planner/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/planner-0.14.3.tar.bz2) = 9aee1307f8b9d643241473791f0efa64
-SHA256 (gnome2/planner-0.14.3.tar.bz2) = 8fa5e28b0ba71c0822be73d3c0719623e711b5f9abdcddb63321e31c02a168fe
-SIZE (gnome2/planner-0.14.3.tar.bz2) = 3685823
+MD5 (gnome2/planner-0.14.4.tar.bz2) = 8fcbd1b55dd037662f7710a28a96bb92
+SHA256 (gnome2/planner-0.14.4.tar.bz2) = d45efc53dae4e2b03e2ad8ac1c31f615bfd77e67500b11baf4dee49feee7147a
+SIZE (gnome2/planner-0.14.4.tar.bz2) = 3738005
diff --git a/deskutils/planner/pkg-plist b/deskutils/planner/pkg-plist
index e96c932a020b..768c6dd45b3b 100644
--- a/deskutils/planner/pkg-plist
+++ b/deskutils/planner/pkg-plist
@@ -26,6 +26,9 @@ lib/planner/file-modules/libmrp-xml.so
 lib/planner/file-modules/libmrp-xsl.a
 lib/planner/file-modules/libmrp-xsl.la
 lib/planner/file-modules/libmrp-xsl.so
+%%EVO%%lib/planner/plugins/libeds-plugin.a
+%%EVO%%lib/planner/plugins/libeds-plugin.la
+%%EVO%%lib/planner/plugins/libeds-plugin.so
 lib/planner/plugins/libhtml-plugin.a
 lib/planner/plugins/libhtml-plugin.la
 lib/planner/plugins/libhtml-plugin.so
@@ -165,6 +168,7 @@ share/locale/fi/LC_MESSAGES/planner.mo
 share/locale/fr/LC_MESSAGES/planner.mo
 share/locale/ga/LC_MESSAGES/planner.mo
 share/locale/gl/LC_MESSAGES/planner.mo
+share/locale/gu/LC_MESSAGES/planner.mo
 share/locale/hi/LC_MESSAGES/planner.mo
 share/locale/hr/LC_MESSAGES/planner.mo
 share/locale/hu/LC_MESSAGES/planner.mo
@@ -179,6 +183,7 @@ share/locale/lv/LC_MESSAGES/planner.mo
 share/locale/mk/LC_MESSAGES/planner.mo
 share/locale/ml/LC_MESSAGES/planner.mo
 share/locale/mn/LC_MESSAGES/planner.mo
+share/locale/mr/LC_MESSAGES/planner.mo
 share/locale/ms/LC_MESSAGES/planner.mo
 share/locale/nb/LC_MESSAGES/planner.mo
 share/locale/ne/LC_MESSAGES/planner.mo
@@ -249,6 +254,7 @@ share/planner/sql/upgrade-0.11-0.13.sql
 share/planner/sql/upgrade-0.6.x-0.11.sql
 share/planner/stylesheets/html1_css.xsl
 share/planner/stylesheets/html1_css_ie.xsl
+share/planner/stylesheets/html1_css_ie7.xsl
 share/planner/stylesheets/html1_gantt.xsl
 share/planner/stylesheets/html1_resources.xsl
 share/planner/stylesheets/html1_tasks.xsl
@@ -299,6 +305,8 @@ share/planner/ui/xml-planner-plugin.ui
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrmtry share/locale/gl/LC_MESSAGES
 @dirrmtry share/locale/gl
 @dirrmtry share/locale/dz/LC_MESSAGES