* Fix the build on 4.X

* Add conditional support for gstreamer and dbus (gstreamer is enabled by
  default for package builds)


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3781 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 41 insertions, 4 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index b203302e5..39f95e913 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	evolution
 PORTVERSION=	2.1.6
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.1
@@ -52,6 +53,14 @@ OPTIONS=	PILOT "Enable Palm Pilot sync support" off \
 
 .include <bsd.port.pre.mk>
 
+.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
+WITH_GSTREAMER=	yes
+.endif
+
+.if exists(${LOCALBASE}/lib/libdbus-glib-1.so)
+WITH_DBUS=	yes
+.endif
+
 .if defined(WITH_PILOT)
 LIB_DEPENDS+=	gpilotdconduit.2:${PORTSDIR}/palm/gnomepilot2
 CONFIGURE_ARGS+=	--with-pisock=${LOCALBASE} \
@@ -72,6 +81,20 @@ CONFIGURE_ARGS+=--with-openldap=no
 RUN_DEPENDS+=	spamassassin:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 .endif
 
+.if defined(WITH_GSTREAMER)
+LIB_DEPENDS+=	gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer
+PLIST_SUB+=	GSTREAMER=""
+.else
+PLIST_SUB+=	GSTREAMER="@comment "
+.endif
+
+.if defined(WITH_DBUS)
+LIB_DEPENDS+=	dbus-glib-1.0:${PORTSDIR}/devel/dbus
+PLIST_SUB+=	DBUS=""
+.else
+PLIST_SUB+=	DBUS="@comment "
+.endif
+
 post-install:
 	@${LN} -sf ${PREFIX}/bin/evolution-${EVO_VERSION} \
 		${PREFIX}/bin/evolution
diff --git a/mail/evolution/files/patch-plugins_exchange-account-setup_exchange-account-setup.c b/mail/evolution/files/patch-plugins_exchange-account-setup_exchange-account-setup.c
new file mode 100644
index 000000000..8d880e79f
--- /dev/null
+++ b/mail/evolution/files/patch-plugins_exchange-account-setup_exchange-account-setup.c
@@ -0,0 +1,14 @@
+--- plugins/exchange-account-setup/exchange-account-setup.c.orig	Tue Mar  1 15:38:29 2005
++++ plugins/exchange-account-setup/exchange-account-setup.c	Tue Mar  1 15:38:45 2005
+@@ -564,9 +564,10 @@
+ org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data)
+ {
+ 	EMConfigTargetAccount *target_account;
+-	target_account = (EMConfigTargetAccount *)data->config->target;
+ 	const char *source_url;
+ 	CamelURL *url;
++
++	target_account = (EMConfigTargetAccount *)data->config->target;
+ 	
+ 	source_url = e_account_get_string (target_account->account,  E_ACCOUNT_SOURCE_URL);
+ 	url = camel_url_new (source_url, NULL);
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 96a91c32d..62803eb55 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -140,7 +140,7 @@ lib/evolution/%%VERSION%%/libmenus.so
 lib/evolution/%%VERSION%%/libmenus.so.0
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-file.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-addressbook-groupwise.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.so
+%%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-audio-inline.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-file.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-http.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-calendar-weather.so
@@ -156,7 +156,7 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-folder-unsubscribe.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mail-to-task.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mailing-list-actions.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-mark-calendar-offline.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-new-mail-notify.so
+%%DBUS%%lib/evolution/%%VERSION%%/plugins/liborg-gnome-new-mail-notify.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-prefer-plain.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-plugin-manager.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-save-attachments.so
@@ -168,7 +168,7 @@ lib/evolution/%%VERSION%%/plugins/liborg-gnome-status-track.so
 lib/evolution/%%VERSION%%/plugins/liborg-gnome-subject-thread.so
 lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-file.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-addressbook-groupwise.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-audio-inline.eplug
+%%GSTREAMER%%lib/evolution/%%VERSION%%/plugins/org-gnome-audio-inline.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-file.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-http.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-calendar-weather.eplug
@@ -186,7 +186,7 @@ lib/evolution/%%VERSION%%/plugins/org-gnome-mail-to-task.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-mailing-list-actions.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-mark-calendar-offline.eplug
-lib/evolution/%%VERSION%%/plugins/org-gnome-new-mail-notify.eplug
+%%DBUS%%lib/evolution/%%VERSION%%/plugins/org-gnome-new-mail-notify.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.eplug
 lib/evolution/%%VERSION%%/plugins/org-gnome-plugin-manager.xml
 lib/evolution/%%VERSION%%/plugins/org-gnome-prefer-plain.eplug