4 files changed, 33 insertions, 21 deletions
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index d147c16f0475..72b820a95041 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -7,15 +7,16 @@
 #
 
 PORTNAME=	deskbar-applet
-PORTVERSION=	0.8.5
-PORTREVISION=	1
+PORTVERSION=	0.8.6
 CATEGORIES=	deskutils
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	browserbookapp
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome panel applet similar to Google's (Windows only) Deskbar
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack pygnomeextras
 USE_PYTHON=	yes
diff --git a/deskutils/deskbar-applet/distinfo b/deskutils/deskbar-applet/distinfo
index 6ee6853a19aa..89c3dd37acab 100644
--- a/deskutils/deskbar-applet/distinfo
+++ b/deskutils/deskbar-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (deskbar-applet-0.8.5.tar.gz) = 7f4963686dd92255d423014c5e404e68
-SHA256 (deskbar-applet-0.8.5.tar.gz) = 92193f7a6297c3e2e970b1ccf98313a234c34dbe35ab169912bc97be1145f367
-SIZE (deskbar-applet-0.8.5.tar.gz) = 480241
+MD5 (gnome2/deskbar-applet-0.8.6.tar.bz2) = 67507881804181b749d5e317a76b91ee
+SHA256 (gnome2/deskbar-applet-0.8.6.tar.bz2) = e934cd086026de4297b7cbae69401eac5f703ddbbefa8a7bf4e2da5c9dc508af
+SIZE (gnome2/deskbar-applet-0.8.6.tar.bz2) = 376810
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py b/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
index 138e42a29a66..1cca47519b67 100644
--- a/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
+++ b/deskutils/deskbar-applet/files/patch-deskbar_deskbar-applet.py
@@ -1,6 +1,6 @@
---- deskbar/deskbar-applet.py.orig	Mon Oct 31 02:44:59 2005
-+++ deskbar/deskbar-applet.py	Mon Oct 31 02:45:06 2005
-@@ -28,8 +28,8 @@
+--- deskbar/deskbar-applet.py.orig	Sat Nov 19 14:15:58 2005
++++ deskbar/deskbar-applet.py	Thu Dec  8 22:23:00 2005
+@@ -34,8 +34,8 @@
  gettext.bindtextdomain('deskbar-applet', abspath(join(deskbar.defs.DATA_DIR, "locale")))
  gettext.textdomain('deskbar-applet')
  
@@ -8,6 +8,6 @@
 -locale.textdomain('deskbar-applet')
 +#locale.bindtextdomain('deskbar-applet', abspath(join(deskbar.defs.DATA_DIR, "locale")))
 +#locale.textdomain('deskbar-applet')
-     
+ 
  def applet_factory(applet, iid):
- 	deskbar.applet.DeskbarApplet(applet)
+ 	print 'Starting Deskbar instance:', applet, iid
diff --git a/deskutils/deskbar-applet/pkg-plist b/deskutils/deskbar-applet/pkg-plist
index ca5d42dab835..123b50493b0d 100644
--- a/deskutils/deskbar-applet/pkg-plist
+++ b/deskutils/deskbar-applet/pkg-plist
@@ -1,16 +1,19 @@
 lib/deskbar-applet/deskbar-applet
+lib/deskbar-applet/handlers/beagle-live.py
+lib/deskbar-applet/handlers/beagle-live.pyc
+lib/deskbar-applet/handlers/beagle-live.pyo
 lib/deskbar-applet/handlers/beagle.py
 lib/deskbar-applet/handlers/beagle.pyc
 lib/deskbar-applet/handlers/beagle.pyo
-lib/deskbar-applet/handlers/directories.py
-lib/deskbar-applet/handlers/directories.pyc
-lib/deskbar-applet/handlers/directories.pyo
 lib/deskbar-applet/handlers/email_address.py
 lib/deskbar-applet/handlers/email_address.pyc
 lib/deskbar-applet/handlers/email_address.pyo
 lib/deskbar-applet/handlers/epiphany.py
 lib/deskbar-applet/handlers/epiphany.pyc
 lib/deskbar-applet/handlers/epiphany.pyo
