*: fix path to evolution-data-server

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Tue Nov 26 10:09:07 2019 +0100
Changeset:	819a4158fdbdf12864aaa98325a5f7b75e682b37

Modified Files:
	bijiben/Makefile
	cheese/Makefile
	empathy/Makefile
	empathy/buildlink3.mk
	gnome-core/Makefile
	libfolks/Makefile

Log Message:
*: fix path to evolution-data-server

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=819a4158fdbdf12864aaa98325a5f7b75e682b37

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 bijiben/Makefile      | 3 +--
 cheese/Makefile       | 3 +--
 empathy/Makefile      | 4 ++--
 empathy/buildlink3.mk | 2 +-
 gnome-core/Makefile   | 2 +-
 libfolks/Makefile     | 3 +--
 6 files changed, 7 insertions(+), 10 deletions(-)

diffs:
diff --git a/bijiben/Makefile b/bijiben/Makefile
index 41a1fccbec..7b5a6c13bc 100644
--- a/bijiben/Makefile
+++ b/bijiben/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.13 2013/06/19 12:15:39 noud4 Exp $
-#
 
 DISTNAME=	bijiben-3.20.2
 PKGREVISION=	1
@@ -16,7 +15,7 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		intltool pkg-config
 
-.include "../../wip/evolution-data-server/buildlink3.mk"
+.include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../net/gnome-online-accounts/buildlink3.mk"
 .include "../../www/webkit-gtk/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
diff --git a/cheese/Makefile b/cheese/Makefile
index 454a6b630d..18cd893d04 100644
--- a/cheese/Makefile
+++ b/cheese/Makefile
@@ -49,8 +49,7 @@ BUILDLINK_API_DEPENDS.cairo+=		cairo>=1.4.0
 BUILDLINK_API_DEPENDS.librsvg+=		librsvg>=2.18.0
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-#BUILDLINK_API_DEPENDS.evolution-data-server+=	evolution-data-server>=1.12.0
-.include "../../wip/evolution-data-server/buildlink3.mk"
+.include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-bad/buildlink3.mk"
 .include "../../graphics/clutter/buildlink3.mk"
diff --git a/empathy/Makefile b/empathy/Makefile
index 5a5b858d30..0c4cfecc93 100644
--- a/empathy/Makefile
+++ b/empathy/Makefile
@@ -49,13 +49,13 @@ BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.37.6
 .include "../../devel/glib2/schemas.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/application.mk"
-BUILDLINK_API_DEPENDS.enchant+=		enchant>=1.2.0
-.include "../../wip/evolution-data-server/buildlink3.mk"
+.include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../wip/gnome-keyring/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
+BUILDLINK_API_DEPENDS.enchant+=		enchant>=1.2.0
 .include "../../textproc/enchant/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/gtk-doc/buildlink3.mk"
diff --git a/empathy/buildlink3.mk b/empathy/buildlink3.mk
index ff3a6b0989..dd916f8f25 100644
--- a/empathy/buildlink3.mk
+++ b/empathy/buildlink3.mk
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.empathy+=	empathy>=3.12.10
 BUILDLINK_PKGSRCDIR.empathy?=	../../wip/empathy
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../wip/evolution-data-server/buildlink3.mk"
+.include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
diff --git a/gnome-core/Makefile b/gnome-core/Makefile
index 317fb24c6a..bfcbc860f4 100644
--- a/gnome-core/Makefile
+++ b/gnome-core/Makefile
@@ -29,7 +29,7 @@ DEPENDS+=	dconf-[0-9]*:../../devel/dconf
 DEPENDS+=	dconf-editor-[0-9]*:../../devel/dconf-editor
 DEPENDS+=	epiphany-[0-9]*:../../wip/epiphany
 DEPENDS+=	evince3-[0-9]*:../../print/evince3
-DEPENDS+=	evolution-data-server-[0-9]*:../../wip/evolution-data-server
+DEPENDS+=	evolution-data-server-[0-9]*:../../mail/evolution-data-server
 DEPENDS+=	libfolks-[0-9]*:../../wip/libfolks
 DEPENDS+=	gcr-[0-9]*:../../security/gcr
 DEPENDS+=	gdk-pixbuf2-[0-9]*:../../graphics/gdk-pixbuf2 #TODO obsolete graphics/gdk-pixbuf?
diff --git a/libfolks/Makefile b/libfolks/Makefile
index 1be70a8078..34fad3e8e5 100644
--- a/libfolks/Makefile
+++ b/libfolks/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.10 2014/10/25 19:00:14 prlw1 Exp $
-#
 
 DISTNAME=	folks-0.10.1
 PKGNAME=	lib${DISTNAME}
@@ -31,7 +30,7 @@ CPPFLAGS.SunOS+=	-std=c99 -D_XOPEN_SOURCE=600
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../security/libsecret/buildlink3.mk"
-.include "../../wip/evolution-data-server/buildlink3.mk"
+.include "../../mail/evolution-data-server/buildlink3.mk"
 .include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../lang/vala/buildlink3.mk"