Index: head/net/neubot/Makefile =================================================================== --- head/net/neubot/Makefile (revision 289937) +++ head/net/neubot/Makefile (revision 289938) @@ -1,46 +1,46 @@ # New ports collection makefile for: neubot # Date created: Wed 18 oct 2011 # Whom: thierry@pompo.net # # $FreeBSD$ # PORTNAME= neubot -PORTVERSION= 0.4.5 +PORTVERSION= 0.4.6 CATEGORIES= net MASTER_SITES= http://releases.neubot.org/_packages/ MAINTAINER= thierry@FreeBSD.org COMMENT= Measures neutrality of your network connection in the background LICENSE= GPLv3 USE_PYTHON= 2.5-2.9 NO_BUILD= yes USERS= _neubot GROUPS= _neubot USE_RC_SUBR= neubotd INSTALLS_ICONS= yes MAN1= neubot.1 MANCOMPRESSED= yes PORTDOCS= AUTHORS BUGS ChangeLog PRIVACY README TODO SUB_FILES= pkg_message SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} PKGMESSAGE= ${WRKDIR}/pkg_message pre-configure: ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/${MAKEFILE} post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} @${CAT} ${PKGMESSAGE} .endif .include Property changes on: head/net/neubot/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/net/neubot/distinfo =================================================================== --- head/net/neubot/distinfo (revision 289937) +++ head/net/neubot/distinfo (revision 289938) @@ -1,2 +1,2 @@ -SHA256 (neubot-0.4.5.tar.gz) = 23a3ba783a2926bcee10ec41632c5f76d2ef4eba36f812cbbe92084b85ca3078 -SIZE (neubot-0.4.5.tar.gz) = 574215 +SHA256 (neubot-0.4.6.tar.gz) = a609aa9cd8a8946aa185de9c6247c919d60e9470c4babda9c53f70530c2a9cb9 +SIZE (neubot-0.4.6.tar.gz) = 597769 Property changes on: head/net/neubot/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/net/neubot/files/neubotd.in =================================================================== --- head/net/neubot/files/neubotd.in (revision 289937) +++ head/net/neubot/files/neubotd.in (revision 289938) @@ -1,47 +1,47 @@ #! /bin/sh # # $FreeBSD$ # # PROVIDE: neubotd # REQUIRE: NETWORKING DAEMON # KEYWORD: shutdown # Add the following line to /etc/rc.conf to enable `neubotd': # -#neubotd_enable="YES" +# neubotd_enable="YES" # . /etc/rc.subr name="neubotd" rcvar=neubotd_enable # read settings, set default values load_rc_config "${name}" : ${neubotd_enable="NO"} required_files="%%PREFIX%%/bin/neubot" pidfile="/var/run/${name}.pid" long_name="neubot daemon." neubotd_log="/var/log/${name}.log" start_cmd=${name}_start stop_cmd=${name}_stop neubotd_start() { [ -x %%PYTHON_CMD%% ] || (echo "%%PYTHON_CMD%% not found"; exit 1) [ -f $pidfile ] && (echo "$name already running?"; exit 2) echo "Starting $long_name" %%PYTHON_CMD%% %%PREFIX%%/bin/neubot start > $neubotd_log && \ echo $$ > $pidfile } neubotd_stop() { [ -f $pidfile ] || (echo "$name not running?"; exit 1) echo "Stopping $long_name" %%PYTHON_CMD%% %%PREFIX%%/bin/neubot stop > $neubotd_log && \ rm -f $pidfile } run_rc_command "$1" Property changes on: head/net/neubot/files/neubotd.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/neubot/files/patch-Makefile =================================================================== --- head/net/neubot/files/patch-Makefile (revision 289937) +++ head/net/neubot/files/patch-Makefile (revision 289938) @@ -1,11 +1,20 @@ ---- Makefile.orig 2011-10-25 20:20:56.000000000 +0200 -+++ Makefile 2011-11-01 21:08:46.000000000 +0100 -@@ -124,7 +124,7 @@ +--- Makefile.orig 2012-01-23 15:46:31.000000000 +0100 ++++ Makefile 2012-01-28 14:53:37.000000000 +0100 +@@ -125,7 +125,7 @@ # [2] http://bit.ly/ayYyAR (debian.org) # DESTDIR = -SYSCONFDIR = /etc +SYSCONFDIR = $(PREFIX)/etc LOCALSTATEDIR = /var/neubot PREFIX = /usr/local BINDIR = $(PREFIX)/bin +@@ -150,7 +150,7 @@ + $(INSTALL) -d $(DESTDIR)$(MANDIR)/$$DIR; \ + test $$? || exit 1; \ + done +- for FILE in `cd UNIX/man && find . -type f`; do \ ++ for FILE in `cd UNIX/man && find . -type f -a ! -name "*.gz"`; do \ + gzip -9c UNIX/man/$$FILE > UNIX/man/$$FILE.gz; \ + test $$? || exit 1; \ + $(INSTALL) -m644 UNIX/man/$$FILE.gz $(DESTDIR)$(MANDIR)/$$FILE.gz; \ Property changes on: head/net/neubot/files/patch-Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/net/neubot/files/pkg_message.in =================================================================== --- head/net/neubot/files/pkg_message.in (revision 289937) +++ head/net/neubot/files/pkg_message.in (revision 289938) @@ -1,9 +1,12 @@ ============================================================================== Please read the file %%DOCSDIR%%/PRIVACY before using this program. To start the daemon, add the following line to /etc/rc.conf: neubotd_enable="YES" + +When upgrading, don't forget to restart the daemon, in order to migrate its +database if needed. ============================================================================== Property changes on: head/net/neubot/files/pkg_message.in ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/net/neubot/pkg-plist =================================================================== --- head/net/neubot/pkg-plist (revision 289937) +++ head/net/neubot/pkg-plist (revision 289938) @@ -1,229 +1,243 @@ bin/neubot etc/xdg/autostart/neubot.desktop share/applications/neubot.desktop share/icons/hicolor/scalable/apps/neubot.svg %%DATADIR%%/__init__.py %%DATADIR%%/__init__.pyc %%DATADIR%%/agent.py %%DATADIR%%/agent.pyc %%DATADIR%%/api/__init__.py %%DATADIR%%/api/__init__.pyc %%DATADIR%%/api/client.py %%DATADIR%%/api/client.pyc %%DATADIR%%/api/server.py %%DATADIR%%/api/server.pyc %%DATADIR%%/bittorrent/__init__.py %%DATADIR%%/bittorrent/__init__.pyc %%DATADIR%%/bittorrent/bitfield.py %%DATADIR%%/bittorrent/bitfield.pyc %%DATADIR%%/bittorrent/client.py %%DATADIR%%/bittorrent/client.pyc %%DATADIR%%/bittorrent/config.py %%DATADIR%%/bittorrent/config.pyc %%DATADIR%%/bittorrent/estimate.py %%DATADIR%%/bittorrent/estimate.pyc %%DATADIR%%/bittorrent/peer.py %%DATADIR%%/bittorrent/peer.pyc %%DATADIR%%/bittorrent/sched.py %%DATADIR%%/bittorrent/sched.pyc %%DATADIR%%/bittorrent/server.py %%DATADIR%%/bittorrent/server.pyc %%DATADIR%%/bittorrent/stream.py %%DATADIR%%/bittorrent/stream.pyc %%DATADIR%%/compat.py %%DATADIR%%/compat.pyc %%DATADIR%%/config.py %%DATADIR%%/config.pyc %%DATADIR%%/database/__init__.py %%DATADIR%%/database/__init__.pyc %%DATADIR%%/database/_table_utils.py %%DATADIR%%/database/_table_utils.pyc %%DATADIR%%/database/main.py %%DATADIR%%/database/main.pyc %%DATADIR%%/database/migrate.py %%DATADIR%%/database/migrate.pyc %%DATADIR%%/database/table_bittorrent.py %%DATADIR%%/database/table_bittorrent.pyc %%DATADIR%%/database/table_config.py %%DATADIR%%/database/table_config.pyc %%DATADIR%%/database/table_geoloc.py %%DATADIR%%/database/table_geoloc.pyc %%DATADIR%%/database/table_log.py %%DATADIR%%/database/table_log.pyc %%DATADIR%%/database/table_speedtest.py %%DATADIR%%/database/table_speedtest.pyc %%DATADIR%%/debug/__init__.py %%DATADIR%%/debug/__init__.pyc %%DATADIR%%/debug/objgraph.py %%DATADIR%%/debug/objgraph.pyc %%DATADIR%%/http/__init__.py %%DATADIR%%/http/__init__.pyc %%DATADIR%%/http/client.py %%DATADIR%%/http/client.pyc %%DATADIR%%/http/message.py %%DATADIR%%/http/message.pyc %%DATADIR%%/http/server.py %%DATADIR%%/http/server.pyc %%DATADIR%%/http/ssi.py %%DATADIR%%/http/ssi.pyc %%DATADIR%%/http/stream.py %%DATADIR%%/http/stream.pyc %%DATADIR%%/log.py %%DATADIR%%/log.pyc +%%DATADIR%%/log_api.py +%%DATADIR%%/log_api.pyc %%DATADIR%%/main/__init__.py %%DATADIR%%/main/__init__.pyc %%DATADIR%%/main/browser.py %%DATADIR%%/main/browser.pyc %%DATADIR%%/main/common.py %%DATADIR%%/main/common.pyc %%DATADIR%%/main/module.py %%DATADIR%%/main/module.pyc %%DATADIR%%/marshal.py %%DATADIR%%/marshal.pyc %%DATADIR%%/negotiate/__init__.py %%DATADIR%%/negotiate/__init__.pyc %%DATADIR%%/negotiate/server.py %%DATADIR%%/negotiate/server.pyc %%DATADIR%%/negotiate/server_bittorrent.py %%DATADIR%%/negotiate/server_bittorrent.pyc %%DATADIR%%/negotiate/server_speedtest.py %%DATADIR%%/negotiate/server_speedtest.pyc %%DATADIR%%/net/CA.py %%DATADIR%%/net/CA.pyc %%DATADIR%%/net/__init__.py %%DATADIR%%/net/__init__.pyc %%DATADIR%%/net/dns.py %%DATADIR%%/net/dns.pyc %%DATADIR%%/net/poller.py %%DATADIR%%/net/poller.pyc %%DATADIR%%/net/stream.py %%DATADIR%%/net/stream.pyc %%DATADIR%%/notifier/__init__.py %%DATADIR%%/notifier/__init__.pyc +%%DATADIR%%/notifier/macos.py +%%DATADIR%%/notifier/macos.pyc %%DATADIR%%/notifier/unix.py %%DATADIR%%/notifier/unix.pyc %%DATADIR%%/notify.py %%DATADIR%%/notify.pyc %%DATADIR%%/privacy.py %%DATADIR%%/privacy.pyc %%DATADIR%%/rendezvous/__init__.py %%DATADIR%%/rendezvous/__init__.pyc %%DATADIR%%/rendezvous/client.py %%DATADIR%%/rendezvous/client.pyc %%DATADIR%%/rendezvous/compat.py %%DATADIR%%/rendezvous/compat.pyc %%DATADIR%%/rendezvous/geoip_wrapper.py %%DATADIR%%/rendezvous/geoip_wrapper.pyc %%DATADIR%%/rendezvous/server.py %%DATADIR%%/rendezvous/server.pyc %%DATADIR%%/rootdir.py %%DATADIR%%/rootdir.pyc +%%DATADIR%%/runner_api.py +%%DATADIR%%/runner_api.pyc +%%DATADIR%%/runner_clnt.py +%%DATADIR%%/runner_clnt.pyc +%%DATADIR%%/runner_core.py +%%DATADIR%%/runner_core.pyc +%%DATADIR%%/runner_lst.py +%%DATADIR%%/runner_lst.pyc +%%DATADIR%%/runner_rendezvous.py +%%DATADIR%%/runner_rendezvous.pyc %%DATADIR%%/server.py %%DATADIR%%/server.pyc %%DATADIR%%/simplejson/__init__.py %%DATADIR%%/simplejson/__init__.pyc %%DATADIR%%/simplejson/decoder.py %%DATADIR%%/simplejson/decoder.pyc %%DATADIR%%/simplejson/encoder.py %%DATADIR%%/simplejson/encoder.pyc %%DATADIR%%/simplejson/ordered_dict.py %%DATADIR%%/simplejson/ordered_dict.pyc %%DATADIR%%/simplejson/scanner.py %%DATADIR%%/simplejson/scanner.pyc %%DATADIR%%/speedtest/__init__.py %%DATADIR%%/speedtest/__init__.pyc %%DATADIR%%/speedtest/client.py %%DATADIR%%/speedtest/client.pyc %%DATADIR%%/speedtest/server.py %%DATADIR%%/speedtest/server.pyc %%DATADIR%%/speedtest/wrapper.py %%DATADIR%%/speedtest/wrapper.pyc %%DATADIR%%/state.py %%DATADIR%%/state.pyc %%DATADIR%%/system/__init__.py %%DATADIR%%/system/__init__.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%%/updater/unix.py %%DATADIR%%/updater/unix.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%%/viewer/__init__.py %%DATADIR%%/viewer/__init__.pyc %%DATADIR%%/viewer/unix.py %%DATADIR%%/viewer/unix.pyc %%DATADIR%%/www/bittorrent.html %%DATADIR%%/www/css/jquery.jqplot.css %%DATADIR%%/www/css/style.css %%DATADIR%%/www/favicon.ico %%DATADIR%%/www/footer.html %%DATADIR%%/www/header.html %%DATADIR%%/www/img/header-web.png %%DATADIR%%/www/index.html %%DATADIR%%/www/js/bittorrent.js %%DATADIR%%/www/js/contrib.js %%DATADIR%%/www/js/excanvas.min.js %%DATADIR%%/www/js/i18n.js %%DATADIR%%/www/js/index.js %%DATADIR%%/www/js/jqplot.canvasAxisTickRenderer.min.js %%DATADIR%%/www/js/jqplot.canvasTextRenderer.min.js %%DATADIR%%/www/js/jqplot.categoryAxisRenderer.min.js %%DATADIR%%/www/js/jqplot.cursor.min.js %%DATADIR%%/www/js/jqplot.dateAxisRenderer.min.js %%DATADIR%%/www/js/jqplot.highlighter.min.js %%DATADIR%%/www/js/jquery-ui.min.js %%DATADIR%%/www/js/jquery.jqplot.min.js %%DATADIR%%/www/js/jquery.min.js %%DATADIR%%/www/js/jquery.qtip.min.js %%DATADIR%%/www/js/log.js %%DATADIR%%/www/js/privacy.js %%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%%/viewer @dirrm %%DATADIR%%/utils @dirrm %%DATADIR%%/updater @dirrm %%DATADIR%%/system @dirrm %%DATADIR%%/speedtest @dirrm %%DATADIR%%/simplejson @dirrm %%DATADIR%%/rendezvous @dirrm %%DATADIR%%/notifier @dirrm %%DATADIR%%/net @dirrm %%DATADIR%%/negotiate @dirrm %%DATADIR%%/main @dirrm %%DATADIR%%/http @dirrm %%DATADIR%%/debug @dirrm %%DATADIR%%/database @dirrm %%DATADIR%%/bittorrent @dirrm %%DATADIR%%/api @dirrm %%DATADIR%% @dirrmtry etc/xdg/autostart @dirrmtry etc/xdg @dirrmtry share/applications @dirrmtry share/icons/hicolor/scalable/apps @dirrmtry share/icons/hicolor/scalable @dirrmtry share/icons/hicolor @dirrmtry share/icons Property changes on: head/net/neubot/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property