Update to 0.11.15.

6 files changed, 35 insertions, 37 deletions

diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index eb2573017db0..72ec9df5dd6a 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	vte
-PORTVERSION=	0.11.13
-PORTREVISION=	2
+PORTVERSION=	0.11.15
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
index 4a27516bbd60..fcef52f5026f 100644
--- a/x11-toolkits/vte/distinfo
+++ b/x11-toolkits/vte/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/vte-0.11.13.tar.bz2) = 5eb73c7de433fb6e53ac4378df9d23b5
-SIZE (gnome2/vte-0.11.13.tar.bz2) = 952108
+MD5 (gnome2/vte-0.11.15.tar.bz2) = a9dc7b330d52ce384e3e5715d396c72f
+SIZE (gnome2/vte-0.11.15.tar.bz2) = 959449
diff --git a/x11-toolkits/vte/files/patch-10_hide_pageup_behavior b/x11-toolkits/vte/files/patch-10_hide_pageup_behavior
deleted file mode 100644
index 9f2b1e619d28..000000000000
--- a/x11-toolkits/vte/files/patch-10_hide_pageup_behavior
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/vte.c.orig	2004-12-20 00:01:33 -0800
-+++ src/vte.c	2004-12-20 00:22:28 -0800
-@@ -696,7 +696,7 @@
- 	    !terminal->pvt->bg_transparent &&
- 	    (terminal->pvt->bg_pixbuf == NULL) &&
- 	    (terminal->pvt->bg_file == NULL) &&
--	    (row == terminal->pvt->screen->scroll_delta) &&
-+	    (row == 0) &&
- 	    (count == terminal->row_count) &&
- 	    (terminal->pvt->scroll_lock_count == 0)) {
- 		height = terminal->char_height;
diff --git a/x11-toolkits/vte/files/patch-configure b/x11-toolkits/vte/files/patch-configure
index f4a8f8c73607..424e74a57917 100644
--- a/x11-toolkits/vte/files/patch-configure
+++ b/x11-toolkits/vte/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Fri Mar 19 03:38:08 2004
-+++ configure	Wed Apr  7 02:56:46 2004
-@@ -23732,10 +23733,6 @@
+--- configure.orig	Tue Aug 23 20:29:13 2005
++++ configure	Tue Aug 23 20:30:09 2005
+@@ -26765,10 +26765,6 @@
  rm -f conftest*
  
  
@@ -11,16 +11,16 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define _XOPEN_SOURCE 1
-@@ -23942,7 +23939,7 @@
+@@ -27067,7 +27063,7 @@
  
  
  
--for ac_func in cfmakeraw getpgid getpt grantpt unlockpt ptsname ptsname_r recvmsg
-+for ac_func in cfmakeraw getpgid getpt posix_openpt grantpt unlockpt ptsname ptsname_r recvmsg
+-for ac_func in cfmakeraw getpgid getpt grantpt unlockpt ptsname ptsname_r
++for ac_func in cfmakeraw getpgid getpt posix_openpt grantpt unlockpt ptsname ptsname_r
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
  echo "$as_me:$LINENO: checking for $ac_func" >&5
-@@ -25977,7 +25974,7 @@
+@@ -29400,7 +29396,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c b/x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c
index cdadaca6af2b..7acaac54558c 100644
--- a/x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c
+++ b/x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c
@@ -1,19 +1,26 @@
---- gnome-pty-helper/gnome-pty-helper.c.orig	Wed Nov 27 13:40:01 2002
-+++ gnome-pty-helper/gnome-pty-helper.c	Wed Nov 27 13:40:42 2002
-@@ -42,6 +42,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <signal.h>
-+#include <sys/param.h>
- #include <fcntl.h>
- #include <termios.h>
- #include <errno.h>
-@@ -93,7 +94,7 @@
- #endif
+--- gnome-pty-helper/gnome-pty-helper.c.orig	Sat Aug 13 07:55:19 2005
++++ gnome-pty-helper/gnome-pty-helper.c	Wed Aug 24 19:03:08 2005
+@@ -95,12 +95,12 @@ static pty_info *pty_list;
  #endif /* CMSG_DATA */
  
--#define CONTROLLEN (sizeof (struct cmsghdr)  + sizeof (int))
-+#define CONTROLLEN (sizeof (struct cmsghdr)  + sizeof (long))
- 
  static struct cmsghdr *cmptr;
+-static int CONTROLLEN;
++static socklen_t CONTROLLEN;
+ 
+ static int
+ init_msg_pass ()
+ {
+-	CONTROLLEN = (CMSG_DATA (cmptr) - (unsigned char *)cmptr) + sizeof(int);
++	CONTROLLEN = CMSG_SPACE (sizeof (int));
+ 	cmptr = malloc (CONTROLLEN);
+ 
+ 	if (cmptr)
+@@ -128,7 +128,7 @@ pass_fd (int client_fd, int fd)
+ 
+ 	cmptr->cmsg_level = SOL_SOCKET;
+ 	cmptr->cmsg_type  = SCM_RIGHTS;
+-	cmptr->cmsg_len   = CONTROLLEN;
++	cmptr->cmsg_len   = CMSG_LEN (sizeof (fd));
+ 	*(int *)CMSG_DATA (cmptr) = fd;
  
+ 	if (sendmsg (client_fd, &msg, 0) != 1)
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index 5a1586baaa75..45f4d5d694fa 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -47,6 +47,7 @@ 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
@@ -86,6 +87,7 @@ share/locale/sr/LC_MESSAGES/vte.mo
 share/locale/sr@Latn/LC_MESSAGES/vte.mo
 share/locale/sv/LC_MESSAGES/vte.mo
 share/locale/ta/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