3 files changed, 53 insertions, 19 deletions

diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index 677d384b1680..3cb34868a3e1 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -3,12 +3,11 @@
 # Whom:                Pawel Worach <pawel.worach@gmail.com>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-shell/Makefile,v 1.6 2009/10/08 06:58:31 kwm Exp $
+#   $MCom: ports/x11/gnome-shell/Makefile,v 1.11 2010/03/29 11:42:11 kwm Exp $
 #
 
 PORTNAME=	gnome-shell
-PORTVERSION=	2.28.0
-PORTREVISION=	3
+PORTVERSION=	2.29.1
 CATEGORIES=	x11
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -16,13 +15,12 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Next generation GNOME desktop shell
 
-BUILD_DEPENDS=	${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
 LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification \
 		mutter-private.0:${PORTSDIR}/x11-wm/mutter \
 		clutter-glx-1.0:${PORTSDIR}/graphics/clutter \
 		gjs-gi:${PORTSDIR}/lang/gjs
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \
-		${LOCALBASE}/share/gir-1.0/Gtk-2.0.gir:${PORTSDIR}/x11-toolkits/gir-repository-gtk20
+    		glxinfo:${PORTSDIR}/graphics/mesa-demos
 
 USE_BZIP2=	yes
 USE_XORG=	x11 xfixes sm
@@ -37,12 +35,17 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/js -I${LOCALBASE}/include/nspr"
 
 GCONF_SCHEMAS=	gnome-shell.schemas
 
+MAN1=		gnome-shell.1
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Werror||g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/bin/python|/usr/bin/env python|g' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/src/gnome-shell.in
+# temp hack around configure failure in 2.29.90. Fixed upstream
+	@${REINPLACE_CMD} -e 's|@GETTEXT_PACKAGE@|gnome-shell|g' \
+		${WRKSRC}/po/Makefile.in.in
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo
index a96b0a90297d..088b45374d71 100644
--- a/x11/gnome-shell/distinfo
+++ b/x11/gnome-shell/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-shell-2.28.0.tar.bz2) = a9f93a6f03da60f2f6e3fb82a9e7dc94
-SHA256 (gnome2/gnome-shell-2.28.0.tar.bz2) = 64d30bd2692af2047a3056545b8f549c713ee91877cee8742d4b02d606ef6bd4
-SIZE (gnome2/gnome-shell-2.28.0.tar.bz2) = 591376
+MD5 (gnome2/gnome-shell-2.29.1.tar.bz2) = dc98591ba7fe8acb92292bc0b2f9d246
+SHA256 (gnome2/gnome-shell-2.29.1.tar.bz2) = 710b863c0beea45543f8057d31b028ec85e19efeedda2b964d784d6fc1729c0b
+SIZE (gnome2/gnome-shell-2.29.1.tar.bz2) = 669050
diff --git a/x11/gnome-shell/pkg-plist b/x11/gnome-shell/pkg-plist
index 011206360815..32918573d672 100644
--- a/x11/gnome-shell/pkg-plist
+++ b/x11/gnome-shell/pkg-plist
@@ -1,63 +1,87 @@
 bin/gnome-shell
 lib/gnome-shell/Big-1.0.typelib
+lib/gnome-shell/Gdm-1.0.typelib
 lib/gnome-shell/Shell-0.1.typelib
 lib/gnome-shell/St-1.0.typelib
 lib/mutter/plugins/libgnome-shell.a
 lib/mutter/plugins/libgnome-shell.la
 lib/mutter/plugins/libgnome-shell.so
 share/applications/gnome-shell.desktop
-%%DATADIR%%/images/app-well-glow.png
-%%DATADIR%%/images/add-workspace.svg
-%%DATADIR%%/images/back.svg
 %%DATADIR%%/images/close-black.svg
-%%DATADIR%%/images/close.svg
-%%DATADIR%%/images/info.svg
 %%DATADIR%%/images/magnifier.svg
-%%DATADIR%%/images/remove-workspace.svg
 %%DATADIR%%/js/misc/docInfo.js
 %%DATADIR%%/js/misc/format.js
-%%DATADIR%%/js/ui/appIcon.js
+%%DATADIR%%/js/misc/params.js
 %%DATADIR%%/js/ui/altTab.js
 %%DATADIR%%/js/ui/appDisplay.js
-%%DATADIR%%/js/ui/button.js
+%%DATADIR%%/js/ui/appFavorites.js
 %%DATADIR%%/js/ui/calendar.js
 %%DATADIR%%/js/ui/chrome.js
 %%DATADIR%%/js/ui/dash.js
 %%DATADIR%%/js/ui/dnd.js
 %%DATADIR%%/js/ui/docDisplay.js
 %%DATADIR%%/js/ui/environment.js
+%%DATADIR%%/js/ui/extensionSystem.js
 %%DATADIR%%/js/ui/genericDisplay.js
 %%DATADIR%%/js/ui/lightbox.js
 %%DATADIR%%/js/ui/link.js
 %%DATADIR%%/js/ui/lookingGlass.js
 %%DATADIR%%/js/ui/main.js
