From 752a66b40a757b50196fb97fda1143a42e96c295 Mon Sep 17 00:00:00 2001 From: kwm Date: Sun, 27 Oct 2013 22:10:10 +0000 Subject: Move gnome3 ports into the place of the gnome2 locations. Update to new port rules, remove conflicts, latest_link, enable stage support. gnome-games was skipped because I got a update for that. gnome-keyring 2 vs 3, needs to be looked at. zenity 2 vs 3, and libgnomekbd 2 vs 3 Use new lib_depend syntax in bsd.gnome.mk. Possible lots of broken links. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18813 df743ca5-7f9a-e211-a948-0013205c9059 --- x11/gnome3/Makefile | 78 +++++++++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 41 deletions(-) (limited to 'x11/gnome3') diff --git a/x11/gnome3/Makefile b/x11/gnome3/Makefile index 1bc19f427..98e7c20e8 100644 --- a/x11/gnome3/Makefile +++ b/x11/gnome3/Makefile @@ -15,35 +15,34 @@ COMMENT?= The "meta-port" for the GNOME 3 integrated X11 desktop CONFLICTS?= gnome2-[0-9]* gnome2-lite-[0-9]* gnome3-lite-[0-9]* -RUN_DEPENDS?= gnome-panel>=3.0.0:${PORTSDIR}/x11/gnome-panel3 \ +RUN_DEPENDS?= gnome-panel>=3.0.0:${PORTSDIR}/x11/gnome-panel \ dconf-editor:${PORTSDIR}/devel/dconf-editor \ - gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session3 \ + gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session \ gnome-themes-standard>=3.0.0:${PORTSDIR}/x11-themes/gnome-themes-standard \ gnome-icon-theme-extras>=3.0.0:${PORTSDIR}/misc/gnome-icon-theme-extras \ gnome-icon-theme-symbolic>=3.0.0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic \ gnome-keyring>=3.0.0:${PORTSDIR}/security/gnome-keyring3 \ - gnome-power-manager>=3.0.0:${PORTSDIR}/sysutils/gnome-power-manager3 \ - orca>=3.0.0:${PORTSDIR}/accessibility/orca3 \ + gnome-power-manager>=3.0.0:${PORTSDIR}/sysutils/gnome-power-manager \ + orca>=3.0.0:${PORTSDIR}/accessibility/orca \ gnome-mount:${PORTSDIR}/sysutils/gnome-mount \ + gnome-shell>=3.0.0:${PORTSDIR}/x11/gnome-shell \ gnome-tweak-tool:${PORTSDIR}/deskutils/gnome-tweak-tool \ - nautilus>=3.0.0:${PORTSDIR}/x11-fm/nautilus3 \ + nautilus>=3.0.0:${PORTSDIR}/x11-fm/nautilus \ ${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 \ + yelp>=3.0.0:${PORTSDIR}/x11/yelp \ 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 \ + seahorse>=3.0.0:${PORTSDIR}/security/seahorse \ + metacity>=2.34.0:${PORTSDIR}/x11-wm/metacity \ + gnome-control-center>=3.0.0:${PORTSDIR}/sysutils/gnome-control-center \ ${LOCALBASE}/share/gnome-background-properties/gnome-backgrounds.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \ caribou:${PORTSDIR}/accessibility/caribou \ - ${LOCALBASE}/share/help/C/gnome-help/index.page:${PORTSDIR}/misc/gnome-user-docs3 \ + ${LOCALBASE}/share/help/C/gnome-help/index.page:${PORTSDIR}/misc/gnome-user-docs \ ${LOCALBASE}/share/sounds/freedesktop/index.theme:${PORTSDIR}/audio/freedesktop-sound-theme \ ekiga:${PORTSDIR}/net-im/ekiga NO_BUILD= yes - -OPTIONS_DEFINE= SHELL -SHELL_DESC= Include Gnome-shell +NO_MTREE= yes .if ${.CURDIR:T}!="gnome3-lite" #OPTIONS_DEFINE+=MAPI @@ -52,45 +51,42 @@ MAPI_DESC= Depend on evolution-mapi (pulls in samba4)" off .include -.if ${PORT_OPTIONS:MSHELL} -RUN_DEPENDS+= gnome-shell>=3.0.0:${PORTSDIR}/x11/gnome-shell -.endif - .if ${.CURDIR:T}!="gnome3-lite" -RUN_DEPENDS+= empathy>=3.0.0:${PORTSDIR}/net-im/empathy3 \ - epiphany>=3.0.0:${PORTSDIR}/www/epiphany3 \ - epiphany-extensions3>=3.0.0:${PORTSDIR}/www/epiphany-extensions3 \ - gnome-screensaver>=3.0.0:${PORTSDIR}/x11/gnome-screensaver3 \ - gucharmap>=3.0.0:${PORTSDIR}/deskutils/gucharmap3 \ - eog>=3.0.0:${PORTSDIR}/graphics/eog3 \ - eog-plugins>=3.0.0:${PORTSDIR}/graphics/eog-plugins3 \ - gedit>=3.0.0:${PORTSDIR}/editors/gedit3 \ - gedit-plugins>=3.0.0:${PORTSDIR}/editors/gedit-plugins3 \ - gnome-terminal>=3.0.0:${PORTSDIR}/x11/gnome-terminal3 \ - mousetweaks>=3.0.0:${PORTSDIR}/accessibility/mousetweaks3 \ - brasero>=3.0.0:${PORTSDIR}/sysutils/brasero3 \ - gcalctool>=3.0.0:${PORTSDIR}/math/gcalctool3 \ +RUN_DEPENDS+= empathy>=3.0.0:${PORTSDIR}/net-im/empathy \ + epiphany>=3.0.0:${PORTSDIR}/www/epiphany \ + epiphany-extensions3>=3.0.0:${PORTSDIR}/www/epiphany-extensions \ + gnome-screensaver>=3.0.0:${PORTSDIR}/x11/gnome-screensaver \ + gucharmap>=3.0.0:${PORTSDIR}/deskutils/gucharmap \ + eog>=3.0.0:${PORTSDIR}/graphics/eog \ + eog-plugins>=3.0.0:${PORTSDIR}/graphics/eog-plugins \ + gedit>=3.0.0:${PORTSDIR}/editors/gedit \ + gedit-plugins>=3.0.0:${PORTSDIR}/editors/gedit-plugins \ + gnome-terminal>=3.0.0:${PORTSDIR}/x11/gnome-terminal \ + mousetweaks>=3.0.0:${PORTSDIR}/accessibility/mousetweaks \ + brasero>=3.0.0:${PORTSDIR}/sysutils/brasero \ + accerciser>=3.0.0:${PORTSDIR}/accessibility/accerciser \ + gcalctool>=3.0.0:${PORTSDIR}/math/gcalctool \ baobab>=3.4.0:${PORTSDIR}/deskutils/baobab \ gnome-dictionary>=3.4.0:${PORTSDIR}/deskutils/gnome-dictionary \ gnome-font-viewer>=3.4.0:${PORTSDIR}/deskutils/gnome-font-viewer \ gnome-screenshot>=3.4.0:${PORTSDIR}/deskutils/gnome-screenshot \ gnome-search-tool>=3.4.0:${PORTSDIR}/deskutils/gnome-search-tool \ gnome-system-log>=3.4.0:${PORTSDIR}/deskutils/gnome-system-log \ - gnome-system-monitor>=3.0.0:${PORTSDIR}/sysutils/gnome-system-monitor3 \ - file-roller>=3.0.0:${PORTSDIR}/archivers/file-roller3 \ - evince>=3.0.0:${PORTSDIR}/graphics/evince3 \ - vino>=3.0.0:${PORTSDIR}/net/vino3 \ - vinagre>=3.0.0:${PORTSDIR}/net/vinagre3 \ + gnome-system-monitor>=3.0.0:${PORTSDIR}/sysutils/gnome-system-monitor \ + file-roller>=3.0.0:${PORTSDIR}/archivers/file-roller \ + evince>=3.0.0:${PORTSDIR}/graphics/evince \ + vino>=3.0.0:${PORTSDIR}/net/vino \ + vinagre>=3.0.0:${PORTSDIR}/net/vinagre \ gnome-games>=3.0.0:${PORTSDIR}/games/gnome-games3 \ - totem>=3.0.0:${PORTSDIR}/multimedia/totem3 \ - gconf-editor>=3.0.0:${PORTSDIR}/sysutils/gconf-editor3 \ - gdm>=3.0.0:${PORTSDIR}/x11/gdm3 \ - evolution>=3.0.0:${PORTSDIR}/mail/evolution3 \ - cheese>=3.0.0:${PORTSDIR}/multimedia/cheese3 + totem>=3.0.0:${PORTSDIR}/multimedia/totem \ + gconf-editor>=3.0.0:${PORTSDIR}/sysutils/gconf-editor \ + gdm>=3.0.0:${PORTSDIR}/x11/gdm \ + evolution>=3.0.0:${PORTSDIR}/mail/evolution \ + cheese>=3.0.0:${PORTSDIR}/multimedia/cheese .if ${PORT_OPTIONS:MMAPI} -RUN_DEPENDS+= evolution-mapi>=3.0.0:${PORTSDIR}/mail/evolution-mapi3 +#RUN_DEPENDS+= evolution-mapi>=3.0.0:${PORTSDIR}/mail/evolution-mapi .endif .endif # !gnome3-lite section -- cgit v1.2.3