Update to 2.2.2.

3 files changed, 102 insertions, 8 deletions

diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index 7cf761552c45..e6c8538e5c8f 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnometerminal
-PORTVERSION=	2.2.1
+PORTVERSION=	2.2.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.2
@@ -14,7 +14,7 @@ DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Terminal component for the GNOME 2.0 Desktop
+COMMENT=	Terminal component for the GNOME 2 Desktop
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
@@ -23,7 +23,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier libgnomeui
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .if defined(WITH_ZVT)
 CONFIGURE_ARGS=	--with-widget=zvt
@@ -33,8 +33,4 @@ CONFIGURE_ARGS=	--with-widget=vte
 USE_GNOME+=	vte
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo
index bb26f7157df0..a11d0bf0d30e 100644
--- a/x11/gnometerminal/distinfo
+++ b/x11/gnometerminal/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-terminal-2.2.1.tar.bz2) = 05603de355b2d4095cbd6f6ac0c438aa
+MD5 (gnome2/gnome-terminal-2.2.2.tar.bz2) = 30140540966ba84597e257054a232e99
diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist
index 52c9e6d8ab6b..1ab44e46820f 100644
--- a/x11/gnometerminal/pkg-plist
+++ b/x11/gnometerminal/pkg-plist
@@ -18,18 +18,82 @@ share/gnome/help/gnome-terminal/C/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/C/figures/terminal_window.png
 share/gnome/help/gnome-terminal/C/gnome-terminal.xml
 share/gnome/help/gnome-terminal/C/legal.xml
+share/gnome/help/gnome-terminal/de/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/de/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/de/figures/terminal_window.png
+share/gnome/help/gnome-terminal/de/gnome-terminal.xml
+share/gnome/help/gnome-terminal/de/legal.xml
+share/gnome/help/gnome-terminal/es/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/es/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/es/figures/terminal_window.png
+share/gnome/help/gnome-terminal/es/gnome-terminal.xml
+share/gnome/help/gnome-terminal/es/legal.xml
+share/gnome/help/gnome-terminal/fr/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/fr/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/fr/figures/terminal_window.png
+share/gnome/help/gnome-terminal/fr/gnome-terminal.xml
+share/gnome/help/gnome-terminal/fr/legal.xml
+share/gnome/help/gnome-terminal/it/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/it/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/it/figures/terminal_window.png
+share/gnome/help/gnome-terminal/it/gnome-terminal.xml
+share/gnome/help/gnome-terminal/it/legal.xml
+share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/ja/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/ja/figures/terminal_window.png
+share/gnome/help/gnome-terminal/ja/gnome-terminal.xml
+share/gnome/help/gnome-terminal/ja/legal.xml
+share/gnome/help/gnome-terminal/ko/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/ko/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/ko/figures/terminal_window.png
+share/gnome/help/gnome-terminal/ko/gnome-terminal.xml
+share/gnome/help/gnome-terminal/ko/legal.xml
 share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/ro/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/ro/figures/terminal_window.png
 share/gnome/help/gnome-terminal/ro/gnome-terminal.xml
 share/gnome/help/gnome-terminal/ro/legal.xml
+share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/sv/figures/terminal_window.png
+share/gnome/help/gnome-terminal/sv/gnome-terminal.xml
+share/gnome/help/gnome-terminal/sv/legal.xml
+share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/zh_CN/figures/terminal_window.png
+share/gnome/help/gnome-terminal/zh_CN/gnome-terminal.xml
+share/gnome/help/gnome-terminal/zh_CN/legal.xml
+share/gnome/help/gnome-terminal/zh_TW/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/zh_TW/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/zh_TW/figures/terminal_window.png
+share/gnome/help/gnome-terminal/zh_TW/gnome-terminal.xml
+share/gnome/help/gnome-terminal/zh_TW/legal.xml
 share/gnome/omf/gnome-terminal/gnome-terminal-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-terminal/gnome-terminal-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-terminal/gnome-terminal-es.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-terminal/gnome-terminal-fr.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-terminal/gnome-terminal-it.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-it.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-terminal/gnome-terminal-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-terminal/gnome-terminal-ko.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-ko.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-terminal/gnome-terminal-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-terminal/gnome-terminal-zh_CN.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-terminal/gnome-terminal-zh_TW.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gnome-terminal.png
 share/locale/am/LC_MESSAGES/gnome-terminal.mo
 share/locale/ar/LC_MESSAGES/gnome-terminal.mo
