update to 0.28.1

This swiches to the new release branch.

5 files changed, 18 insertions, 81 deletions

diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index 70af192befb..1ef912a0e1e 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.85 2011/06/10 17:07:16 drochner Exp $
+# $NetBSD: Makefile,v 1.86 2011/07/08 17:23:05 drochner Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=	3
 CATEGORIES=	x11
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/x11/vte/Makefile.common b/x11/vte/Makefile.common
index 232b2cd2690..f0422305d40 100644
--- a/x11/vte/Makefile.common
+++ b/x11/vte/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.1 2011/03/03 12:05:22 obache Exp $
+# $NetBSD: Makefile.common,v 1.2 2011/07/08 17:23:05 drochner Exp $
 #
 # used by x11/py-vte/Makefile
 
-DISTNAME=	vte-0.26.2
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vte/0.26/}
+DISTNAME=	vte-0.28.1
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vte/0.28/}
 EXTRACT_SUFX=	.tar.bz2
 
 HOMEPAGE=	http://www.gnome.org/
diff --git a/x11/vte/PLIST b/x11/vte/PLIST
index 0b459874adf..685c2fc9d0a 100644
--- a/x11/vte/PLIST
+++ b/x11/vte/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2010/11/16 13:53:06 drochner Exp $
+@comment $NetBSD: PLIST,v 1.26 2011/07/08 17:23:05 drochner Exp $
 bin/vte
 include/vte-0.0/vte/pty.h
 include/vte-0.0/vte/reaper.h
@@ -10,31 +10,30 @@ include/vte-0.0/vte/vtetypebuiltins.h
 include/vte-0.0/vte/vteversion.h
 lib/libvte.la
 lib/pkgconfig/vte.pc
-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-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-0-28.html
+share/gtk-doc/html/vte-0.0/api-index-0-30.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/ch04s02.html
+share/gtk-doc/html/vte-0.0/ch04s03.html
+share/gtk-doc/html/vte-0.0/ch04s04.html
+share/gtk-doc/html/vte-0.0/ch04s05.html
+share/gtk-doc/html/vte-0.0/ch04s06.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/migration-0-30.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
@@ -133,4 +132,4 @@ 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
+share/vte/termcap-0.0/xterm
diff --git a/x11/vte/distinfo b/x11/vte/distinfo
index 4123c636a2c..3575959dfd9 100644
--- a/x11/vte/distinfo
+++ b/x11/vte/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.49 2011/06/15 13:44:39 drochner Exp $
+$NetBSD: distinfo,v 1.50 2011/07/08 17:23:05 drochner Exp $
 
-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 (vte-0.28.1.tar.bz2) = 9867f84c6be65ff485d8a1a3c41a359709b6f84c
+RMD160 (vte-0.28.1.tar.bz2) = e0748777f5a57266762b3dd88f7a10b143e412d9
+Size (vte-0.28.1.tar.bz2) = 1341147 bytes
 SHA1 (patch-aa) = 6b722ecbbd9face7152feca39f1d323870d2a69a
 SHA1 (patch-ab) = 217a8722d09b1854e869c49af69731ffed92f61c
 SHA1 (patch-ac) = 3b357bf9d1bca93c24f5b09dae1adec82323be0d
 SHA1 (patch-af) = 69ea7e022f6c495c3c9af681d05644b9d70e7bdc
 SHA1 (patch-ah) = 28cee2661439d7d6f1959ebf3c7d1b7b3fe0a764
 SHA1 (patch-ai) = 986dd7c2a5778c9c35100901cfaa25acd0cbdc32
-SHA1 (patch-aj) = 8a8dd64193a041e5aafe4dde383f9af272526b26
diff --git a/x11/vte/patches/patch-aj b/x11/vte/patches/patch-aj
deleted file mode 100644
index f6b57574f67..00000000000
--- a/x11/vte/patches/patch-aj
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-aj,v 1.4 2011/06/15 13:44:40 drochner Exp $
-
-CVE-2011-2198 (patch from gnome bug #652124)
-
---- src/vteseq.c.orig	2010-08-09 11:38:44.000000000 +0000
-+++ src/vteseq.c
-@@ -532,9 +532,10 @@ vte_sequence_handler_offset(VteTerminal 
- 
- /* Call another function a given number of times, or once. */
- static void
--vte_sequence_handler_multiple(VteTerminal *terminal,
--			      GValueArray *params,
--			      VteTerminalSequenceHandler handler)
-+vte_sequence_handler_multiple_limited(VteTerminal *terminal,
-+                                      GValueArray *params,
-+                                      VteTerminalSequenceHandler handler,
-+                                      glong max)
- {
- 	long val = 1;
- 	int i;
-@@ -544,13 +545,29 @@ vte_sequence_handler_multiple(VteTermina
- 		value = g_value_array_get_nth(params, 0);
- 		if (G_VALUE_HOLDS_LONG(value)) {
- 			val = g_value_get_long(value);
--			val = MAX(val, 1);	/* FIXME: vttest. */
-+			val = CLAMP(val, 1, max);	/* FIXME: vttest. */
- 		}
- 	}
- 	for (i = 0; i < val; i++)
- 		handler (terminal, NULL);
- }
- 
-+static void
-+vte_sequence_handler_multiple(VteTerminal *terminal,
-+                              GValueArray *params,
-+                              VteTerminalSequenceHandler handler)
-+{
-+        vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG);
-+}
-+
-+static void
-+vte_sequence_handler_multiple_r(VteTerminal *terminal,
-+                                GValueArray *params,
-+                                VteTerminalSequenceHandler handler)
-+{
-+        vte_sequence_handler_multiple_limited(terminal, params, handler,
-+                                              terminal->column_count - terminal->pvt->screen->cursor_current.col);
-+}
- 
- /* Manipulate certain terminal attributes. */
- static void
-@@ -1570,7 +1587,7 @@ vte_sequence_handler_ic (VteTerminal *te
- static void
- vte_sequence_handler_IC (VteTerminal *terminal, GValueArray *params)
- {
--	vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_ic);
-+	vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_ic);
- }
- 
- /* Begin insert mode. */