+%%DATADIR%%/js/ui/messageTray.js
+%%DATADIR%%/js/ui/notificationDaemon.js
 %%DATADIR%%/js/ui/overview.js
+%%DATADIR%%/js/ui/placeDisplay.js
 %%DATADIR%%/js/ui/panel.js
-%%DATADIR%%/js/ui/places.js
 %%DATADIR%%/js/ui/runDialog.js
+%%DATADIR%%/js/ui/search.js
 %%DATADIR%%/js/ui/shellDBus.js
+%%DATADIR%%/js/ui/statusMenu.js
 %%DATADIR%%/js/ui/sidebar.js
 %%DATADIR%%/js/ui/tweener.js
 %%DATADIR%%/js/ui/widget.js
 %%DATADIR%%/js/ui/widgetBox.js
+%%DATADIR%%/js/ui/windowAttentionHandler.js
 %%DATADIR%%/js/ui/windowManager.js
-%%DATADIR%%/js/ui/workspaces.js
+%%DATADIR%%/js/ui/workspace.js
+%%DATADIR%%/js/ui/workspaceSwitcherPopup.js
+%%DATADIR%%/js/ui/workspacesView.js
+%%DATADIR%%/theme/add-workspace.svg
+%%DATADIR%%/theme/close-window.svg
+%%DATADIR%%/theme/close.svg
+%%DATADIR%%/theme/corner-ripple.png
+%%DATADIR%%/theme/dialog-error.svg
 %%DATADIR%%/theme/gnome-shell.css
+%%DATADIR%%/theme/mosaic-view-active.svg
+%%DATADIR%%/theme/mosaic-view.svg
+%%DATADIR%%/theme/move-window-on-new.svg
+%%DATADIR%%/theme/remove-workspace.svg
 %%DATADIR%%/theme/scroll-button-down-hover.png
 %%DATADIR%%/theme/scroll-button-down.png
 %%DATADIR%%/theme/scroll-button-up-hover.png
 %%DATADIR%%/theme/scroll-button-up.png
-%%DATADIR%%/theme/scroll-vhandle.png
+%%DATADIR%%/theme/scroll-hhandle.svg
+%%DATADIR%%/theme/scroll-vhandle.svg
+%%DATADIR%%/theme/section-back.svg
+%%DATADIR%%/theme/section-more-open.svg
+%%DATADIR%%/theme/section-more.svg
+%%DATADIR%%/theme/single-view-active.svg
+%%DATADIR%%/theme/single-view.svg
+%%DATADIR%%/theme/ws-switch-arrow-left.svg
+%%DATADIR%%/theme/ws-switch-arrow-right.svg
 share/locale/ar/LC_MESSAGES/gnome-shell.mo
+share/locale/bg/LC_MESSAGES/gnome-shell.mo
 share/locale/ca/LC_MESSAGES/gnome-shell.mo
 share/locale/cs/LC_MESSAGES/gnome-shell.mo
 share/locale/da/LC_MESSAGES/gnome-shell.mo
 share/locale/de/LC_MESSAGES/gnome-shell.mo
+share/locale/el/LC_MESSAGES/gnome-shell.mo
 share/locale/en_GB/LC_MESSAGES/gnome-shell.mo
 share/locale/es/LC_MESSAGES/gnome-shell.mo
+share/locale/fi/LC_MESSAGES/gnome-shell.mo
 share/locale/fr/LC_MESSAGES/gnome-shell.mo
 share/locale/ga/LC_MESSAGES/gnome-shell.mo
 share/locale/gl/LC_MESSAGES/gnome-shell.mo
+share/locale/he/LC_MESSAGES/gnome-shell.mo
 share/locale/hu/LC_MESSAGES/gnome-shell.mo
 share/locale/it/LC_MESSAGES/gnome-shell.mo
 share/locale/ko/LC_MESSAGES/gnome-shell.mo
@@ -66,9 +90,14 @@ share/locale/nl/LC_MESSAGES/gnome-shell.mo
 share/locale/pa/LC_MESSAGES/gnome-shell.mo
 share/locale/pl/LC_MESSAGES/gnome-shell.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-shell.mo
+share/locale/ro/LC_MESSAGES/gnome-shell.mo
+share/locale/ru/LC_MESSAGES/gnome-shell.mo
 share/locale/sl/LC_MESSAGES/gnome-shell.mo
+share/locale/sr/LC_MESSAGES/gnome-shell.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-shell.mo
 share/locale/sv/LC_MESSAGES/gnome-shell.mo
 share/locale/tr/LC_MESSAGES/gnome-shell.mo
+share/locale/vi/LC_MESSAGES/gnome-shell.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-shell.mo
 @dirrm %%DATADIR%%/theme
 @dirrm %%DATADIR%%/js/ui
@@ -77,3 +106,5 @@ share/locale/zh_CN/LC_MESSAGES/gnome-shell.mo
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%
 @dirrm lib/gnome-shell
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin