[Bsd-sharp-cvs] CVS commit to /cvsroot/bsd-sharp/FreeBSD-ports/deskutils/tomboy by tmclau02

[noreply at forge.novell.com]

CVS commit to /cvsroot/bsd-sharp/FreeBSD-ports/deskutils/tomboy by tmclau02

Modified Files:
	Makefile pkg-plist 
Log Message:
Sync with FreeBSD tree changes.

===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/deskutils/tomboy/Makefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- /cvsroot/bsd-sharp/FreeBSD-ports/deskutils/tomboy/Makefile	2006/10/30 17:02:07	1.30
+++ /cvsroot/bsd-sharp/FreeBSD-ports/deskutils/tomboy/Makefile	2006/11/18 05:45:44	1.31
@@ -3,12 +3,12 @@
 # Whom:				Tom McLaughlin <tmclaugh at sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $Id: Makefile,v 1.30 2006/10/30 17:02:07 tmclau02 Exp $
+#   $Id: Makefile,v 1.31 2006/11/18 05:45:44 tmclau02 Exp $
 #
 
 PORTNAME=	tomboy
 PORTVERSION=	0.4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -19,13 +19,18 @@
 
 LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell \
     		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+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
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_GNOME=	gnomehack gnometarget intltool gnomeprefix gnomesharp20
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_ICONS=	yes
+INSTALLS_OMF=	yes
 
+CONFIGURE_ARGS+=--enable-evolution=yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -34,17 +39,6 @@
 
 .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 (${LOCALBASE}/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
===================================================================
RCS file: /cvsroot/bsd-sharp/FreeBSD-ports/deskutils/tomboy/pkg-plist,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- /cvsroot/bsd-sharp/FreeBSD-ports/deskutils/tomboy/pkg-plist	2006/10/08 04:39:50	1.18
+++ /cvsroot/bsd-sharp/FreeBSD-ports/deskutils/tomboy/pkg-plist	2006/11/18 05:45:44	1.19
@@ -1,5 +1,5 @@
 bin/tomboy
-%%EVO:%%lib/tomboy/Plugins/Evolution.dll
+lib/tomboy/Plugins/Evolution.dll
 lib/tomboy/Plugins/ExportToHTML.dll
 lib/tomboy/Plugins/FixedWidth.dll
 lib/tomboy/Plugins/NoteOfTheDay.dll