8 files changed, 105 insertions, 184 deletions

diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index 6d8e5f1f5a36..336c5c1f5d19 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	drivel
-PORTVERSION=	2.0.2
-PORTREVISION=	13
+PORTVERSION=	3.0.2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	SF/${PORTNAME}/Drivel%20%28stable%29/${PORTVERSION}
 
@@ -18,24 +17,17 @@ LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
-USE_GNOME=	gnomeprefix gnomehack libgnomeui intlhack gtksourceview
+USE_GNOME=	glib20 gtk20 gconf2 gnomevfs2 gtksourceview2 libxml2 gnomedocutils
+USE_GSTREAMER=	soup
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
-USE_AUTOTOOLS=	libtool:22
+USE_AUTOTOOLS=	libtool:22 autoconf:262:env automake:110:env
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	drivel.schemas
 
-.ifndef(WITHOUT_RHYTHMBOX)
-CONFIGURE_ARGS+=	--with-rhythmbox
-BUILD_DEPENDS+=		rhythmbox:${PORTSDIR}/audio/rhythmbox
-RUN_DEPENDS+=		${BUILD_DEPENDS}
-.else
-CONFIGURE_ARGS+=	--without-rhythmbox
-.endif
-
 .ifndef(WITHOUT_GTKSPELL)
 LIB_DEPENDS+=		gtkspell.0:${PORTSDIR}/textproc/gtkspell
 .else
@@ -44,13 +36,10 @@ CONFIGURE_ARGS+=	--without-gtkspell
 
 pre-everything::
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Define WITHOUT_RHYTHMBOX=yes to disable rhythmbox backend"
 	@${ECHO_MSG} "Define WITHOUT_GTKSPELL=yes to disable gtkspell"
 	@${ECHO_MSG} ""
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|;;|;|g' \
-		${WRKSRC}/src/journal.c \
-		${WRKSRC}/src/msg_queue.c
+pre-configure:
+	( cd ${WRKSRC} ; autoreconf )
 
 .include <bsd.port.mk>
