diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-10-01 20:49:44 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2009-10-01 20:49:44 +0800 |
| commit | 0ab4ef028d631aff94aab841e00d9ae98b277b56 (patch) | |
| tree | c5e898b4eafb0d047f65385edf5172d7aa56f32f /x11 | |
| parent | 7e174cebb687a2876a6f070be62fb106b4356e55 (diff) | |
| download | marcuscom-ports-0ab4ef028d631aff94aab841e00d9ae98b277b56.tar marcuscom-ports-0ab4ef028d631aff94aab841e00d9ae98b277b56.tar.gz marcuscom-ports-0ab4ef028d631aff94aab841e00d9ae98b277b56.tar.bz2 marcuscom-ports-0ab4ef028d631aff94aab841e00d9ae98b277b56.tar.lz marcuscom-ports-0ab4ef028d631aff94aab841e00d9ae98b277b56.tar.xz marcuscom-ports-0ab4ef028d631aff94aab841e00d9ae98b277b56.tar.zst marcuscom-ports-0ab4ef028d631aff94aab841e00d9ae98b277b56.zip | |
Turn evolution-mapi in a OPTION.
People might not want to pulling samba4.
Aside from the fact it conflicts with the samba server ports.
Prodded by: avl
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13078 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gnome2/Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index df07cabff..2498b1d66 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome2/Makefile,v 1.276 2009/09/10 00:57:38 kwm Exp $ +# $MCom: ports/x11/gnome2/Makefile,v 1.277 2009/09/24 07:14:46 kwm Exp $ # PORTNAME= gnome2 @@ -42,7 +42,6 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple dasher:${PORTSDIR}/accessibility/dasher \ evolution:${PORTSDIR}/mail/evolution \ ${LOCALBASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \ - ${LOCALBASE}/libdata/pkgconfig/libexchangemapi-1.0.pc:${PORTSDIR}/mail/evolution-mapi \ network-admin:${PORTSDIR}/sysutils/gnome-system-tools \ vino-passwd:${PORTSDIR}/net/vino \ exchange-connector-setup-2.28:${PORTSDIR}/mail/evolution-exchange \ @@ -69,7 +68,8 @@ USE_PYTHON= yes .endif .if !defined(GNOME_SLAVE) || ${.CURDIR:T}=="gnome2-lite" -OPTIONS= XSCREENSAVER "Use xscreensaver as screen saver app" off +OPTIONS= XSCREENSAVER "Use xscreensaver as screen saver app" off \ + MAPI "Depend on evolution-mapi (pulls in samba4)" on .endif do-install: # empty @@ -100,6 +100,9 @@ RUN_DEPENDS+= empathy:${PORTSDIR}/net-im/empathy \ .if ${OSVERSION}>=600000 RUN_DEPENDS+= ekiga:${PORTSDIR}/net/ekiga .endif +.if defined(WITH_MAPI) +RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/libexchangemapi-1.0.pc:${PORTSDIR}/mail/evolution-mapi +.endif .endif .endif |