3 files changed, 20 insertions, 88 deletions

diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index 0b34338eaa18..0836434ea5dd 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	gdesklets
-PORTVERSION=	0.36.1
-PORTREVISION=	3
+PORTVERSION=	0.36.2
 CATEGORIES=	deskutils gnome
-MASTER_SITES=	http://www.gdesklets.de/files/ \
-		GENTOO/distfiles
+MASTER_SITES=	GENTOO/distfiles
+# XXX		currently broken: http://www.gdesklets.de/files/
+DISTNAME=	gDesklets-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	cy@FreeBSD.org
 COMMENT=	A framework for Gnome 2.x for desktop applets
 
-BROKEN=	Does not fetch
+USE_BZIP2=	yes
 
 LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop
 
diff --git a/deskutils/gdesklets/distinfo b/deskutils/gdesklets/distinfo
index 2fcebf444ec0..3beabd6887ce 100644
--- a/deskutils/gdesklets/distinfo
+++ b/deskutils/gdesklets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gdesklets-0.36.1.tar.gz) = 5e0cfd4cd99437aba24dfca33a72b2b6aef33b4c1128064ce82a368280bc6d61
-SIZE (gdesklets-0.36.1.tar.gz) = 3537820
+SHA256 (gDesklets-0.36.2.tar.bz2) = 178c651038f5943a714bfe632427d91d58d2caace95a645ecca7c9bd0552d6c8
+SIZE (gDesklets-0.36.2.tar.bz2) = 3423236
diff --git a/deskutils/gdesklets/pkg-plist b/deskutils/gdesklets/pkg-plist
index 051624f3b0a3..28160198e894 100644
--- a/deskutils/gdesklets/pkg-plist
+++ b/deskutils/gdesklets/pkg-plist
@@ -72,60 +72,7 @@ lib/gdesklets/Controls/__init__.pyc
 lib/gdesklets/Controls/__init__.pyo
 lib/gdesklets/Displays/15pieces/15pieces.display
 lib/gdesklets/Displays/15pieces/COPYING
-lib/gdesklets/Displays/15pieces/GNU/1.png
-lib/gdesklets/Displays/15pieces/GNU/10.png
-lib/gdesklets/Displays/15pieces/GNU/11.png
-lib/gdesklets/Displays/15pieces/GNU/12.png
-lib/gdesklets/Displays/15pieces/GNU/13.png
-lib/gdesklets/Displays/15pieces/GNU/14.png
-lib/gdesklets/Displays/15pieces/GNU/15.png
-lib/gdesklets/Displays/15pieces/GNU/2.png
-lib/gdesklets/Displays/15pieces/GNU/3.png
-lib/gdesklets/Displays/15pieces/GNU/4.png
-lib/gdesklets/Displays/15pieces/GNU/5.png
-lib/gdesklets/Displays/15pieces/GNU/6.png
-lib/gdesklets/Displays/15pieces/GNU/7.png
-lib/gdesklets/Displays/15pieces/GNU/8.png
-lib/gdesklets/Displays/15pieces/GNU/9.png
-lib/gdesklets/Displays/15pieces/GNU/bg.png
-lib/gdesklets/Displays/15pieces/GNU/free.png
-lib/gdesklets/Displays/15pieces/GNU/restart.png
-lib/gdesklets/Displays/15pieces/Globe/1.png
-lib/gdesklets/Displays/15pieces/Globe/10.png
-lib/gdesklets/Displays/15pieces/Globe/11.png
-lib/gdesklets/Displays/15pieces/Globe/12.png
-lib/gdesklets/Displays/15pieces/Globe/13.png
-lib/gdesklets/Displays/15pieces/Globe/14.png
-lib/gdesklets/Displays/15pieces/Globe/15.png
-lib/gdesklets/Displays/15pieces/Globe/2.png
-lib/gdesklets/Displays/15pieces/Globe/3.png
-lib/gdesklets/Displays/15pieces/Globe/4.png
-lib/gdesklets/Displays/15pieces/Globe/5.png
-lib/gdesklets/Displays/15pieces/Globe/6.png
-lib/gdesklets/Displays/15pieces/Globe/7.png
-lib/gdesklets/Displays/15pieces/Globe/8.png
-lib/gdesklets/Displays/15pieces/Globe/9.png
-lib/gdesklets/Displays/15pieces/Globe/bg.png
-lib/gdesklets/Displays/15pieces/Globe/free.png
-lib/gdesklets/Displays/15pieces/Globe/restart.png
-lib/gdesklets/Displays/15pieces/Gnome/1.png
-lib/gdesklets/Displays/15pieces/Gnome/10.png
-lib/gdesklets/Displays/15pieces/Gnome/11.png
-lib/gdesklets/Displays/15pieces/Gnome/12.png
-lib/gdesklets/Displays/15pieces/Gnome/13.png
-lib/gdesklets/Displays/15pieces/Gnome/14.png
-lib/gdesklets/Displays/15pieces/Gnome/15.png
-lib/gdesklets/Displays/15pieces/Gnome/2.png
-lib/gdesklets/Displays/15pieces/Gnome/3.png
-lib/gdesklets/Displays/15pieces/Gnome/4.png
-lib/gdesklets/Displays/15pieces/Gnome/5.png
-lib/gdesklets/Displays/15pieces/Gnome/6.png
-lib/gdesklets/Displays/15pieces/Gnome/7.png
-lib/gdesklets/Displays/15pieces/Gnome/8.png
-lib/gdesklets/Displays/15pieces/Gnome/9.png
-lib/gdesklets/Displays/15pieces/Gnome/bg.png
-lib/gdesklets/Displays/15pieces/Gnome/free.png
-lib/gdesklets/Displays/15pieces/Gnome/restart.png
+lib/gdesklets/Displays/15pieces/Numbers/0.png
 lib/gdesklets/Displays/15pieces/Numbers/1.png
 lib/gdesklets/Displays/15pieces/Numbers/10.png
 lib/gdesklets/Displays/15pieces/Numbers/11.png
