3 files changed, 20 insertions, 9 deletions

diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index 00ffbcb387be..de7a2efe489b 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	drivel
-PORTVERSION=	1.2.3
-PORTREVISION=	4
+PORTVERSION=	2.0.0
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,6 +17,7 @@ COMMENT=	The Gnome livejournal client
 LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
 USE_X_PREFIX=	yes
+USE_BZIP2=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui intlhack gtksourceview
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/deskutils/drivel/distinfo b/deskutils/drivel/distinfo
index 8e2e959a3342..4c740ac84c03 100644
--- a/deskutils/drivel/distinfo
+++ b/deskutils/drivel/distinfo
@@ -1,2 +1,2 @@
-MD5 (drivel-1.2.3.tar.bz2) = 628909334696dd44dc6a60ece5445ae8
-SIZE (drivel-1.2.3.tar.bz2) = 524188
+MD5 (drivel-2.0.0.tar.bz2) = 38c866e10909d123bb20c6fb4a852ba7
+SIZE (drivel-2.0.0.tar.bz2) = 670832
diff --git a/deskutils/drivel/pkg-plist b/deskutils/drivel/pkg-plist
index efaa3f591b3d..7341b9631f6c 100644
--- a/deskutils/drivel/pkg-plist
+++ b/deskutils/drivel/pkg-plist
@@ -1,46 +1,55 @@
 bin/drivel
 share/gnome/application-registry/drivel.applications
-share/gnome/applications/drivel.desktop
+share/gnome/applications/gnome-drivel.desktop
 share/gnome/drivel/glade/drivel.glade
 share/gnome/drivel/languages/livejournal.lang
 share/gnome/help/drivel/C/drivel.xml
 share/gnome/help/drivel/C/legal.xml
+share/gnome/icons/gnome/48x48/mimetypes/gnome-mime-application-x-drivel.png
 share/gnome/mime-info/drivel.keys
 share/gnome/mime-info/drivel.mime
 share/gnome/omf/drivel/drivel-C.omf
+share/gnome/pixmaps/drivel-48.png
+share/gnome/pixmaps/drivel/advogato.png
+share/gnome/pixmaps/drivel/atom.png
+share/gnome/pixmaps/drivel/blogger.png
 share/gnome/pixmaps/drivel/checkbutton.xpm
 share/gnome/pixmaps/drivel/combobox.xpm
 share/gnome/pixmaps/drivel/community.png
 share/gnome/pixmaps/drivel/doublearrow.png
 share/gnome/pixmaps/drivel/drivel_splash.png
+share/gnome/pixmaps/drivel/drivel-24.png
 share/gnome/pixmaps/drivel/entry.xpm
 share/gnome/pixmaps/drivel/feed.png
 share/gnome/pixmaps/drivel/hscale.xpm
 share/gnome/pixmaps/drivel/insert_image.png
 share/gnome/pixmaps/drivel/insert_object.png
 share/gnome/pixmaps/drivel/leftarrow.png
-share/gnome/pixmaps/drivel/livejournal_tray_normal.png
-share/gnome/pixmaps/drivel/livejournal_tray_updated.png
+share/gnome/pixmaps/drivel/livejournal.png
+share/gnome/pixmaps/drivel/mt.png
 share/gnome/pixmaps/drivel/private.png
 share/gnome/pixmaps/drivel/protected.png
 share/gnome/pixmaps/drivel/public.png
 share/gnome/pixmaps/drivel/radiobutton.xpm
 share/gnome/pixmaps/drivel/rightarrow.png
 share/gnome/pixmaps/drivel/user.png
+share/gnome/pixmaps/drivel/tray_livejournal.png
 share/gnome/pixmaps/drivel/xmms.xpm
-share/gnome/pixmaps/gnome-application-x-drivel.png
-share/gnome/pixmaps/livejournal.png
+share/locale/bg/LC_MESSAGES/drivel.mo
 share/locale/cs/LC_MESSAGES/drivel.mo
 share/locale/de/LC_MESSAGES/drivel.mo
+share/locale/el/LC_MESSAGES/drivel.mo
 share/locale/en_CA/LC_MESSAGES/drivel.mo
 share/locale/en_GB/LC_MESSAGES/drivel.mo
 share/locale/es/LC_MESSAGES/drivel.mo
 share/locale/ja/LC_MESSAGES/drivel.mo
+share/locale/nb/LC_MESSAGES/drivel.mo
 share/locale/nl/LC_MESSAGES/drivel.mo
 share/locale/no/LC_MESSAGES/drivel.mo
 share/locale/pa/LC_MESSAGES/drivel.mo
 share/locale/pt/LC_MESSAGES/drivel.mo
 share/locale/pt_BR/LC_MESSAGES/drivel.mo
+share/locale/rw/LC_MESSAGES/drivel.mo
 share/locale/sq/LC_MESSAGES/drivel.mo
 share/locale/sr/LC_MESSAGES/drivel.mo
 share/locale/sr@Latn/LC_MESSAGES/drivel.mo
@@ -48,6 +57,8 @@ share/locale/sv/LC_MESSAGES/drivel.mo
 share/locale/zh_CN/LC_MESSAGES/drivel.mo
 share/mime/application/x-drivel.xml
 share/mime/packages/drivel.xml
+@unexec /bin/rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/rw 2>/dev/null || /usr/bin/true
 @dirrm share/gnome/pixmaps/drivel
 @dirrm share/gnome/omf/drivel
 @dirrm share/gnome/help/drivel/C