diff --git a/deskutils/drivel/distinfo b/deskutils/drivel/distinfo
index 001d0079743b..4ceb0f6cfb2f 100644
--- a/deskutils/drivel/distinfo
+++ b/deskutils/drivel/distinfo
@@ -1,3 +1,3 @@
-MD5 (drivel-2.0.2.tar.bz2) = b77d376946ab32f0f8992c5e0baf1f51
-SHA256 (drivel-2.0.2.tar.bz2) = cdf058e843cde20f48d11c4e0d6be61f9892392a8dcc049b6904a861e1f20baf
-SIZE (drivel-2.0.2.tar.bz2) = 684729
+MD5 (drivel-3.0.2.tar.bz2) = 0d993bffb0cad23e6262958eff4aab60
+SHA256 (drivel-3.0.2.tar.bz2) = 5194cef7d93d3ec87499c66e85957fee5b0556432296e338be5397a52f0136b2
+SIZE (drivel-3.0.2.tar.bz2) = 690570
diff --git a/deskutils/drivel/files/patch-Makefile-am b/deskutils/drivel/files/patch-Makefile-am
new file mode 100644
index 000000000000..8228a2e88c88
--- /dev/null
+++ b/deskutils/drivel/files/patch-Makefile-am
@@ -0,0 +1,11 @@
+--- Makefile.am.orig	2010-08-29 00:53:06.632333365 -0400
++++ Makefile.am	2010-08-29 00:53:13.143217679 -0400
+@@ -9,7 +9,7 @@
+ distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper'
+ 
+ all-local: Makefile
+-	make -C po $(PACKAGE).pot
++	gmake -C po $(PACKAGE).pot
+ 
+ clean-local: Makefile
+ 	find . -name '*~' -delete
diff --git a/deskutils/drivel/files/patch-show-options b/deskutils/drivel/files/patch-show-options
deleted file mode 100644
index 9b69c1a81855..000000000000
--- a/deskutils/drivel/files/patch-show-options
+++ /dev/null
@@ -1,64 +0,0 @@
---- src/journal.c.orig	25 Jun 2005 16:19:28 -0000	1.127
-+++ src/journal.c	8 Mar 2006 13:18:06 -0000
-@@ -1401,6 +1401,16 @@
- 	return;
- }
- 
-+static void
-+journal_set_expander(DrivelClient *dc, gboolean state)
-+{
-+	gtk_expander_set_expanded (GTK_EXPANDER (dc->journal_expander), state);
-+	if (state)
-+		gtk_label_set_text_with_mnemonic(GTK_LABEL(dc->journal_more_options), _("Hide _options"));
-+	else
-+		gtk_label_set_text_with_mnemonic(GTK_LABEL(dc->journal_more_options), _("Show more _options"));
-+}
-+
- /* display the default items for a blank journal entry and set the sensitivity
-    of the widgets appropriately */
- 
-@@ -1482,7 +1492,7 @@
- 			
- 	/* set the expander state */
- 	state = gconf_client_get_bool (dc->client, dc->gconf->expander_open, NULL);
--	gtk_expander_set_expanded (GTK_EXPANDER (dc->journal_expander), state);
-+	journal_set_expander (dc,state);
- 	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (dc->menu_view_options), state);
- 	
- 	/* enable/disable highlighting */
-@@ -1753,7 +1763,7 @@
- 	value = gconf_entry_get_value (entry);
- 	state = gconf_value_get_bool (value);
- 	
--	gtk_expander_set_expanded (GTK_EXPANDER (dc->journal_expander), state);
-+	journal_set_expander (dc,state);
- 	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (dc->menu_view_options), state);
- 	
- 	return;
-@@ -3399,7 +3409,7 @@
- 		{ "Strike", GTK_STOCK_STRIKETHROUGH, NULL, NULL, NULL, G_CALLBACK (strikethrough_cb) },
- 		{ "Super", NULL, N_("Supe_rscript"), NULL, NULL, G_CALLBACK (superscript_cb) },
- 		{ "Sub", NULL, N_("Subs_cript"), NULL, NULL, G_CALLBACK (subscript_cb) },
--		{ "List", NULL, N_("L_ist"), NULL, NULL, G_CALLBACK (list_cb) },
-+		{ "List", NULL, N_("Lis_t"), NULL, NULL, G_CALLBACK (list_cb) },
- 		{ "ListItem", NULL, N_("List Ite_m"), NULL, NULL, G_CALLBACK (listitem_cb) },
- 		{ "Indent", NULL, N_("I_ndent"), NULL, NULL, G_CALLBACK (blockquote_cb) },
- 		{ "InsertLink", "drivel-insert-link", N_("Insert _Link..."), NULL, N_("Create a link to a web page, livejournal user, or a long journal entry"), G_CALLBACK (insert_link_cb) },
-@@ -3675,6 +3685,7 @@
- 	
- 	/* options expander */
- 	dc->journal_expander = glade_xml_get_widget (xml, "more_options");
-+	dc->journal_more_options = glade_xml_get_widget (xml, "more_options_label");
- 
- 	/* buttons */
- 	help_button = glade_xml_get_widget (xml, "help_button");
---- src/drivel.h.orig	30 Aug 2005 17:46:18 -0000	1.56
-+++ src/drivel.h	8 Mar 2006 13:18:06 -0000
-@@ -215,6 +215,7 @@
- 	GtkWidget *journal_text;
- 	GtkWidget *journal_security;
- 	GtkWidget *journal_expander;
-+	GtkWidget *journal_more_options;
- 	GtkWidget *journal_picture;
- 	GtkWidget *journal_comment;
- 	GtkWidget *journal_autoformat;
diff --git a/deskutils/drivel/files/patch-src-Makefile-am b/deskutils/drivel/files/patch-src-Makefile-am
new file mode 100644
index 000000000000..dc055e8c1f0f
--- /dev/null
+++ b/deskutils/drivel/files/patch-src-Makefile-am
@@ -0,0 +1,12 @@
+--- src/Makefile.am.orig	2010-08-29 00:47:37.560980649 -0400
++++ src/Makefile.am	2010-08-29 00:47:43.680408814 -0400
+@@ -61,8 +61,7 @@
+ 
+ drivel_LDADD = \
+ 	$(DRIVEL_LIBS) \
+-	$(INTLLIBS) \
+-	-ldl
++	$(INTLLIBS)
+ 
+ gladedir   = $(pkgdatadir)/glade
+ glade_DATA = drivel-gtk.glade
diff --git a/deskutils/drivel/files/patch-src-blog_lj b/deskutils/drivel/files/patch-src-blog_lj
deleted file mode 100644
index 9c4382e1f1f9..000000000000
--- a/deskutils/drivel/files/patch-src-blog_lj
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/blog_lj.c.orig	25 Jun 2005 16:19:28 -0000	1.27
-+++ src/blog_lj.c	28 Feb 2006 16:41:41 -0000
-@@ -826,6 +826,11 @@
- 		
- 		for (j = 0; j < prop_count; j++)
- 		{
-+			g_snprintf (key, 32, "prop_%d_itemid", j + 1);
-+			mesg = drivel_request_value_lookup (dr, key);
-+			if (strcmp(mesg,itemid[i])!=0)
-+				continue;
-+
- 			g_snprintf (key, 32, "prop_%d_name", j + 1);
- 			mesg = drivel_request_value_lookup (dr, key);
- 
-@@ -869,28 +874,28 @@
- 			{
- 				prop = journal_prop_new ();
- 				prop->name = g_strdup ("music");
--				prop->value = g_strdup (picture[i]);
-+				prop->value = g_strdup (music[i]);
- 				g_array_append_val (entry->properties, prop);
- 			}
- 			if (mood[i])
- 			{
- 				prop = journal_prop_new ();
- 				prop->name = g_strdup ("mood");
--				prop->value = g_strdup (picture[i]);
-+				prop->value = g_strdup (mood[i]);
- 				g_array_append_val (entry->properties, prop);
- 			}
- 			if (comments[i])
- 			{
- 				prop = journal_prop_new ();
- 				prop->name = g_strdup ("comments");
--				prop->value = g_strdup (picture[i]);
-+				prop->value = g_strdup (comments[i]);
- 				g_array_append_val (entry->properties, prop);
- 			}
- 			if (autoformat[i])
- 			{
- 				prop = journal_prop_new ();
- 				prop->name = g_strdup ("autoformat");
--				prop->value = g_strdup (picture[i]);
-+				prop->value = g_strdup (autoformat[i]);
- 				g_array_append_val (entry->properties, prop);
- 			}
- 			prop = journal_prop_new ();
diff --git a/deskutils/drivel/files/patch-src-main b/deskutils/drivel/files/patch-src-main
deleted file mode 100644
index b35c7251e61d..000000000000
--- a/deskutils/drivel/files/patch-src-main
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main.c.orig	30 Aug 2005 17:46:19 -0000	1.60
-+++ src/main.c	6 Mar 2006 17:05:44 -0000
-@@ -253,7 +253,7 @@
- 	{
- 		c = g_utf8_get_char_validated (p, -1);
- 
--		if (!g_unichar_isalnum (c) && c != '_' && c!= '-')
-+		if (!g_unichar_isalnum (c) && c != '_' && c!= '-' && c!='@' && c!='.')
- 		{
- 			retval = FALSE;
- 			break;
diff --git a/deskutils/drivel/pkg-plist b/deskutils/drivel/pkg-plist
index 13446ae14673..c8c4daa6d334 100644
--- a/deskutils/drivel/pkg-plist
+++ b/deskutils/drivel/pkg-plist
@@ -1,77 +1,108 @@
 bin/drivel
 share/application-registry/drivel.applications
 share/applications/gnome-drivel.desktop
-share/drivel/glade/drivel.glade
-share/drivel/languages/livejournal.lang
 share/gnome/help/drivel/C/drivel.xml
 share/gnome/help/drivel/C/legal.xml
-share/mime-info/drivel.keys
-share/mime-info/drivel.mime
-share/omf/drivel/drivel-C.omf
-share/pixmaps/drivel-48.png
-share/pixmaps/drivel/advogato.png
-share/pixmaps/drivel/atom.png
-share/pixmaps/drivel/blogger.png
-share/pixmaps/drivel/checkbutton.xpm
-share/pixmaps/drivel/combobox.xpm
-share/pixmaps/drivel/community.png
-share/pixmaps/drivel/doublearrow.png
-share/pixmaps/drivel/drivel_splash.png
-share/pixmaps/drivel/drivel-24.png
-share/pixmaps/drivel/entry.xpm
-share/pixmaps/drivel/feed.png
-share/pixmaps/drivel/hscale.xpm
-share/pixmaps/drivel/insert_image.png
-share/pixmaps/drivel/insert_object.png
-share/pixmaps/drivel/leftarrow.png
-share/pixmaps/drivel/livejournal.png
-share/pixmaps/drivel/mt.png
-share/pixmaps/drivel/private.png
-share/pixmaps/drivel/protected.png
-share/pixmaps/drivel/public.png
-share/pixmaps/drivel/radiobutton.xpm
-share/pixmaps/drivel/rightarrow.png
-share/pixmaps/drivel/user.png
-share/pixmaps/drivel/tray_livejournal.png
-share/pixmaps/drivel/xmms.xpm
+share/gnome/help/drivel/cs/drivel.xml
+share/gnome/help/drivel/de/drivel.xml
+share/gnome/help/drivel/pt/drivel.xml
+share/icons/gnome/16x16/mimetypes/gnome-mime-application-x-drivel.png
+share/icons/gnome/22x22/mimetypes/gnome-mime-application-x-drivel.png
+share/icons/gnome/24x24/mimetypes/gnome-mime-application-x-drivel.png
+share/icons/gnome/32x32/mimetypes/gnome-mime-application-x-drivel.png
 share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-drivel.png
+share/locale/ar/LC_MESSAGES/drivel.mo
 share/locale/bg/LC_MESSAGES/drivel.mo
+share/locale/ca/LC_MESSAGES/drivel.mo
 share/locale/cs/LC_MESSAGES/drivel.mo
 share/locale/de/LC_MESSAGES/drivel.mo
+share/locale/dz/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/fi/LC_MESSAGES/drivel.mo
+share/locale/fr/LC_MESSAGES/drivel.mo
+share/locale/it/LC_MESSAGES/drivel.mo
 share/locale/ja/LC_MESSAGES/drivel.mo
+share/locale/lt/LC_MESSAGES/drivel.mo
 share/locale/nb/LC_MESSAGES/drivel.mo
+share/locale/ne/LC_MESSAGES/drivel.mo
 share/locale/nl/LC_MESSAGES/drivel.mo
 share/locale/no/LC_MESSAGES/drivel.mo
+share/locale/oc/LC_MESSAGES/drivel.mo
 share/locale/pa/LC_MESSAGES/drivel.mo
 share/locale/pl/LC_MESSAGES/drivel.mo
 share/locale/pt/LC_MESSAGES/drivel.mo
 share/locale/pt_BR/LC_MESSAGES/drivel.mo
+share/locale/ru/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
 share/locale/sv/LC_MESSAGES/drivel.mo
+share/locale/te/LC_MESSAGES/drivel.mo
+share/locale/th/LC_MESSAGES/drivel.mo
+share/locale/vi/LC_MESSAGES/drivel.mo
 share/locale/zh_CN/LC_MESSAGES/drivel.mo
+share/locale/zh_HK/LC_MESSAGES/drivel.mo
 share/locale/zh_TW/LC_MESSAGES/drivel.mo
+share/mime-info/drivel.keys
+share/mime-info/drivel.mime
 share/mime/application/x-drivel.xml
 share/mime/packages/drivel.xml
+share/omf/drivel/drivel-C.omf
+share/omf/drivel/drivel-cs.omf
+share/omf/drivel/drivel-de.omf
+share/omf/drivel/drivel-pt.omf
+share/pixmaps/drivel-48.png
+%%DATADIR%%/glade/atom.png
+%%DATADIR%%/glade/advogato.png
+%%DATADIR%%/glade/blogger.png
+%%DATADIR%%/glade/checkbutton.xpm
+%%DATADIR%%/glade/combobox.xpm
+%%DATADIR%%/glade/community.png
+%%DATADIR%%/glade/doublearrow.png
+%%DATADIR%%/glade/drivel-24.png
+%%DATADIR%%/glade/drivel_splash.png
+%%DATADIR%%/glade/entry.xpm
+%%DATADIR%%/glade/feed.png
+%%DATADIR%%/glade/hscale.xpm
+%%DATADIR%%/glade/insert_image.png
+%%DATADIR%%/glade/insert_object.png
+%%DATADIR%%/glade/leftarrow.png
+%%DATADIR%%/glade/livejournal.png
+%%DATADIR%%/glade/mt.png
+%%DATADIR%%/glade/private.png
+%%DATADIR%%/glade/protected.png
+%%DATADIR%%/glade/public.png
+%%DATADIR%%/glade/radiobutton.xpm
+%%DATADIR%%/glade/rightarrow.png
+%%DATADIR%%/glade/tray_livejournal.png
+%%DATADIR%%/glade/user.png
+%%DATADIR%%/glade/xmms.xpm
+%%DATADIR%%/glade/drivel-gtk.glade
 @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
-@dirrmtry share/icons/gnome/48x48/mimetypes
-@dirrmtry share/icons/gnome/48x48
-@dirrm share/pixmaps/drivel
-@dirrm share/omf/drivel
-@dirrm share/gnome/help/drivel/C
-@dirrm share/gnome/help/drivel
-@dirrm share/drivel/languages
-@dirrm share/drivel/glade
-@dirrm share/drivel
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@dirrmtry share/icons/gnome/48x48/mimetypes
+@dirrmtry share/icons/gnome/48x48
+@dirrmtry share/gnome/help/drivel/C
+@dirrmtry share/gnome/help/drivel/cs
+@dirrmtry share/gnome/help/drivel/de
+@dirrmtry share/gnome/help/drivel/pt
+@dirrmtry share/gnome/help/drivel
+@dirrmtry share/icons/gnome/16x16/mimetypes
+@dirrmtry share/icons/gnome/16x16
+@dirrmtry share/icons/gnome/22x22/mimetypes
+@dirrmtry share/icons/gnome/22x22
+@dirrmtry share/icons/gnome/24x24/mimetypes
+@dirrmtry share/icons/gnome/24x24
+@dirrmtry share/icons/gnome/32x32/mimetypes
+@dirrmtry share/icons/gnome/32x32
+@dirrmtry share/icons/gnome
+@dirrmtry share/omf/drivel
+@dirrmtry %%DATADIR%%/glade
+@dirrmtry %%DATADIR%%
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
 @dirrmtry share/applications