Update to GNOME 2.2.

This is Phase I.  All existing ports have been updated to their GNOME 2.2
counterparts.

4 files changed, 18 insertions, 4 deletions

diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 7d1a4aa..a997e5b 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vte
-PORTVERSION=	0.10.11
+PORTVERSION=	0.10.17
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.10
@@ -14,7 +14,7 @@ DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20
+LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -35,6 +35,10 @@ post-patch:
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|malloc\.h|stdlib.h|g' \
 		${WRKSRC}/gnome-pty-helper/gnome-pty-helper.c
+	@${REINPLACE_CMD} -e 's|Xft\.h|Xft2.h|g' \
+		${WRKSRC}/src/vte.c
+	@${REINPLACE_CMD} -Ee '/^(libvte_la_LIBADD|vte_LDADD)/s/(.*)/\1 -lXft2/' \
+		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|[(]libdir[)]/locale|(prefix)/share/locale|g' \
 		${WRKSRC}/po/Makefile.in.in
 
diff --git a/x11-toolkits/vte/distinfo b/x11-toolkits/vte/distinfo
index b9901b8..a566ee0 100644
--- a/x11-toolkits/vte/distinfo
+++ b/x11-toolkits/vte/distinfo
@@ -1 +1 @@
-MD5 (gnome2/vte-0.10.11.tar.bz2) = 457569d09306fd9d6fbe2b11db8b6a2e
+MD5 (gnome2/vte-0.10.17.tar.bz2) = db4f0e903c3912827a40de80b5e8e548
diff --git a/x11-toolkits/vte/files/patch-src_keymap.c b/x11-toolkits/vte/files/patch-src_keymap.c
index 7ed434e..16012c8 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: keymap.c,v 1.5 2002/10/18 20:53:53 nalin Exp $"
+ #ident "$Id: patch-src_keymap.c,v 1.1 2002/10/22 21:53:50 marcus Exp $"
  #include "../config.h"
 +#include <sys/types.h>
  #include <stdlib.h>
diff --git a/x11-toolkits/vte/pkg-plist b/x11-toolkits/vte/pkg-plist
index 45ac251..4da27569 100644
--- a/x11-toolkits/vte/pkg-plist
+++ b/x11-toolkits/vte/pkg-plist
@@ -18,26 +18,36 @@ lib/vte/window
 libdata/pkgconfig/vte.pc
 libexec/gnome-pty-helper
 share/gnome/vte/termcap/xterm
+share/locale/am/LC_MESSAGES/vte.mo
 share/locale/bg/LC_MESSAGES/vte.mo
 share/locale/ca/LC_MESSAGES/vte.mo
 share/locale/cs/LC_MESSAGES/vte.mo
 share/locale/da/LC_MESSAGES/vte.mo
 share/locale/de/LC_MESSAGES/vte.mo
+share/locale/el/LC_MESSAGES/vte.mo
 share/locale/es/LC_MESSAGES/vte.mo
 share/locale/fi/LC_MESSAGES/vte.mo
 share/locale/fr/LC_MESSAGES/vte.mo
 share/locale/he/LC_MESSAGES/vte.mo
+share/locale/hu/LC_MESSAGES/vte.mo
+share/locale/ko/LC_MESSAGES/vte.mo
 share/locale/lv/LC_MESSAGES/vte.mo
+share/locale/mn/LC_MESSAGES/vte.mo
 share/locale/ms/LC_MESSAGES/vte.mo
 share/locale/nl/LC_MESSAGES/vte.mo
 share/locale/no/LC_MESSAGES/vte.mo
+share/locale/ro/LC_MESSAGES/vte.mo
 share/locale/pl/LC_MESSAGES/vte.mo
+share/locale/pt/LC_MESSAGES/vte.mo
 share/locale/pt_BR/LC_MESSAGES/vte.mo
 share/locale/ru/LC_MESSAGES/vte.mo
+share/locale/sl/LC_MESSAGES/vte.mo
 share/locale/sk/LC_MESSAGES/vte.mo
 share/locale/sv/LC_MESSAGES/vte.mo
+share/locale/tr/LC_MESSAGES/vte.mo
 share/locale/uk/LC_MESSAGES/vte.mo
 share/locale/vi/LC_MESSAGES/vte.mo
+share/locale/zh_CN/LC_MESSAGES/vte.mo
 share/locale/zh_TW/LC_MESSAGES/vte.mo
 @dirrm share/gnome/vte/termcap
 @dirrm share/gnome/vte