4 files changed, 37 insertions, 20 deletions

diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index 9755ba394f92..01d23a88b3af 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $Id: Makefile,v 1.37 2007/01/22 20:19:00 tmclau02 Exp $
+#   $Id: Makefile,v 1.42 2007/03/13 00:44:36 killfill Exp $
 #
 
 PORTNAME=	tomboy
-PORTVERSION=	0.5.4
-PORTREVISION=	1
+PORTVERSION=	0.6.1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/deskutils/tomboy/distinfo b/deskutils/tomboy/distinfo
index 916b14f18e59..58408149d275 100644
--- a/deskutils/tomboy/distinfo
+++ b/deskutils/tomboy/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/tomboy-0.5.4.tar.bz2) = 0cd4701cadd23cef76c0fe708a17c3d5
-SHA256 (gnome2/tomboy-0.5.4.tar.bz2) = aa87ebc9cb629f7c875c1b865bc499b97bcc13aebb35d243e40e94e7a12c12d2
-SIZE (gnome2/tomboy-0.5.4.tar.bz2) = 1012487
+MD5 (gnome2/tomboy-0.6.1.tar.bz2) = 33e7f6b465055bcc72d6997b5f2a3199
+SHA256 (gnome2/tomboy-0.6.1.tar.bz2) = b796f4cdae0966aeb1da3207d956308d41ccbfeec042841bddd25dc8982ce1d7
+SIZE (gnome2/tomboy-0.6.1.tar.bz2) = 1188501
diff --git a/deskutils/tomboy/files/patch-Tomboy_Applet.cs b/deskutils/tomboy/files/patch-Tomboy_Applet.cs
deleted file mode 100644
index 6c25d7305285..000000000000
--- a/deskutils/tomboy/files/patch-Tomboy_Applet.cs
+++ /dev/null
@@ -1,13 +0,0 @@
---- Tomboy/Applet.cs.orig	Mon Jan 22 14:48:19 2007
-+++ Tomboy/Applet.cs	Mon Jan 22 14:48:22 2007
-@@ -91,7 +91,9 @@
- 
- 		void ShowHelpVerb ()
- 		{
--			Tomboy.ActionManager ["ShowHelpAction"].Activate ();
-+			// Don't use the ActionManager in this case because
-+			// the handler won't know about the Screen.
-+			GuiUtils.ShowHelp ("tomboy.xml", null, Screen, null);
- 		}
- 
- 		void ShowAboutVerb ()
diff --git a/deskutils/tomboy/pkg-plist b/deskutils/tomboy/pkg-plist
index e9e3cad082b4..98f47685dbc1 100644
--- a/deskutils/tomboy/pkg-plist
+++ b/deskutils/tomboy/pkg-plist
@@ -13,38 +13,66 @@ lib/tomboy/libtomboy.la
 lib/tomboy/libtomboy.so
 libdata/bonobo/servers/GNOME_TomboyApplet.server
 libdata/pkgconfig/tomboy-plugins.pc
+share/dbus-1/services/org.gnome.Tomboy.service
 share/gnome/applications/DefaultPlugins.desktop
 share/gnome/applications/tomboy.desktop
-share/dbus-1/services/org.gnome.Tomboy.service
+share/gnome/help/tomboy/C/figures/tomboy-main-menu.png
 share/gnome/help/tomboy/C/figures/tomboy-new-note.png
 share/gnome/help/tomboy/C/figures/tomboy-panel.png
+share/gnome/help/tomboy/C/figures/tomboy-pindown.png
+share/gnome/help/tomboy/C/figures/tomboy-pinup.png
 share/gnome/help/tomboy/C/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/C/figures/tomboy-preferences-hotkeys.png
+share/gnome/help/tomboy/C/figures/tomboy-preferences-plugins.png
 share/gnome/help/tomboy/C/figures/tomboy-tools.png
 share/gnome/help/tomboy/C/legal.xml
 share/gnome/help/tomboy/C/tomboy.xml
