Update to 2.0.1.

This is mainly a bug fix release with a few added translations.  A full list
of changes can be found in WRKSRC/ChangeLog.

6 files changed, 28 insertions, 30 deletions

diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index 9b1a82ae7343..973a5d66ac5e 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnometerminal
-PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTVERSION=	2.0.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	2.0.0/sources/gnome-terminal
 DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -23,19 +22,15 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomehier
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-pre-patch:
+post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
-		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
-		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \
-		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index 83faaa7e8adc..8b556c8c9c6e 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-terminal-2.0.0.tar.bz2) = 8486e569451db6747184fbcbd4734bdf
+MD5 (gnome2/gnome-terminal-2.0.1.tar.bz2) = b98bfb8e7deb733ee2ff126c503ed139
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index 071c3c5100df..a519e431fc52 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -13,10 +13,16 @@ etc/gconf/schemas/gnome-terminal.schemas
 libdata/bonobo/servers/gnome-terminal.server
 share/gnome/applications/gnome-terminal.desktop
 share/gnome/gnome-terminal/glade/gnome-terminal.glade2
+share/gnome/help/gnome-terminal/C/figures/gnome-terminal-default.png
+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/omf/gnome-terminal/gnome-terminal-C.omf
 share/gnome/pixmaps/gnome-terminal.png
+share/locale/bg/LC_MESSAGES/gnome-terminal.mo
+share/locale/ca/LC_MESSAGES/gnome-terminal.mo
+share/locale/cs/LC_MESSAGES/gnome-terminal.mo
 share/locale/da/LC_MESSAGES/gnome-terminal.mo
 share/locale/de/LC_MESSAGES/gnome-terminal.mo
 share/locale/el/LC_MESSAGES/gnome-terminal.mo
@@ -33,6 +39,7 @@ share/locale/ms/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
+share/locale/pt_BR/LC_MESSAGES/gnome-terminal.mo
 share/locale/ru/LC_MESSAGES/gnome-terminal.mo
 share/locale/sk/LC_MESSAGES/gnome-terminal.mo
 share/locale/sl/LC_MESSAGES/gnome-terminal.mo
@@ -40,12 +47,9 @@ share/locale/sv/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/help/gnome-terminal/C
-@dirrm share/gnome/help/gnome-terminal
-@dirrm share/gnome/gnome-terminal/glade
-@dirrm share/gnome/gnome-terminal
 @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
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index 9b1a82ae7343..973a5d66ac5e 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnometerminal
-PORTVERSION=	2.0.0
-PORTREVISION=	1
+PORTVERSION=	2.0.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	2.0.0/releases/gnome-2.0-desktop-final
+MASTER_SITE_SUBDIR=	2.0.0/sources/gnome-terminal
 DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -23,19 +22,15 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomehier
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
-pre-patch:
+post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
-		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
-		 s|[(]libdir[)]/bonobo/servers|(prefix)/libdata/bonobo/servers|g ; \
-		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo
index 83faaa7e8adc..8b556c8c9c6e 100644
--- a/x11/gnometerminal/distinfo
+++ b/x11/gnometerminal/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-terminal-2.0.0.tar.bz2) = 8486e569451db6747184fbcbd4734bdf
+MD5 (gnome2/gnome-terminal-2.0.1.tar.bz2) = b98bfb8e7deb733ee2ff126c503ed139
diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist
index 071c3c5100df..a519e431fc52 100644
--- a/x11/gnometerminal/pkg-plist
+++ b/x11/gnometerminal/pkg-plist
@@ -13,10 +13,16 @@ etc/gconf/schemas/gnome-terminal.schemas
 libdata/bonobo/servers/gnome-terminal.server
 share/gnome/applications/gnome-terminal.desktop
 share/gnome/gnome-terminal/glade/gnome-terminal.glade2
+share/gnome/help/gnome-terminal/C/figures/gnome-terminal-default.png
+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/omf/gnome-terminal/gnome-terminal-C.omf
 share/gnome/pixmaps/gnome-terminal.png
+share/locale/bg/LC_MESSAGES/gnome-terminal.mo
+share/locale/ca/LC_MESSAGES/gnome-terminal.mo
+share/locale/cs/LC_MESSAGES/gnome-terminal.mo
 share/locale/da/LC_MESSAGES/gnome-terminal.mo
 share/locale/de/LC_MESSAGES/gnome-terminal.mo
 share/locale/el/LC_MESSAGES/gnome-terminal.mo
@@ -33,6 +39,7 @@ share/locale/ms/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
+share/locale/pt_BR/LC_MESSAGES/gnome-terminal.mo
 share/locale/ru/LC_MESSAGES/gnome-terminal.mo
 share/locale/sk/LC_MESSAGES/gnome-terminal.mo
 share/locale/sl/LC_MESSAGES/gnome-terminal.mo
@@ -40,12 +47,9 @@ share/locale/sv/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/help/gnome-terminal/C
-@dirrm share/gnome/help/gnome-terminal
-@dirrm share/gnome/gnome-terminal/glade
-@dirrm share/gnome/gnome-terminal
 @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