3 files changed, 173 insertions, 152 deletions
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index a89bb978fe2d..8a1388ad5a36 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-desktop/Makefile,v 1.112 2007/03/13 12:15:44 ahze Exp $
+#   $MCom: ports/x11/gnome-desktop/Makefile,v 1.127 2007/10/17 21:36:13 mezz Exp $
 #
 
 PORTNAME=	gnome-desktop
-PORTVERSION=	2.18.3
+PORTVERSION=	2.20.1
 PORTREVISION?=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 1731b7eda864..1c2a077101d9 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-desktop-2.18.3.tar.bz2) = 98de3b7d0da690da8b94cddc74f3914b
-SHA256 (gnome2/gnome-desktop-2.18.3.tar.bz2) = 8997a2ceca2dbb28fb402e23ea5f255b68c59ea4f932b253e2843bfe62af7c64
-SIZE (gnome2/gnome-desktop-2.18.3.tar.bz2) = 1306654
+MD5 (gnome2/gnome-desktop-2.20.1.tar.bz2) = 19912d1e1743960ebf824684cdf8f097
+SHA256 (gnome2/gnome-desktop-2.20.1.tar.bz2) = f94a3e8962980628ae8a18135c419d239109cf1f68b4d8de7e4739194cf53391
+SIZE (gnome2/gnome-desktop-2.20.1.tar.bz2) = 1356668
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index 9535ff1fde10..2d1c2909b170 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -7,25 +7,29 @@ lib/libgnome-desktop-2.la
 lib/libgnome-desktop-2.so
 lib/libgnome-desktop-2.so.2
 libdata/pkgconfig/gnome-desktop-2.0.pc
-share/gnome/applications/gnome-about.desktop
-share/gnome/gnome-about/gnome-64.png
-share/gnome/gnome-about/gnome-version.xml
-share/gnome/gnome-about/headers/header-bg-ancient01a.png
-share/gnome/gnome-about/headers/header-bg-city01.png
-share/gnome/gnome-about/headers/header-bg-clouds01.png
-share/gnome/gnome-about/headers/header-bg-clouds02.png
-share/gnome/gnome-about/headers/header-bg-hills01.png
-share/gnome/gnome-about/headers/header-bg-landscape01.png
-share/gnome/gnome-about/headers/header-bg-mountains01.png
-share/gnome/gnome-about/headers/header-bg-snow01.png
-share/gnome/gnome-about/headers/header-bg-sunset01.png
+share/applications/gnome-about.desktop
+share/gnome-about/contributors.list
+share/gnome-about/foundation-members.list
+share/gnome-about/gnome-64.png
+share/gnome-about/gnome-version.xml
+share/gnome-about/headers/header-bg-ancient01a.png
+share/gnome-about/headers/header-bg-city01.png
+share/gnome-about/headers/header-bg-clouds01.png
+share/gnome-about/headers/header-bg-clouds02.png
+share/gnome-about/headers/header-bg-hills01.png
+share/gnome-about/headers/header-bg-landscape01.png
+share/gnome-about/headers/header-bg-mountains01.png
+share/gnome-about/headers/header-bg-snow01.png
+share/gnome-about/headers/header-bg-sunset01.png
 share/gnome/help/fdl/C/fdl.xml
 share/gnome/help/fdl/ar/fdl.xml
 share/gnome/help/fdl/es/fdl.xml
 share/gnome/help/fdl/fr/fdl.xml
 share/gnome/help/fdl/ko/fdl.xml
+share/gnome/help/fdl/oc/fdl.xml
 share/gnome/help/fdl/sv/fdl.xml
 share/gnome/help/fdl/uk/fdl.xml
+share/gnome/help/fdl/vi/fdl.xml
 share/gnome/help/gpl/C/gpl.xml
 share/gnome/help/gpl/ar/gpl.xml
 share/gnome/help/gpl/ca/gpl.xml
@@ -33,6 +37,7 @@ share/gnome/help/gpl/es/gpl.xml
 share/gnome/help/gpl/fi/gpl.xml
 share/gnome/help/gpl/fr/gpl.xml
 share/gnome/help/gpl/ko/gpl.xml
