3 files changed, 20 insertions, 18 deletions

diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 5fdb2eebc6a0..22daa62a74b5 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	metacity
-PORTVERSION=	2.4.1
+PORTVERSION=	2.4.2
 CATEGORIES=	x11-wm
-MASTER_SITES=	http://people.redhat.com/~hp/metacity/
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/metacity/2.4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/x11-wm/metacity/distinfo b/x11-wm/metacity/distinfo
index 73c9dff5ebf4..eac21d6a8af8 100644
--- a/x11-wm/metacity/distinfo
+++ b/x11-wm/metacity/distinfo
@@ -1 +1 @@
-MD5 (gnome2/metacity-2.4.1.tar.gz) = bbe3fd579deb3e315cbdd6eb81b79d88
+MD5 (gnome2/metacity-2.4.2.tar.gz) = 8ba3517a033a0ea93064de6cd0e090d8
diff --git a/x11-wm/metacity/pkg-plist b/x11-wm/metacity/pkg-plist
index 45060c33e26a..8dcee3ced91c 100644
--- a/x11-wm/metacity/pkg-plist
+++ b/x11-wm/metacity/pkg-plist
@@ -86,23 +86,24 @@ share/gnome/themes/Crux/metacity-1/inactive-top-right-border.png
 share/gnome/themes/Crux/metacity-1/inactive-top-right-corner.png
 share/gnome/themes/Crux/metacity-1/metacity-theme-1.xml
 share/gnome/themes/Esco/metacity-1/metacity-theme-1.xml
-share/gnome/themes/Gorilla/metacity-1/active-button.png
-share/gnome/themes/Gorilla/metacity-1/active-close-button.png
-share/gnome/themes/Gorilla/metacity-1/active-close-menu-icon.png
-share/gnome/themes/Gorilla/metacity-1/active-maximize-button.png
-share/gnome/themes/Gorilla/metacity-1/active-maximize-menu-icon.png
-share/gnome/themes/Gorilla/metacity-1/active-menu-button.png
-share/gnome/themes/Gorilla/metacity-1/active-minimize-button.png
-share/gnome/themes/Gorilla/metacity-1/active-minimize-menu-icon.png
-share/gnome/themes/Gorilla/metacity-1/inactive-close-button.png
-share/gnome/themes/Gorilla/metacity-1/inactive-maximize-button.png
-share/gnome/themes/Gorilla/metacity-1/inactive-menu-button.png
-share/gnome/themes/Gorilla/metacity-1/inactive-minimize-button.png
-share/gnome/themes/Gorilla/metacity-1/metacity-theme-1.xml
+share/gnome/themes/AgingGorilla/metacity-1/active-button.png
+share/gnome/themes/AgingGorilla/metacity-1/active-close-button.png
+share/gnome/themes/AgingGorilla/metacity-1/active-close-menu-icon.png
+share/gnome/themes/AgingGorilla/metacity-1/active-maximize-button.png
+share/gnome/themes/AgingGorilla/metacity-1/active-maximize-menu-icon.png
+share/gnome/themes/AgingGorilla/metacity-1/active-menu-button.png
+share/gnome/themes/AgingGorilla/metacity-1/active-minimize-button.png
+share/gnome/themes/AgingGorilla/metacity-1/active-minimize-menu-icon.png
+share/gnome/themes/AgingGorilla/metacity-1/inactive-close-button.png
+share/gnome/themes/AgingGorilla/metacity-1/inactive-maximize-button.png
+share/gnome/themes/AgingGorilla/metacity-1/inactive-menu-button.png
+share/gnome/themes/AgingGorilla/metacity-1/inactive-minimize-button.png
+share/gnome/themes/AgingGorilla/metacity-1/metacity-theme-1.xml
 share/gnome/themes/Metabox/metacity-1/metacity-theme-1.xml
 share/gnome/wm-properties/metacity.desktop
 share/locale/az/LC_MESSAGES/metacity.mo
 share/locale/ca/LC_MESSAGES/metacity.mo
+share/locale/cs/LC_MESSAGES/metacity.mo
 share/locale/da/LC_MESSAGES/metacity.mo
 share/locale/de/LC_MESSAGES/metacity.mo
 share/locale/el/LC_MESSAGES/metacity.mo
@@ -129,8 +130,8 @@ share/locale/zh_CN/LC_MESSAGES/metacity.mo
 share/locale/zh_TW/LC_MESSAGES/metacity.mo
 @dirrm share/gnome/themes/Metabox/metacity-1
 @dirrm share/gnome/themes/Metabox
-@dirrm share/gnome/themes/Gorilla/metacity-1
-@dirrm share/gnome/themes/Gorilla
+@dirrm share/gnome/themes/AgingGorilla/metacity-1
+@dirrm share/gnome/themes/AgingGorilla
 @dirrm share/gnome/themes/Esco/metacity-1
 @dirrm share/gnome/themes/Esco
 @dirrm share/gnome/themes/Crux/metacity-1