@@ -142,27 +89,9 @@ lib/gdesklets/Displays/15pieces/Numbers/7.png
 lib/gdesklets/Displays/15pieces/Numbers/8.png
 lib/gdesklets/Displays/15pieces/Numbers/9.png
 lib/gdesklets/Displays/15pieces/Numbers/bg.png
-lib/gdesklets/Displays/15pieces/Numbers/free.png
 lib/gdesklets/Displays/15pieces/Numbers/restart.png
 lib/gdesklets/Displays/15pieces/README
-lib/gdesklets/Displays/15pieces/Tux/1.png
-lib/gdesklets/Displays/15pieces/Tux/10.png
-lib/gdesklets/Displays/15pieces/Tux/11.png
-lib/gdesklets/Displays/15pieces/Tux/12.png
-lib/gdesklets/Displays/15pieces/Tux/13.png
-lib/gdesklets/Displays/15pieces/Tux/14.png
-lib/gdesklets/Displays/15pieces/Tux/15.png
-lib/gdesklets/Displays/15pieces/Tux/2.png
-lib/gdesklets/Displays/15pieces/Tux/3.png
-lib/gdesklets/Displays/15pieces/Tux/4.png
-lib/gdesklets/Displays/15pieces/Tux/5.png
-lib/gdesklets/Displays/15pieces/Tux/6.png
-lib/gdesklets/Displays/15pieces/Tux/7.png
-lib/gdesklets/Displays/15pieces/Tux/8.png
-lib/gdesklets/Displays/15pieces/Tux/9.png
-lib/gdesklets/Displays/15pieces/Tux/bg.png
-lib/gdesklets/Displays/15pieces/Tux/free.png
-lib/gdesklets/Displays/15pieces/Tux/restart.png
+lib/gdesklets/Displays/15pieces/gDesklets/0.png
 lib/gdesklets/Displays/15pieces/gDesklets/1.png
 lib/gdesklets/Displays/15pieces/gDesklets/10.png
 lib/gdesklets/Displays/15pieces/gDesklets/11.png
@@ -179,9 +108,8 @@ lib/gdesklets/Displays/15pieces/gDesklets/7.png
 lib/gdesklets/Displays/15pieces/gDesklets/8.png
 lib/gdesklets/Displays/15pieces/gDesklets/9.png
 lib/gdesklets/Displays/15pieces/gDesklets/bg.png
-lib/gdesklets/Displays/15pieces/gDesklets/free.png
+lib/gdesklets/Displays/15pieces/gDesklets/dummy.png
 lib/gdesklets/Displays/15pieces/gDesklets/restart.png
-lib/gdesklets/Displays/15pieces/gfx/dummy.png
 lib/gdesklets/Displays/15pieces/make_tiles.sh
 lib/gdesklets/Displays/Calendar/COPYING
 lib/gdesklets/Displays/Calendar/Calendar.display
@@ -289,6 +217,9 @@ lib/gdesklets/config/ConfigString.pyo
 lib/gdesklets/config/ConfigTitle.py
 lib/gdesklets/config/ConfigTitle.pyc
 lib/gdesklets/config/ConfigTitle.pyo
+lib/gdesklets/config/ConfigToggle.py
+lib/gdesklets/config/ConfigToggle.pyc
+lib/gdesklets/config/ConfigToggle.pyo
 lib/gdesklets/config/ConfigURI.py
 lib/gdesklets/config/ConfigURI.pyc
 lib/gdesklets/config/ConfigURI.pyo
@@ -501,6 +432,7 @@ lib/gdesklets/libdesklets/system/__init__.pyc
 lib/gdesklets/libdesklets/system/__init__.pyo
 lib/gdesklets/libdesklets/system/gtop.la
 lib/gdesklets/libdesklets/system/gtop.so
+lib/gdesklets/macros/python-include.m4
 lib/gdesklets/main/AboutDialog.py
 lib/gdesklets/main/AboutDialog.pyc
 lib/gdesklets/main/AboutDialog.pyo
@@ -510,6 +442,9 @@ lib/gdesklets/main/Control.pyo
 lib/gdesklets/main/DisplayList.py
 lib/gdesklets/main/DisplayList.pyc
 lib/gdesklets/main/DisplayList.pyo
+lib/gdesklets/main/LoadingFeedback.py
+lib/gdesklets/main/LoadingFeedback.pyc
+lib/gdesklets/main/LoadingFeedback.pyo
 lib/gdesklets/main/MetaData.py
 lib/gdesklets/main/MetaData.pyc
 lib/gdesklets/main/MetaData.pyo
@@ -664,6 +599,7 @@ lib/gdesklets/shell/plugins/ViewSwitch/__init__.pyo
 lib/gdesklets/shell/plugins/gDeskletsClient/__init__.py
 lib/gdesklets/shell/plugins/gDeskletsClient/__init__.pyc
 lib/gdesklets/shell/plugins/gDeskletsClient/__init__.pyo
+lib/gdesklets/test-control.py
 lib/gdesklets/utils/BGWatcher.py
 lib/gdesklets/utils/BGWatcher.pyc
 lib/gdesklets/utils/BGWatcher.pyo
@@ -832,6 +768,7 @@ share/pixmaps/gdesklets.png
 @dirrm lib/gdesklets/scripting
 @dirrm lib/gdesklets/plugin
 @dirrm lib/gdesklets/main
+@dirrm lib/gdesklets/macros
 @dirrm lib/gdesklets/libdesklets/system/OpenBSD
 @dirrm lib/gdesklets/libdesklets/system/NetBSD
 @dirrm lib/gdesklets/libdesklets/system/Linux
@@ -855,13 +792,8 @@ share/pixmaps/gdesklets.png
 @dirrm lib/gdesklets/Displays/Clock
 @dirrm lib/gdesklets/Displays/Calendar/months
 @dirrm lib/gdesklets/Displays/Calendar
-@dirrm lib/gdesklets/Displays/15pieces/gfx
 @dirrm lib/gdesklets/Displays/15pieces/gDesklets
-@dirrm lib/gdesklets/Displays/15pieces/Tux
 @dirrm lib/gdesklets/Displays/15pieces/Numbers
-@dirrm lib/gdesklets/Displays/15pieces/Gnome
-@dirrm lib/gdesklets/Displays/15pieces/Globe
-@dirrm lib/gdesklets/Displays/15pieces/GNU
 @dirrm lib/gdesklets/Displays/15pieces
 @dirrm lib/gdesklets/Displays
 @dirrm lib/gdesklets/Controls/URI