5 files changed, 112 insertions, 49 deletions

diff --git a/net/tucan/Makefile b/net/tucan/Makefile
index 396d3d791ed3..fe7e5484f1c2 100644
--- a/net/tucan/Makefile
+++ b/net/tucan/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	tucan
-PORTVERSION=	0.3.9
-PORTREVISION=	4
+PORTVERSION=	0.3.10
 CATEGORIES=	net
-MASTER_SITES=	http://forja.rediris.es/frs/download.php/1470/ \
+MASTER_SITES=	http://forja.rediris.es/frs/download.php/2051/ \
 		http://build-tucan-doc.googlecode.com/files/
 
 MAINTAINER=	gustau.perez@gmail.com
@@ -51,7 +50,7 @@ do-install:
 	(cd ${WRKSRC}/i18n/ && ${COPYTREE_SHARE} \* ${DATADIR}/i18n/)
 	(cd ${WRKSRC}/media/ && ${COPYTREE_SHARE} \* ${DATADIR}/media/)
 	(cd ${WRKSRC}/ui/ && ${COPYTREE_SHARE} \* ${DATADIR}/ui/)
-	${INSTALL_DATA} ${WRKSRC}/media/tucan.svg ${PREFIX}/share/pixmaps/
+	${INSTALL_DATA} ${WRKSRC}/media/tucan.png ${PREFIX}/share/pixmaps/
 	${INSTALL_MAN} ${WRKSRC}/tucan.1.gz ${PREFIX}/man/man1/
 	${INSTALL} ${WRKSRC}/tucan.desktop ${PREFIX}/share/applications/
 
diff --git a/net/tucan/distinfo b/net/tucan/distinfo
index 668ad4fc4718..1d303545ae2a 100644
--- a/net/tucan/distinfo
+++ b/net/tucan/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tucan-0.3.9.tar.gz) = ec1cb4f28b444af36389be5f5080774f2bd90ef55d3a9a3b748cbe16eef1cab5
-SIZE (tucan-0.3.9.tar.gz) = 338109
+SHA256 (tucan-0.3.10.tar.gz) = 41c4e68de970eb4388b41fa75b7c38142b989483318490abf8af377303c99e5c
+SIZE (tucan-0.3.10.tar.gz) = 545190
diff --git a/net/tucan/files/patch-core__service_config.py b/net/tucan/files/patch-core__service_config.py
index 28ed918b3ad0..1f036e4cb8fb 100644
--- a/net/tucan/files/patch-core__service_config.py
+++ b/net/tucan/files/patch-core__service_config.py
@@ -1,5 +1,5 @@
---- ./core/service_config.py.orig	2009-10-07 01:02:28.000000000 +0200
-+++ ./core/service_config.py	2011-05-22 19:41:52.000000000 +0200
+--- core/service_config.py.orig	2011-06-29 20:00:20.785827385 +0200
++++ core/service_config.py	2011-06-29 20:00:44.438339926 +0200
 @@ -18,7 +18,7 @@
  ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  ###############################################################################
@@ -9,7 +9,7 @@
  import pickle
  import base64
  import logging
-@@ -157,6 +157,7 @@
+@@ -184,6 +184,7 @@
  
  	def save(self):
  		""""""
diff --git a/net/tucan/files/patch-core_config.py b/net/tucan/files/patch-core_config.py
new file mode 100644
index 000000000000..9493c12a9bc4
--- /dev/null
+++ b/net/tucan/files/patch-core_config.py
@@ -0,0 +1,20 @@
+--- core/config.py.orig	2011-01-03 20:00:07.000000000 +0100
++++ core/config.py	2011-06-30 01:58:31.000000000 +0200
+@@ -18,7 +18,7 @@
+ ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ ###############################################################################
+ 
+-import os
++import os,stat
+ import uuid
+ import shutil
+ import __builtin__
+@@ -91,6 +91,8 @@
+ 					package, icon, name, enabled, config = self.service(path)
+ 					if name:
+ 						self.set(SECTION_SERVICES, name, path.encode("utf-8"))
++					for service_file in os.listdir(path):
++						os.chmod(path + service_file, stat.S_IRUSR|stat.S_IWUSR)
+ 			self.save()
+ 
+ 	def check_config(self):
diff --git a/net/tucan/pkg-plist b/net/tucan/pkg-plist
index 78be335986fd..5863db0d9234 100644
--- a/net/tucan/pkg-plist
+++ b/net/tucan/pkg-plist
@@ -1,73 +1,70 @@
 bin/tucan
 share/applications/tucan.desktop