+%%EVO%%lib/deskbar-applet/handlers/evolution.py
+%%EVO%%lib/deskbar-applet/handlers/evolution.pyc
+%%EVO%%lib/deskbar-applet/handlers/evolution.pyo
 lib/deskbar-applet/handlers/files.py
 lib/deskbar-applet/handlers/files.pyc
 lib/deskbar-applet/handlers/files.pyo
@@ -20,7 +23,6 @@ lib/deskbar-applet/handlers/galago.pyo
 lib/deskbar-applet/handlers/galeon.py
 lib/deskbar-applet/handlers/galeon.pyc
 lib/deskbar-applet/handlers/galeon.pyo
-lib/deskbar-applet/handlers/google-live-help.txt
 lib/deskbar-applet/handlers/google-live.py
 lib/deskbar-applet/handlers/google-live.pyc
 lib/deskbar-applet/handlers/google-live.pyo
@@ -106,25 +108,34 @@ lib/deskbar-applet/handlers/web_address.pyo
 %%PYTHON_SITELIBDIR%%/deskbar/preferences.py
 %%PYTHON_SITELIBDIR%%/deskbar/preferences.pyc
 %%PYTHON_SITELIBDIR%%/deskbar/preferences.pyo
-%%PYTHON_SITELIBDIR%%/deskbar/tokenizer.py
-%%PYTHON_SITELIBDIR%%/deskbar/tokenizer.pyc
-%%PYTHON_SITELIBDIR%%/deskbar/tokenizer.pyo
 libdata/bonobo/servers/Deskbar_Applet.server
 libdata/pkgconfig/deskbar-applet.pc
 share/gnome/deskbar-applet/Deskbar_Applet.xml
 share/gnome/deskbar-applet/art/deskbar-applet-small.png
-share/gnome/deskbar-applet/art/deskbar-applet.png
+share/gnome/deskbar-applet/art/deskbar-applet.svg
 share/gnome/deskbar-applet/art/folder-bookmark.png
 share/gnome/deskbar-applet/art/generic.png
 share/gnome/deskbar-applet/art/google.png
 share/gnome/deskbar-applet/art/web-bookmark.png
 share/gnome/deskbar-applet/prefs-dialog.glade
-share/gnome/pixmaps/deskbar-applet.png
+share/gnome/deskbar-applet/smart-bookmarks.glade
+share/gnome/pixmaps/deskbar-applet.svg
+share/locale/bg/LC_MESSAGES/deskbar-applet.mo
+share/locale/de/LC_MESSAGES/deskbar-applet.mo
+share/locale/en_CA/LC_MESSAGES/deskbar-applet.mo
 share/locale/en_GB/LC_MESSAGES/deskbar-applet.mo
+share/locale/es/LC_MESSAGES/deskbar-applet.mo
 share/locale/fi/LC_MESSAGES/deskbar-applet.mo
+share/locale/gl/LC_MESSAGES/deskbar-applet.mo
+share/locale/hu/LC_MESSAGES/deskbar-applet.mo
 share/locale/ja/LC_MESSAGES/deskbar-applet.mo
+share/locale/lt/LC_MESSAGES/deskbar-applet.mo
+share/locale/nb/LC_MESSAGES/deskbar-applet.mo
 share/locale/nl/LC_MESSAGES/deskbar-applet.mo
+share/locale/pa/LC_MESSAGES/deskbar-applet.mo
+share/locale/sk/LC_MESSAGES/deskbar-applet.mo
 share/locale/sv/LC_MESSAGES/deskbar-applet.mo
+share/locale/th/LC_MESSAGES/deskbar-applet.mo
 share/locale/zh_CN/LC_MESSAGES/deskbar-applet.mo
 @dirrm share/gnome/deskbar-applet/art
 @dirrm share/gnome/deskbar-applet