Upgrade to 0.4.4.

Changelog at <http://www.neubot.org/neubot-0.4.4>.

4 files changed, 26 insertions, 69 deletions

diff --git a/net/neubot/Makefile b/net/neubot/Makefile
index bf43d1b9a40f..e6535a3d4a8d 100644
--- a/net/neubot/Makefile
+++ b/net/neubot/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	neubot
-PORTVERSION=	0.4.2
+PORTVERSION=	0.4.4
 CATEGORIES=	net
 MASTER_SITES=	http://releases.neubot.org/_packages/
 
diff --git a/net/neubot/distinfo b/net/neubot/distinfo
index 256e019b882b..ecc17d5f0fb2 100644
--- a/net/neubot/distinfo
+++ b/net/neubot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (neubot-0.4.2.tar.gz) = f56c94994937b10547374d014ba2b3cee86d79a2e939fa68a2d87bb03afbae8b
-SIZE (neubot-0.4.2.tar.gz) = 605972
+SHA256 (neubot-0.4.4.tar.gz) = 069a2947593c30c8ddbce062eb995a7c27836a334def04359761821ef330cff3
+SIZE (neubot-0.4.4.tar.gz) = 601610
diff --git a/net/neubot/files/patch-Makefile b/net/neubot/files/patch-Makefile
index b854845b386c..b61e5fe23d5a 100644
--- a/net/neubot/files/patch-Makefile
+++ b/net/neubot/files/patch-Makefile
@@ -1,23 +1,11 @@
---- Makefile.orig	2011-09-19 13:28:35.000000000 +0200
-+++ Makefile	2011-10-22 15:07:25.000000000 +0200
-@@ -177,9 +177,9 @@
- 	done
- 
- _install_autostart:
--	@$(INSTALL) -d $(DESTDIR)/etc/xdg/autostart/
-+	@$(INSTALL) -d $(DESTDIR)$(PREFIX)/etc/xdg/autostart/
- 	@$(INSTALL) unix_root/etc/xdg/autostart/neubot-on-gui-login.desktop \
--	 $(DESTDIR)/etc/xdg/autostart
-+	 $(DESTDIR)$(PREFIX)/etc/xdg/autostart
- 
+--- Makefile.orig	2011-10-25 20:20:56.000000000 +0200
++++ Makefile	2011-11-01 21:08:46.000000000 +0100
+@@ -124,7 +124,7 @@
+ # [2] http://bit.ly/ayYyAR (debian.org)
  #
- # After the install we need to edit the following files to
-@@ -194,7 +194,7 @@
- NEEDEDIT += $(DESTDIR)$(MENUDIR)/neubot-status-icon.desktop
- NEEDEDIT += $(DESTDIR)$(MENUDIR)/neubot-web-ui.desktop
- NEEDEDIT += $(DESTDIR)$(MENUDIR)/neubot.desktop
--NEEDEDIT += $(DESTDIR)/etc/xdg/autostart/neubot-on-gui-login.desktop
-+NEEDEDIT += $(DESTDIR)$(PREFIX)/etc/xdg/autostart/neubot-on-gui-login.desktop
- NEEDEDIT += $(DESTDIR)$(DATADIR)/neubot/gui/infobox_gtk.py
- 
- _install_edit:
+ DESTDIR =
+-SYSCONFDIR = /etc
++SYSCONFDIR = $(PREFIX)/etc
+ LOCALSTATEDIR = /var/neubot
+ PREFIX = /usr/local
+ BINDIR = $(PREFIX)/bin
diff --git a/net/neubot/pkg-plist b/net/neubot/pkg-plist
index 0391e36f4611..87ac89fe9148 100644
--- a/net/neubot/pkg-plist
+++ b/net/neubot/pkg-plist
@@ -1,10 +1,10 @@
 bin/nagios-plugin-neubot
 bin/neubot
+bin/neubot_gui
+bin/neubot_notify
 bin/neubotw
 bin/start-neubot-daemon
