update to 0.26.2

This switches to the gnome-2.32 release branch.

4 files changed, 146 insertions, 140 deletions

diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index 0685b7dd564..30159afa1cd 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.79 2010/11/15 22:59:13 abs Exp $
+# $NetBSD: Makefile,v 1.80 2010/11/16 13:53:06 drochner Exp $
 #
 
-DISTNAME=	vte-0.24.3
-PKGREVISION=	2
+DISTNAME=	vte-0.26.2
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vte/0.24/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vte/0.26/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/x11/vte/PLIST b/x11/vte/PLIST
index 5c518b16bec..0b459874adf 100644
--- a/x11/vte/PLIST
+++ b/x11/vte/PLIST
@@ -1,129 +1,136 @@
-@comment $NetBSD: PLIST,v 1.24 2010/07/06 15:56:06 drochner Exp $
+@comment $NetBSD: PLIST,v 1.25 2010/11/16 13:53:06 drochner Exp $
 bin/vte
-include/vte/pty.h
-include/vte/reaper.h
-include/vte/vte.h
-include/vte/vteaccess.h
-include/vte/vtetypebuiltins.h
-include/vte/vteversion.h
+include/vte-0.0/vte/pty.h
+include/vte-0.0/vte/reaper.h
+include/vte-0.0/vte/vte.h
+include/vte-0.0/vte/vteaccess.h
+include/vte-0.0/vte/vtedeprecated.h
+include/vte-0.0/vte/vtepty.h
+include/vte-0.0/vte/vtetypebuiltins.h
+include/vte-0.0/vte/vteversion.h
 lib/libvte.la
 lib/pkgconfig/vte.pc
-lib/vte/decset
-lib/vte/interpret
-lib/vte/osc
-lib/vte/slowcat
-lib/vte/window
+lib/vte-0.0/decset
+lib/vte-0.0/interpret
+lib/vte-0.0/osc
+lib/vte-0.0/slowcat
+lib/vte-0.0/window
 libexec/gnome-pty-helper
