7 files changed, 52 insertions, 34 deletions

diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 17ce76d850b6..74e71b984516 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -3,19 +3,19 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/vte/Makefile,v 1.61 2006/10/03 12:33:40 ahze Exp $
+#   $MCom: ports/x11-toolkits/vte/Makefile,v 1.72 2007/03/13 00:43:46 mezz Exp $
 #
 
 PORTNAME=	vte
-PORTVERSION=	0.14.2
-PORTREVISION?=	1
+PORTVERSION=	0.16.0
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Terminal widget with improved accessibility and I18N support
+MAINTAINER?=	gnome@FreeBSD.org
+COMMENT?=	Terminal widget with improved accessibility and I18N support
 
 USE_BZIP2=	yes
 
@@ -27,17 +27,20 @@ USE_XLIB=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GETTEXT=	yes
-USE_GNOME=	gnomeprefix gnomehack gtk20 ltverhack referencehack
+USE_GNOME?=	gnomeprefix gnomehack gtk20 ltverhack referencehack
 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
+CONFIGURE_ARGS?=--disable-python \
+		--disable-freetypetest
 
+.if !defined(MASTERDIR)
 OPTIONS=	GLX	"Enable support for DRI/GLX rendering" off
+.endif
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_GLX)
+.if defined(WITH_GLX) && !defined(MASTERDIR)
 CONFIGURE_ARGS+=	--with-glX
 USE_GL=			yes
 .endif
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
index dc59ace94fc2..042506957fc7 100644
--- a/x11-toolkits/vte/distinfo
+++ b/x11-toolkits/vte/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vte-0.14.2.tar.bz2) = eceafec1b564cc059fa3407f83631817
-SHA256 (gnome2/vte-0.14.2.tar.bz2) = 1ad92649f848064f903dd60a2d6d2b724d8fbe3c766bf5a4b6fcdbf1f2435088
-SIZE (gnome2/vte-0.14.2.tar.bz2) = 1031948
+MD5 (gnome2/vte-0.16.0.tar.bz2) = 6b85967ba75ed574d0e5782697fbc79f
+SHA256 (gnome2/vte-0.16.0.tar.bz2) = 7f71faf8beb686f940f13125ff5fcc142c7b8ccde81cf80c8f278fdf4a0cacec
+SIZE (gnome2/vte-0.16.0.tar.bz2) = 1095254
diff --git a/x11-toolkits/vte/files/patch-configure b/x11-toolkits/vte/files/patch-configure
index 7cddbbd44395..e9fe9010769e 100644
--- a/x11-toolkits/vte/files/patch-configure
+++ b/x11-toolkits/vte/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	Tue Oct  3 08:23:12 2006
-+++ configure	Tue Oct  3 08:23:12 2006
-@@ -26464,7 +26464,7 @@
+--- configure.orig	Tue Feb 13 16:22:38 2007
++++ configure	Tue Feb 13 16:23:19 2007
+@@ -24887,7 +24887,7 @@ fi
  
  
  
--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
+-for ac_func in cfmakeraw fork setsid setpgid getpgid getpt grantpt unlockpt ptsname ptsname_r tcgetattr tcsetattr
++for ac_func in cfmakeraw fork setsid setpgid getpgid getpt grantpt posix_openpt unlockpt ptsname ptsname_r tcgetattr tcsetattr
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
  echo "$as_me:$LINENO: checking for $ac_func" >&5
