update to 2.18.2

This switches to the new gnome-2.20 branch.

3 files changed, 21 insertions, 12 deletions

diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 275bc8ab82a..cb4d8a7cf26 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2007/09/21 13:04:30 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2007/11/03 16:18:10 drochner Exp $
 #
 
-DISTNAME=		gnome-terminal-2.18.1
-PKGREVISION=		2
+DISTNAME=		gnome-terminal-2.18.2
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-terminal/2.18/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/gnome-terminal/PLIST b/x11/gnome-terminal/PLIST
index d1507b5f075..d90eca4f5b9 100644
--- a/x11/gnome-terminal/PLIST
+++ b/x11/gnome-terminal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/09/25 10:54:24 hira Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/11/03 16:18:10 drochner Exp $
 bin/gnome-terminal
 lib/bonobo/servers/gnome-terminal.server
 share/applications/gnome-terminal.desktop
@@ -13,11 +13,12 @@ share/gnome/help/gnome-terminal/bg/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/bg/figures/terminal_window.png
 share/gnome/help/gnome-terminal/bg/gnome-terminal.xml
 share/gnome/help/gnome-terminal/bg/legal.xml
+share/gnome/help/gnome-terminal/ca/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/ca/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/ca/gnome-terminal.xml
 share/gnome/help/gnome-terminal/de/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/de/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/de/figures/terminal_window.png
 share/gnome/help/gnome-terminal/de/gnome-terminal.xml
-share/gnome/help/gnome-terminal/de/legal.xml
 share/gnome/help/gnome-terminal/es/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/es/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/es/gnome-terminal.xml
@@ -34,9 +35,10 @@ share/gnome/help/gnome-terminal/ja/gnome-terminal.xml
 share/gnome/help/gnome-terminal/ja/legal.xml
 share/gnome/help/gnome-terminal/ko/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/ko/figures/gnome-terminal-tabbed.png
-share/gnome/help/gnome-terminal/ko/figures/terminal_window.png
 share/gnome/help/gnome-terminal/ko/gnome-terminal.xml
-share/gnome/help/gnome-terminal/ko/legal.xml
+share/gnome/help/gnome-terminal/oc/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/oc/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/oc/gnome-terminal.xml
 share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/ro/figures/terminal_window.png
@@ -63,6 +65,7 @@ share/gnome/help/gnome-terminal/zh_TW/gnome-terminal.xml
 share/gnome/help/gnome-terminal/zh_TW/legal.xml
 share/locale/am/LC_MESSAGES/gnome-terminal.mo
 share/locale/ar/LC_MESSAGES/gnome-terminal.mo
+share/locale/as/LC_MESSAGES/gnome-terminal.mo
 share/locale/az/LC_MESSAGES/gnome-terminal.mo
 share/locale/be/LC_MESSAGES/gnome-terminal.mo
 share/locale/be@latin/LC_MESSAGES/gnome-terminal.mo
@@ -120,6 +123,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-terminal.mo
 share/locale/ro/LC_MESSAGES/gnome-terminal.mo
 share/locale/ru/LC_MESSAGES/gnome-terminal.mo
 share/locale/rw/LC_MESSAGES/gnome-terminal.mo
+share/locale/si/LC_MESSAGES/gnome-terminal.mo
 share/locale/sk/LC_MESSAGES/gnome-terminal.mo
 share/locale/sl/LC_MESSAGES/gnome-terminal.mo
 share/locale/sq/LC_MESSAGES/gnome-terminal.mo
@@ -138,12 +142,14 @@ share/locale/zh_HK/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
 share/omf/gnome-terminal/gnome-terminal-C.omf
 share/omf/gnome-terminal/gnome-terminal-bg.omf
+share/omf/gnome-terminal/gnome-terminal-ca.omf
 share/omf/gnome-terminal/gnome-terminal-de.omf
 share/omf/gnome-terminal/gnome-terminal-es.omf
 share/omf/gnome-terminal/gnome-terminal-fr.omf
 share/omf/gnome-terminal/gnome-terminal-it.omf
 share/omf/gnome-terminal/gnome-terminal-ja.omf
 share/omf/gnome-terminal/gnome-terminal-ko.omf
+share/omf/gnome-terminal/gnome-terminal-oc.omf
 share/omf/gnome-terminal/gnome-terminal-ro.omf
 share/omf/gnome-terminal/gnome-terminal-ru.omf
 share/omf/gnome-terminal/gnome-terminal-sv.omf
@@ -166,6 +172,8 @@ share/pixmaps/gnome-terminal.png
 @dirrm share/gnome/help/gnome-terminal/ru
 @dirrm share/gnome/help/gnome-terminal/ro/figures
 @dirrm share/gnome/help/gnome-terminal/ro
+@dirrm share/gnome/help/gnome-terminal/oc/figures
+@dirrm share/gnome/help/gnome-terminal/oc
 @dirrm share/gnome/help/gnome-terminal/ko/figures
 @dirrm share/gnome/help/gnome-terminal/ko
 @dirrm share/gnome/help/gnome-terminal/ja/figures
@@ -178,6 +186,8 @@ share/pixmaps/gnome-terminal.png
 @dirrm share/gnome/help/gnome-terminal/es
 @dirrm share/gnome/help/gnome-terminal/de/figures
 @dirrm share/gnome/help/gnome-terminal/de
+@dirrm share/gnome/help/gnome-terminal/ca/figures
+@dirrm share/gnome/help/gnome-terminal/ca
 @dirrm share/gnome/help/gnome-terminal/bg/figures
 @dirrm share/gnome/help/gnome-terminal/bg
 @dirrm share/gnome/help/gnome-terminal/C/figures
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 8b68b885c7e..7a89e64af49 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1 2007/09/19 23:57:04 wiz Exp $
+$NetBSD: distinfo,v 1.2 2007/11/03 16:18:11 drochner Exp $
 
-SHA1 (gnome-terminal-2.18.1.tar.bz2) = 130af5f027f967116f86947ec54be66f0f974df6
-RMD160 (gnome-terminal-2.18.1.tar.bz2) = fb99a2e42752ae67eda7e2b980c1127e104c849d
-Size (gnome-terminal-2.18.1.tar.bz2) = 1995096 bytes
+SHA1 (gnome-terminal-2.18.2.tar.bz2) = a37dff35e90ab1c2e15d47d5731ff0fb596dbd4d
+RMD160 (gnome-terminal-2.18.2.tar.bz2) = b38a45f8f6c9fbffaedd8d4d9dfc9c1a21738746
+Size (gnome-terminal-2.18.2.tar.bz2) = 2057415 bytes
 SHA1 (patch-aa) = 852623004e3aa680be4c090bb58fd23ac0055aa1
 SHA1 (patch-ab) = c32fe51f97ec7f244c8a5f46e7a13acf2daa2478
 SHA1 (patch-ac) = 0f7f7f64abd8f614e44c068ac398afe92c5506aa