-share/pixmaps/tucan.svg
+share/pixmaps/tucan.png
 %%DATADIR%%/core/__init__.py
 %%DATADIR%%/core/accounts.py
 %%DATADIR%%/core/config.py
 %%DATADIR%%/core/cons.py
 %%DATADIR%%/core/core.py
+%%DATADIR%%/core/dependencies.py
 %%DATADIR%%/core/download_manager.py
 %%DATADIR%%/core/download_plugin.py
 %%DATADIR%%/core/downloader.py
 %%DATADIR%%/core/events.py
+%%DATADIR%%/core/history.py
+%%DATADIR%%/core/link_dispatcher.py
 %%DATADIR%%/core/log_stream.py
 %%DATADIR%%/core/misc.py
+%%DATADIR%%/core/pid_file.py
+%%DATADIR%%/core/queue.py
+%%DATADIR%%/core/recaptcha.py
 %%DATADIR%%/core/service_config.py
 %%DATADIR%%/core/service_manager.py
 %%DATADIR%%/core/service_update.py
 %%DATADIR%%/core/sessions.py
 %%DATADIR%%/core/slots.py
 %%DATADIR%%/core/tesseract.py
+%%DATADIR%%/core/upload_manager.py
 %%DATADIR%%/core/uploader.py
 %%DATADIR%%/core/url_open.py
 %%DATADIR%%/default_plugins/4shared/__init__.py
 %%DATADIR%%/default_plugins/4shared/anonymous_download.py
 %%DATADIR%%/default_plugins/4shared/favicon_4shared.ico
-%%DATADIR%%/default_plugins/4shared/parsers.py
 %%DATADIR%%/default_plugins/4shared/service.conf
 %%DATADIR%%/default_plugins/badongo/__init__.py
 %%DATADIR%%/default_plugins/badongo/anonymous_download.py
 %%DATADIR%%/default_plugins/badongo/favicon_badongo.ico
-%%DATADIR%%/default_plugins/badongo/parsers.py
 %%DATADIR%%/default_plugins/badongo/service.conf
 %%DATADIR%%/default_plugins/depositfiles/__init__.py
 %%DATADIR%%/default_plugins/depositfiles/anonymous_download.py
 %%DATADIR%%/default_plugins/depositfiles/favicon_depositfiles.ico
-%%DATADIR%%/default_plugins/depositfiles/parsers.py
 %%DATADIR%%/default_plugins/depositfiles/service.conf
 %%DATADIR%%/default_plugins/easy-share/__init__.py
 %%DATADIR%%/default_plugins/easy-share/anonymous_download.py
 %%DATADIR%%/default_plugins/easy-share/favicon_easy-share.ico
-%%DATADIR%%/default_plugins/easy-share/parsers.py
 %%DATADIR%%/default_plugins/easy-share/service.conf
 %%DATADIR%%/default_plugins/filefactory/__init__.py
 %%DATADIR%%/default_plugins/filefactory/anonymous_download.py
 %%DATADIR%%/default_plugins/filefactory/favicon_filefactory.ico
-%%DATADIR%%/default_plugins/filefactory/parsers.py
 %%DATADIR%%/default_plugins/filefactory/service.conf
-%%DATADIR%%/default_plugins/gigasize/__init__.py
-%%DATADIR%%/default_plugins/gigasize/anonymous_download.py
-%%DATADIR%%/default_plugins/gigasize/check_links.py
-%%DATADIR%%/default_plugins/gigasize/favicon_gigasize.ico
-%%DATADIR%%/default_plugins/gigasize/service.conf
+%%DATADIR%%/default_plugins/fileserve/__init__.py
+%%DATADIR%%/default_plugins/fileserve/anonymous_download.py
+%%DATADIR%%/default_plugins/fileserve/favicon_fileserve.ico
+%%DATADIR%%/default_plugins/fileserve/service.conf
 %%DATADIR%%/default_plugins/hotfile/__init__.py
 %%DATADIR%%/default_plugins/hotfile/anonymous_download.py
 %%DATADIR%%/default_plugins/hotfile/favicon_hotfile.ico