-share/gtk-doc/html/vte/VteReaper.html
-share/gtk-doc/html/vte/VteTerminal.html
-share/gtk-doc/html/vte/VteTerminalAccessible.html
-share/gtk-doc/html/vte/api-index-0-20.html
-share/gtk-doc/html/vte/api-index-0-24.html
-share/gtk-doc/html/vte/api-index-deprecated.html
-share/gtk-doc/html/vte/api-index-full.html
-share/gtk-doc/html/vte/ch01.html
-share/gtk-doc/html/vte/ch02.html
-share/gtk-doc/html/vte/deprecated-objects.html
-share/gtk-doc/html/vte/home.png
-share/gtk-doc/html/vte/index.html
-share/gtk-doc/html/vte/index.sgml
-share/gtk-doc/html/vte/internal-objects.html
-share/gtk-doc/html/vte/left.png
-share/gtk-doc/html/vte/licence.html
-share/gtk-doc/html/vte/object-hierarchy.html
-share/gtk-doc/html/vte/pt01.html
-share/gtk-doc/html/vte/right.png
-share/gtk-doc/html/vte/style.css
-share/gtk-doc/html/vte/up.png
-share/gtk-doc/html/vte/vte-Version-Information.html
-share/gtk-doc/html/vte/vte.devhelp
-share/gtk-doc/html/vte/vte.devhelp2
-share/locale/am/LC_MESSAGES/vte.mo
-share/locale/ang/LC_MESSAGES/vte.mo
-share/locale/ar/LC_MESSAGES/vte.mo
-share/locale/as/LC_MESSAGES/vte.mo
-share/locale/ast/LC_MESSAGES/vte.mo
-share/locale/az/LC_MESSAGES/vte.mo
-share/locale/be/LC_MESSAGES/vte.mo
-share/locale/be@latin/LC_MESSAGES/vte.mo
-share/locale/bg/LC_MESSAGES/vte.mo
-share/locale/bn/LC_MESSAGES/vte.mo
-share/locale/bn_IN/LC_MESSAGES/vte.mo
-share/locale/bs/LC_MESSAGES/vte.mo
-share/locale/ca/LC_MESSAGES/vte.mo
-share/locale/ca@valencia/LC_MESSAGES/vte.mo
-share/locale/cs/LC_MESSAGES/vte.mo
-share/locale/cy/LC_MESSAGES/vte.mo
-share/locale/da/LC_MESSAGES/vte.mo
-share/locale/de/LC_MESSAGES/vte.mo
-share/locale/dz/LC_MESSAGES/vte.mo
-share/locale/el/LC_MESSAGES/vte.mo
-share/locale/en@shaw/LC_MESSAGES/vte.mo
-share/locale/en_CA/LC_MESSAGES/vte.mo
-share/locale/en_GB/LC_MESSAGES/vte.mo
-share/locale/es/LC_MESSAGES/vte.mo
-share/locale/et/LC_MESSAGES/vte.mo
-share/locale/eu/LC_MESSAGES/vte.mo
-share/locale/fa/LC_MESSAGES/vte.mo
-share/locale/fi/LC_MESSAGES/vte.mo
-share/locale/fr/LC_MESSAGES/vte.mo
-share/locale/ga/LC_MESSAGES/vte.mo
-share/locale/gl/LC_MESSAGES/vte.mo
-share/locale/gu/LC_MESSAGES/vte.mo
-share/locale/he/LC_MESSAGES/vte.mo
-share/locale/hi/LC_MESSAGES/vte.mo
-share/locale/hr/LC_MESSAGES/vte.mo
-share/locale/hu/LC_MESSAGES/vte.mo
-share/locale/id/LC_MESSAGES/vte.mo
-share/locale/is/LC_MESSAGES/vte.mo
-share/locale/it/LC_MESSAGES/vte.mo
-share/locale/ja/LC_MESSAGES/vte.mo
-share/locale/ka/LC_MESSAGES/vte.mo
-share/locale/kn/LC_MESSAGES/vte.mo
-share/locale/ko/LC_MESSAGES/vte.mo
-share/locale/ku/LC_MESSAGES/vte.mo
-share/locale/ky/LC_MESSAGES/vte.mo
-share/locale/li/LC_MESSAGES/vte.mo
-share/locale/lt/LC_MESSAGES/vte.mo
-share/locale/lv/LC_MESSAGES/vte.mo
-share/locale/mai/LC_MESSAGES/vte.mo
-share/locale/mi/LC_MESSAGES/vte.mo
-share/locale/mk/LC_MESSAGES/vte.mo
-share/locale/ml/LC_MESSAGES/vte.mo
-share/locale/mn/LC_MESSAGES/vte.mo
-share/locale/mr/LC_MESSAGES/vte.mo
-share/locale/ms/LC_MESSAGES/vte.mo
-share/locale/nb/LC_MESSAGES/vte.mo
-share/locale/nds/LC_MESSAGES/vte.mo
-share/locale/ne/LC_MESSAGES/vte.mo
-share/locale/nl/LC_MESSAGES/vte.mo
-share/locale/nn/LC_MESSAGES/vte.mo
-share/locale/oc/LC_MESSAGES/vte.mo
-share/locale/or/LC_MESSAGES/vte.mo
-share/locale/pa/LC_MESSAGES/vte.mo
-share/locale/pl/LC_MESSAGES/vte.mo
-share/locale/pt/LC_MESSAGES/vte.mo
-share/locale/pt_BR/LC_MESSAGES/vte.mo
-share/locale/ro/LC_MESSAGES/vte.mo
-share/locale/ru/LC_MESSAGES/vte.mo
-share/locale/rw/LC_MESSAGES/vte.mo
-share/locale/si/LC_MESSAGES/vte.mo
-share/locale/sk/LC_MESSAGES/vte.mo
-share/locale/sl/LC_MESSAGES/vte.mo
-share/locale/sq/LC_MESSAGES/vte.mo
-share/locale/sr/LC_MESSAGES/vte.mo
-share/locale/sr@latin/LC_MESSAGES/vte.mo
-share/locale/sv/LC_MESSAGES/vte.mo
-share/locale/ta/LC_MESSAGES/vte.mo
-share/locale/te/LC_MESSAGES/vte.mo
-share/locale/th/LC_MESSAGES/vte.mo
-share/locale/tr/LC_MESSAGES/vte.mo
-share/locale/ug/LC_MESSAGES/vte.mo
-share/locale/uk/LC_MESSAGES/vte.mo
-share/locale/vi/LC_MESSAGES/vte.mo
-share/locale/wa/LC_MESSAGES/vte.mo
-share/locale/xh/LC_MESSAGES/vte.mo
-share/locale/zh_CN/LC_MESSAGES/vte.mo
-share/locale/zh_HK/LC_MESSAGES/vte.mo
-share/locale/zh_TW/LC_MESSAGES/vte.mo
+share/gtk-doc/html/vte-0.0/VteReaper.html
+share/gtk-doc/html/vte-0.0/VteTerminal.html
+share/gtk-doc/html/vte-0.0/VteTerminalAccessible.html
+share/gtk-doc/html/vte-0.0/annotation-glossary.html
+share/gtk-doc/html/vte-0.0/api-index-0-20.html
+share/gtk-doc/html/vte-0.0/api-index-0-24.html
+share/gtk-doc/html/vte-0.0/api-index-0-26.html
+share/gtk-doc/html/vte-0.0/api-index-deprecated.html
+share/gtk-doc/html/vte-0.0/api-index-full.html
+share/gtk-doc/html/vte-0.0/ch01.html
+share/gtk-doc/html/vte-0.0/ch02.html
+share/gtk-doc/html/vte-0.0/ch03.html
+share/gtk-doc/html/vte-0.0/deprecated-objects.html
+share/gtk-doc/html/vte-0.0/home.png
+share/gtk-doc/html/vte-0.0/index.html
+share/gtk-doc/html/vte-0.0/index.sgml
+share/gtk-doc/html/vte-0.0/internal-objects.html
+share/gtk-doc/html/vte-0.0/left.png
+share/gtk-doc/html/vte-0.0/licence.html
+share/gtk-doc/html/vte-0.0/object-hierarchy.html
+share/gtk-doc/html/vte-0.0/pt01.html
+share/gtk-doc/html/vte-0.0/right.png
+share/gtk-doc/html/vte-0.0/style.css
+share/gtk-doc/html/vte-0.0/up.png
+share/gtk-doc/html/vte-0.0/vte-0.0.devhelp
+share/gtk-doc/html/vte-0.0/vte-0.0.devhelp2
+share/gtk-doc/html/vte-0.0/vte-Version-Information.html
+share/gtk-doc/html/vte-0.0/vte-Vte-PTY.html
+share/locale/am/LC_MESSAGES/vte-0.0.mo
+share/locale/ang/LC_MESSAGES/vte-0.0.mo
+share/locale/ar/LC_MESSAGES/vte-0.0.mo
+share/locale/as/LC_MESSAGES/vte-0.0.mo
+share/locale/ast/LC_MESSAGES/vte-0.0.mo
+share/locale/az/LC_MESSAGES/vte-0.0.mo
+share/locale/be/LC_MESSAGES/vte-0.0.mo
+share/locale/be@latin/LC_MESSAGES/vte-0.0.mo
+share/locale/bg/LC_MESSAGES/vte-0.0.mo
+share/locale/bn/LC_MESSAGES/vte-0.0.mo
+share/locale/bn_IN/LC_MESSAGES/vte-0.0.mo
+share/locale/bs/LC_MESSAGES/vte-0.0.mo
+share/locale/ca/LC_MESSAGES/vte-0.0.mo
+share/locale/ca@valencia/LC_MESSAGES/vte-0.0.mo
+share/locale/cs/LC_MESSAGES/vte-0.0.mo
+share/locale/cy/LC_MESSAGES/vte-0.0.mo
+share/locale/da/LC_MESSAGES/vte-0.0.mo
+share/locale/de/LC_MESSAGES/vte-0.0.mo
+share/locale/dz/LC_MESSAGES/vte-0.0.mo
+share/locale/el/LC_MESSAGES/vte-0.0.mo
+share/locale/en@shaw/LC_MESSAGES/vte-0.0.mo
+share/locale/en_CA/LC_MESSAGES/vte-0.0.mo
+share/locale/en_GB/LC_MESSAGES/vte-0.0.mo
+share/locale/eo/LC_MESSAGES/vte-0.0.mo
+share/locale/es/LC_MESSAGES/vte-0.0.mo
+share/locale/et/LC_MESSAGES/vte-0.0.mo
+share/locale/eu/LC_MESSAGES/vte-0.0.mo
+share/locale/fa/LC_MESSAGES/vte-0.0.mo
+share/locale/fi/LC_MESSAGES/vte-0.0.mo
+share/locale/fr/LC_MESSAGES/vte-0.0.mo
+share/locale/ga/LC_MESSAGES/vte-0.0.mo
+share/locale/gl/LC_MESSAGES/vte-0.0.mo
+share/locale/gu/LC_MESSAGES/vte-0.0.mo
+share/locale/he/LC_MESSAGES/vte-0.0.mo
+share/locale/hi/LC_MESSAGES/vte-0.0.mo
+share/locale/hr/LC_MESSAGES/vte-0.0.mo
+share/locale/hu/LC_MESSAGES/vte-0.0.mo
+share/locale/id/LC_MESSAGES/vte-0.0.mo
+share/locale/is/LC_MESSAGES/vte-0.0.mo
+share/locale/it/LC_MESSAGES/vte-0.0.mo
+share/locale/ja/LC_MESSAGES/vte-0.0.mo
+share/locale/ka/LC_MESSAGES/vte-0.0.mo
+share/locale/kn/LC_MESSAGES/vte-0.0.mo
+share/locale/ko/LC_MESSAGES/vte-0.0.mo
+share/locale/ku/LC_MESSAGES/vte-0.0.mo
+share/locale/ky/LC_MESSAGES/vte-0.0.mo
+share/locale/li/LC_MESSAGES/vte-0.0.mo
+share/locale/lt/LC_MESSAGES/vte-0.0.mo
+share/locale/lv/LC_MESSAGES/vte-0.0.mo
+share/locale/mai/LC_MESSAGES/vte-0.0.mo
+share/locale/mi/LC_MESSAGES/vte-0.0.mo
+share/locale/mk/LC_MESSAGES/vte-0.0.mo
+share/locale/ml/LC_MESSAGES/vte-0.0.mo
+share/locale/mn/LC_MESSAGES/vte-0.0.mo
+share/locale/mr/LC_MESSAGES/vte-0.0.mo
+share/locale/ms/LC_MESSAGES/vte-0.0.mo
+share/locale/nb/LC_MESSAGES/vte-0.0.mo
+share/locale/nds/LC_MESSAGES/vte-0.0.mo
+share/locale/ne/LC_MESSAGES/vte-0.0.mo
+share/locale/nl/LC_MESSAGES/vte-0.0.mo
+share/locale/nn/LC_MESSAGES/vte-0.0.mo
+share/locale/oc/LC_MESSAGES/vte-0.0.mo
+share/locale/or/LC_MESSAGES/vte-0.0.mo
+share/locale/pa/LC_MESSAGES/vte-0.0.mo
+share/locale/pl/LC_MESSAGES/vte-0.0.mo
+share/locale/pt/LC_MESSAGES/vte-0.0.mo
+share/locale/pt_BR/LC_MESSAGES/vte-0.0.mo
+share/locale/ro/LC_MESSAGES/vte-0.0.mo
+share/locale/ru/LC_MESSAGES/vte-0.0.mo
+share/locale/rw/LC_MESSAGES/vte-0.0.mo
+share/locale/si/LC_MESSAGES/vte-0.0.mo
+share/locale/sk/LC_MESSAGES/vte-0.0.mo
+share/locale/sl/LC_MESSAGES/vte-0.0.mo
+share/locale/sq/LC_MESSAGES/vte-0.0.mo
+share/locale/sr/LC_MESSAGES/vte-0.0.mo
+share/locale/sr@latin/LC_MESSAGES/vte-0.0.mo
+share/locale/sv/LC_MESSAGES/vte-0.0.mo
+share/locale/ta/LC_MESSAGES/vte-0.0.mo
+share/locale/te/LC_MESSAGES/vte-0.0.mo
+share/locale/th/LC_MESSAGES/vte-0.0.mo
+share/locale/tr/LC_MESSAGES/vte-0.0.mo
+share/locale/ug/LC_MESSAGES/vte-0.0.mo
+share/locale/uk/LC_MESSAGES/vte-0.0.mo
+share/locale/vi/LC_MESSAGES/vte-0.0.mo
+share/locale/wa/LC_MESSAGES/vte-0.0.mo
+share/locale/xh/LC_MESSAGES/vte-0.0.mo
+share/locale/zh_CN/LC_MESSAGES/vte-0.0.mo
+share/locale/zh_HK/LC_MESSAGES/vte-0.0.mo
+share/locale/zh_TW/LC_MESSAGES/vte-0.0.mo
 share/vte/termcap/xterm