diff --git a/x11-toolkits/vte/files/patch-python_Makefile.in b/x11-toolkits/vte/files/patch-python_Makefile.in
new file mode 100644
index 000000000000..10ee93b1347b
--- /dev/null
+++ b/x11-toolkits/vte/files/patch-python_Makefile.in
@@ -0,0 +1,19 @@
+--- python/Makefile.in.orig	Tue Feb 27 12:46:42 2007
++++ python/Makefile.in	Tue Feb 27 12:47:11 2007
+@@ -61,7 +61,6 @@
+ LTLIBRARIES = $(pythonsiteexec_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_DEPENDENCIES =  \
+-@BUILD_PYTHON_MODULES_TRUE@	$(top_builddir)/src/libvte.la \
+ @BUILD_PYTHON_MODULES_TRUE@	$(am__DEPENDENCIES_1) \
+ @BUILD_PYTHON_MODULES_TRUE@	$(am__DEPENDENCIES_1) \
+ @BUILD_PYTHON_MODULES_TRUE@	$(am__DEPENDENCIES_1) \
+@@ -303,7 +302,7 @@
+ @BUILD_PYTHON_MODULES_TRUE@CLEANFILES = vte.c
+ @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_CFLAGS = $(VTE_CFLAGS) $(X_CFLAGS) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS)
+ @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_SOURCES = vtemodule.c
+-@BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LIBADD = $(top_builddir)/src/libvte.la $(LIBS) $(PYGTK_LIBS) $(VTE_LIBS) $(X_LIBS)
++@BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LIBADD = -lvte $(LIBS) $(PYGTK_LIBS) $(VTE_LIBS) $(X_LIBS)
+ @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initvte
+ @BUILD_PYTHON_MODULES_TRUE@nodist_vtemodule_la_SOURCES = vte.c
+ all: all-am
diff --git a/x11-toolkits/vte/files/patch-src_pty.c b/x11-toolkits/vte/files/patch-src_pty.c
index a31b1192bc2a..da0f42b81a3c 100644
--- a/x11-toolkits/vte/files/patch-src_pty.c
+++ b/x11-toolkits/vte/files/patch-src_pty.c
@@ -1,19 +1,10 @@
---- src/pty.c.orig	Tue Jun  3 15:54:15 2003
-+++ src/pty.c	Wed Apr  7 02:55:57 2004
-@@ -45,6 +45,7 @@
- #include "pty.h"
+--- src/pty.c.orig	Tue Feb 13 16:24:15 2007
++++ src/pty.c	Tue Feb 13 16:29:15 2007
+@@ -271,6 +271,7 @@ _vte_pty_run_on_pty (struct vte_pty_chil
+ 		     GPid *pid, GError **error)
+ {
+ 	gboolean ret = TRUE;
++	extern char **environ;
+ 	GError *local_error = NULL;
  
- #ifdef VTE_USE_GNOME_PTY_HELPER
-+#include "../gnome-pty-helper/config.h"
- #include "../gnome-pty-helper/gnome-pty.h"
- #endif
- 
-@@ -709,6 +710,8 @@
- #ifdef HAVE_GETPT
- 	/* Call the system's function for allocating a pty. */
- 	fd = getpt();
-+#elif defined(HAVE_POSIX_OPENPT)
-+	fd = posix_openpt(O_RDWR | O_NOCTTY);
- #else
- 	/* Try to allocate a pty by accessing the pty master multiplex. */
- 	fd = open("/dev/ptmx", O_RDWR | O_NOCTTY);
+ 	if (command != NULL) {
diff --git a/x11-toolkits/vte/pkg-descr b/x11-toolkits/vte/pkg-descr
index 9c325db4ccc0..a363e23c7866 100644
--- a/x11-toolkits/vte/pkg-descr
+++ b/x11-toolkits/vte/pkg-descr
@@ -1,2 +1,4 @@
 Terminal widget with improved font, internationalisation and accessibility
 support for the GNOME 2 desktop.  Designed to replace libzvt.
+
+WWW: http://www.gnome.org/
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index c36847f1f528..7ef70c1607f8 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -25,6 +25,7 @@ share/locale/ang/LC_MESSAGES/vte.mo
 share/locale/ar/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
@@ -158,6 +159,8 @@ share/locale/zh_TW/LC_MESSAGES/vte.mo
 @dirrmtry share/locale/ca
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
 @dirrmtry share/locale/be/LC_MESSAGES
 @dirrmtry share/locale/be
 @dirrmtry share/locale/ang/LC_MESSAGES