-%%DATADIR%%/default_plugins/hotfile/parsers.py
 %%DATADIR%%/default_plugins/hotfile/service.conf
 %%DATADIR%%/default_plugins/mediafire/__init__.py
 %%DATADIR%%/default_plugins/mediafire/anonymous_download.py
 %%DATADIR%%/default_plugins/mediafire/favicon_mediafire.ico
-%%DATADIR%%/default_plugins/mediafire/parsers.py
 %%DATADIR%%/default_plugins/mediafire/service.conf
 %%DATADIR%%/default_plugins/megaupload/__init__.py
 %%DATADIR%%/default_plugins/megaupload/anonymous_download.py
-%%DATADIR%%/default_plugins/megaupload/captcha.py
 %%DATADIR%%/default_plugins/megaupload/check_links.py
 %%DATADIR%%/default_plugins/megaupload/favicon_megaupload.ico
 %%DATADIR%%/default_plugins/megaupload/premium_cookie.py
 %%DATADIR%%/default_plugins/megaupload/premium_download.py
-%%DATADIR%%/default_plugins/megaupload/premium_parser.py
 %%DATADIR%%/default_plugins/megaupload/service.conf
 %%DATADIR%%/default_plugins/rapidshare/__init__.py
 %%DATADIR%%/default_plugins/rapidshare/anonymous_download.py
@@ -79,15 +76,19 @@ share/pixmaps/tucan.svg
 %%DATADIR%%/default_plugins/sendspace/__init__.py
 %%DATADIR%%/default_plugins/sendspace/anonymous_download.py
 %%DATADIR%%/default_plugins/sendspace/favicon_sendspace.ico
-%%DATADIR%%/default_plugins/sendspace/parsers.py
 %%DATADIR%%/default_plugins/sendspace/service.conf
+%%DATADIR%%/default_plugins/uploading/__init__.py
+%%DATADIR%%/default_plugins/uploading/anonymous_download.py
+%%DATADIR%%/default_plugins/uploading/favicon_uploading.ico
+%%DATADIR%%/default_plugins/uploading/service.conf
 %%DATADIR%%/default_plugins/zshare/__init__.py
 %%DATADIR%%/default_plugins/zshare/anonymous_download.py
 %%DATADIR%%/default_plugins/zshare/favicon_zshare.ico
-%%DATADIR%%/default_plugins/zshare/parsers.py
 %%DATADIR%%/default_plugins/zshare/service.conf
 %%DATADIR%%/i18n/cs/LC_MESSAGES/tucan.mo
 %%DATADIR%%/i18n/cs/cs.po
+%%DATADIR%%/i18n/da/LC_MESSAGES/tucan.mo
+%%DATADIR%%/i18n/da/da.po
 %%DATADIR%%/i18n/de/LC_MESSAGES/tucan.mo
 %%DATADIR%%/i18n/de/de.po
 %%DATADIR%%/i18n/en/LC_MESSAGES/tucan.mo
@@ -100,6 +101,8 @@ share/pixmaps/tucan.svg
 %%DATADIR%%/i18n/gr/gr.po
 %%DATADIR%%/i18n/it/LC_MESSAGES/tucan.mo
 %%DATADIR%%/i18n/it/it.po
+%%DATADIR%%/i18n/nl/LC_MESSAGES/tucan.mo
+%%DATADIR%%/i18n/nl/nl.po
 %%DATADIR%%/i18n/pl/LC_MESSAGES/tucan.mo
 %%DATADIR%%/i18n/pl/pl.po
 %%DATADIR%%/i18n/pt/LC_MESSAGES/tucan.mo
@@ -110,29 +113,55 @@ share/pixmaps/tucan.svg
 %%DATADIR%%/i18n/se/se.po
 %%DATADIR%%/i18n/sk/LC_MESSAGES/tucan.mo
 %%DATADIR%%/i18n/sk/sk.po