+share/locale/az/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
@@ -40,6 +104,7 @@ share/locale/el/LC_MESSAGES/gnome-terminal.mo
 share/locale/en_GB/LC_MESSAGES/gnome-terminal.mo
 share/locale/es/LC_MESSAGES/gnome-terminal.mo
 share/locale/et/LC_MESSAGES/gnome-terminal.mo
+share/locale/fa/LC_MESSAGES/gnome-terminal.mo
 share/locale/fi/LC_MESSAGES/gnome-terminal.mo
 share/locale/fr/LC_MESSAGES/gnome-terminal.mo
 share/locale/gl/LC_MESSAGES/gnome-terminal.mo
@@ -51,6 +116,7 @@ share/locale/ko/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/ml/LC_MESSAGES/gnome-terminal.mo
 share/locale/mn/LC_MESSAGES/gnome-terminal.mo
 share/locale/ms/LC_MESSAGES/gnome-terminal.mo
 share/locale/nl/LC_MESSAGES/gnome-terminal.mo
@@ -63,15 +129,38 @@ share/locale/ru/LC_MESSAGES/gnome-terminal.mo
 share/locale/sk/LC_MESSAGES/gnome-terminal.mo
 share/locale/sl/LC_MESSAGES/gnome-terminal.mo
 share/locale/sq/LC_MESSAGES/gnome-terminal.mo
+share/locale/sr/LC_MESSAGES/gnome-terminal.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-terminal.mo
 share/locale/sv/LC_MESSAGES/gnome-terminal.mo
+share/locale/ta/LC_MESSAGES/gnome-terminal.mo
 share/locale/tr/LC_MESSAGES/gnome-terminal.mo
 share/locale/uk/LC_MESSAGES/gnome-terminal.mo
 share/locale/vi/LC_MESSAGES/gnome-terminal.mo
 share/locale/wa/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
+@dirrm share/gnome/omf/gnome-terminal
+@dirrm share/gnome/help/gnome-terminal/zh_TW/figures
+@dirrm share/gnome/help/gnome-terminal/zh_TW
+@dirrm share/gnome/help/gnome-terminal/zh_CN/figures
+@dirrm share/gnome/help/gnome-terminal/zh_CN
+@dirrm share/gnome/help/gnome-terminal/sv/figures
+@dirrm share/gnome/help/gnome-terminal/sv
 @dirrm share/gnome/help/gnome-terminal/ro/figures
 @dirrm share/gnome/help/gnome-terminal/ro
+@dirrm share/gnome/help/gnome-terminal/ko/figures
+@dirrm share/gnome/help/gnome-terminal/ko
+@dirrm share/gnome/help/gnome-terminal/ja/figures
+@dirrm share/gnome/help/gnome-terminal/ja
+@dirrm share/gnome/help/gnome-terminal/it/figures
+@dirrm share/gnome/help/gnome-terminal/it
+@dirrm share/gnome/help/gnome-terminal/fr/figures
+@dirrm share/gnome/help/gnome-terminal/fr
+@dirrm share/gnome/help/gnome-terminal/es/figures
+@dirrm share/gnome/help/gnome-terminal/es
+@dirrm share/gnome/help/gnome-terminal/de/figures
+@dirrm share/gnome/help/gnome-terminal/de
+@dirrm share/gnome/help/gnome-terminal/C/figures
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles/Default
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/profiles
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome-terminal/keybindings
@@ -83,4 +172,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal/global
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome-terminal
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-ko.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-sv.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-terminal/gnome-terminal-zh_TW.omf 2>/dev/null || /usr/bin/true