+share/gnome/help/gpl/oc/gpl.xml
 share/gnome/help/gpl/pa/gpl.xml
 share/gnome/help/gpl/sv/gpl.xml
 share/gnome/help/gpl/uk/gpl.xml
@@ -43,110 +48,12 @@ share/gnome/help/lgpl/ar/lgpl.xml
 share/gnome/help/lgpl/es/lgpl.xml
 share/gnome/help/lgpl/fr/lgpl.xml
 share/gnome/help/lgpl/ko/lgpl.xml
+share/gnome/help/lgpl/oc/lgpl.xml
 share/gnome/help/lgpl/pa/lgpl.xml
 share/gnome/help/lgpl/sv/lgpl.xml
 share/gnome/help/lgpl/uk/lgpl.xml
+share/gnome/help/lgpl/vi/lgpl.xml
 share/gnome/help/lgpl/zh_CN/lgpl.xml
-share/gnome/omf/fdl/fdl-C.omf
-share/gnome/omf/fdl/fdl-ar.omf
-share/gnome/omf/fdl/fdl-es.omf
-share/gnome/omf/fdl/fdl-fr.omf
-share/gnome/omf/fdl/fdl-ko.omf
-share/gnome/omf/fdl/fdl-sv.omf
-share/gnome/omf/fdl/fdl-uk.omf
-share/gnome/omf/gpl/gpl-C.omf
-share/gnome/omf/gpl/gpl-ar.omf
-share/gnome/omf/gpl/gpl-ca.omf
-share/gnome/omf/gpl/gpl-es.omf
-share/gnome/omf/gpl/gpl-fi.omf
-share/gnome/omf/gpl/gpl-fr.omf
-share/gnome/omf/gpl/gpl-ko.omf
-share/gnome/omf/gpl/gpl-pa.omf
-share/gnome/omf/gpl/gpl-sv.omf
-share/gnome/omf/gpl/gpl-uk.omf
-share/gnome/omf/gpl/gpl-vi.omf
-share/gnome/omf/gpl/gpl-zh_CN.omf
-share/gnome/omf/lgpl/lgpl-C.omf
-share/gnome/omf/lgpl/lgpl-ar.omf
-share/gnome/omf/lgpl/lgpl-es.omf
-share/gnome/omf/lgpl/lgpl-fr.omf
-share/gnome/omf/lgpl/lgpl-ko.omf
-share/gnome/omf/lgpl/lgpl-pa.omf
-share/gnome/omf/lgpl/lgpl-sv.omf
-share/gnome/omf/lgpl/lgpl-uk.omf
-share/gnome/omf/lgpl/lgpl-zh_CN.omf
-share/gnome/pixmaps/apple-green.png
-share/gnome/pixmaps/apple-red.png
-share/gnome/pixmaps/gnome-aorta.png
-share/gnome/pixmaps/gnome-applets.png
-share/gnome/pixmaps/gnome-background-image.png
-share/gnome/pixmaps/gnome-background-pattern.png
-share/gnome/pixmaps/gnome-background.png
-share/gnome/pixmaps/gnome-calc2.png
-share/gnome/pixmaps/gnome-calc3.png
-share/gnome/pixmaps/gnome-calendar.png
-share/gnome/pixmaps/gnome-ccbackground.png
-share/gnome/pixmaps/gnome-ccdesktop.png
-share/gnome/pixmaps/gnome-ccdialog.png
-share/gnome/pixmaps/gnome-ccmime.png
-share/gnome/pixmaps/gnome-ccperiph.png
-share/gnome/pixmaps/gnome-ccscreensaver.png
-share/gnome/pixmaps/gnome-ccwindowmanager.png
-share/gnome/pixmaps/gnome-color-browser.png
-share/gnome/pixmaps/gnome-color-xterm.png
-share/gnome/pixmaps/gnome-computer.png
-share/gnome/pixmaps/gnome-cromagnon.png
-share/gnome/pixmaps/gnome-day.png
-share/gnome/pixmaps/gnome-debian.png
-share/gnome/pixmaps/gnome-diskfree.png
-share/gnome/pixmaps/gnome-emacs.png
-share/gnome/pixmaps/gnome-eterm.png
-share/gnome/pixmaps/gnome-file-c.png
-share/gnome/pixmaps/gnome-file-h.png
-share/gnome/pixmaps/gnome-folder.png
-share/gnome/pixmaps/gnome-gemvt.png
-share/gnome/pixmaps/gnome-gimp.png
-share/gnome/pixmaps/gnome-gmenu.png
-share/gnome/pixmaps/gnome-gmush.png
-share/gnome/pixmaps/gnome-gnomoku.png
-share/gnome/pixmaps/gnome-home.png
-share/gnome/pixmaps/gnome-html.png
-share/gnome/pixmaps/gnome-image-gif.png
-share/gnome/pixmaps/gnome-image-jpeg.png
-share/gnome/pixmaps/gnome-irc.png
-share/gnome/pixmaps/gnome-laptop.png
-share/gnome/pixmaps/gnome-log.png
-share/gnome/pixmaps/gnome-logo-icon-transparent.png
-share/gnome/pixmaps/gnome-logo-icon.png
-share/gnome/pixmaps/gnome-logo-large.png
-share/gnome/pixmaps/gnome-mdi.png
-share/gnome/pixmaps/gnome-mnemonic.png
-share/gnome/pixmaps/gnome-month.png
-share/gnome/pixmaps/gnome-mouse.png
-share/gnome/pixmaps/gnome-news.png
-share/gnome/pixmaps/gnome-note.png
-share/gnome/pixmaps/gnome-qeye.png
-share/gnome/pixmaps/gnome-set-time.png
-share/gnome/pixmaps/gnome-spider.png
-share/gnome/pixmaps/gnome-squeak.png
-share/gnome/pixmaps/gnome-suse.png
-share/gnome/pixmaps/gnome-talk.png
-share/gnome/pixmaps/gnome-term-linux.png
-share/gnome/pixmaps/gnome-term-linux2.png
-share/gnome/pixmaps/gnome-term-night.png
-share/gnome/pixmaps/gnome-term-tiger.png
-share/gnome/pixmaps/gnome-term.png
-share/gnome/pixmaps/gnome-tigert.png
-share/gnome/pixmaps/gnome-touristinfo.png
-share/gnome/pixmaps/gnome-user-interface.png
-share/gnome/pixmaps/gnome-week.png
-share/gnome/pixmaps/gnome-windows.png
-share/gnome/pixmaps/gnome-word.png
-share/gnome/pixmaps/gnome-xterm.png
-share/gnome/pixmaps/gtkvim.png
-share/gnome/pixmaps/kterm.xpm
-share/gnome/pixmaps/monitor.png
-share/gnome/pixmaps/vnterm.xpm
 share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -215,6 +122,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/rw/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -229,7 +137,7 @@ share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ug/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ur/LC_MESSAGES/gnome-desktop-2.0.mo
