From 024f0bb23fb82642e74441cc90251d374642a8ff Mon Sep 17 00:00:00 2001
From: kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Mon, 17 Jun 2013 09:31:27 +0000
Subject: Comment out mapi it doesn't build currently. Ditch gnome-packagekit,
 broken by packagekit update. Remove OSVERSION check around cheese < 8.x is
 EOL.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18542 df743ca5-7f9a-e211-a948-0013205c9059
---
 x11/gnome2/Makefile | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 89157d704..3d0503412 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -65,9 +65,11 @@ USE_PYTHON=	yes
 .endif
 
 .if !defined(GNOME_SLAVE) || ${.CURDIR:T}=="gnome2-lite"
-OPTIONS_DEFINE=	XSCREENSAVER MAPI
+OPTIONS_DEFINE=	XSCREENSAVER
+# MAPI
+
 XSCREENSAVER_DESC=	Use xscreensaver as screen saver app
-MAPI_DESC=	include evolution-mapi (pulls in samba4)
+#MAPI_DESC=	include evolution-mapi (pulls in samba4)
 .endif
 
 do-install:	# empty
@@ -93,11 +95,9 @@ RUN_DEPENDS+=	empathy:${PORTSDIR}/net-im/empathy \
 		${LOCALBASE}/libexec/deskbar-applet/deskbar-applet:${PORTSDIR}/deskutils/deskbar-applet \
 		${LOCALBASE}/lib/hamster-applet/hamster-applet:${PORTSDIR}/deskutils/hamster-applet \
 		${LOCALBASE}/lib/gtk-2.0/modules/libatk-bridge.so:${PORTSDIR}/accessibility/at-spi \
-		gpk-application:${PORTSDIR}/ports-mgmt/gnome-packagekit \
-		ekiga:${PORTSDIR}/net/ekiga3
-.  if ${OSVERSION}>=800000
-RUN_DEPENDS+=	cheese:${PORTSDIR}/multimedia/cheese
-.  endif
+		ekiga:${PORTSDIR}/net/ekiga3 \
+		cheese:${PORTSDIR}/multimedia/cheese
+
 .  if ${ARCH} == "i386"
 #RUN_DEPENDS+=	tomboy:${PORTSDIR}/deskutils/tomboy
 .  endif
-- 
cgit v1.2.3