diff options
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gdm3/Makefile | 4 | ||||
| -rw-r--r-- | x11/gnome2-lite/Makefile | 3 | ||||
| -rw-r--r-- | x11/gnome2/Makefile | 41 | ||||
| -rw-r--r-- | x11/gnome3/Makefile | 4 |
4 files changed, 29 insertions, 23 deletions
diff --git a/x11/gdm3/Makefile b/x11/gdm3/Makefile index c5f8b2856..976e901ce 100644 --- a/x11/gdm3/Makefile +++ b/x11/gdm3/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm3/Makefile,v 1.20 2012/06/02 13:10:28 kwm Exp $ +# $MCom: ports/x11/gdm3/Makefile,v 1.21 2012/10/08 21:48:11 kwm Exp $ # PORTNAME= gdm @@ -16,7 +16,7 @@ DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME 3 version of xdm display manager -BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ +BUILD_DEPENDS= zenity>=3.0.0:${PORTSDIR}/x11/zenity3 \ nss-config:${PORTSDIR}/security/nss \ ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes LIB_DEPENDS= ck-connector.0:${PORTSDIR}/sysutils/consolekit \ diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile index 9fe0e1279..978317600 100644 --- a/x11/gnome2-lite/Makefile +++ b/x11/gnome2-lite/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome2-lite/Makefile,v 1.64 2011/04/25 22:13:32 mezz Exp $ +# $MCom: ports/x11/gnome2-lite/Makefile,v 1.65 2011/04/30 20:43:30 mezz Exp $ # PORTREVISION= 0 @@ -24,7 +24,6 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-applet ${LOCALBASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnome-user-docs \ ${LOCALBASE}/share/sounds/question.wav:${PORTSDIR}/audio/gnome-audio \ ${LOCALBASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \ - evince:${PORTSDIR}/graphics/evince \ gcalctool:${PORTSDIR}/math/gcalctool \ ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ gconf-editor:${PORTSDIR}/sysutils/gconf-editor \ diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index 482e11b5a..c321310d8 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.307 2011/10/20 21:24:53 kwm Exp $ +# $MCom: ports/x11/gnome2/Makefile,v 1.308 2012/09/03 16:28:29 mezz Exp $ # PORTNAME= gnome2 @@ -49,7 +49,6 @@ RUN_DEPENDS?= ${LOCALBASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnome-apple totem:${PORTSDIR}/multimedia/totem \ gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \ ${LOCALBASE}/share/gnome-background-properties/gnome-backgrounds.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \ - evince:${PORTSDIR}/graphics/evince \ alacarte:${PORTSDIR}/deskutils/alacarte \ gnome-power-manager:${PORTSDIR}/sysutils/gnome-power-manager \ orca:${PORTSDIR}/accessibility/orca \ @@ -69,8 +68,11 @@ USE_PYTHON= yes .endif .if !defined(GNOME_SLAVE) || ${.CURDIR:T}=="gnome2-lite" -OPTIONS= XSCREENSAVER "Use xscreensaver as screen saver app" off \ - MAPI "Depend on evolution-mapi (pulls in samba4)" off +OPTIONS_DEFINE= XSCREENSAVER MAPI EXTRAS +OPTIONS_DEFAULT=EXTRAS +XSCREENSAVER_DESC= Use xscreensaver as screen saver app +MAPI_DESC= include evolution-mapi (pulls in samba4) +EXTRAS_DESC= bundle evince, brasero, yelp and epiphany .endif do-install: # empty @@ -78,11 +80,16 @@ do-install: # empty .include <bsd.port.pre.mk> .if !defined(GNOME_SLAVE) -.if ${ARCH}!="sparc64" && ${ARCH}!="ia64" +# hmmm XXX +. if ${.CURDIR:T}=="gnome2-lite" && empty(${PORT_OPTIONS:EXTRAS}) +. if ${ARCH}!="sparc64" && ${ARCH}!="ia64" RUN_DEPENDS+= yelp:${PORTSDIR}/x11/yelp \ epiphany:${PORTSDIR}/www/epiphany -.endif -.if ${.CURDIR:T}!="gnome2-lite" +. endif +RUN_DEPENDS+= evince:${PORTSDIR}/graphics/evince \ +. endif + +. if ${.CURDIR:T}!="gnome2-lite" RUN_DEPENDS+= empathy:${PORTSDIR}/net-im/empathy \ gucharmap:${PORTSDIR}/deskutils/gucharmap \ sound-juicer:${PORTSDIR}/audio/sound-juicer \ @@ -97,24 +104,24 @@ RUN_DEPENDS+= empathy:${PORTSDIR}/net-im/empathy \ ${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 +. if ${OSVERSION}>=800000 RUN_DEPENDS+= cheese:${PORTSDIR}/multimedia/cheese -.endif -.if ${ARCH} == "i386" +. endif +. if ${ARCH} == "i386" #RUN_DEPENDS+= tomboy:${PORTSDIR}/deskutils/tomboy -.endif -.if defined(WITH_MAPI) +. endif +. if defined(WITH_MAPI) RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/libexchangemapi-1.0.pc:${PORTSDIR}/mail/evolution-mapi -.endif -.endif +. endif +. endif .endif .if ${.CURDIR}==${MASTERDIR} || ${.CURDIR:T}=="gnome2-lite" -.if defined(WITH_XSCREENSAVER) +. if defined(WITH_XSCREENSAVER) RUN_DEPENDS+= ${LOCALBASE}/share/applications/xscreensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome -.else +. else RUN_DEPENDS+= gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver -.endif +. endif .endif .include <bsd.port.post.mk> diff --git a/x11/gnome3/Makefile b/x11/gnome3/Makefile index bd207cbef..b39a66834 100644 --- a/x11/gnome3/Makefile +++ b/x11/gnome3/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome3/Makefile,v 1.38 2012/07/17 08:50:17 kwm Exp $ +# $MCom: ports/x11/gnome3/Makefile,v 1.39 2012/10/04 10:07:50 kwm Exp $ # PORTNAME= gnome3 @@ -33,7 +33,7 @@ RUN_DEPENDS?= gnome-panel>=3.0.0:${PORTSDIR}/x11/gnome-panel3 \ ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ ${LOCALBASE}/share/hal/fdi/information/10freedesktop/10-camera-ptp.fdi:${PORTSDIR}/sysutils/hal-info \ yelp>=3.0.0:${PORTSDIR}/x11/yelp3 \ - zenity>=3.0.0:${PORTSDIR}/x11/zenity \ + zenity>=3.0.0:${PORTSDIR}/x11/zenity3 \ seahorse>=3.0.0:${PORTSDIR}/security/seahorse3 \ metacity>=2.34.0:${PORTSDIR}/x11-wm/metacity3 \ gnome-control-center>=3.0.0:${PORTSDIR}/sysutils/gnome-control-center3 \ |