-share/locale/uz/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/xh/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -239,6 +147,148 @@ share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
+share/omf/fdl/fdl-C.omf
+share/omf/fdl/fdl-ar.omf
+share/omf/fdl/fdl-es.omf
+share/omf/fdl/fdl-fr.omf
+share/omf/fdl/fdl-ko.omf
+share/omf/fdl/fdl-oc.omf
+share/omf/fdl/fdl-sv.omf
+share/omf/fdl/fdl-uk.omf
+share/omf/fdl/fdl-vi.omf
+share/omf/gpl/gpl-C.omf
+share/omf/gpl/gpl-ar.omf
+share/omf/gpl/gpl-ca.omf
+share/omf/gpl/gpl-es.omf
+share/omf/gpl/gpl-fi.omf
+share/omf/gpl/gpl-fr.omf
+share/omf/gpl/gpl-ko.omf
+share/omf/gpl/gpl-oc.omf
+share/omf/gpl/gpl-pa.omf
+share/omf/gpl/gpl-sv.omf
+share/omf/gpl/gpl-uk.omf
+share/omf/gpl/gpl-vi.omf
+share/omf/gpl/gpl-zh_CN.omf
+share/omf/lgpl/lgpl-C.omf
+share/omf/lgpl/lgpl-ar.omf
+share/omf/lgpl/lgpl-es.omf
+share/omf/lgpl/lgpl-fr.omf
+share/omf/lgpl/lgpl-ko.omf
+share/omf/lgpl/lgpl-oc.omf
+share/omf/lgpl/lgpl-pa.omf
+share/omf/lgpl/lgpl-sv.omf
+share/omf/lgpl/lgpl-uk.omf
+share/omf/lgpl/lgpl-vi.omf
+share/omf/lgpl/lgpl-zh_CN.omf
+share/pixmaps/apple-green.png
+share/pixmaps/apple-red.png
+share/pixmaps/gnome-aorta.png
+share/pixmaps/gnome-applets.png
+share/pixmaps/gnome-background-image.png
+share/pixmaps/gnome-background-pattern.png
+share/pixmaps/gnome-background.png
+share/pixmaps/gnome-calc2.png
+share/pixmaps/gnome-calc3.png
+share/pixmaps/gnome-calendar.png
+share/pixmaps/gnome-ccbackground.png
+share/pixmaps/gnome-ccdesktop.png
+share/pixmaps/gnome-ccdialog.png
+share/pixmaps/gnome-ccmime.png
+share/pixmaps/gnome-ccperiph.png
+share/pixmaps/gnome-ccscreensaver.png
+share/pixmaps/gnome-ccwindowmanager.png
+share/pixmaps/gnome-color-browser.png
+share/pixmaps/gnome-color-xterm.png
+share/pixmaps/gnome-computer.png
+share/pixmaps/gnome-cromagnon.png
+share/pixmaps/gnome-day.png
+share/pixmaps/gnome-debian.png
+share/pixmaps/gnome-diskfree.png
+share/pixmaps/gnome-emacs.png
+share/pixmaps/gnome-eterm.png
+share/pixmaps/gnome-file-c.png
+share/pixmaps/gnome-file-h.png
+share/pixmaps/gnome-folder.png
+share/pixmaps/gnome-gemvt.png
+share/pixmaps/gnome-gimp.png
+share/pixmaps/gnome-gmenu.png
+share/pixmaps/gnome-gmush.png
+share/pixmaps/gnome-gnomoku.png
+share/pixmaps/gnome-home.png
+share/pixmaps/gnome-html.png
+share/pixmaps/gnome-image-gif.png
+share/pixmaps/gnome-image-jpeg.png
+share/pixmaps/gnome-irc.png
+share/pixmaps/gnome-laptop.png
+share/pixmaps/gnome-log.png
+share/pixmaps/gnome-logo-icon-transparent.png
+share/pixmaps/gnome-logo-icon.png
+share/pixmaps/gnome-logo-large.png
+share/pixmaps/gnome-mdi.png
+share/pixmaps/gnome-mnemonic.png
+share/pixmaps/gnome-month.png
+share/pixmaps/gnome-mouse.png
+share/pixmaps/gnome-news.png
+share/pixmaps/gnome-note.png
+share/pixmaps/gnome-qeye.png
+share/pixmaps/gnome-set-time.png
+share/pixmaps/gnome-spider.png
+share/pixmaps/gnome-squeak.png
+share/pixmaps/gnome-suse.png
+share/pixmaps/gnome-talk.png
+share/pixmaps/gnome-term-linux.png
+share/pixmaps/gnome-term-linux2.png
+share/pixmaps/gnome-term-night.png
+share/pixmaps/gnome-term-tiger.png
+share/pixmaps/gnome-term.png
+share/pixmaps/gnome-tigert.png
+share/pixmaps/gnome-touristinfo.png
+share/pixmaps/gnome-user-interface.png
+share/pixmaps/gnome-week.png
+share/pixmaps/gnome-windows.png
+share/pixmaps/gnome-word.png
+share/pixmaps/gnome-xterm.png
+share/pixmaps/gtkvim.png
+share/pixmaps/kterm.xpm
+share/pixmaps/monitor.png
+share/pixmaps/vnterm.xpm
+@dirrm share/omf/lgpl
+@dirrm share/omf/gpl
+@dirrm share/omf/fdl
+@dirrm share/gnome/help/lgpl/zh_CN
+@dirrm share/gnome/help/lgpl/vi
+@dirrm share/gnome/help/lgpl/uk
+@dirrm share/gnome/help/lgpl/sv
+@dirrm share/gnome/help/lgpl/pa
+@dirrm share/gnome/help/lgpl/oc
+@dirrm share/gnome/help/lgpl/ko
+@dirrm share/gnome/help/lgpl/fr
+@dirrm share/gnome/help/lgpl/es
+@dirrm share/gnome/help/lgpl/ar
+@dirrm share/gnome/help/gpl/zh_CN
+@dirrm share/gnome/help/gpl/vi
+@dirrm share/gnome/help/gpl/uk
+@dirrm share/gnome/help/gpl/sv
+@dirrm share/gnome/help/gpl/pa
+@dirrm share/gnome/help/gpl/oc
+@dirrm share/gnome/help/gpl/ko
+@dirrm share/gnome/help/gpl/fr
+@dirrm share/gnome/help/gpl/fi
+@dirrm share/gnome/help/gpl/es
+@dirrm share/gnome/help/gpl/ca
+@dirrm share/gnome/help/gpl/ar
+@dirrm share/gnome/help/fdl/vi
+@dirrm share/gnome/help/fdl/uk
+@dirrm share/gnome/help/fdl/sv
+@dirrm share/gnome/help/fdl/oc
+@dirrm share/gnome/help/fdl/ko
+@dirrm share/gnome/help/fdl/fr
+@dirrm share/gnome/help/fdl/es
+@dirrm share/gnome/help/fdl/ar
+@dirrm share/gnome-about/headers
+@dirrm include/gnome-desktop-2.0/libgnomeui
+@dirrm include/gnome-desktop-2.0/libgnome
+@dirrm include/gnome-desktop-2.0
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -249,14 +299,16 @@ share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
 @dirrmtry share/locale/yi
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uz/LC_MESSAGES
-@dirrmtry share/locale/uz
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
 @dirrmtry share/locale/ur/LC_MESSAGES
 @dirrmtry share/locale/ur
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
@@ -281,35 +333,4 @@ share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrm share/gnome/omf/lgpl
-@dirrm share/gnome/omf/gpl
-@dirrm share/gnome/omf/fdl
-@dirrm share/gnome/help/lgpl/zh_CN
-@dirrm share/gnome/help/lgpl/uk
-@dirrm share/gnome/help/lgpl/sv
-@dirrm share/gnome/help/lgpl/pa
-@dirrm share/gnome/help/lgpl/ko
-@dirrm share/gnome/help/lgpl/fr
-@dirrm share/gnome/help/lgpl/es
-@dirrm share/gnome/help/lgpl/ar
-@dirrm share/gnome/help/gpl/zh_CN
-@dirrm share/gnome/help/gpl/vi
-@dirrm share/gnome/help/gpl/uk
-@dirrm share/gnome/help/gpl/sv
-@dirrm share/gnome/help/gpl/pa
-@dirrm share/gnome/help/gpl/ko
-@dirrm share/gnome/help/gpl/fr
-@dirrm share/gnome/help/gpl/fi
-@dirrm share/gnome/help/gpl/es
-@dirrm share/gnome/help/gpl/ca
-@dirrm share/gnome/help/gpl/ar
-@dirrm share/gnome/help/fdl/uk
-@dirrm share/gnome/help/fdl/sv
-@dirrm share/gnome/help/fdl/ko
-@dirrm share/gnome/help/fdl/fr
-@dirrm share/gnome/help/fdl/es
-@dirrm share/gnome/help/fdl/ar
-@dirrm share/gnome/gnome-about/headers
-@dirrm include/gnome-desktop-2.0/libgnomeui
-@dirrm include/gnome-desktop-2.0/libgnome
-@dirrm include/gnome-desktop-2.0
+@dirrmtry share/applications