+share/gnome/help/tomboy/en_GB/figures/tomboy-main-menu.png
+share/gnome/help/tomboy/en_GB/figures/tomboy-new-note.png
+share/gnome/help/tomboy/en_GB/figures/tomboy-panel.png
+share/gnome/help/tomboy/en_GB/figures/tomboy-pindown.png
+share/gnome/help/tomboy/en_GB/figures/tomboy-pinup.png
+share/gnome/help/tomboy/en_GB/figures/tomboy-preferences-editing.png
+share/gnome/help/tomboy/en_GB/figures/tomboy-preferences-hotkeys.png
+share/gnome/help/tomboy/en_GB/figures/tomboy-preferences-plugins.png
+share/gnome/help/tomboy/en_GB/figures/tomboy-tools.png
+share/gnome/help/tomboy/en_GB/legal.xml
+share/gnome/help/tomboy/en_GB/tomboy.xml
+share/gnome/help/tomboy/es/figures/tomboy-main-menu.png
 share/gnome/help/tomboy/es/figures/tomboy-new-note.png
 share/gnome/help/tomboy/es/figures/tomboy-panel.png
+share/gnome/help/tomboy/es/figures/tomboy-pindown.png
+share/gnome/help/tomboy/es/figures/tomboy-pinup.png
 share/gnome/help/tomboy/es/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/es/figures/tomboy-preferences-hotkeys.png
+share/gnome/help/tomboy/es/figures/tomboy-preferences-plugins.png
 share/gnome/help/tomboy/es/figures/tomboy-tools.png
 share/gnome/help/tomboy/es/legal.xml
 share/gnome/help/tomboy/es/tomboy.xml
+share/gnome/help/tomboy/fr/figures/tomboy-main-menu.png
 share/gnome/help/tomboy/fr/figures/tomboy-new-note.png
 share/gnome/help/tomboy/fr/figures/tomboy-panel.png
+share/gnome/help/tomboy/fr/figures/tomboy-pindown.png
+share/gnome/help/tomboy/fr/figures/tomboy-pinup.png
 share/gnome/help/tomboy/fr/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/fr/figures/tomboy-preferences-hotkeys.png
+share/gnome/help/tomboy/fr/figures/tomboy-preferences-plugins.png
 share/gnome/help/tomboy/fr/figures/tomboy-tools.png
 share/gnome/help/tomboy/fr/legal.xml
 share/gnome/help/tomboy/fr/tomboy.xml
+share/gnome/help/tomboy/sv/figures/tomboy-main-menu.png
 share/gnome/help/tomboy/sv/figures/tomboy-new-note.png
 share/gnome/help/tomboy/sv/figures/tomboy-panel.png
+share/gnome/help/tomboy/sv/figures/tomboy-pindown.png
+share/gnome/help/tomboy/sv/figures/tomboy-pinup.png
 share/gnome/help/tomboy/sv/figures/tomboy-preferences-editing.png
 share/gnome/help/tomboy/sv/figures/tomboy-preferences-hotkeys.png
+share/gnome/help/tomboy/sv/figures/tomboy-preferences-plugins.png
 share/gnome/help/tomboy/sv/figures/tomboy-tools.png
 share/gnome/help/tomboy/sv/legal.xml
 share/gnome/help/tomboy/sv/tomboy.xml
 share/gnome/omf/tomboy/tomboy-C.omf
+share/gnome/omf/tomboy/tomboy-en_GB.omf
 share/gnome/omf/tomboy/tomboy-es.omf
 share/gnome/omf/tomboy/tomboy-fr.omf
 share/gnome/omf/tomboy/tomboy-sv.omf
@@ -76,6 +104,7 @@ share/locale/fi/LC_MESSAGES/tomboy.mo
 share/locale/fr/LC_MESSAGES/tomboy.mo
 share/locale/gl/LC_MESSAGES/tomboy.mo
 share/locale/gu/LC_MESSAGES/tomboy.mo
+share/locale/he/LC_MESSAGES/tomboy.mo
 share/locale/hi/LC_MESSAGES/tomboy.mo
 share/locale/hu/LC_MESSAGES/tomboy.mo
 share/locale/is/LC_MESSAGES/tomboy.mo
@@ -160,6 +189,8 @@ share/locale/zh_TW/LC_MESSAGES/tomboy.mo
 @dirrm share/gnome/help/tomboy/fr
 @dirrm share/gnome/help/tomboy/es/figures
 @dirrm share/gnome/help/tomboy/es
+@dirrm share/gnome/help/tomboy/en_GB/figures
+@dirrm share/gnome/help/tomboy/en_GB
 @dirrm share/gnome/help/tomboy/C/figures
 @dirrm share/gnome/help/tomboy/C
 @dirrm share/gnome/help/tomboy