Update to 2.2.0.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@428 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 40 insertions, 12 deletions

diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 940f70721..08d8405cd 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -6,17 +6,22 @@
 #
 
 PORTNAME=	gnometerminal
-PORTVERSION=	2.1.4
+PORTVERSION=	2.2.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.1
+MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.2
 DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	vte.4:${PORTSDIR}/x11-toolkits/vte \
-		gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+
+.if defined(WITH_ZVT)
+LIB_DEPENDS+=	zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt
+.else
+LIB_DEPENDS+=	vte.4:${PORTSDIR}/x11-toolkits/vte
+.endif
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -25,11 +30,16 @@ USE_GMAKE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--with-widget=vte
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
+.if defined(WITH_ZVT)
+CONFIGURE_ARGS=	--with-widget=zvt
+.else
+CONFIGURE_ARGS=	--with-widget=vte
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 4b1808cdd..3f87e28da 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-terminal-2.1.4.tar.bz2) = d229db96fefb70c963431bf41fb05245
+MD5 (gnome2/gnome-terminal-2.2.0.tar.bz2) = 53ff251ccb44887b53a75b407633c4a7
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index f3e4ad803..663a36493 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -26,6 +26,8 @@ share/gnome/help/gnome-terminal/ro/legal.xml
 share/gnome/omf/gnome-terminal/gnome-terminal-C.omf
 share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf
 share/gnome/pixmaps/gnome-terminal.png
+share/locale/am/LC_MESSAGES/gnome-terminal.mo
+share/locale/ar/LC_MESSAGES/gnome-terminal.mo
 share/locale/be/LC_MESSAGES/gnome-terminal.mo
 share/locale/bg/LC_MESSAGES/gnome-terminal.mo
 share/locale/ca/LC_MESSAGES/gnome-terminal.mo
@@ -45,7 +47,9 @@ share/locale/ko/LC_MESSAGES/gnome-terminal.mo
 share/locale/ja/LC_MESSAGES/gnome-terminal.mo
 share/locale/lt/LC_MESSAGES/gnome-terminal.mo
 share/locale/lv/LC_MESSAGES/gnome-terminal.mo
+share/locale/mk/LC_MESSAGES/gnome-terminal.mo
 share/locale/ms/LC_MESSAGES/gnome-terminal.mo
+share/locale/nl/LC_MESSAGES/gnome-terminal.mo
 share/locale/no/LC_MESSAGES/gnome-terminal.mo
 share/locale/pl/LC_MESSAGES/gnome-terminal.mo
 share/locale/pt/LC_MESSAGES/gnome-terminal.mo
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index 940f70721..08d8405cd 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -6,17 +6,22 @@
 #
 
 PORTNAME=	gnometerminal
-PORTVERSION=	2.1.4
+PORTVERSION=	2.2.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.1
+MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.2
 DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-LIB_DEPENDS=	vte.4:${PORTSDIR}/x11-toolkits/vte \
-		gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+
+.if defined(WITH_ZVT)
+LIB_DEPENDS+=	zvt-2.0.0:${PORTSDIR}/x11-toolkits/libzvt
+.else
+LIB_DEPENDS+=	vte.4:${PORTSDIR}/x11-toolkits/vte
+.endif
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -25,11 +30,16 @@ USE_GMAKE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--with-widget=vte
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
+.if defined(WITH_ZVT)
+CONFIGURE_ARGS=	--with-widget=zvt
+.else
+CONFIGURE_ARGS=	--with-widget=vte
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo
index 4b1808cdd..3f87e28da 100644
--- a/x11/gnometerminal/distinfo
+++ b/x11/gnometerminal/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-terminal-2.1.4.tar.bz2) = d229db96fefb70c963431bf41fb05245
+MD5 (gnome2/gnome-terminal-2.2.0.tar.bz2) = 53ff251ccb44887b53a75b407633c4a7
diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist
index f3e4ad803..663a36493 100644
--- a/x11/gnometerminal/pkg-plist
+++ b/x11/gnometerminal/pkg-plist
@@ -26,6 +26,8 @@ share/gnome/help/gnome-terminal/ro/legal.xml
 share/gnome/omf/gnome-terminal/gnome-terminal-C.omf
 share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf
 share/gnome/pixmaps/gnome-terminal.png
+share/locale/am/LC_MESSAGES/gnome-terminal.mo
+share/locale/ar/LC_MESSAGES/gnome-terminal.mo
 share/locale/be/LC_MESSAGES/gnome-terminal.mo
 share/locale/bg/LC_MESSAGES/gnome-terminal.mo
 share/locale/ca/LC_MESSAGES/gnome-terminal.mo
@@ -45,7 +47,9 @@ share/locale/ko/LC_MESSAGES/gnome-terminal.mo
 share/locale/ja/LC_MESSAGES/gnome-terminal.mo
 share/locale/lt/LC_MESSAGES/gnome-terminal.mo
 share/locale/lv/LC_MESSAGES/gnome-terminal.mo
+share/locale/mk/LC_MESSAGES/gnome-terminal.mo
 share/locale/ms/LC_MESSAGES/gnome-terminal.mo
+share/locale/nl/LC_MESSAGES/gnome-terminal.mo
 share/locale/no/LC_MESSAGES/gnome-terminal.mo
 share/locale/pl/LC_MESSAGES/gnome-terminal.mo
 share/locale/pt/LC_MESSAGES/gnome-terminal.mo