-etc/xdg/autostart/neubot-on-gui-login.desktop
-share/applications/neubot-status-icon.desktop
-share/applications/neubot-web-ui.desktop
+etc/xdg/autostart/neubot.desktop
 share/applications/neubot.desktop
 share/icons/hicolor/scalable/apps/neubot.svg
 %%DATADIR%%/__init__.py
@@ -17,8 +17,6 @@ share/icons/hicolor/scalable/apps/neubot.svg
 %%DATADIR%%/api/client.pyc
 %%DATADIR%%/api/server.py
 %%DATADIR%%/api/server.pyc
-%%DATADIR%%/arcfour.py
-%%DATADIR%%/arcfour.pyc
 %%DATADIR%%/bittorrent/__init__.py
 %%DATADIR%%/bittorrent/__init__.pyc
 %%DATADIR%%/bittorrent/bitfield.py
@@ -39,8 +37,6 @@ share/icons/hicolor/scalable/apps/neubot.svg
 %%DATADIR%%/bittorrent/server.pyc
 %%DATADIR%%/bittorrent/stream.py
 %%DATADIR%%/bittorrent/stream.pyc
-%%DATADIR%%/blocks.py
-%%DATADIR%%/blocks.pyc
 %%DATADIR%%/compat.py
 %%DATADIR%%/compat.pyc
 %%DATADIR%%/config.py
@@ -63,30 +59,10 @@ share/icons/hicolor/scalable/apps/neubot.svg
 %%DATADIR%%/database/table_log.pyc
 %%DATADIR%%/database/table_speedtest.py
 %%DATADIR%%/database/table_speedtest.pyc
-%%DATADIR%%/database/tool_buckets.py
-%%DATADIR%%/database/tool_buckets.pyc
-%%DATADIR%%/database/tool_collate.py
-%%DATADIR%%/database/tool_collate.pyc
-%%DATADIR%%/database/tool_goodset.py
-%%DATADIR%%/database/tool_goodset.pyc
-%%DATADIR%%/database/tool_privacy.py
-%%DATADIR%%/database/tool_privacy.pyc
-%%DATADIR%%/database/tool_slice.py
-%%DATADIR%%/database/tool_slice.pyc
-%%DATADIR%%/database/tool_users.py
-%%DATADIR%%/database/tool_users.pyc
 %%DATADIR%%/debug/__init__.py
 %%DATADIR%%/debug/__init__.pyc
 %%DATADIR%%/debug/objgraph.py
 %%DATADIR%%/debug/objgraph.pyc
-%%DATADIR%%/gui/__init__.py
-%%DATADIR%%/gui/__init__.pyc
-%%DATADIR%%/gui/infobox.py
-%%DATADIR%%/gui/infobox.pyc
-%%DATADIR%%/gui/infobox_gtk.py
-%%DATADIR%%/gui/infobox_gtk.pyc
-%%DATADIR%%/gui/infobox_tk.py
-%%DATADIR%%/gui/infobox_tk.pyc
 %%DATADIR%%/http/__init__.py
 %%DATADIR%%/http/__init__.pyc
 %%DATADIR%%/http/client.py
@@ -99,10 +75,6 @@ share/icons/hicolor/scalable/apps/neubot.svg
 %%DATADIR%%/http/ssi.pyc
 %%DATADIR%%/http/stream.py
 %%DATADIR%%/http/stream.pyc
-%%DATADIR%%/http/utils.py
-%%DATADIR%%/http/utils.pyc
-%%DATADIR%%/libversion.py
-%%DATADIR%%/libversion.pyc
 %%DATADIR%%/log.py
 %%DATADIR%%/log.pyc
 %%DATADIR%%/main/__init__.py
@@ -123,16 +95,12 @@ share/icons/hicolor/scalable/apps/neubot.svg
 %%DATADIR%%/net/__init__.pyc
 %%DATADIR%%/net/dns.py
 %%DATADIR%%/net/dns.pyc