+%%DATADIR%%/i18n/sl/LC_MESSAGES/tucan.mo
+%%DATADIR%%/i18n/sl/sl.po
+%%DATADIR%%/i18n/tr/LC_MESSAGES/tucan.mo
+%%DATADIR%%/i18n/tr/tr.po
 %%DATADIR%%/i18n/tucan.pot
-%%DATADIR%%/media/application-x-executable.svg
-%%DATADIR%%/media/applications-system.svg
-%%DATADIR%%/media/contact-new.svg
-%%DATADIR%%/media/document-save.svg
-%%DATADIR%%/media/edit-delete.svg
-%%DATADIR%%/media/go-down.svg
-%%DATADIR%%/media/go-up.svg
-%%DATADIR%%/media/image-missing.svg
-%%DATADIR%%/media/mail-reply-sender.svg
-%%DATADIR%%/media/media-playback-start.svg
-%%DATADIR%%/media/media-playback-stop.svg
-%%DATADIR%%/media/network-error.svg
-%%DATADIR%%/media/package-x-generic.svg
-%%DATADIR%%/media/preferences-desktop-locale.svg
-%%DATADIR%%/media/preferences-desktop.svg
-%%DATADIR%%/media/preferences-system.svg
-%%DATADIR%%/media/software-update-available.svg
-%%DATADIR%%/media/software-update-urgent.svg
-%%DATADIR%%/media/system-software-update.svg
-%%DATADIR%%/media/system-users.svg
-%%DATADIR%%/media/tucan.svg
-%%DATADIR%%/media/user-home.svg
+%%DATADIR%%/media/application-x-executable.png
+%%DATADIR%%/media/applications-system.png
+%%DATADIR%%/media/contact-new.png
+%%DATADIR%%/media/document-save.png
+%%DATADIR%%/media/edit-delete.png
+%%DATADIR%%/media/go-down.png
+%%DATADIR%%/media/go-up.png
+%%DATADIR%%/media/image-missing.png
+%%DATADIR%%/media/mail-reply-sender.png
+%%DATADIR%%/media/media-playback-start.png
+%%DATADIR%%/media/media-playback-stop.png
+%%DATADIR%%/media/network-error.png
+%%DATADIR%%/media/package-x-generic.png
+%%DATADIR%%/media/preferences-desktop-locale.png
+%%DATADIR%%/media/preferences-desktop.png
+%%DATADIR%%/media/preferences-system.png
+%%DATADIR%%/media/scalable/application-x-executable.svg
+%%DATADIR%%/media/scalable/applications-system.svg
+%%DATADIR%%/media/scalable/contact-new.svg
+%%DATADIR%%/media/scalable/document-save.svg
+%%DATADIR%%/media/scalable/edit-delete.svg
+%%DATADIR%%/media/scalable/go-down.svg
+%%DATADIR%%/media/scalable/go-up.svg
+%%DATADIR%%/media/scalable/image-missing.svg
+%%DATADIR%%/media/scalable/mail-reply-sender.svg
+%%DATADIR%%/media/scalable/media-playback-start.svg
+%%DATADIR%%/media/scalable/media-playback-stop.svg
+%%DATADIR%%/media/scalable/network-error.svg
+%%DATADIR%%/media/scalable/package-x-generic.svg
+%%DATADIR%%/media/scalable/preferences-desktop-locale.svg
+%%DATADIR%%/media/scalable/preferences-desktop.svg
+%%DATADIR%%/media/scalable/preferences-system.svg
+%%DATADIR%%/media/scalable/software-update-available.svg
+%%DATADIR%%/media/scalable/software-update-urgent.svg
+%%DATADIR%%/media/scalable/system-software-update.svg
+%%DATADIR%%/media/scalable/system-users.svg
+%%DATADIR%%/media/scalable/tucan.svg
+%%DATADIR%%/media/scalable/user-home.svg
+%%DATADIR%%/media/software-update-available.png
+%%DATADIR%%/media/software-update-urgent.png
+%%DATADIR%%/media/system-software-update.png
+%%DATADIR%%/media/system-users.png
+%%DATADIR%%/media/tucan.png
+%%DATADIR%%/media/user-home.png
 %%DATADIR%%/tucan.py
 %%DATADIR%%/ui/__init__.py
 %%DATADIR%%/ui/console/__init__.py