diff --git a/x11/vte/distinfo b/x11/vte/distinfo
index 65b5a0a0093..506ed3542ef 100644
--- a/x11/vte/distinfo
+++ b/x11/vte/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.46 2010/07/20 12:10:34 drochner Exp $
+$NetBSD: distinfo,v 1.47 2010/11/16 13:53:06 drochner Exp $
 
-SHA1 (vte-0.24.3.tar.bz2) = 463f2abf529286ce450b6c026a53bcd3e1fbb627
-RMD160 (vte-0.24.3.tar.bz2) = 0fed099ec8a1e88ce7a7fd0f12cab260b7559be0
-Size (vte-0.24.3.tar.bz2) = 1287755 bytes
+SHA1 (vte-0.26.2.tar.bz2) = 4c8fb07403538b7f743ec1d7af7b127683c7b9c2
+RMD160 (vte-0.26.2.tar.bz2) = 22a2217f69c2f64090a9d45105047fb1a440b07f
+Size (vte-0.26.2.tar.bz2) = 1310863 bytes
 SHA1 (patch-aa) = 6b722ecbbd9face7152feca39f1d323870d2a69a
 SHA1 (patch-ab) = 217a8722d09b1854e869c49af69731ffed92f61c
 SHA1 (patch-ac) = 3b357bf9d1bca93c24f5b09dae1adec82323be0d
 SHA1 (patch-af) = 69ea7e022f6c495c3c9af681d05644b9d70e7bdc
 SHA1 (patch-ah) = 28cee2661439d7d6f1959ebf3c7d1b7b3fe0a764
