Presenting GNOME 2.26 for FreeBSD. See

http://library.gnome.org/misc/release-notes/2.26/ for a list of what's new.
On the FreeBSD front, we introduced a port of libxul 1.9 as an alternative
for Firefox 2.0 as a Gecko provider.  Almost all of the Gecko consumers
can make use of this provider by setting:

WITH_GECKO=libxul

The GNOME 2.26 port was done by ahze, kwm, marcus, and mezz with
contributions by Joseph S. Atkinson, Peter Wemm, Eric L. Chen,
Martin Matuska, Craig Butler, and Pawel Worach.

7 files changed, 35 insertions, 90 deletions

diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 3eb38350af11..277b44db6328 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/vte/Makefile,v 1.91 2008/09/22 23:42:39 kwm Exp $
+#   $MCom: ports/x11-toolkits/vte/Makefile,v 1.94 2009/03/16 07:57:41 kwm Exp $
 #
 
 PORTNAME=	vte
-PORTVERSION=	0.17.4
+PORTVERSION=	0.20.0
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
@@ -27,8 +27,8 @@ USE_AUTOTOOLS=	libtool:15
 USE_GETTEXT=	yes
 USE_GNOME?=	gnomeprefix gnomehack gtk20 ltverhack referencehack
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		BSD_PTHREAD_LIBS="${PTHREAD_LIBS}"
+		LDFLAGS="-L${LOCALBASE}/lib"
+#		BSD_PTHREAD_LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS?=--disable-python \
 		--disable-freetypetest
 
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
index f703509a9b03..f716a7305113 100644
--- a/x11-toolkits/vte/distinfo
+++ b/x11-toolkits/vte/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vte-0.17.4.tar.bz2) = ec6cb2668db7146eae7cfc48af98f3ed
-SHA256 (gnome2/vte-0.17.4.tar.bz2) = 50ae10aea7fa99c9ae296031782c18ac15663e84eb6ecd94cd0a18c7843987d2
-SIZE (gnome2/vte-0.17.4.tar.bz2) = 1084847
+MD5 (gnome2/vte-0.20.0.tar.bz2) = 12dde859bc98e039336baff6e9e6b15b
+SHA256 (gnome2/vte-0.20.0.tar.bz2) = 6612c72fe73279a23e296a70e19b3f5dd270c6d16cf0cc6a191475c1a16846f7
+SIZE (gnome2/vte-0.20.0.tar.bz2) = 1089171
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 8f838a9b007f..5534225003e7 100644
--- a/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in
+++ b/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in
@@ -1,22 +1,5 @@
 --- gnome-pty-helper/Makefile.in.orig	2007-07-29 17:20:13.000000000 -0400
 +++ gnome-pty-helper/Makefile.in	2007-07-29 17:25:47.000000000 -0400