-%%DATADIR%%/net/measurer.py
-%%DATADIR%%/net/measurer.pyc
 %%DATADIR%%/net/poller.py
 %%DATADIR%%/net/poller.pyc
 %%DATADIR%%/net/stream.py
 %%DATADIR%%/net/stream.pyc
 %%DATADIR%%/notify.py
 %%DATADIR%%/notify.pyc
-%%DATADIR%%/on_gui_login.py
-%%DATADIR%%/on_gui_login.pyc
 %%DATADIR%%/privacy.py
 %%DATADIR%%/privacy.pyc
 %%DATADIR%%/rendezvous/__init__.py
@@ -149,8 +117,6 @@ share/icons/hicolor/scalable/apps/neubot.svg
 %%DATADIR%%/rootdir.pyc
 %%DATADIR%%/server.py
 %%DATADIR%%/server.pyc
-%%DATADIR%%/show_database.py
-%%DATADIR%%/show_database.pyc
 %%DATADIR%%/simplejson/__init__.py
 %%DATADIR%%/simplejson/__init__.pyc
 %%DATADIR%%/simplejson/decoder.py
@@ -175,20 +141,20 @@ share/icons/hicolor/scalable/apps/neubot.svg
 %%DATADIR%%/speedtest/session.pyc
 %%DATADIR%%/state.py
 %%DATADIR%%/state.pyc
-%%DATADIR%%/statusicon.py
-%%DATADIR%%/statusicon.pyc
 %%DATADIR%%/system/__init__.py
 %%DATADIR%%/system/__init__.pyc
-%%DATADIR%%/system/_proc_win32.py
-%%DATADIR%%/system/_proc_win32.pyc
 %%DATADIR%%/system/linux.py
 %%DATADIR%%/system/linux.pyc
 %%DATADIR%%/system/unix.py
 %%DATADIR%%/system/unix.pyc
 %%DATADIR%%/system/win32.py
 %%DATADIR%%/system/win32.pyc
-%%DATADIR%%/utils.py
-%%DATADIR%%/utils.pyc
+%%DATADIR%%/utils/__init__.py
+%%DATADIR%%/utils/__init__.pyc
+%%DATADIR%%/utils/blocks.py
+%%DATADIR%%/utils/blocks.pyc
+%%DATADIR%%/utils/version.py
+%%DATADIR%%/utils/version.pyc
 %%DATADIR%%/www/bittorrent.html
 %%DATADIR%%/www/css/jquery.jqplot.css
 %%DATADIR%%/www/css/style.css
@@ -217,18 +183,22 @@ share/icons/hicolor/scalable/apps/neubot.svg
 %%DATADIR%%/www/js/settings.js
 %%DATADIR%%/www/js/speedtest.js
 %%DATADIR%%/www/js/state.js
+%%DATADIR%%/www/js/update.js
 %%DATADIR%%/www/js/utils.js
 %%DATADIR%%/www/lang/en.js
 %%DATADIR%%/www/lang/it.js
 %%DATADIR%%/www/log.html
+%%DATADIR%%/www/not_running.html
 %%DATADIR%%/www/privacy.html
 %%DATADIR%%/www/settings.html
 %%DATADIR%%/www/speedtest.html
+%%DATADIR%%/www/update.html
 @dirrm %%DATADIR%%/www/lang
 @dirrm %%DATADIR%%/www/js
 @dirrm %%DATADIR%%/www/img
 @dirrm %%DATADIR%%/www/css
 @dirrm %%DATADIR%%/www
+@dirrm %%DATADIR%%/utils
 @dirrm %%DATADIR%%/system
 @dirrm %%DATADIR%%/speedtest
 @dirrm %%DATADIR%%/simplejson
@@ -236,7 +206,6 @@ share/icons/hicolor/scalable/apps/neubot.svg
 @dirrm %%DATADIR%%/net
 @dirrm %%DATADIR%%/main
 @dirrm %%DATADIR%%/http
-@dirrm %%DATADIR%%/gui
 @dirrm %%DATADIR%%/debug
 @dirrm %%DATADIR%%/database
 @dirrm %%DATADIR%%/bittorrent