-SHA1 (patch-ai) = f2fe5969be0af12c8b4c88622ebe3dcb13f79fee
+SHA1 (patch-ai) = 986dd7c2a5778c9c35100901cfaa25acd0cbdc32
diff --git a/x11/vte/patches/patch-ai b/x11/vte/patches/patch-ai
index 71033ec596c..bff89c04e62 100644
--- a/x11/vte/patches/patch-ai
+++ b/x11/vte/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.2 2009/03/15 16:47:29 jmcneill Exp $
+$NetBSD: patch-ai,v 1.3 2010/11/16 13:53:06 drochner Exp $
 
---- gnome-pty-helper/gnome-pty-helper.c.orig	2008-11-27 19:13:04.000000000 -0500
+--- gnome-pty-helper/gnome-pty-helper.c.orig	2010-07-15 17:08:44.000000000 +0000
 +++ gnome-pty-helper/gnome-pty-helper.c
-@@ -121,6 +121,7 @@ pass_fd (int client_fd, int fd)
+@@ -122,6 +122,7 @@ pass_fd (int client_fd, int fd)
  	msg.msg_iovlen     = 1;
  	msg.msg_name       = NULL;
  	msg.msg_namelen    = 0;
@@ -10,11 +10,11 @@ $NetBSD: patch-ai,v 1.2 2009/03/15 16:47:29 jmcneill Exp $
  	msg.msg_control    = (caddr_t) cmsgbuf;
  	msg.msg_controllen = sizeof(cmsgbuf);
  
-@@ -129,6 +130,7 @@ pass_fd (int client_fd, int fd)
- 	cmptr->cmsg_type  = SCM_RIGHTS;
+@@ -131,6 +132,7 @@ pass_fd (int client_fd, int fd)
  	cmptr->cmsg_len   = CMSG_LEN(sizeof(int));
- 	*(int *)CMSG_DATA (cmptr) = fd;
+         fdptr = (int *) CMSG_DATA(cmptr);
+         memcpy (fdptr, &fd, sizeof(int));
 +#endif
- 
  	if (sendmsg (client_fd, &msg, 0) != 1)
  		return -1;
+