-@@ -107,6 +107,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
-+BSD_PTHREAD_LIBS = @BSD_PTHREAD_LIBS@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-@@ -271,7 +272,7 @@ clean-libexecPROGRAMS:
- 	-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_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS)
-+	$(LINK) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS) $(BSD_PTHREAD_LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
 @@ -584,8 +585,8 @@ uninstall-am: uninstall-libexecPROGRAMS
  
  
diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_configure b/x11-toolkits/vte/files/patch-gnome-pty-helper_configure
deleted file mode 100644
index 70091c3aa2f7..000000000000
--- a/x11-toolkits/vte/files/patch-gnome-pty-helper_configure
+++ /dev/null
@@ -1,27 +0,0 @@
---- gnome-pty-helper/configure.orig	2008-09-08 19:30:02.000000000 -0400
-+++ gnome-pty-helper/configure	2008-09-08 19:31:21.000000000 -0400
-@@ -673,6 +673,7 @@ AMTAR
- am__tar
- am__untar
- CC
-+BSD_PTHREAD_LIBS
- CFLAGS
- LDFLAGS
- CPPFLAGS
-@@ -8434,6 +8435,7 @@ AMTAR!$AMTAR$ac_delim
- am__tar!$am__tar$ac_delim
- am__untar!$am__untar$ac_delim
- CC!$CC$ac_delim
-+BSD_PTHREAD_LIBS!$BSD_PTHREAD_LIBS$ac_delim
- CFLAGS!$CFLAGS$ac_delim
- LDFLAGS!$LDFLAGS$ac_delim
- CPPFLAGS!$CPPFLAGS$ac_delim
-@@ -8470,7 +8472,7 @@ LIBOBJS!$LIBOBJS$ac_delim
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
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
deleted file mode 100644
index 6be543a31e05..000000000000
--- a/x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- gnome-pty-helper/gnome-pty-helper.c.orig	Tue Feb 14 03:58:10 2006
-+++ gnome-pty-helper/gnome-pty-helper.c	Sat Feb 25 16:38:04 2006
-@@ -95,12 +95,12 @@ static pty_info *pty_list;
- #endif /* CMSG_DATA */
- 
- static struct cmsghdr *cmptr;
--static int CONTROLLEN;
-+static socklen_t CONTROLLEN;
- 
- static int
- init_msg_pass (void)
- {
--	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/files/patch-python_Makefile.in b/x11-toolkits/vte/files/patch-python_Makefile.in
index 10ee93b1347b..d8c01a7483df 100644
--- a/x11-toolkits/vte/files/patch-python_Makefile.in
+++ b/x11-toolkits/vte/files/patch-python_Makefile.in
@@ -1,19 +1,36 @@
---- 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 @@
+--- python/Makefile.in.orig	2009-03-16 08:49:19.000000000 +0100
++++ python/Makefile.in	2009-03-16 08:51:17.000000000 +0100
+@@ -56,7 +56,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@	$(am__DEPENDENCIES_1)
+@@ -290,11 +289,11 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = vte.defs pyvte.pc.in vte.override cat.py unrealize.py vte-demo.py
+-defsdir = $(datadir)/pygtk/2.0/defs
+-defs_DATA = vte.defs
+-pkgconfigdir = $(prefix)/libdata/pkgconfig
+-pkgconfig_DATA = pyvte.pc
+-PYTHON_MODULES = vtemodule.la
++@BUILD_PYTHON_MODULES_TRUE@defsdir = $(datadir)/pygtk/2.0/defs
++@BUILD_PYTHON_MODULES_TRUE@defs_DATA = vte.defs
++@BUILD_PYTHON_MODULES_TRUE@pkgconfigdir = $(prefix)/libdata/pkgconfig
++@BUILD_PYTHON_MODULES_TRUE@pkgconfig_DATA = pyvte.pc
++@BUILD_PYTHON_MODULES_TRUE@PYTHON_MODULES = vtemodule.la
+ @BUILD_PYTHON_MODULES_TRUE@pythonsiteexecdir = $(pyexecdir)/gtk-2.0
+ @BUILD_PYTHON_MODULES_TRUE@pythonsiteexec_LTLIBRARIES = $(PYTHON_MODULES)
  @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
+@@ -305,7 +304,7 @@
+ # we do this to suport building with -Wl,-z,defs which errors on
+ # vtemodule.so as we cannot include $(PYTHON_LIBS) due to bug 410986.
+ @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initvte $(PYTHON_LDFLAGS) $(AM_LDFLAGS)
 -@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/pkg-plist b/x11-toolkits/vte/pkg-plist
index 15cb7dfbb283..d4337b16529b 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -11,19 +11,15 @@ lib/libvte.so
 lib/libvte.so.9
 lib/vte/decset
 lib/vte/interpret
-lib/vte/iso8859mode
-lib/vte/nativeecho
 lib/vte/osc
 lib/vte/slowcat
-lib/vte/utf8echo
-lib/vte/utf8mode
-lib/vte/vterdb
 lib/vte/window
 libdata/pkgconfig/vte.pc
 libexec/gnome-pty-helper
 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/az/LC_MESSAGES/vte.mo
 share/locale/be/LC_MESSAGES/vte.mo
 share/locale/be@latin/LC_MESSAGES/vte.mo
@@ -138,5 +134,7 @@ share/locale/zh_TW/LC_MESSAGES/vte.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
 @dirrmtry share/locale/ang/LC_MESSAGES
 @dirrmtry share/locale/ang