4 files changed, 35 insertions, 18 deletions

diff --git a/deskutils/tomboy/Makefile b/deskutils/tomboy/Makefile
index 0ff7dfeef93c..c1613afd79bd 100644
--- a/deskutils/tomboy/Makefile
+++ b/deskutils/tomboy/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $Id: Makefile,v 1.17 2005/10/23 20:57:55 tmclau02 Exp $
+#   $Id: Makefile,v 1.22 2006/02/16 02:44:45 tmclau02 Exp $
 #
 
 PORTNAME=	tomboy
-PORTVERSION=	0.3.3
-PORTREVISION=	3
+PORTVERSION=	0.3.5
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.beatniksoftware.com/tomboy/releases/
 
@@ -32,9 +32,29 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 MAN1=		tomboy.1
 GCONF_SCHEMAS=	tomboy.schemas
 
+.include <bsd.port.pre.mk>
+
+# Tomboy's Evolution plugin relies on gmime# and not evo# according to
+# configure.  Enable if either evo or gmime# is installed.
+.if defined (WITH_EVOLUTION) || exists (${X11BASE}/bin/evolution) || exists (${LOCALBASE}/lib/mono/gmime-sharp/gmime-sharp.dll)
+CONFIGURE_ARGS+= --enable-evolution=yes
+BUILD_DEPENDS=	${LOCALBASE}/lib/mono/gmime-sharp/gmime-sharp.dll:${PORTSDIR}/mail/gmime2-sharp
+RUN_DEPENDS=	${LOCALBASE}/lib/mono/gmime-sharp/gmime-sharp.dll:${PORTSDIR}/mail/gmime2-sharp
+PLIST_SUB+=	EVO:=""
+.else
+PLIST_SUB+=	EVO:="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|(libdir)/dbus-1.0|(prefix)/share/dbus-1|g' \
 		${WRKSRC}/data/Makefile.in
+	@${REINPLACE_CMD} -e 's|`$$PKG_CONFIG --variable=libdir libpanelapplet-2.0`|"$$libdir"|g; \
+	s|PANELAPPLET_SERVER_DIR="$$libdir|PANELAPPLET_SERVER_DIR="$$prefix/libdata|g' \
+		${WRKSRC}/configure
+
+post-install:
+	${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE} ${WRKSRC}/Tomboy/Plugins/FixedWidth.dll ${PREFIX}/lib/tomboy/Plugins
+	${INSTALL} ${COPY} ${_BINOWNGRP} -m ${BINMODE} ${WRKSRC}/Tomboy/Plugins/NoteOfTheDay.dll ${PREFIX}/lib/tomboy/Plugins
 
 .include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/deskutils/tomboy/distinfo b/deskutils/tomboy/distinfo
index 568f41d7de15..d72b196b09aa 100644
--- a/deskutils/tomboy/distinfo
+++ b/deskutils/tomboy/distinfo
@@ -1,3 +1,3 @@
-MD5 (tomboy-0.3.3.tar.gz) = 7ad987216b484f747f53aa7f9055a46b
-SHA256 (tomboy-0.3.3.tar.gz) = 80c423ba7d36bd1363365375d8a5ce2cdcbefc9dde0af5293c4cfd77de1d46f1
-SIZE (tomboy-0.3.3.tar.gz) = 608252
+MD5 (tomboy-0.3.5.tar.gz) = 57e9829d80d8452f002e0a3856bd2c48
+SHA256 (tomboy-0.3.5.tar.gz) = 1af5290924b65b9e55d40816ad0797cf6e81df727bfb4a8642e700c1bb35a0ac
+SIZE (tomboy-0.3.5.tar.gz) = 665599
diff --git a/deskutils/tomboy/files/patch-Tomboy::Trie.cs b/deskutils/tomboy/files/patch-Tomboy::Trie.cs
deleted file mode 100644
index 8798a58db65c..000000000000
--- a/deskutils/tomboy/files/patch-Tomboy::Trie.cs
+++ /dev/null
@@ -1,11 +0,0 @@
---- Tomboy/Trie.cs.orig	Thu May  5 14:11:16 2005
-+++ Tomboy/Trie.cs	Sat Sep 10 20:01:33 2005
-@@ -132,7 +132,7 @@
- 					while (m != null) {
- 						TrieState q1 = m.State;
- 						TrieState r = q.Fail;
--						TrieMatch n;
-+						TrieMatch n = null;
- 
- 						while (r != null) {
- 							n = FindMatchAtState (r, m.Value);
diff --git a/deskutils/tomboy/pkg-plist b/deskutils/tomboy/pkg-plist
index 8007408936b6..0a7457ac8c39 100644
--- a/deskutils/tomboy/pkg-plist
+++ b/deskutils/tomboy/pkg-plist
@@ -1,5 +1,8 @@
 bin/tomboy
+%%EVO:%%lib/tomboy/Plugins/Evolution.dll
 lib/tomboy/Plugins/ExportToHTML.dll
+lib/tomboy/Plugins/FixedWidth.dll
+lib/tomboy/Plugins/NoteOfTheDay.dll
 lib/tomboy/Plugins/PrintNotes.dll
 lib/tomboy/Tomboy.exe
 lib/tomboy/Tomboy.exe.config
@@ -18,6 +21,7 @@ share/locale/en_CA/LC_MESSAGES/tomboy.mo
 share/locale/en_GB/LC_MESSAGES/tomboy.mo
 share/locale/es/LC_MESSAGES/tomboy.mo
 share/locale/eu/LC_MESSAGES/tomboy.mo
+share/locale/fi/LC_MESSAGES/tomboy.mo
 share/locale/fr/LC_MESSAGES/tomboy.mo
 share/locale/hu/LC_MESSAGES/tomboy.mo
 share/locale/is/LC_MESSAGES/tomboy.mo
@@ -26,16 +30,20 @@ share/locale/ja/LC_MESSAGES/tomboy.mo
 share/locale/ko/LC_MESSAGES/tomboy.mo
 share/locale/lt/LC_MESSAGES/tomboy.mo
 share/locale/nb/LC_MESSAGES/tomboy.mo
+share/locale/ne/LC_MESSAGES/tomboy.mo
 share/locale/nl/LC_MESSAGES/tomboy.mo
 share/locale/no/LC_MESSAGES/tomboy.mo
 share/locale/pa/LC_MESSAGES/tomboy.mo
 share/locale/pl/LC_MESSAGES/tomboy.mo
 share/locale/pt_BR/LC_MESSAGES/tomboy.mo
+share/locale/ro/LC_MESSAGES/tomboy.mo
+share/locale/ru/LC_MESSAGES/tomboy.mo
 share/locale/rw/LC_MESSAGES/tomboy.mo
 share/locale/sq/LC_MESSAGES/tomboy.mo
 share/locale/sv/LC_MESSAGES/tomboy.mo
 share/locale/tr/LC_MESSAGES/tomboy.mo
 share/locale/uk/LC_MESSAGES/tomboy.mo
+share/locale/vi/LC_MESSAGES/tomboy.mo
 share/locale/zh_CN/LC_MESSAGES/tomboy.mo
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw