10 files changed, 73 insertions, 35 deletions

diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index e319fee4fa57..23290abd992d 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	vte
-PORTVERSION=	0.10.29
+PORTVERSION=	0.11.10
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.10
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.11
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,10 +23,21 @@ USE_BISON=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
+		BSD_PTHREAD_LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--disable-python
 
+.ifdef(WITH_GLX)
+CONFIGURE_ARGS+=	--with-glX
+.endif
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Vte supports the following configurable option(s):"
+	@${ECHO_MSG} "	WITH_GLX=yes	Enable support for DRI rendering (may improve performance)"
+	@${ECHO_MSG} ""
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|malloc\.h|stdlib.h|g' \
 		${WRKSRC}/gnome-pty-helper/gnome-pty-helper.c
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
index 0da53fe475b2..505d4768788b 100644
--- a/x11-toolkits/vte/distinfo
+++ b/x11-toolkits/vte/distinfo
@@ -1 +1 @@
-MD5 (gnome2/vte-0.10.29.tar.bz2) = f1bba34a7c3cadde8d1b9a333163184b
+MD5 (gnome2/vte-0.11.10.tar.bz2) = 71facdedd477749908402a6931d36e64
diff --git a/x11-toolkits/vte/files/patch-configure b/x11-toolkits/vte/files/patch-configure
index 72106cddb908..955fd6d5115e 100644
--- a/x11-toolkits/vte/files/patch-configure
+++ b/x11-toolkits/vte/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Tue Dec  3 02:15:27 2002
-+++ configure	Wed Dec  4 02:01:09 2002
-@@ -8643,6 +8643,7 @@
+--- configure.orig	Tue May  6 10:14:49 2003
++++ configure	Wed May  7 02:24:01 2003
+@@ -8724,6 +8724,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,3 +8,14 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -13009,10 +13010,6 @@
+ fi
+ rm -f conftest*
+ 
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define _XOPEN_SOURCE_EXTENDED 1
+-_ACEOF
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in b/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in
index e609f0e131fe..fdb419f853c2 100644
--- a/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in
+++ b/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in
@@ -1,6 +1,23 @@
---- gnome-pty-helper/Makefile.in.orig	Wed Nov 27 13:30:48 2002
-+++ gnome-pty-helper/Makefile.in	Wed Nov 27 13:31:05 2002
-@@ -425,8 +425,8 @@
+--- gnome-pty-helper/Makefile.in.orig	Mon Jun  2 20:23:02 2003
++++ gnome-pty-helper/Makefile.in	Mon Jun  2 20:26:54 2003
+@@ -65,6 +65,7 @@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
++BSD_PTHREAD_LIBS = @BSD_PTHREAD_LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+@@ -217,7 +218,7 @@
+ 	-test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS)
+ gnome-pty-helper$(EXEEXT): $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_DEPENDENCIES) 
+ 	@rm -f gnome-pty-helper$(EXEEXT)
+-	$(LINK) $(gnome_pty_helper_LDFLAGS) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS)
++	$(LINK) $(gnome_pty_helper_LDFLAGS) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS) $(BSD_PTHREAD_LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT) core *.core
+@@ -514,8 +515,8 @@
  
  
  install-exec-hook:
diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_configure b/x11-toolkits/vte/files/patch-gnome-pty-helper_configure
new file mode 100644
index 000000000000..668f2a6dba5b
--- /dev/null
+++ b/x11-toolkits/vte/files/patch-gnome-pty-helper_configure
@@ -0,0 +1,10 @@
+--- gnome-pty-helper/configure.orig	Mon Jun  2 20:27:32 2003
++++ gnome-pty-helper/configure	Mon Jun  2 20:28:06 2003
+@@ -6318,6 +6318,7 @@
+ s,@ECHO_N@,$ECHO_N,;t t
+ s,@ECHO_T@,$ECHO_T,;t t
+ s,@LIBS@,$LIBS,;t t
++s,@BSD_PTHREAD_LIBS@,$BSD_PTHREAD_LIBS,;t t
+ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+ s,@INSTALL_DATA@,$INSTALL_DATA,;t t
diff --git a/x11-toolkits/vte/files/patch-src_dumpkeys.c b/x11-toolkits/vte/files/patch-src_dumpkeys.c
index 74852c5eb9ef..9c7110edf5d5 100644
--- a/x11-toolkits/vte/files/patch-src_dumpkeys.c
+++ b/x11-toolkits/vte/files/patch-src_dumpkeys.c
@@ -2,7 +2,7 @@
 +++ src/dumpkeys.c	Wed Dec  4 02:04:30 2002
 @@ -18,11 +18,11 @@
  
