3 files changed, 54 insertions, 8 deletions

diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index 05f213f19bcf..3c1cb6ed1717 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tomboy
-PORTVERSION=	1.6.1
-PORTREVISION=	1
+PORTVERSION=	1.12.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -17,13 +16,13 @@ COMMENT=	Personal note taking system for the GNOME desktop
 
 LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
 BUILD_DEPENDS=	${LOCALBASE}/lib/mono/gmime-sharp-2.4/gmime-sharp.dll:${PORTSDIR}/mail/gmime24-sharp \
-		${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib \
+		${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-1.0.pc:${PORTSDIR}/devel/dbus-sharp-glib \
 		mautil:${PORTSDIR}/devel/mono-addins
 RUN_DEPENDS=	${LOCALBASE}/lib/mono/gmime-sharp-2.4/gmime-sharp.dll:${PORTSDIR}/mail/gmime24-sharp \
-		${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib \
+		${LOCALBASE}/libdata/pkgconfig/dbus-sharp-glib-1.0.pc:${PORTSDIR}/devel/dbus-sharp-glib \
 		mautil:${PORTSDIR}/devel/mono-addins
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix gnomedesktopsharp20
 GNU_CONFIGURE=	yes
@@ -62,5 +61,5 @@ post-patch:
 	@${REINPLACE_CMD} 's|gmime-sharp|gmime-sharp-2.4|g' \
 		${WRKSRC}/configure
 
-.include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
+.include "${PORTSDIR}/lang/mono/bsd.mono.mk"
 .include <bsd.port.post.mk>
diff --git a/deskutils/tomboy/distinfo b/deskutils/tomboy/distinfo
index 6bbd1e07059b..9fc01746cac0 100644
--- a/deskutils/tomboy/distinfo
+++ b/deskutils/tomboy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/tomboy-1.6.1.tar.bz2) = 4c0b5e0103682711e1cd620c9c617716a33b3520d62c22a2f6ab7bab2a54e61c
-SIZE (gnome2/tomboy-1.6.1.tar.bz2) = 7217604
+SHA256 (gnome2/tomboy-1.12.0.tar.xz) = e1f33dba1d1bb39624b75e77760ddf29c020083d283d65f976be1dc3056e3203
+SIZE (gnome2/tomboy-1.12.0.tar.xz) = 6628944
diff --git a/deskutils/tomboy/pkg-plist b/deskutils/tomboy/pkg-plist
index 005d87c23001..5970de87722e 100644
--- a/deskutils/tomboy/pkg-plist
+++ b/deskutils/tomboy/pkg-plist
@@ -4,6 +4,8 @@ bin/tomboy
 lib/tomboy/Tomboy.exe
 lib/tomboy/Tomboy.exe.config
 lib/tomboy/Tomboy.exe.mdb
+lib/tomboy/addins/AdvancedPreferences.dll
+lib/tomboy/addins/AdvancedPreferences.dll.mdb
 lib/tomboy/addins/Backlinks.dll
 lib/tomboy/addins/Backlinks.dll.mdb
 lib/tomboy/addins/Bugzilla.dll
@@ -23,6 +25,8 @@ lib/tomboy/addins/NoteDirectoryWatcher.dll.mdb
 lib/tomboy/addins/NoteOfTheDay.dll
 lib/tomboy/addins/NoteOfTheDay.dll.mdb
 lib/tomboy/addins/PrintNotes.dll
+lib/tomboy/addins/RemoveBrokenLinks.dll
+lib/tomboy/addins/RemoveBrokenLinks.dll.mdb
 lib/tomboy/addins/SshSyncServiceAddin.dll
 lib/tomboy/addins/SshSyncServiceAddin.dll.mdb
 lib/tomboy/addins/StickyNoteImport.dll
@@ -548,6 +552,45 @@ share/gnome/help/tomboy/lt/search.page
 share/gnome/help/tomboy/lt/sync-setup.page
 share/gnome/help/tomboy/lt/sync.page
 share/gnome/help/tomboy/lt/whatsnew.page
+share/gnome/help/tomboy/lv/addins-desktop.page
+share/gnome/help/tomboy/lv/addins-formatting.page
+share/gnome/help/tomboy/lv/addins-sync.page
+share/gnome/help/tomboy/lv/addins-tools.page
+share/gnome/help/tomboy/lv/addins.page
+share/gnome/help/tomboy/lv/advanced.page
+share/gnome/help/tomboy/lv/create-note.page
+share/gnome/help/tomboy/lv/create-notebook.page
+share/gnome/help/tomboy/lv/delete-notes.page
+share/gnome/help/tomboy/lv/edit-note.page
+share/gnome/help/tomboy/lv/figures/add-notebook-search.png
+share/gnome/help/tomboy/lv/figures/add-to-notebook.png
+share/gnome/help/tomboy/lv/figures/delete-notebook.png
+share/gnome/help/tomboy/lv/figures/move-notes-search.png
+share/gnome/help/tomboy/lv/figures/new-notebook.png
+share/gnome/help/tomboy/lv/figures/note-template.png
+share/gnome/help/tomboy/lv/figures/notebook-icon.png
+share/gnome/help/tomboy/lv/figures/tomboy-main-menu.png
+share/gnome/help/tomboy/lv/figures/tomboy-new-note.png
+share/gnome/help/tomboy/lv/figures/tomboy-panel.png
+share/gnome/help/tomboy/lv/figures/tomboy-pindown.png
+share/gnome/help/tomboy/lv/figures/tomboy-pinup.png
+share/gnome/help/tomboy/lv/figures/tomboy-preferences-add-ins.png
+share/gnome/help/tomboy/lv/figures/tomboy-preferences-editing.png
+share/gnome/help/tomboy/lv/figures/tomboy-preferences-hotkeys.png
+share/gnome/help/tomboy/lv/figures/tomboy-preferences-synchronization.png
+share/gnome/help/tomboy/lv/figures/tomboy-tools.png
+share/gnome/help/tomboy/lv/figures/tomboy.png
+share/gnome/help/tomboy/lv/hotkeys.page
+share/gnome/help/tomboy/lv/index.page
+share/gnome/help/tomboy/lv/introduction.page
+share/gnome/help/tomboy/lv/legal.xml
+share/gnome/help/tomboy/lv/note-edit-prefs.page
+share/gnome/help/tomboy/lv/prefs.page
+share/gnome/help/tomboy/lv/problems.page
+share/gnome/help/tomboy/lv/search.page
+share/gnome/help/tomboy/lv/sync-setup.page
+share/gnome/help/tomboy/lv/sync.page
+share/gnome/help/tomboy/lv/whatsnew.page
 share/gnome/help/tomboy/oc/addins-desktop.page
 share/gnome/help/tomboy/oc/addins-formatting.page
 share/gnome/help/tomboy/oc/addins-sync.page
@@ -904,6 +947,7 @@ share/icons/hicolor/16x16/mimetypes/application-x-note.png
 share/icons/hicolor/22x22/apps/tomboy.png
 share/icons/hicolor/22x22/mimetypes/application-x-note.png
 share/icons/hicolor/24x24/apps/tomboy.png
+share/icons/hicolor/256x256/apps/tomboy.png
 share/icons/hicolor/32x32/apps/tomboy.png
 share/icons/hicolor/48x48/apps/tomboy.png
 share/icons/hicolor/48x48/mimetypes/application-x-note.png
@@ -932,6 +976,7 @@ share/locale/eo/LC_MESSAGES/tomboy.mo
 share/locale/es/LC_MESSAGES/tomboy.mo
 share/locale/et/LC_MESSAGES/tomboy.mo
 share/locale/eu/LC_MESSAGES/tomboy.mo
+share/locale/fa/LC_MESSAGES/tomboy.mo
 share/locale/fi/LC_MESSAGES/tomboy.mo
 share/locale/fr/LC_MESSAGES/tomboy.mo
 share/locale/ga/LC_MESSAGES/tomboy.mo
@@ -1042,6 +1087,8 @@ share/mime/packages/tomboy.xml
 @dirrm share/gnome/help/tomboy/pl
 @dirrm share/gnome/help/tomboy/oc/figures
 @dirrm share/gnome/help/tomboy/oc
+@dirrm share/gnome/help/tomboy/lv/figures
+@dirrm share/gnome/help/tomboy/lv
 @dirrm share/gnome/help/tomboy/lt/figures
 @dirrm share/gnome/help/tomboy/lt
 @dirrm share/gnome/help/tomboy/it/figures