@@ -142,8 +171,11 @@ share/pixmaps/tucan.svg
 %%DATADIR%%/ui/gtk/__init__.py
 %%DATADIR%%/ui/gtk/about.py
 %%DATADIR%%/ui/gtk/advanced_packages.py
+%%DATADIR%%/ui/gtk/captcha_dialog.py
+%%DATADIR%%/ui/gtk/clipboard.py
 %%DATADIR%%/ui/gtk/file_chooser.py
 %%DATADIR%%/ui/gtk/gui.py
+%%DATADIR%%/ui/gtk/history_view.py
 %%DATADIR%%/ui/gtk/input_files.py
 %%DATADIR%%/ui/gtk/input_links.py
 %%DATADIR%%/ui/gtk/log_view.py
@@ -151,6 +183,7 @@ share/pixmaps/tucan.svg
 %%DATADIR%%/ui/gtk/menu_bar.py
 %%DATADIR%%/ui/gtk/message.py
 %%DATADIR%%/ui/gtk/preferences.py
+%%DATADIR%%/ui/gtk/recover.py
 %%DATADIR%%/ui/gtk/report.py
 %%DATADIR%%/ui/gtk/service_preferences.py
 %%DATADIR%%/ui/gtk/shutdown.py
@@ -162,7 +195,12 @@ share/pixmaps/tucan.svg
 @dirrm share/tucan/ui/gtk
 @dirrm share/tucan/ui/console
 @dirrm share/tucan/ui
+@dirrm share/tucan/media/scalable
 @dirrm share/tucan/media
+@dirrm share/tucan/i18n/tr/LC_MESSAGES
+@dirrm share/tucan/i18n/tr
+@dirrm share/tucan/i18n/sl/LC_MESSAGES
+@dirrm share/tucan/i18n/sl
 @dirrm share/tucan/i18n/sk/LC_MESSAGES
 @dirrm share/tucan/i18n/sk
 @dirrm share/tucan/i18n/se/LC_MESSAGES
@@ -173,6 +211,8 @@ share/pixmaps/tucan.svg
 @dirrm share/tucan/i18n/pt
 @dirrm share/tucan/i18n/pl/LC_MESSAGES
 @dirrm share/tucan/i18n/pl
+@dirrm share/tucan/i18n/nl/LC_MESSAGES
+@dirrm share/tucan/i18n/nl
 @dirrm share/tucan/i18n/it/LC_MESSAGES
 @dirrm share/tucan/i18n/it
 @dirrm share/tucan/i18n/gr/LC_MESSAGES
@@ -185,16 +225,19 @@ share/pixmaps/tucan.svg
 @dirrm share/tucan/i18n/en
 @dirrm share/tucan/i18n/de/LC_MESSAGES
 @dirrm share/tucan/i18n/de
+@dirrm share/tucan/i18n/da/LC_MESSAGES
+@dirrm share/tucan/i18n/da
 @dirrm share/tucan/i18n/cs/LC_MESSAGES
 @dirrm share/tucan/i18n/cs
 @dirrm share/tucan/i18n
 @dirrm share/tucan/default_plugins/zshare
+@dirrm share/tucan/default_plugins/uploading
 @dirrm share/tucan/default_plugins/sendspace
 @dirrm share/tucan/default_plugins/rapidshare
 @dirrm share/tucan/default_plugins/megaupload
 @dirrm share/tucan/default_plugins/mediafire
 @dirrm share/tucan/default_plugins/hotfile
-@dirrm share/tucan/default_plugins/gigasize
+@dirrm share/tucan/default_plugins/fileserve
 @dirrm share/tucan/default_plugins/filefactory
 @dirrm share/tucan/default_plugins/easy-share
 @dirrm share/tucan/default_plugins/depositfiles
@@ -204,3 +247,4 @@ share/pixmaps/tucan.svg
 @dirrm share/tucan/core
 @dirrm share/tucan
 @dirrmtry share/applications
+@dirrmtry share/pixmaps