- #ident "$Id: patch-src_dumpkeys.c,v 1.1 2002/12/04 07:10:42 marcus Exp $"
+ #ident "$Id: patch-src_dumpkeys.c,v 1.3 2003/04/12 04:52:53 marcus Exp $"
  #include "../config.h"
 +#include <sys/types.h>
  #ifdef HAVE_SYS_SELECT_H
diff --git a/x11-toolkits/vte/files/patch-src_keymap.c b/x11-toolkits/vte/files/patch-src_keymap.c
index 16012c800304..db657443b846 100644
--- a/x11-toolkits/vte/files/patch-src_keymap.c
+++ b/x11-toolkits/vte/files/patch-src_keymap.c
@@ -2,7 +2,7 @@
 +++ src/keymap.c	Tue Oct 22 17:42:33 2002
 @@ -18,6 +18,7 @@
  
- #ident "$Id: patch-src_keymap.c,v 1.1 2002/10/22 21:53:50 marcus Exp $"
+ #ident "$Id: patch-src_keymap.c,v 1.3 2003/04/12 04:52:53 marcus Exp $"
  #include "../config.h"
 +#include <sys/types.h>
  #include <stdlib.h>
diff --git a/x11-toolkits/vte/files/patch-src_pty.c b/x11-toolkits/vte/files/patch-src_pty.c
index f88e85642dee..3601fb3d69f0 100644
--- a/x11-toolkits/vte/files/patch-src_pty.c
+++ b/x11-toolkits/vte/files/patch-src_pty.c
@@ -1,13 +1,10 @@
---- src/pty.c.orig	Tue May 13 01:18:15 2003
-+++ src/pty.c	Tue May 13 01:26:22 2003
-@@ -48,6 +48,10 @@
+--- src/pty.c.orig	Sat Apr 12 00:47:10 2003
++++ src/pty.c	Sat Apr 12 00:47:34 2003
+@@ -45,6 +45,7 @@
+ #include "pty.h"
+ 
+ #ifdef VTE_USE_GNOME_PTY_HELPER
++#include "../gnome-pty-helper/config.h"
  #include "../gnome-pty-helper/gnome-pty.h"
  #endif
  
-+#ifdef __FreeBSD__
-+#define HAVE_RECVMSG 1
-+#endif
-+
- #ifdef MSG_NOSIGNAL
- #define PTY_RECVMSG_FLAGS MSG_NOSIGNAL
- #else
diff --git a/x11-toolkits/vte/files/patch-src_vte.c b/x11-toolkits/vte/files/patch-src_vte.c
deleted file mode 100644
index 9c267212f5c1..000000000000
--- a/x11-toolkits/vte/files/patch-src_vte.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/vte.c.orig	Tue Mar  4 14:25:26 2003
-+++ src/vte.c	Wed Mar 26 01:42:42 2003
-@@ -547,7 +547,7 @@
- static wchar_t
- vte_wc_from_unichar(VteTerminal *terminal, gunichar c)
- {
--#ifdef __STDC_ISO_10646__
-+#if defined(__STDC_ISO_10646__) || (defined(__FreeBSD__) && __FreeBSD_version < 500000)
- 	return (wchar_t) c;
- #else
- 	gpointer original, result;
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index 30ebb21d7f75..d9d48291e46d 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -5,13 +5,14 @@ include/vte/vte.h
 include/vte/vteaccess.h
 lib/libvte.a
 lib/libvte.so
-lib/libvte.so.4
+lib/libvte.so.5
 lib/vte/decset
 lib/vte/interpret
 lib/vte/iso8859mode
 lib/vte/nativeecho
 lib/vte/osc
 lib/vte/slowcat
+lib/vte/vterdb
 lib/vte/utf8echo
 lib/vte/utf8mode
 lib/vte/window
@@ -40,7 +41,9 @@ share/locale/is/LC_MESSAGES/vte.mo
 share/locale/it/LC_MESSAGES/vte.mo
 share/locale/ja/LC_MESSAGES/vte.mo
 share/locale/ko/LC_MESSAGES/vte.mo
+share/locale/li/LC_MESSAGES/vte.mo
 share/locale/lv/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/ms/LC_MESSAGES/vte.mo