Sun Mar 22 16:07:51 2009 UTC ()
Update some patterns, and note missing updates.


(wiz)
diff -r1.113 -r1.114 pkgsrc/meta-pkgs/gnome/Makefile
cvs diff -r1.113 -r1.114 pkgsrc/meta-pkgs/gnome/Makefile (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/gnome/Makefile 2009/02/09 22:56:25 1.113
+++ pkgsrc/meta-pkgs/gnome/Makefile 2009/03/22 16:07:51 1.114
@@ -1,127 +1,137 @@ @@ -1,127 +1,137 @@
1# $NetBSD: Makefile,v 1.113 2009/02/09 22:56:25 joerg Exp $ 1# $NetBSD: Makefile,v 1.114 2009/03/22 16:07:51 wiz Exp $
2 2
3DISTNAME= gnome-2.24.2.90 3DISTNAME= gnome-2.25.99.0
4PKGREVISION= 1 
5CATEGORIES= meta-pkgs x11 gnome 4CATEGORIES= meta-pkgs x11 gnome
6MASTER_SITES= # empty 5MASTER_SITES= # empty
7 6
8MAINTAINER= drochner@NetBSD.org 7MAINTAINER= drochner@NetBSD.org
9HOMEPAGE= http://www.gnome.org/ 8HOMEPAGE= http://www.gnome.org/
10COMMENT= Meta-package for the GNOME desktop 9COMMENT= Meta-package for the GNOME desktop
11 10
12META_PACKAGE= yes 11META_PACKAGE= yes
13 12
14.include "../../lang/python/pyversion.mk" 13.include "../../lang/python/pyversion.mk"
15 14
16PKG_OPTIONS_VAR= PKG_OPTIONS.gnome 15PKG_OPTIONS_VAR= PKG_OPTIONS.gnome
17PKG_SUPPORTED_OPTIONS= pulseaudio 16PKG_SUPPORTED_OPTIONS= pulseaudio
18PKG_SUGGESTED_OPTIONS= pulseaudio 17PKG_SUGGESTED_OPTIONS= pulseaudio
19.include "../../mk/bsd.options.mk" 18.include "../../mk/bsd.options.mk"
20 19
21# see http://ftp.gnome.org/pub/GNOME/desktop/2.24/2.24.3/sources/ 20# see http://ftp.gnome.org/pub/GNOME/desktop/2.26/2.26.0/sources/
22 21
23DEPENDS+= alacarte>=0.11.6:../../x11/alacarte 22DEPENDS+= alacarte>=0.11.10:../../x11/alacarte
24DEPENDS+= bug-buddy>=2.24.2:../../net/bug-buddy 23DEPENDS+= brasero>=2.26.0:../../sysutils/brasero
25DEPENDS+= cheese>=2.24.3:../../graphics/cheese 24DEPENDS+= bug-buddy>=2.26.0:../../net/bug-buddy
26DEPENDS+= dasher>=4.9.0:../../editors/dasher 25DEPENDS+= cheese>=2.26.0:../../graphics/cheese
27DEPENDS+= deskbar-applet>=2.24.3:../../misc/deskbar-applet 26DEPENDS+= dasher>=4.10.0:../../editors/dasher
28DEPENDS+= eel>=2.24.1:../../devel/eel 27DEPENDS+= deskbar-applet>=2.26.0:../../misc/deskbar-applet
29# needs opal->ffmpeg->lame, which has a special license 28# needs opal->ffmpeg->lame, which has a special license
30#DEPENDS+= ekiga>=3.0.2:../../net/ekiga 29#DEPENDS+= ekiga>=3.2.0:../../net/ekiga
 30# XXX: 2.26.0
31DEPENDS+= empathy>=2.24.1:../../chat/empathy 31DEPENDS+= empathy>=2.24.1:../../chat/empathy
32DEPENDS+= eog>=2.24.3.1:../../graphics/eog 32DEPENDS+= eog>=2.26.0:../../graphics/eog
33DEPENDS+= epiphany>=2.24.3:../../www/epiphany 33DEPENDS+= epiphany>=2.26.0:../../www/epiphany
34DEPENDS+= evince>=2.24.2:../../print/evince 34DEPENDS+= evince>=2.26.0:../../print/evince
35DEPENDS+= evolution>=2.24.3:../../mail/evolution 35DEPENDS+= evolution>=2.26.0:../../mail/evolution
36DEPENDS+= evolution-data-server>=2.24.3:../../mail/evolution-data-server 36DEPENDS+= evolution-data-server>=2.26.0:../../mail/evolution-data-server
 37# XXX: 2.26.0
37DEPENDS+= evolution-exchange>=2.24.3:../../mail/evolution-exchange 38DEPENDS+= evolution-exchange>=2.24.3:../../mail/evolution-exchange
 39# XXX: unpackaged
 40#DEPENDS+= evolution-mapi>=0.26.0:../../mail/evolution-exchange
 41# XXX: 2.26.0
38DEPENDS+= evolution-webcal>=2.24.0:../../time/evolution-webcal 42DEPENDS+= evolution-webcal>=2.24.0:../../time/evolution-webcal
39DEPENDS+= file-roller>=2.24.3:../../archivers/file-roller 43DEPENDS+= file-roller>=2.26.0:../../archivers/file-roller
40DEPENDS+= gcalctool>=5.24.3:../../math/gcalctool 44DEPENDS+= gcalctool>=5.26.0:../../math/gcalctool
41DEPENDS+= gconf-editor>=2.24.1:../../editors/gconf-editor 45DEPENDS+= gconf-editor>=2.26.0:../../editors/gconf-editor
42# too old 46# XXX: 2.26.0
43#DEPENDS+= gdm>=2.24.1:../../x11/gdm 
44DEPENDS+= gdm-[0-9]*:../../x11/gdm 47DEPENDS+= gdm-[0-9]*:../../x11/gdm
45DEPENDS+= gedit>=2.24.3:../../editors/gedit 48DEPENDS+= gedit>=2.26.0:../../editors/gedit
46DEPENDS+= gnome-applets>=2.24.3.1:../../x11/gnome-applets 49DEPENDS+= gnome-applets>=2.26.0:../../x11/gnome-applets
47DEPENDS+= gnome-backgrounds>=2.24.0:../../graphics/gnome-backgrounds 50DEPENDS+= gnome-backgrounds>=2.24.1:../../graphics/gnome-backgrounds
48DEPENDS+= gnome-control-center>=2.24.0.1:../../x11/gnome-control-center 51DEPENDS+= gnome-control-center>=2.26.0:../../x11/gnome-control-center
49DEPENDS+= gnome-desktop>=2.24.3:../../x11/gnome-desktop 52DEPENDS+= gnome-desktop>=2.26.0:../../x11/gnome-desktop
50DEPENDS+= gnome-desktop-sharp>=2.24.0:../../x11/gnome-desktop-sharp 53DEPENDS+= gnome-desktop-sharp>=2.26.0:../../x11/gnome-desktop-sharp
51DEPENDS+= gnome-doc-utils>=0.14.2:../../textproc/gnome-doc-utils 54DEPENDS+= gnome-doc-utils>=0.16.0:../../textproc/gnome-doc-utils
52DEPENDS+= gnome-games>=2.24.3:../../games/gnome-games 55DEPENDS+= gnome-games>=2.26.0:../../games/gnome-games
53DEPENDS+= gnome-icon-theme>=2.24.0:../../graphics/gnome-icon-theme 56DEPENDS+= gnome-icon-theme>=2.26.0:../../graphics/gnome-icon-theme
54DEPENDS+= gnome-keyring>=2.24.1:../../security/gnome-keyring 57DEPENDS+= gnome-keyring>=2.26.0:../../security/gnome-keyring
55.if ${X11_TYPE} != "native" || exists(${X11BASE}/lib/libXdamage.so) 58.if ${X11_TYPE} != "native" || exists(${X11BASE}/lib/libXdamage.so)
56DEPENDS+= gnome-mag>=0.15.4:../../x11/gnome-mag 59DEPENDS+= gnome-mag>=0.15.5:../../x11/gnome-mag
57.endif 60.endif
58DEPENDS+= gnome-media>=2.24.0.1:../../multimedia/gnome-media 61DEPENDS+= gnome-media>=2.26.0:../../multimedia/gnome-media
59DEPENDS+= gnome-menus>=2.24.2:../../sysutils/gnome-menus 62DEPENDS+= gnome-menus>=2.26.0:../../sysutils/gnome-menus
60DEPENDS+= gnome-netstatus>=2.12.2:../../net/gnome-netstatus 63DEPENDS+= gnome-netstatus>=2.26.0:../../net/gnome-netstatus
 64# XXX: 2.26.0
61DEPENDS+= gnome-nettool>=2.22.1:../../net/gnome-nettool 65DEPENDS+= gnome-nettool>=2.22.1:../../net/gnome-nettool
62DEPENDS+= gnome-panel>=2.24.3:../../x11/gnome-panel 66DEPENDS+= gnome-panel>=2.26.0:../../x11/gnome-panel
63.if ${X11_TYPE} != "native" || exists(${X11BASE}/lib/pkgconfig/xrender.pc) 67.if ${X11_TYPE} != "native" || exists(${X11BASE}/lib/pkgconfig/xrender.pc)
 68# XXX: 2.26.0
64DEPENDS+= gnome-power-manager>=2.24.2:../../sysutils/gnome-power-manager 69DEPENDS+= gnome-power-manager>=2.24.2:../../sysutils/gnome-power-manager
65.endif 70.endif
66DEPENDS+= ${PYPKGPREFIX}-gnome2-desktop>=2.24.1:../../x11/py-gnome2-desktop 71DEPENDS+= ${PYPKGPREFIX}-gnome2-desktop>=2.26.0:../../x11/py-gnome2-desktop
67DEPENDS+= gnome-screensaver>=2.24.1:../../x11/gnome-screensaver 72DEPENDS+= gnome-screensaver>=2.25.2:../../x11/gnome-screensaver
68DEPENDS+= gnome-session>=2.24.3:../../x11/gnome-session 73DEPENDS+= gnome-session>=2.26.0:../../x11/gnome-session
69DEPENDS+= gnome-settings-daemon>=2.24.1:../../sysutils/gnome-settings-daemon 74DEPENDS+= gnome-settings-daemon>=2.26.0:../../sysutils/gnome-settings-daemon
70DEPENDS+= gnome-sharp>=2.24.0:../../x11/gnome-sharp 75DEPENDS+= gnome-sharp>=2.24.1:../../x11/gnome-sharp
71DEPENDS+= gnome-speech>=0.4.22:../../audio/gnome-speech 76DEPENDS+= gnome-speech>=0.4.25:../../audio/gnome-speech
72DEPENDS+= gnome-system-monitor>=2.24.3:../../sysutils/gnome-system-monitor 77DEPENDS+= gnome-system-monitor>=2.26.0.1:../../sysutils/gnome-system-monitor
 78# XXX: 2.22.2
73DEPENDS+= gnome-system-tools>=2.22.1:../../sysutils/gnome-system-tools 79DEPENDS+= gnome-system-tools>=2.22.1:../../sysutils/gnome-system-tools
74DEPENDS+= gnome-terminal>=2.24.3:../../x11/gnome-terminal 80DEPENDS+= gnome-terminal>=2.26.0:../../x11/gnome-terminal
75DEPENDS+= gnome-themes>=2.24.3:../../x11/gnome-themes 81DEPENDS+= gnome-themes>=2.26.0:../../x11/gnome-themes
76DEPENDS+= gnome-user-docs>=2.24.2:../../misc/gnome-user-docs 82DEPENDS+= gnome-user-docs>=2.26.0:../../misc/gnome-user-docs
77DEPENDS+= gnome-utils>=2.24.1:../../misc/gnome-utils 83# unpackaged
78DEPENDS+= gnome-volume-manager>=2.24.0:../../sysutils/gnome-volume-manager 84#DEPENDS+= gnome-user-share>=2.26.0:../../misc/gnome-user-share
79DEPENDS+= gok>=2.24.0:../../misc/gok 85DEPENDS+= gnome-utils>=2.26.0:../../misc/gnome-utils
80DEPENDS+= gst-plugins0.10-base>=0.10.21:../../multimedia/gst-plugins0.10-base 86DEPENDS+= gok>=2.26.0:../../misc/gok
81DEPENDS+= gst-plugins0.10-good>=0.10.10:../../multimedia/gst-plugins0.10-good 87DEPENDS+= gst-plugins0.10-base>=0.10.22:../../multimedia/gst-plugins0.10-base
 88DEPENDS+= gst-plugins0.10-good>=0.10.14:../../multimedia/gst-plugins0.10-good
82.if !empty(PKG_OPTIONS:Mpulseaudio) 89.if !empty(PKG_OPTIONS:Mpulseaudio)
83DEPENDS+= gst-plugins0.10-pulse>=0.10.11:../../audio/gst-plugins0.10-pulse 90DEPENDS+= gst-plugins0.10-pulse>=0.10.14:../../audio/gst-plugins0.10-pulse
84.endif 91.endif
85DEPENDS+= gstreamer0.10>=0.10.21:../../multimedia/gstreamer0.10 92DEPENDS+= gstreamer0.10>=0.10.22:../../multimedia/gstreamer0.10
86DEPENDS+= gtk2-engines>=2.16.1:../../x11/gtk2-engines 93DEPENDS+= gtk2-engines>=2.18.0:../../x11/gtk2-engines
87DEPENDS+= gtkhtml314>=3.24.3:../../www/gtkhtml314 94DEPENDS+= gtkhtml314>=3.26.0:../../www/gtkhtml314
88DEPENDS+= gtksourceview2>=2.4.2:../../x11/gtksourceview2 95DEPENDS+= gtksourceview2>=2.6.0:../../x11/gtksourceview2
89DEPENDS+= gucharmap>=2.24.3:../../fonts/gucharmap 96DEPENDS+= gucharmap>=2.26.0:../../fonts/gucharmap
90DEPENDS+= gvfs>=1.0.3:../../sysutils/gvfs 97DEPENDS+= gvfs>=1.2.0:../../sysutils/gvfs
 98# XXX: 2.26.0
91DEPENDS+= hamster-applet>=2.24.3:../../time/hamster-applet 99DEPENDS+= hamster-applet>=2.24.3:../../time/hamster-applet
92DEPENDS+= libgail-gnome>=1.20.1:../../devel/libgail-gnome 100DEPENDS+= libgail-gnome>=1.20.1:../../devel/libgail-gnome
93DEPENDS+= libgnomekbd>=2.24.0:../../x11/libgnomekbd 101DEPENDS+= libgnomekbd>=2.26.0:../../x11/libgnomekbd
94DEPENDS+= libgnomeprint>=2.18.5:../../print/libgnomeprint 102DEPENDS+= libgnomeprint>=2.18.6:../../print/libgnomeprint
95DEPENDS+= libgnomeprintui>=2.18.3:../../print/libgnomeprintui 103DEPENDS+= libgnomeprintui>=2.18.4:../../print/libgnomeprintui
 104# XXX: 2.26.0
96DEPENDS+= libgtop>=2.24.3:../../sysutils/libgtop 105DEPENDS+= libgtop>=2.24.3:../../sysutils/libgtop
97DEPENDS+= libgweather>=2.24.3:../../devel/libgweather 106DEPENDS+= libgweather>=2.26.0:../../devel/libgweather
98DEPENDS+= liboobs>=2.22.0:../../sysutils/liboobs 107DEPENDS+= liboobs>=2.22.0:../../sysutils/liboobs
99DEPENDS+= librsvg>=2.22.3:../../graphics/librsvg 108DEPENDS+= librsvg>=2.26.0:../../graphics/librsvg
100DEPENDS+= libsoup24>=2.24.3:../../net/libsoup24 109DEPENDS+= libsoup24>=2.26.0:../../net/libsoup24
101DEPENDS+= libwnck>=2.24.2:../../devel/libwnck 110DEPENDS+= libwnck>=2.26.0:../../devel/libwnck
102DEPENDS+= metacity>=2.24.0:../../wm/metacity 111DEPENDS+= metacity>=2.26.0:../../wm/metacity
103.if ${X11_TYPE} != "native" || exists(${X11BASE}/lib/pkgconfig/xtst.pc) 112.if ${X11_TYPE} != "native" || exists(${X11BASE}/lib/pkgconfig/xtst.pc)
104DEPENDS+= mousetweaks>=2.24.3:../../misc/mousetweaks 113DEPENDS+= mousetweaks>=2.26.0:../../misc/mousetweaks
105.endif 114.endif
106DEPENDS+= nautilus>=2.24.2:../../sysutils/nautilus 115DEPENDS+= nautilus>=2.26.0:../../sysutils/nautilus
107DEPENDS+= nautilus-cd-burner>=2.24.0:../../sysutils/nautilus-cd-burner 
108.if ${X11_TYPE} != "native" || exists(${X11BASE}/lib/libXdamage.so) 116.if ${X11_TYPE} != "native" || exists(${X11BASE}/lib/libXdamage.so)
109DEPENDS+= orca>=2.24.3:../../misc/orca 117DEPENDS+= orca>=2.26.0:../../misc/orca
110.endif 118.endif
 119# XXX: 2.5.0
111DEPENDS+= ${PYPKGPREFIX}-gtksourceview>=2.4.0:../../x11/py-gtksourceview 120DEPENDS+= ${PYPKGPREFIX}-gtksourceview>=2.4.0:../../x11/py-gtksourceview
112DEPENDS+= seahorse>=2.24.1:../../security/seahorse 121DEPENDS+= seahorse>=2.26.0:../../security/seahorse
113DEPENDS+= seahorse-plugins>=2.24.1:../../security/seahorse-plugins 122DEPENDS+= seahorse-plugins>=2.26.0:../../security/seahorse-plugins
114DEPENDS+= sound-juicer>=2.24.0:../../audio/sound-juicer 123DEPENDS+= sound-juicer>=2.26.0:../../audio/sound-juicer
115#DEPENDS+= sound-theme-freedesktop>=0.2:../../audio/sound-theme-freedesktop 124DEPENDS+= swfdec-gnome>=2.26.0:../../multimedia/swfdec-gnome
116DEPENDS+= swfdec-gnome>=2.24.0:../../multimedia/swfdec-gnome 125# XXX: 0.14.0
117DEPENDS+= tomboy>=0.12.2:../../editors/tomboy 126DEPENDS+= tomboy>=0.12.2:../../editors/tomboy
118DEPENDS+= totem>=2.24.3:../../multimedia/totem 127DEPENDS+= totem>=2.26.0:../../multimedia/totem
119DEPENDS+= totem-pl-parser>=2.24.3:../../multimedia/totem-pl-parser 128DEPENDS+= totem-pl-parser>=2.26.0:../../multimedia/totem-pl-parser
120# packaged in wip, doesn't work 129# XXX: packaged in wip, doesn't work; update to 2.26.0
121#DEPENDS+= vinagre>=2.24.2:../../*/vinagre 130#DEPENDS+= vinagre>=2.24.2:../../*/vinagre
 131# XXX: 2.26.0
122DEPENDS+= vino>=2.24.1:../../net/vino 132DEPENDS+= vino>=2.24.1:../../net/vino
123DEPENDS+= vte>=0.17.4:../../x11/vte 133DEPENDS+= vte>=0.20.0:../../x11/vte
124DEPENDS+= yelp>=2.24.0:../../misc/yelp 134DEPENDS+= yelp>=2.26.0:../../misc/yelp
125DEPENDS+= zenity>=2.24.1:../../x11/zenity 135DEPENDS+= zenity>=2.26.0:../../x11/zenity
126 136
127.include "../../mk/bsd.pkg.mk" 137.include "../../mk/bsd.pkg.mk"