-Update to 0.3.9a, should be fix with Python 2.4.x.

-Fix the CONFLICTS for not get in conflicts with itself.
-Remove the manpages from FILESDIR, those have been added in the tarball.
-Make portlint a bit happier man.

PR:		ports/75191
Submitted by:	Janos Mohacsi <janos.mohacsi@bsd.hu> (maintainer)

19 files changed, 43 insertions, 1911 deletions

diff --git a/net/py-bittornado/Makefile b/net/py-bittornado/Makefile
index 5e41de8e735f..65367ea8f66d 100644
--- a/net/py-bittornado/Makefile
+++ b/net/py-bittornado/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	BitTornado
-PORTVERSION=	0.3.7
-PORTREVISION=	2
+PORTVERSION=	0.3.9a
 PORTEPOCH=	1
 CATEGORIES?=	net python ipv6
-MASTER_SITES=	http://e.scarywater.net/bt/download/ \
+MASTER_SITES=	http://www.bittornado.com/download/ \
+		http://e.scarywater.net/bt/download/ \
 		http://mediahost.inetsalestech.com/shadow/ \
 		http://www.hypermax.net.au/~gamr/ \
 		http://ftp.acc.umu.se/mirror/bittornado/
@@ -19,23 +19,23 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT?=	An extended BitTorrent peer-to-peer tool for distributing files
 
-CONFLICTS=	py??-*[Bb]it[Tt]ornado* py??-*[Bb]it[Tt]orrent* btqueue*
+CONFLICTS=	py??-*[Bb]it[Tt]ornado-core-[0-9]* py??-*[Bb]it[Tt]orrent*-[0-9]* btqueue-[0-9]*
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 USE_REINPLACE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-CVS
 
-DOC_FILES=	BUILD.windows.txt FAQ.txt IMPORTANT-multitracker-readme.txt \
-		INSTALL.unix.txt LICENSE.txt README.txt \
-		README-experimental.txt credits.txt multitracker-spec.txt \
-		README-Psyco.txt todo.txt webseed-spec.txt
+DOC_FILES1=	BUILD.windows.txt FAQ.txt IMPORTANT-multitracker-readme.txt \
+		INSTALL.unix.txt credits.txt multitracker-spec.txt \
+		README-Psyco.txt webseed-spec.txt
+DOC_FILES2=	LICENSE.txt README.txt
 EXTRA_DOC_FILES=	multitracker/README.txt
 MAN1=		bittorrent-downloader.1 bittorrent-multi-downloader.1 \
 		btcompletedir.1 btcopyannounce.1 btdownloadcurses.1 \
-		btdownloadheadless.1 btlaunchmany.1 btlaunchmanycurses.1 \
-		btmakemetafile.1 btreannounce.1 btrename.1 btsethttpseeds.1 \
-		btshowmetainfo.1 bttrack.1
+		btdownloadgui.1 btdownloadheadless.1 btlaunchmany.1 \
+		btlaunchmanycurses.1 btmakemetafile.1 btreannounce.1 \
+		btrename.1 btsethttpseeds.1 btshowmetainfo.1 bttrack.1
 
 # required for GUI
 .ifndef(WITHOUT_GUI)
@@ -74,18 +74,21 @@ pre-everything::
 post-install:
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in ${DOC_FILES}
+.for file in ${DOC_FILES1}
+	@${INSTALL_DATA} ${WRKSRC}/docs/${file} ${DOCSDIR}
+.endfor
+.for file in ${DOC_FILES2}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .for file in ${EXTRA_DOC_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}/`${ECHO} ${file} | ${SED} -e 's|/|_|g'`
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}/`${ECHO} ${file} | ${SED} -e 's|/|_|g'`
 .endfor
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${FILESDIR}/bittornado.sh.sample ${EXAMPLESDIR}
+	@${MKDIR} ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${FILESDIR}/bittornado.sh.sample ${EXAMPLESDIR}
 .endif
 .ifndef(NO_INSTALL_MANPAGES)
 .for file in ${MAN1}
-	${INSTALL_MAN} ${FILESDIR}/${file} ${PREFIX}/man/man1
+	@${INSTALL_MAN} ${WRKSRC}/docs/man/${file} ${PREFIX}/man/man1
 .endfor
 .endif
 
diff --git a/net/py-bittornado/distinfo b/net/py-bittornado/distinfo
index 78835ffa61bf..a7151cf082c9 100644
--- a/net/py-bittornado/distinfo
+++ b/net/py-bittornado/distinfo
@@ -1,2 +1,2 @@
-MD5 (BitTornado-0.3.7.tar.gz) = ffeccfa4ee6a5732ea036332ccf34e92
-SIZE (BitTornado-0.3.7.tar.gz) = 176879
+MD5 (BitTornado-0.3.9a.tar.gz) = 8a3973b01bfc6b1d7b001e2e5c5ca53a
+SIZE (BitTornado-0.3.9a.tar.gz) = 185847
diff --git a/net/py-bittornado/files/bittorrent-downloader.1 b/net/py-bittornado/files/bittorrent-downloader.1
deleted file mode 100644
index 5ca148392cb3..000000000000
--- a/net/py-bittornado/files/bittorrent-downloader.1
+++ /dev/null
@@ -1,125 +0,0 @@
-.TH "BITTORRENT-DOWNLOADER" 1 "Sep 24 2003"
-.SH NAME
-bittorrent-downloader \- download files using a scatter-gather network
-.SH SYNOPSIS
-.nf
-.B btdownloadheadless [ option ... ] \fIURL\fB
-.B btdownloadheadless [ option ... ] \fIfilename\fB
-.B btdownloadcurses   [ option ... ] \fIURL\fB
-.B btdownloadcurses   [ option ... ] \fIfilename\fB
-.B btdownloadgui      [ option ... ] \fIURL\fB
-.B btdownloadgui      [ option ... ] \fIfilename\fB
-.fi
-.br
-.B 
-.SH DESCRIPTION
-This manual page documents briefly the \fBbtdownloadheadless\fP,
-\fBbtdownloadcurses\fP, and \fBbtdownloadgui\fP commands.
-.PP
-These are all programs that allow a user to download files using
-bittorrent, a peer to peer, scatter-gather network protocol.
-They all have the same options.
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B \-\-responsefile \fIfilename\fP
-treat \fIfilename\fP as a file which the server reponse was stored in. If this
-option is used, no filename or URL should be present on the command line.
-.TP
-.B \-\-url \fIurl\fP
-retrieve the torrent info file from \fIurl\fP.  If this option is used, no
-filename or URL should be present on the command line.
-.TP
-.B \-i \fIip\fP | \-\-ip \fIip\fP
-report \fIip\fP as your IP to the tracker
-.TP
-.B \-\-bind \fIip\fP
-bind to \fIip\fP instead of the default
-.TP
-.B \-\-minport \fIportnum\fP
-set \fIportnum\fP as the minimum port to listen on, counts up if unavailable (default 6881)
-.TP
-.B \-\-maxport \fIportnum\fP
-set \fIportnum\fP as the maximum port to listen on (default 6889)
-.TP
-.B \-\-saveas \fIfilename\fP
-store the downloaded file to \fIfilename\fP, instead of querying user (gui) or 
-using the filename stored in the torrent info file
-.TP
-.B \-\-max_uploads \fInum\fP
-Only allow \fInum\fP uploads at once (default 4)
-.TP 
-.B \-\-max_upload_rate \fIkbytes\fP
-maximum rate to upload at in kilobytes, 0 means no limit (default 0)
-.TP
-.B \-\-keepalive_interval \fIsecs\fP
-pause \fIsecs\fP seconds between sending keepalives (default 120.0)
-.TP
-.B \-\-download_slice_size \fIbytes\fP
-query for \fIbytes\fP bytes per request (default 32768)
-.TP
-.B \-\-request_backlog \fInum\fP
-keep \fInum\fP requests in a single pipe at once (default 5)
-.TP
-.B \-\-max_message_length \fIbytes\fP
-set \fIbytes\fP to the maximum length prefix encoding you'll accept over the wire - larger values get the connection dropped (default 8388608)
-.TP
-.B \-\-timeout \fIsecs\fP
-wait \fIsecs\fP before closing sockets which nothing has been recieved on (default 300.0)
-.TP
-.B \-\-timeout_check_interval \fIsecs\fP
-check whether connections have timed out every \fIsecs\fP seconds (default 60.0)
-.TP
-.B \-\-max_slice_length \fIbytes\fP
-requests from peers larger than \fIbytes\fP bytes are ignored (default 131072)
-.TP
-.B \-\-max_rate_recalculate_interval \fIsecs\fP
-connections that pause longer than \fIsecs\fP seconds are given reduced rate (default 15.0)
-.TP
-.B \-\-max_rate_period \fIsecs\fP
-set \fIsecs\fP to the maximum amount of time to guess the current rate estimate represents (default 20.0)
-.TP
-.B \-\-upload_rate_fudge \fIsecs\fP
-set the time equivalent of writing to kernel-level TCP buffer to \fIsecs\fP (default 5.0)
-.TP
-.B \-\-display_interval \fIsecs\fP
-update displayed information every \fIsecs\fP seconds (default 0.1)
-.TP
-.B \-\-rerequest_interval \fIsecs\fP
-request more peers every \fIsecs\fP seconds (default 300)
-.TP
-.B \-\-min_peers \fInum\fP
-do not rerequest if we have \fInum\fP peers already (default 20)
-.TP
-.B \-\-http_timeout \fIsecs\fP
-wait \fIsecs\fP seconds before assuming a http connection has timed out (default 60)
-.TP
-.B \-\-snub_time \fIsecs\fP
-wait \fIsecs\fP seconds for data to come in over a connection before assuming it's semi-permanently choked (default 30.0)
-.TP
-.B \-\-spew \fI 1 | 0 \fP
-whether to display diagnostic info to stdout.  This option is not useful when
-using btdownloadcurses or btdownloadgui. (default 0)
-.B \-\-max_initiate \fInum\fP
-stop initiating new connections when we have \fInum\fP peers (default 40)
-.TP
-.B \-\-check_hashes \fI 1 | 0 \fP
-whether to check hashes on disk (defaults to 1)
-.TP
-.B \-\-report_hash_failures \fI 1 | 0 \fP
-whether to report to the user that hash failuers occur (non-fatal, common error) (default 0)
-.TP 
-.B \-\-rarest_first_priority_cutoff \fInum\fP
-the number of peers which need to have a piece before other partials take
-priority over rarest first (default 3)
-
-.SH SEE ALSO
-.BR bttrack (1),
-.BR btmakemetafile (1),
-.BR btlaunchmany (1).
-.br
-.SH AUTHOR
-This manual page was written by Michael Janssen <jamuraa@debian.org>,
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/net/py-bittornado/files/bittorrent-multi-downloader.1 b/net/py-bittornado/files/bittorrent-multi-downloader.1
deleted file mode 100644
index 0025e2e9ad1d..000000000000
--- a/net/py-bittornado/files/bittorrent-multi-downloader.1
+++ /dev/null
@@ -1,29 +0,0 @@
-.TH "BITTORRENT-MULTI-DOWNLOADER" 1 "Jan 18 2003"
-.SH NAME
-bittorrent-multi-downloader \- multiple file clients for bittorrent
-.SH SYNOPSIS
-.nf
-.B btlaunchmany \fIdirname\fP [ option ... ]
-.B btlaunchmanycurses \fIdirname\fP [ option ... ]
-.fi
-.SH DESCRIPTION
-This manual page documents briefly the \fBbtlaunchmany\fP and 
-\fBbtlaunchmanycurses\fP commands.
-.PP
-\fBbtlaunchmany\fP is a program that eases the use of 
-bittorrent in multiple-downloader situations.  The program checks
-a directory for torrent files.  When it finds any, it starts a 
-separate downloader thread for each file.
-.SH OPTIONS
-
-These programs have the exact same options as the normal 
-downloaders, which are documented in \fBbittorrent-downloader\fP(1).
-
-.SH SEE ALSO
-.BR bittorrent-downloader (1),
-.BR btmakemetafile (1),
-.BR bttrack (1).
-.br
-.SH AUTHOR
-This manual page was written by Michael Janssen <jamuraa@debian.org>,
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/net/py-bittornado/files/btcompletedir.1 b/net/py-bittornado/files/btcompletedir.1
deleted file mode 100644
index 1e6afe007b7f..000000000000
--- a/net/py-bittornado/files/btcompletedir.1
+++ /dev/null
@@ -1,95 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH BTCOMPLETEDIR "1" "May 2004" "btcompletedir" "User Commands"
-.SH NAME
-btcompletedir \- manual page for btcompletedir 
-.SH SYNOPSIS
-.B btcompletedir
-\fI<trackerurl> <dir> \fR[\fIdir\fR...] [\fIparams\fR...]
-.SH DESCRIPTION
-makes a .torrent file for every file or directory present in each dir.
-.PP
-\fB\-\-announce_list\fR <arg>
-.IP
-a list of announce URLs - explained below (defaults to '')
-.PP
-\fB\-\-piece_size_pow2\fR <arg>
-.IP
-which power of 2 to set the piece size to (0 = automatic) (defaults
-to 0)
-.PP
-\fB\-\-comment\fR <arg>
-.IP
-optional human-readable comment to put in .torrent (defaults to '')
-.PP
-\fB\-\-target\fR <arg>
-.IP
-optional target file for the torrent (defaults to '')
-.IP
-announce_list = optional list of redundant/backup tracker URLs, in the format:
-.IP
-url[,url...][|url[,url...]...]
-.IP
-where URLs separated by commas are all tried first
-before the next group of URLs separated by the pipe is checked.
-If none is given, it is assumed you don't want one in the metafile.
-If announce_list is given, clients which support it
-will ignore the <announce> value.
-.IP
-Examples:
-.IP
-http://tracker1.com|http://tracker2.com|http://tracker3.com
-.IP
-(tries trackers 1-3 in order)
-.IP
-http://tracker1.com,http://tracker2.com,http://tracker3.com
-.IP
-(tries trackers 1-3 in a randomly selected order)
-.IP
-http://tracker1.com|http://backup1.com,http://backup2.com
-.IP
-(tries tracker 1 first, then tries between the 2 backups randomly)
-.PP
-makes a .torrent file for every file or directory present in each dir.
-.PP
-\fB\-\-announce_list\fR <arg>
-.IP
-a list of announce URLs - explained below (defaults to '')
-.PP
-\fB\-\-piece_size_pow2\fR <arg>
-.IP
-which power of 2 to set the piece size to (0 = automatic) (defaults
-to 0)
-.PP
-\fB\-\-comment\fR <arg>
-.IP
-optional human-readable comment to put in .torrent (defaults to '')
-.PP
-\fB\-\-target\fR <arg>
-.IP
-optional target file for the torrent (defaults to '')
-.IP
-announce_list = optional list of redundant/backup tracker URLs, in the format:
-.IP
-url[,url...][|url[,url...]...]
-.IP
-where URLs separated by commas are all tried first
-before the next group of URLs separated by the pipe is checked.
-If none is given, it is assumed you don't want one in the metafile.
-If announce_list is given, clients which support it
-will ignore the <announce> value.
-.IP
-Examples:
-.IP
-http://tracker1.com|http://tracker2.com|http://tracker3.com
-.IP
-(tries trackers 1-3 in order)
-.IP
-http://tracker1.com,http://tracker2.com,http://tracker3.com
-.IP
-(tries trackers 1-3 in a randomly selected order)
-.IP
-http://tracker1.com|http://backup1.com,http://backup2.com
-.IP
-(tries tracker 1 first, then tries between the 2 backups randomly)
-.SH "SEE ALSO"
-http://bittornado.org
diff --git a/net/py-bittornado/files/btcopyannounce.1 b/net/py-bittornado/files/btcopyannounce.1
deleted file mode 100644
index a5a66b79a1b1..000000000000
--- a/net/py-bittornado/files/btcopyannounce.1
+++ /dev/null
@@ -1,13 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH BTCOPYANNOUNCE "1" "May 2004" "btcopyannounce" "User Commands"
-.SH NAME
-Btcopyannounce \- manual page for btcopyannounce
-.SH SYNOPSIS
-.B btcopyannounce
-\fI<source.torrent> <file1.torrent> \fR[\fIfile2.torrent\fR...]
-.SH DESCRIPTION
-copies announce information from source to all specified torrents
-.PP
-copies announce information from source to all specified torrents
-.SH "SEE ALSO"
-http://bittornado.org
diff --git a/net/py-bittornado/files/btdownloadcurses.1 b/net/py-bittornado/files/btdownloadcurses.1
deleted file mode 100644
index 9df6e66ccf0c..000000000000
--- a/net/py-bittornado/files/btdownloadcurses.1
+++ /dev/null
@@ -1,477 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH BTDOWNLOADCURSES "1" "August 2004" "btdownloadcurses (bittornado)" "User Commands"
-.SH NAME
-Btdownloadcurses \- curses bittornado download interface
-.SH SYNOPSIS
-.B btdownloadcurses
-\fI<global options>\fR
-.SH DESCRIPTION
-Arguments are:
-.PP
-\fB\-\-max_uploads\fR <arg>
-.IP
-the maximum number of uploads to allow at once. (defaults to 7)
-.PP
-\fB\-\-keepalive_interval\fR <arg>
-.IP
-number of seconds to pause between sending keepalives (defaults to 120.0)
-.PP
-\fB\-\-download_slice_size\fR <arg>
-.IP
-How many bytes to query for per request. (defaults to 16384)
-.PP
-\fB\-\-upload_unit_size\fR <arg>
-.IP
-when limiting upload rate, how many bytes to send at a time (defaults to 1460)
-.PP
-\fB\-\-request_backlog\fR <arg>
-.IP
-maximum number of requests to keep in a single pipe at once. (defaults to 10)
-.PP
-\fB\-\-max_message_length\fR <arg>
-.IP
-maximum length prefix encoding you'll accept over the wire - larger values get the
-connection dropped. (defaults to 8388608)
-.PP
-\fB\-\-ip\fR <arg>
-.IP
-ip to report you have to the tracker. (defaults to '')
-.PP
-\fB\-\-minport\fR <arg>
-.IP
-minimum port to listen on, counts up if unavailable (defaults to 10000)
-.PP
-\fB\-\-maxport\fR <arg>
-.IP
-maximum port to listen on (defaults to 60000)
-.PP
-\fB\-\-random_port\fR <arg>
-.IP
-whether to choose randomly inside the port range instead of counting up linearly
-(defaults to 1)
-.PP
-\fB\-\-responsefile\fR <arg>
-.IP
-file the server response was stored in, alternative to url (defaults to '')
-.PP
-\fB\-\-url\fR <arg>
-.IP
-url to get file from, alternative to responsefile (defaults to '')
-.PP
-\fB\-\-selector_enabled\fR <arg>
-.IP
-whether to enable the file selector and fast resume function (defaults to 1)
-.PP
-\fB\-\-expire_cache_data\fR <arg>
-.IP
-the number of days after which you wish to expire old cache data (0 = disabled) (defaults
-to 10)
-.PP
-\fB\-\-priority\fR <arg>
-.IP
-a list of file priorities separated by commas, must be one per file, 0 = highest, 1 =
-normal, 2 = lowest, \fB\-1\fR = download disabled (defaults to '')
-.PP
-\fB\-\-saveas\fR <arg>
-.IP
-local file name to save the file as, null indicates query user (defaults to '')
-.PP
-\fB\-\-timeout\fR <arg>
-.IP
-time to wait between closing sockets which nothing has been received on (defaults to
-300.0)
-.PP
-\fB\-\-timeout_check_interval\fR <arg>
-.IP
-time to wait between checking if any connections have timed out (defaults to 60.0)
-.PP
-\fB\-\-max_slice_length\fR <arg>
-.IP
-maximum length slice to send to peers, larger requests are ignored (defaults to 131072)
-.PP
-\fB\-\-max_rate_period\fR <arg>
-.IP
-maximum amount of time to guess the current rate estimate represents (defaults to 20.0)
-.PP
-\fB\-\-bind\fR <arg>
-.IP
-comma-separated list of ips/hostnames to bind to locally (defaults to '')
-.PP
-\fB\-\-ipv6_enabled\fR <arg>
-.IP
-allow the client to connect to peers via IPv6 (defaults to 0)
-.PP
-\fB\-\-ipv6_binds_v4\fR <arg>
-.IP
-set if an IPv6 server socket will also field IPv4 connections (defaults to 1)
-.PP
-\fB\-\-upnp_nat_access\fR <arg>
-.IP
-attempt to autoconfigure a UPnP router to forward a server port (0 = disabled, 1 = mode 1
-[fast], 2 = mode 2 [slow]) (defaults to 1)
-.PP
-\fB\-\-upload_rate_fudge\fR <arg>
-.IP
-time equivalent of writing to kernel-level TCP buffer, for rate adjustment (defaults to
-5.0)
-.PP
-\fB\-\-tcp_ack_fudge\fR <arg>
-.IP
-how much TCP ACK download overhead to add to upload rate calculations (0 = disabled)
-(defaults to 0.029999999999999999)
-.PP
-\fB\-\-display_interval\fR <arg>
-.IP
-time between updates of displayed information (defaults to 0.5)
-.PP
-\fB\-\-rerequest_interval\fR <arg>
-.IP
-time to wait between requesting more peers (defaults to 300)
-.PP
-\fB\-\-min_peers\fR <arg>
-.IP
-minimum number of peers to not do rerequesting (defaults to 20)
-.PP
-\fB\-\-http_timeout\fR <arg>
-.IP
-number of seconds to wait before assuming that an http connection has timed out (defaults
-to 60)
-.PP
-\fB\-\-max_initiate\fR <arg>
-.IP
-number of peers at which to stop initiating new connections (defaults to 40)
-.PP
-\fB\-\-check_hashes\fR <arg>
-.IP
-whether to check hashes on disk (defaults to 1)
-.PP
-\fB\-\-max_upload_rate\fR <arg>
-.IP
-maximum kB/s to upload at (0 = no limit, \fB\-1\fR = automatic) (defaults to 0)
-.PP
-\fB\-\-max_download_rate\fR <arg>
-.IP
-maximum kB/s to download at (0 = no limit) (defaults to 0)
-.PP
-\fB\-\-alloc_type\fR <arg>
-.IP
-allocation type (may be normal, background, pre-allocate or sparse) (defaults to
-\&'normal')
-.PP
-\fB\-\-alloc_rate\fR <arg>
-.IP
-rate (in MiB/s) to allocate space at using background allocation (defaults to 2.0)
-.PP
-\fB\-\-buffer_reads\fR <arg>
-.IP
-whether to buffer disk reads (defaults to 1)
-.PP
-\fB\-\-write_buffer_size\fR <arg>
-.IP
-the maximum amount of space to use for buffering disk writes (in megabytes, 0 = disabled)
-(defaults to 4)
-.PP
-\fB\-\-snub_time\fR <arg>
-.IP
-seconds to wait for data to come in over a connection before assuming it's
-semi-permanently choked (defaults to 30.0)
-.PP
-\fB\-\-spew\fR <arg>
-.IP
-whether to display diagnostic info to stdout (defaults to 0)
-.PP
-\fB\-\-rarest_first_cutoff\fR <arg>
-.IP
-number of downloads at which to switch from random to rarest first (defaults to 2)
-.PP
-\fB\-\-rarest_first_priority_cutoff\fR <arg>
-.IP
-the number of peers which need to have a piece before other partials take priority over
-rarest first (defaults to 5)
-.PP
-\fB\-\-min_uploads\fR <arg>
-.IP
-the number of uploads to fill out to with extra optimistic unchokes (defaults to 4)
-.PP
-\fB\-\-max_files_open\fR <arg>
-.IP
-the maximum number of files to keep open at a time, 0 means no limit (defaults to 50)
-.PP
-\fB\-\-round_robin_period\fR <arg>
-.IP
-the number of seconds between the client's switching upload targets (defaults to 30)
-.PP
-\fB\-\-super_seeder\fR <arg>
-.IP
-whether to use special upload-efficiency-maximizing routines (only for dedicated seeds)
-(defaults to 0)
-.PP
-\fB\-\-security\fR <arg>
-.IP
-whether to enable extra security features intended to prevent abuse (defaults to 1)
-.PP
-\fB\-\-max_connections\fR <arg>
-.IP
-the absolute maximum number of peers to connect with (0 = no limit) (defaults to 0)
-.PP
-\fB\-\-auto_kick\fR <arg>
-.IP
-whether to allow the client to automatically kick/ban peers that send bad data (defaults
-to 1)
-.PP
-\fB\-\-double_check\fR <arg>
-.IP
-whether to double-check data being written to the disk for errors (may increase CPU load)
-(defaults to 1)
-.PP
-\fB\-\-triple_check\fR <arg>
-.IP
-whether to thoroughly check data being written to the disk (may slow disk access)
-(defaults to 0)
-.PP
-\fB\-\-lock_files\fR <arg>
-.IP
-whether to lock files the client is working with (defaults to 1)
-.PP
-\fB\-\-lock_while_reading\fR <arg>
-.IP
-whether to lock access to files being read (defaults to 0)
-.PP
-\fB\-\-auto_flush\fR <arg>
-.IP
-minutes between automatic flushes to disk (0 = disabled) (defaults to 0)
-.PP
-Arguments are:
-.PP
-\fB\-\-max_uploads\fR <arg>
-.IP
-the maximum number of uploads to allow at once. (defaults to 7)
-.PP
-\fB\-\-keepalive_interval\fR <arg>
-.IP
-number of seconds to pause between sending keepalives (defaults to 120.0)
-.PP
-\fB\-\-download_slice_size\fR <arg>
-.IP
-How many bytes to query for per request. (defaults to 16384)
-.PP
-\fB\-\-upload_unit_size\fR <arg>
-.IP
-when limiting upload rate, how many bytes to send at a time (defaults to 1460)
-.PP
-\fB\-\-request_backlog\fR <arg>
-.IP
-maximum number of requests to keep in a single pipe at once. (defaults to 10)
-.PP
-\fB\-\-max_message_length\fR <arg>
-.IP
-maximum length prefix encoding you'll accept over the wire - larger values get the
-connection dropped. (defaults to 8388608)
-.PP
-\fB\-\-ip\fR <arg>
-.IP
-ip to report you have to the tracker. (defaults to '')
-.PP
-\fB\-\-minport\fR <arg>
-.IP
-minimum port to listen on, counts up if unavailable (defaults to 10000)
-.PP
-\fB\-\-maxport\fR <arg>
-.IP
-maximum port to listen on (defaults to 60000)
-.PP
-\fB\-\-random_port\fR <arg>
-.IP
-whether to choose randomly inside the port range instead of counting up linearly
-(defaults to 1)
-.PP
-\fB\-\-responsefile\fR <arg>
-.IP
-file the server response was stored in, alternative to url (defaults to '')
-.PP
-\fB\-\-url\fR <arg>
-.IP
-url to get file from, alternative to responsefile (defaults to '')
-.PP
-\fB\-\-selector_enabled\fR <arg>
-.IP
-whether to enable the file selector and fast resume function (defaults to 1)
-.PP
-\fB\-\-expire_cache_data\fR <arg>
-.IP
-the number of days after which you wish to expire old cache data (0 = disabled) (defaults
-to 10)
-.PP
-\fB\-\-priority\fR <arg>
-.IP
-a list of file priorities separated by commas, must be one per file, 0 = highest, 1 =
-normal, 2 = lowest, \fB\-1\fR = download disabled (defaults to '')
-.PP
-\fB\-\-saveas\fR <arg>
-.IP
-local file name to save the file as, null indicates query user (defaults to '')
-.PP
-\fB\-\-timeout\fR <arg>
-.IP
-time to wait between closing sockets which nothing has been received on (defaults to
-300.0)
-.PP
-\fB\-\-timeout_check_interval\fR <arg>
-.IP
-time to wait between checking if any connections have timed out (defaults to 60.0)
-.PP
-\fB\-\-max_slice_length\fR <arg>
-.IP
-maximum length slice to send to peers, larger requests are ignored (defaults to 131072)
-.PP
-\fB\-\-max_rate_period\fR <arg>
-.IP
-maximum amount of time to guess the current rate estimate represents (defaults to 20.0)
-.PP
-\fB\-\-bind\fR <arg>
-.IP
-comma-separated list of ips/hostnames to bind to locally (defaults to '')
-.PP
-\fB\-\-ipv6_enabled\fR <arg>
-.IP
-allow the client to connect to peers via IPv6 (defaults to 0)
-.PP
-\fB\-\-ipv6_binds_v4\fR <arg>
-.IP
-set if an IPv6 server socket will also field IPv4 connections (defaults to 1)
-.PP
-\fB\-\-upnp_nat_access\fR <arg>
-.IP
-attempt to autoconfigure a UPnP router to forward a server port (0 = disabled, 1 = mode 1
-[fast], 2 = mode 2 [slow]) (defaults to 1)
-.PP
-\fB\-\-upload_rate_fudge\fR <arg>
-.IP
-time equivalent of writing to kernel-level TCP buffer, for rate adjustment (defaults to
-5.0)
-.PP
-\fB\-\-tcp_ack_fudge\fR <arg>
-.IP
-how much TCP ACK download overhead to add to upload rate calculations (0 = disabled)
-(defaults to 0.029999999999999999)
-.PP
-\fB\-\-display_interval\fR <arg>
-.IP
-time between updates of displayed information (defaults to 0.5)
-.PP
-\fB\-\-rerequest_interval\fR <arg>
-.IP
-time to wait between requesting more peers (defaults to 300)
-.PP
-\fB\-\-min_peers\fR <arg>
-.IP
-minimum number of peers to not do rerequesting (defaults to 20)
-.PP
-\fB\-\-http_timeout\fR <arg>
-.IP
-number of seconds to wait before assuming that an http connection has timed out (defaults
-to 60)
-.PP
-\fB\-\-max_initiate\fR <arg>
-.IP
-number of peers at which to stop initiating new connections (defaults to 40)
-.PP
-\fB\-\-check_hashes\fR <arg>
-.IP
-whether to check hashes on disk (defaults to 1)
-.PP
-\fB\-\-max_upload_rate\fR <arg>
-.IP
-maximum kB/s to upload at (0 = no limit, \fB\-1\fR = automatic) (defaults to 0)
-.PP
-\fB\-\-max_download_rate\fR <arg>
-.IP
-maximum kB/s to download at (0 = no limit) (defaults to 0)
-.PP
-\fB\-\-alloc_type\fR <arg>
-.IP
-allocation type (may be normal, background, pre-allocate or sparse) (defaults to
-\&'normal')
-.PP
-\fB\-\-alloc_rate\fR <arg>
-.IP
-rate (in MiB/s) to allocate space at using background allocation (defaults to 2.0)
-.PP
-\fB\-\-buffer_reads\fR <arg>
-.IP
-whether to buffer disk reads (defaults to 1)
-.PP
-\fB\-\-write_buffer_size\fR <arg>
-.IP
-the maximum amount of space to use for buffering disk writes (in megabytes, 0 = disabled)
-(defaults to 4)
-.PP
-\fB\-\-snub_time\fR <arg>
-.IP
-seconds to wait for data to come in over a connection before assuming it's
-semi-permanently choked (defaults to 30.0)
-.PP
-\fB\-\-spew\fR <arg>
-.IP
-whether to display diagnostic info to stdout (defaults to 0)
-.PP
-\fB\-\-rarest_first_cutoff\fR <arg>
-.IP
-number of downloads at which to switch from random to rarest first (defaults to 2)
-.PP
-\fB\-\-rarest_first_priority_cutoff\fR <arg>
-.IP
-the number of peers which need to have a piece before other partials take priority over
-rarest first (defaults to 5)
-.PP
-\fB\-\-min_uploads\fR <arg>
-.IP
-the number of uploads to fill out to with extra optimistic unchokes (defaults to 4)
-.PP
-\fB\-\-max_files_open\fR <arg>
-.IP
-the maximum number of files to keep open at a time, 0 means no limit (defaults to 50)
-.PP
-\fB\-\-round_robin_period\fR <arg>
-.IP
-the number of seconds between the client's switching upload targets (defaults to 30)
-.PP
-\fB\-\-super_seeder\fR <arg>
-.IP
-whether to use special upload-efficiency-maximizing routines (only for dedicated seeds)
-(defaults to 0)
-.PP
-\fB\-\-security\fR <arg>
-.IP
-whether to enable extra security features intended to prevent abuse (defaults to 1)
-.PP
-\fB\-\-max_connections\fR <arg>
-.IP
-the absolute maximum number of peers to connect with (0 = no limit) (defaults to 0)
-.PP
-\fB\-\-auto_kick\fR <arg>
-.IP
-whether to allow the client to automatically kick/ban peers that send bad data (defaults
-to 1)
-.PP
-\fB\-\-double_check\fR <arg>
-.IP
-whether to double-check data being written to the disk for errors (may increase CPU load)
-(defaults to 1)
-.PP
-\fB\-\-triple_check\fR <arg>
-.IP
-whether to thoroughly check data being written to the disk (may slow disk access)
-(defaults to 0)
-.PP
-\fB\-\-lock_files\fR <arg>
-.IP
-whether to lock files the client is working with (defaults to 1)
-.PP
-\fB\-\-lock_while_reading\fR <arg>
-.IP
-whether to lock access to files being read (defaults to 0)
-.PP
-\fB\-\-auto_flush\fR <arg>
-.IP
-minutes between automatic flushes to disk (0 = disabled) (defaults to 0)
diff --git a/net/py-bittornado/files/btdownloadheadless.1 b/net/py-bittornado/files/btdownloadheadless.1
deleted file mode 100644
index ee6307be8ee3..000000000000
--- a/net/py-bittornado/files/btdownloadheadless.1
+++ /dev/null
@@ -1,268 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH BTDOWNLOADHEADLESS "1" "August 2004" "btdownloadheadless (bittornado)" "User Commands"
-.SH NAME
-btdownloadheadless \- headless bittornado download interface
-.SH DESCRIPTION
-Arguments are:
-.PP
-\fB\-\-max_uploads\fR <arg>
-.IP
-the maximum number of uploads to allow at once. (defaults to 7)
-.PP
-\fB\-\-keepalive_interval\fR <arg>
-.IP
-number of seconds to pause between sending keepalives (defaults to
-120.0)
-.PP
-\fB\-\-download_slice_size\fR <arg>
-.IP
-How many bytes to query for per request. (defaults to 16384)
-.PP
-\fB\-\-upload_unit_size\fR <arg>
-.IP
-when limiting upload rate, how many bytes to send at a time (defaults
-to 1460)
-.PP
-\fB\-\-request_backlog\fR <arg>
-.IP
-maximum number of requests to keep in a single pipe at once.
-(defaults to 10)
-.PP
-\fB\-\-max_message_length\fR <arg>
-.IP
-maximum length prefix encoding you'll accept over the wire - larger
-values get the connection dropped. (defaults to 8388608)
-.PP
-\fB\-\-ip\fR <arg>
-.IP
-ip to report you have to the tracker. (defaults to '')
-.PP
-\fB\-\-minport\fR <arg>
-.IP
-minimum port to listen on, counts up if unavailable (defaults to
-10000)
-.PP
-\fB\-\-maxport\fR <arg>
-.IP
-maximum port to listen on (defaults to 60000)
-.PP
-\fB\-\-random_port\fR <arg>
-.IP
-whether to choose randomly inside the port range instead of counting
-up linearly (defaults to 1)
-.PP
-\fB\-\-responsefile\fR <arg>
-.IP
-file the server response was stored in, alternative to url (defaults
-to '')
-.PP
-\fB\-\-url\fR <arg>
-.IP
-url to get file from, alternative to responsefile (defaults to '')
-.PP
-\fB\-\-selector_enabled\fR <arg>
-.IP
-whether to enable the file selector and fast resume function
-(defaults to 1)
-.PP
-\fB\-\-expire_cache_data\fR <arg>
-.IP
-the number of days after which you wish to expire old cache data (0 =
-disabled) (defaults to 10)
-.PP
-\fB\-\-priority\fR <arg>
-.IP
-a list of file priorities separated by commas, must be one per file,
-0 = highest, 1 = normal, 2 = lowest, \fB\-1\fR = download disabled (defaults
-to '')
-.PP
-\fB\-\-saveas\fR <arg>
-.IP
-local file name to save the file as, null indicates query user
-(defaults to '')
-.PP
-\fB\-\-timeout\fR <arg>
-.IP
-time to wait between closing sockets which nothing has been received
-on (defaults to 300.0)
-.PP
-\fB\-\-timeout_check_interval\fR <arg>
-.IP
-time to wait between checking if any connections have timed out
-(defaults to 60.0)
-.PP
-\fB\-\-max_slice_length\fR <arg>
-.IP
-maximum length slice to send to peers, larger requests are ignored
-(defaults to 131072)
-.PP
-\fB\-\-max_rate_period\fR <arg>
-.IP
-maximum amount of time to guess the current rate estimate represents
-(defaults to 20.0)
-.PP
-\fB\-\-bind\fR <arg>
-.IP
-comma-separated list of ips/hostnames to bind to locally (defaults to
-\&'')
-.PP
-\fB\-\-ipv6_enabled\fR <arg>
-.IP
-allow the client to connect to peers via IPv6 (defaults to 0)
-.PP
-\fB\-\-ipv6_binds_v4\fR <arg>
-.IP
-set if an IPv6 server socket will also field IPv4 connections
-(defaults to 1)
-.PP
-\fB\-\-upnp_nat_access\fR <arg>
-.IP
-attempt to autoconfigure a UPnP router to forward a server port (0 =
-disabled, 1 = mode 1 [fast], 2 = mode 2 [slow]) (defaults to 1)
-.PP
-\fB\-\-upload_rate_fudge\fR <arg>
-.IP
-time equivalent of writing to kernel-level TCP buffer, for rate
-adjustment (defaults to 5.0)
-.PP
-\fB\-\-tcp_ack_fudge\fR <arg>
-.IP
-how much TCP ACK download overhead to add to upload rate calculations
-(0 = disabled) (defaults to 0.029999999999999999)
-.PP
-\fB\-\-display_interval\fR <arg>
-.IP
-time between updates of displayed information (defaults to 0.5)
-.PP
-\fB\-\-rerequest_interval\fR <arg>
-.IP
-time to wait between requesting more peers (defaults to 300)
-.PP
-\fB\-\-min_peers\fR <arg>
-.IP
-minimum number of peers to not do rerequesting (defaults to 20)
-.PP
-\fB\-\-http_timeout\fR <arg>
-.IP
-number of seconds to wait before assuming that an http connection has
-timed out (defaults to 60)
-.PP
-\fB\-\-max_initiate\fR <arg>
-.IP
-number of peers at which to stop initiating new connections (defaults
-to 40)
-.PP
-\fB\-\-check_hashes\fR <arg>
-.IP
-whether to check hashes on disk (defaults to 1)
-.PP
-\fB\-\-max_upload_rate\fR <arg>
-.IP
-maximum kB/s to upload at (0 = no limit, \fB\-1\fR = automatic) (defaults to
-0)
-.PP
-\fB\-\-max_download_rate\fR <arg>
-.IP
-maximum kB/s to download at (0 = no limit) (defaults to 0)
-.PP
-\fB\-\-alloc_type\fR <arg>
-.IP
-allocation type (may be normal, background, pre-allocate or sparse)
-(defaults to 'normal')
-.PP
-\fB\-\-alloc_rate\fR <arg>
-.IP
-rate (in MiB/s) to allocate space at using background allocation
-(defaults to 2.0)
-.PP
-\fB\-\-buffer_reads\fR <arg>
-.IP
-whether to buffer disk reads (defaults to 1)
-.PP
-\fB\-\-write_buffer_size\fR <arg>
-.IP
-the maximum amount of space to use for buffering disk writes (in
-megabytes, 0 = disabled) (defaults to 4)
-.PP
-\fB\-\-snub_time\fR <arg>
-.IP
-seconds to wait for data to come in over a connection before assuming
-it's semi-permanently choked (defaults to 30.0)
-.PP
-\fB\-\-spew\fR <arg>
-.IP
-whether to display diagnostic info to stdout (defaults to 0)
-.PP
-\fB\-\-rarest_first_cutoff\fR <arg>
-.IP
-number of downloads at which to switch from random to rarest first
-(defaults to 2)
-.PP
-\fB\-\-rarest_first_priority_cutoff\fR <arg>
-.IP
-the number of peers which need to have a piece before other partials
-take priority over rarest first (defaults to 5)
-.PP
-\fB\-\-min_uploads\fR <arg>
-.IP
-the number of uploads to fill out to with extra optimistic unchokes
-(defaults to 4)
-.PP
-\fB\-\-max_files_open\fR <arg>
-.IP
-the maximum number of files to keep open at a time, 0 means no limit
-(defaults to 50)
-.PP
-\fB\-\-round_robin_period\fR <arg>
-.IP
-the number of seconds between the client's switching upload targets
-(defaults to 30)
-.PP
-\fB\-\-super_seeder\fR <arg>
-.IP
-whether to use special upload-efficiency-maximizing routines (only
-for dedicated seeds) (defaults to 0)
-.PP
-\fB\-\-security\fR <arg>
-.IP
-whether to enable extra security features intended to prevent abuse
-(defaults to 1)
-.PP
-\fB\-\-max_connections\fR <arg>
-.IP
-the absolute maximum number of peers to connect with (0 = no limit)
-(defaults to 0)
-.PP
-\fB\-\-auto_kick\fR <arg>
-.IP
-whether to allow the client to automatically kick/ban peers that send
-bad data (defaults to 1)
-.PP
-\fB\-\-double_check\fR <arg>
-.IP
-whether to double-check data being written to the disk for errors
-(may increase CPU load) (defaults to 1)
-.PP
-\fB\-\-triple_check\fR <arg>
-.IP
-whether to thoroughly check data being written to the disk (may slow
-disk access) (defaults to 0)
-.PP
-\fB\-\-lock_files\fR <arg>
-.IP
-whether to lock files the client is working with (defaults to 1)
-.PP
-\fB\-\-lock_while_reading\fR <arg>
-.IP
-whether to lock access to files being read (defaults to 0)
-.PP
-\fB\-\-auto_flush\fR <arg>
-.IP
-minutes between automatic flushes to disk (0 = disabled) (defaults to
-0)
-.PP
-\fB\-\-save_options\fR <arg>
-.IP
-whether to save the current options as the new default configuration
-(only for btdownloadheadless.py) (defaults to 0)
-.PP
diff --git a/net/py-bittornado/files/btlaunchmany.1 b/net/py-bittornado/files/btlaunchmany.1
deleted file mode 100644
index 0d508ca97e38..000000000000
--- a/net/py-bittornado/files/btlaunchmany.1
+++ /dev/null
@@ -1,288 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH BTLAUNCHMANY "1" "August 2004" "btlaunchmany (bttornado)" "User Commands"
-.SH NAME
-Btlaunchmany \- manual page for btlaunchmany
-.SH SYNOPSIS
-.B btlaunchmany
-\fI<directory> <global options>\fR
-.SH DESCRIPTION
-<directory> - directory to look for .torrent files (semi-recursive)
-Arguments are:
-.PP
-\fB\-\-max_uploads\fR <arg>
-.IP
-the maximum number of uploads to allow at once. (defaults to 7)
-.PP
-\fB\-\-keepalive_interval\fR <arg>
-.IP
-number of seconds to pause between sending keepalives (defaults to
-120.0)
-.PP
-\fB\-\-download_slice_size\fR <arg>
-.IP
-How many bytes to query for per request. (defaults to 16384)
-.PP
-\fB\-\-upload_unit_size\fR <arg>
-.IP
-when limiting upload rate, how many bytes to send at a time (defaults
-to 1460)
-.PP
-\fB\-\-request_backlog\fR <arg>
-.IP
-maximum number of requests to keep in a single pipe at once.
-(defaults to 10)
-.PP
-\fB\-\-max_message_length\fR <arg>
-.IP
-maximum length prefix encoding you'll accept over the wire - larger
-values get the connection dropped. (defaults to 8388608)
-.PP
-\fB\-\-ip\fR <arg>
-.IP
-ip to report you have to the tracker. (defaults to '')
-.PP
-\fB\-\-minport\fR <arg>
-.IP
-minimum port to listen on, counts up if unavailable (defaults to
-10000)
-.PP
-\fB\-\-maxport\fR <arg>
-.IP
-maximum port to listen on (defaults to 60000)
-.PP
-\fB\-\-random_port\fR <arg>
-.IP
-whether to choose randomly inside the port range instead of counting
-up linearly (defaults to 1)
-.PP
-\fB\-\-responsefile\fR <arg>
-.IP
-file the server response was stored in, alternative to url (defaults
-to '')
-.PP
-\fB\-\-url\fR <arg>
-.IP
-url to get file from, alternative to responsefile (defaults to '')
-.PP
-\fB\-\-selector_enabled\fR <arg>
-.IP
-whether to enable the file selector and fast resume function
-(defaults to 1)
-.PP
-\fB\-\-expire_cache_data\fR <arg>
-.IP
-the number of days after which you wish to expire old cache data (0 =
-disabled) (defaults to 10)
-.PP
-\fB\-\-priority\fR <arg>
-.IP
-a list of file priorities separated by commas, must be one per file,
-0 = highest, 1 = normal, 2 = lowest, \fB\-1\fR = download disabled (defaults
-to '')
-.PP
-\fB\-\-saveas\fR <arg>
-.IP
-local file name to save the file as, null indicates query user
-(defaults to '')
-.PP
-\fB\-\-timeout\fR <arg>
-.IP
-time to wait between closing sockets which nothing has been received
-on (defaults to 300.0)
-.PP
-\fB\-\-timeout_check_interval\fR <arg>
-.IP
-time to wait between checking if any connections have timed out
-(defaults to 60.0)
-.PP
-\fB\-\-max_slice_length\fR <arg>
-.IP
-maximum length slice to send to peers, larger requests are ignored
-(defaults to 131072)
-.PP
-\fB\-\-max_rate_period\fR <arg>
-.IP
-maximum amount of time to guess the current rate estimate represents
-(defaults to 20.0)
-.PP
-\fB\-\-bind\fR <arg>
-.IP
-comma-separated list of ips/hostnames to bind to locally (defaults to
-\&'')
-.PP
-\fB\-\-ipv6_enabled\fR <arg>
-.IP
-allow the client to connect to peers via IPv6 (defaults to 0)
-.PP
-\fB\-\-ipv6_binds_v4\fR <arg>
-.IP
-set if an IPv6 server socket will also field IPv4 connections
-(defaults to 1)
-.PP
-\fB\-\-upnp_nat_access\fR <arg>
-.IP
-attempt to autoconfigure a UPnP router to forward a server port (0 =
-disabled, 1 = mode 1 [fast], 2 = mode 2 [slow]) (defaults to 1)
-.PP
-\fB\-\-upload_rate_fudge\fR <arg>
-.IP
-time equivalent of writing to kernel-level TCP buffer, for rate
-adjustment (defaults to 5.0)
-.PP
-\fB\-\-tcp_ack_fudge\fR <arg>
-.IP
-how much TCP ACK download overhead to add to upload rate calculations
-(0 = disabled) (defaults to 0.029999999999999999)
-.PP
-\fB\-\-display_interval\fR <arg>
-.IP
-time between updates of displayed information (defaults to 0.5)
-.PP
-\fB\-\-rerequest_interval\fR <arg>
-.IP
-time to wait between requesting more peers (defaults to 300)
-.PP
-\fB\-\-min_peers\fR <arg>
-.IP
-minimum number of peers to not do rerequesting (defaults to 20)
-.PP
-\fB\-\-http_timeout\fR <arg>
-.IP
-number of seconds to wait before assuming that an http connection has
-timed out (defaults to 60)
-.PP
-\fB\-\-max_initiate\fR <arg>
-.IP
-number of peers at which to stop initiating new connections (defaults
-to 40)
-.PP
-\fB\-\-check_hashes\fR <arg>
-.IP
-whether to check hashes on disk (defaults to 1)
-.PP
-\fB\-\-max_upload_rate\fR <arg>
-.IP
-maximum kB/s to upload at (0 = no limit, \fB\-1\fR = automatic) (defaults to
-0)
-.PP
-\fB\-\-max_download_rate\fR <arg>
-.IP
-maximum kB/s to download at (0 = no limit) (defaults to 0)
-.PP
-\fB\-\-alloc_type\fR <arg>
-.IP
-allocation type (may be normal, background, pre-allocate or sparse)
-(defaults to 'normal')
-.PP
-\fB\-\-alloc_rate\fR <arg>
-.IP
-rate (in MiB/s) to allocate space at using background allocation
-(defaults to 2.0)
-.PP
-\fB\-\-buffer_reads\fR <arg>
-.IP
-whether to buffer disk reads (defaults to 1)
-.PP
-\fB\-\-write_buffer_size\fR <arg>
-.IP
-the maximum amount of space to use for buffering disk writes (in
-megabytes, 0 = disabled) (defaults to 4)
-.PP
-\fB\-\-snub_time\fR <arg>
-.IP
-seconds to wait for data to come in over a connection before assuming
-it's semi-permanently choked (defaults to 30.0)
-.PP
-\fB\-\-spew\fR <arg>
-.IP
-whether to display diagnostic info to stdout (defaults to 0)
-.PP
-\fB\-\-rarest_first_cutoff\fR <arg>
-.IP
-number of downloads at which to switch from random to rarest first
-(defaults to 2)
-.PP
-\fB\-\-rarest_first_priority_cutoff\fR <arg>
-.IP
-the number of peers which need to have a piece before other partials
-take priority over rarest first (defaults to 5)
-.PP
-\fB\-\-min_uploads\fR <arg>
-.IP
-the number of uploads to fill out to with extra optimistic unchokes
-(defaults to 4)
-.PP
-\fB\-\-max_files_open\fR <arg>
-.IP
-the maximum number of files to keep open at a time, 0 means no limit
-(defaults to 50)
-.PP
-\fB\-\-round_robin_period\fR <arg>
-.IP
-the number of seconds between the client's switching upload targets
-(defaults to 30)
-.PP
-\fB\-\-super_seeder\fR <arg>
-.IP
-whether to use special upload-efficiency-maximizing routines (only
-for dedicated seeds) (defaults to 0)
-.PP
-\fB\-\-security\fR <arg>
-.IP
-whether to enable extra security features intended to prevent abuse
-(defaults to 1)
-.PP
-\fB\-\-max_connections\fR <arg>
-.IP
-the absolute maximum number of peers to connect with (0 = no limit)
-(defaults to 0)
-.PP
-\fB\-\-auto_kick\fR <arg>
-.IP
-whether to allow the client to automatically kick/ban peers that send
-bad data (defaults to 1)
-.PP
-\fB\-\-double_check\fR <arg>
-.IP
-whether to double-check data being written to the disk for errors
-(may increase CPU load) (defaults to 1)
-.PP
-\fB\-\-triple_check\fR <arg>
-.IP
-whether to thoroughly check data being written to the disk (may slow
-disk access) (defaults to 0)
-.PP
-\fB\-\-lock_files\fR <arg>
-.IP
-whether to lock files the client is working with (defaults to 1)
-.PP
-\fB\-\-lock_while_reading\fR <arg>
-.IP
-whether to lock access to files being read (defaults to 0)
-.PP
-\fB\-\-auto_flush\fR <arg>
-.IP
-minutes between automatic flushes to disk (0 = disabled) (defaults to
-0)
-.PP
-\fB\-\-parse_dir_interval\fR <arg>
-.IP
-how often to rescan the torrent directory, in seconds (defaults to
-60)
-.PP
-\fB\-\-saveas_style\fR <arg>
-.IP
-How to name torrent downloads (1 = rename to torrent name, 2 = save
-under name in torrent, 3 = save in directory under torrent name)
-(defaults to 1)
-.PP
-\fB\-\-display_path\fR <arg>
-.IP
-whether to display the full path or the torrent contents for each
-torrent (defaults to 1)
-.PP
-\fB\-\-save_options\fR <arg>
-.IP
-whether to save the current options as the new default configuration
-(only for btlaunchmany) (defaults to 0)
-.PP
diff --git a/net/py-bittornado/files/btlaunchmanycurses.1 b/net/py-bittornado/files/btlaunchmanycurses.1
deleted file mode 100644
index 816ee85b9e5b..000000000000
--- a/net/py-bittornado/files/btlaunchmanycurses.1
+++ /dev/null
@@ -1,288 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH BTLAUNCHMANYCURSES "1" "August 2004" "btlaunchmanycurses (bittornado)" "User Commands"
-.SH NAME
-Btlaunchmanycurses: \- launch separate torrent download threads for each .torrent file in directory
-.SH SYNOPSIS
-.B btlaunchmanycurses
-\fI<directory> <global options>\fR
-.SH DESCRIPTION
-<directory> - directory to look for .torrent files (semi-recursive)
-Arguments are:
-.PP
-\fB\-\-max_uploads\fR <arg>
-.IP
-the maximum number of uploads to allow at once. (defaults to 7)
-.PP
-\fB\-\-keepalive_interval\fR <arg>
-.IP
-number of seconds to pause between sending keepalives (defaults to
-120.0)
-.PP
-\fB\-\-download_slice_size\fR <arg>
-.IP
-How many bytes to query for per request. (defaults to 16384)
-.PP
-\fB\-\-upload_unit_size\fR <arg>
-.IP
-when limiting upload rate, how many bytes to send at a time (defaults
-to 1460)
-.PP
-\fB\-\-request_backlog\fR <arg>
-.IP
-maximum number of requests to keep in a single pipe at once.
-(defaults to 10)
-.PP
-\fB\-\-max_message_length\fR <arg>
-.IP
-maximum length prefix encoding you'll accept over the wire - larger
-values get the connection dropped. (defaults to 8388608)
-.PP
-\fB\-\-ip\fR <arg>
-.IP
-ip to report you have to the tracker. (defaults to '')
-.PP
-\fB\-\-minport\fR <arg>
-.IP
-minimum port to listen on, counts up if unavailable (defaults to
-10000)
-.PP
-\fB\-\-maxport\fR <arg>
-.IP
-maximum port to listen on (defaults to 60000)
-.PP
-\fB\-\-random_port\fR <arg>
-.IP
-whether to choose randomly inside the port range instead of counting
-up linearly (defaults to 1)
-.PP
-\fB\-\-responsefile\fR <arg>
-.IP
-file the server response was stored in, alternative to url (defaults
-to '')
-.PP
-\fB\-\-url\fR <arg>
-.IP
-url to get file from, alternative to responsefile (defaults to '')
-.PP
-\fB\-\-selector_enabled\fR <arg>
-.IP
-whether to enable the file selector and fast resume function
-(defaults to 1)
-.PP
-\fB\-\-expire_cache_data\fR <arg>
-.IP
-the number of days after which you wish to expire old cache data (0 =
-disabled) (defaults to 10)
-.PP
-\fB\-\-priority\fR <arg>
-.IP
-a list of file priorities separated by commas, must be one per file,
-0 = highest, 1 = normal, 2 = lowest, \fB\-1\fR = download disabled (defaults
-to '')
-.PP
-\fB\-\-saveas\fR <arg>
-.IP
-local file name to save the file as, null indicates query user
-(defaults to '')
-.PP
-\fB\-\-timeout\fR <arg>
-.IP
-time to wait between closing sockets which nothing has been received
-on (defaults to 300.0)
-.PP
-\fB\-\-timeout_check_interval\fR <arg>
-.IP
-time to wait between checking if any connections have timed out
-(defaults to 60.0)
-.PP
-\fB\-\-max_slice_length\fR <arg>
-.IP
-maximum length slice to send to peers, larger requests are ignored
-(defaults to 131072)
-.PP
-\fB\-\-max_rate_period\fR <arg>
-.IP
-maximum amount of time to guess the current rate estimate represents
-(defaults to 20.0)
-.PP
-\fB\-\-bind\fR <arg>
-.IP
-comma-separated list of ips/hostnames to bind to locally (defaults to
-\&'')
-.PP
-\fB\-\-ipv6_enabled\fR <arg>
-.IP
-allow the client to connect to peers via IPv6 (defaults to 0)
-.PP
-\fB\-\-ipv6_binds_v4\fR <arg>
-.IP
-set if an IPv6 server socket will also field IPv4 connections
-(defaults to 1)
-.PP
-\fB\-\-upnp_nat_access\fR <arg>
-.IP
-attempt to autoconfigure a UPnP router to forward a server port (0 =
-disabled, 1 = mode 1 [fast], 2 = mode 2 [slow]) (defaults to 1)
-.PP
-\fB\-\-upload_rate_fudge\fR <arg>
-.IP
-time equivalent of writing to kernel-level TCP buffer, for rate
-adjustment (defaults to 5.0)
-.PP
-\fB\-\-tcp_ack_fudge\fR <arg>
-.IP
-how much TCP ACK download overhead to add to upload rate calculations
-(0 = disabled) (defaults to 0.029999999999999999)
-.PP
-\fB\-\-display_interval\fR <arg>
-.IP
-time between updates of displayed information (defaults to 0.5)
-.PP
-\fB\-\-rerequest_interval\fR <arg>
-.IP
-time to wait between requesting more peers (defaults to 300)
-.PP
-\fB\-\-min_peers\fR <arg>
-.IP
-minimum number of peers to not do rerequesting (defaults to 20)
-.PP
-\fB\-\-http_timeout\fR <arg>
-.IP
-number of seconds to wait before assuming that an http connection has
-timed out (defaults to 60)
-.PP
-\fB\-\-max_initiate\fR <arg>
-.IP
-number of peers at which to stop initiating new connections (defaults
-to 40)
-.PP
-\fB\-\-check_hashes\fR <arg>
-.IP
-whether to check hashes on disk (defaults to 1)
-.PP
-\fB\-\-max_upload_rate\fR <arg>
-.IP
-maximum kB/s to upload at (0 = no limit, \fB\-1\fR = automatic) (defaults to
-0)
-.PP
-\fB\-\-max_download_rate\fR <arg>
-.IP
-maximum kB/s to download at (0 = no limit) (defaults to 0)
-.PP
-\fB\-\-alloc_type\fR <arg>
-.IP
-allocation type (may be normal, background, pre-allocate or sparse)
-(defaults to 'normal')
-.PP
-\fB\-\-alloc_rate\fR <arg>
-.IP
-rate (in MiB/s) to allocate space at using background allocation
-(defaults to 2.0)
-.PP
-\fB\-\-buffer_reads\fR <arg>
-.IP
-whether to buffer disk reads (defaults to 1)
-.PP
-\fB\-\-write_buffer_size\fR <arg>
-.IP
-the maximum amount of space to use for buffering disk writes (in
-megabytes, 0 = disabled) (defaults to 4)
-.PP
-\fB\-\-snub_time\fR <arg>
-.IP
-seconds to wait for data to come in over a connection before assuming
-it's semi-permanently choked (defaults to 30.0)
-.PP
-\fB\-\-spew\fR <arg>
-.IP
-whether to display diagnostic info to stdout (defaults to 0)
-.PP
-\fB\-\-rarest_first_cutoff\fR <arg>
-.IP
-number of downloads at which to switch from random to rarest first
-(defaults to 2)
-.PP
-\fB\-\-rarest_first_priority_cutoff\fR <arg>
-.IP
-the number of peers which need to have a piece before other partials
-take priority over rarest first (defaults to 5)
-.PP
-\fB\-\-min_uploads\fR <arg>
-.IP
-the number of uploads to fill out to with extra optimistic unchokes
-(defaults to 4)
-.PP
-\fB\-\-max_files_open\fR <arg>
-.IP
-the maximum number of files to keep open at a time, 0 means no limit
-(defaults to 50)
-.PP
-\fB\-\-round_robin_period\fR <arg>
-.IP
-the number of seconds between the client's switching upload targets
-(defaults to 30)
-.PP
-\fB\-\-super_seeder\fR <arg>
-.IP
-whether to use special upload-efficiency-maximizing routines (only
-for dedicated seeds) (defaults to 0)
-.PP
-\fB\-\-security\fR <arg>
-.IP
-whether to enable extra security features intended to prevent abuse
-(defaults to 1)
-.PP
-\fB\-\-max_connections\fR <arg>
-.IP
-the absolute maximum number of peers to connect with (0 = no limit)
-(defaults to 0)
-.PP
-\fB\-\-auto_kick\fR <arg>
-.IP
-whether to allow the client to automatically kick/ban peers that send
-bad data (defaults to 1)
-.PP
-\fB\-\-double_check\fR <arg>
-.IP
-whether to double-check data being written to the disk for errors
-(may increase CPU load) (defaults to 1)
-.PP
-\fB\-\-triple_check\fR <arg>
-.IP
-whether to thoroughly check data being written to the disk (may slow
-disk access) (defaults to 0)
-.PP
-\fB\-\-lock_files\fR <arg>
-.IP
-whether to lock files the client is working with (defaults to 1)
-.PP
-\fB\-\-lock_while_reading\fR <arg>
-.IP
-whether to lock access to files being read (defaults to 0)
-.PP
-\fB\-\-auto_flush\fR <arg>
-.IP
-minutes between automatic flushes to disk (0 = disabled) (defaults to
-0)
-.PP
-\fB\-\-parse_dir_interval\fR <arg>
-.IP
-how often to rescan the torrent directory, in seconds (defaults to
-60)
-.PP
-\fB\-\-saveas_style\fR <arg>
-.IP
-How to name torrent downloads (1 = rename to torrent name, 2 = save
-under name in torrent, 3 = save in directory under torrent name)
-(defaults to 2)
-.PP
-\fB\-\-display_path\fR <arg>
-.IP
-whether to display the full path or the torrent contents for each
-torrent (defaults to 0)
-.PP
-\fB\-\-save_options\fR <arg>
-.IP
-whether to save the current options as the new default configuration
-(only for btlaunchmanycurses.py) (defaults to 0)
-.PP
diff --git a/net/py-bittornado/files/btmakemetafile.1 b/net/py-bittornado/files/btmakemetafile.1
deleted file mode 100644
index 0b6c84412583..000000000000
--- a/net/py-bittornado/files/btmakemetafile.1
+++ /dev/null
@@ -1,50 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH "BTMAKEMETAFILE" 1 "Jan 18 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-btmakemetafile \- program to generate torrent info files for bittorrent
-.SH SYNOPSIS
-.B btmakemetafile \fItracker_announce_address\fP \fIfile\fP [ option ... ] 
-.SH DESCRIPTION
-This manual page documents briefly the \fBbtmakemetafile\fP
-command.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBbtmakemetafile\fP is a program that generates the torrent info files
-which are distributed to bittorrent clients (usually via the WWW) in order
-to inform them where the designated tracker for the torrent is located, and 
-to allow them to verify the file's contents.
-.PP
-\fBbtmakemetafile\fP takes two arguments.  Both are required.  The first
-is the file that the torrent info file will be generated for.  The second is 
-the "announce" address of a tracker (ex. http://127.0.0.1:6969/announce).
-.SH OPTIONS
-.TP
-.B \-\-piece_size_pow2 \fIarg\fP
-which power of 2 to set the piece size to (default: 18)
-
-.SH SEE ALSO
-.BR bittorrent-downloader (1),
-.BR btrename (1),
-.BR btreannounce (1),
-.BR bttrack (1).
-.br
-.SH AUTHOR
-This manual page was written by Michael Janssen <jamuraa@debian.org>,
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/net/py-bittornado/files/btreannounce.1 b/net/py-bittornado/files/btreannounce.1
deleted file mode 100644
index 5ebdab93b04c..000000000000
--- a/net/py-bittornado/files/btreannounce.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH "BTREANNOUNCE" 1 "Jan 18 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-btreannounce \- change the announce address of a torrent file.
-.SH SYNOPSIS
-\fBbttrack\fP \fIurl\fP \fIoldtorrent\fP \fInewtorrent\fP
-.SH DESCRIPTION
-This manual page documents briefly the \fBbtreannounce\fP
-command.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBbtreannounce\fP is a program which will change the announce 
-address of a existing torrent file.  The torrent specified by 
-the \fIoldtorrent\fP argument will be modified to use the new 
-announce url given by the \fIurl\fP argument, and the changed 
-file will be saved as \fInewtorrent\fP.
-
-.SH SEE ALSO
-.BR bittorrent-downloader (1),
-.BR btmakemetafile (1),
-.BR btrename (1).
-.br
-.SH AUTHOR
-This manual page was written by Michael Janssen <jamuraa@debian.org>,
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/net/py-bittornado/files/btrename.1 b/net/py-bittornado/files/btrename.1
deleted file mode 100644
index 7c287da8efaf..000000000000
--- a/net/py-bittornado/files/btrename.1
+++ /dev/null
@@ -1,42 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH "BTRENAME" 1 "Jan 18 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-btrename \- change the suggested filename inside a bittorrent file
-.SH SYNOPSIS
-\fBbttrack\fP \fItorrent\fP \fInewfilename\fP
-.SH DESCRIPTION
-This manual page documents briefly the \fBbtrename\fP
-command.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBbtrename\fP is a program which will change the suggested 
-filename presented to the user for a bittorrent file. This 
-will make the downloader save it as a different name by default.
-The torrent specified by the \fItorrent\fP option is modified 
-in-place, changing the suggested filename to \fInewfilename\fP.
-
-.SH SEE ALSO
-.BR bittorrent-downloader (1),
-.BR btmakemetafile (1),
-.BR btreannounce (1).
-.br
-.SH AUTHOR
-This manual page was written by Michael Janssen <jamuraa@debian.org>,
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/net/py-bittornado/files/btsethttpseeds.1 b/net/py-bittornado/files/btsethttpseeds.1
deleted file mode 100644
index 6b3c8d2f04f9..000000000000
--- a/net/py-bittornado/files/btsethttpseeds.1
+++ /dev/null
@@ -1,26 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.33.
-.TH BTSETHTTPSEEDS "1" "May 2004" "btsethttpseeds" "User Commands"
-.SH NAME
-Btsethttpseeds \- manual page for btsethttpseeds
-.SH SYNOPSIS
-.B btsethttpseeds
-\fI<http-seeds> file1.torrent \fR[\fIfile2.torrent\fR...]
-.SH DESCRIPTION
-.IP
-Where:
-.IP
-http-seeds = list of seed URLs, in the format:
-.IP
-url[|url...] or 0
-.IP
-if the list is a zero, any http seeds will be stripped.
-.IP
-Where:
-.IP
-http-seeds = list of seed URLs, in the format:
-.IP
-url[|url...] or 0
-.IP
-if the list is a zero, any http seeds will be stripped.
-.SH "SEE ALSO"
-http://bittornado.org
diff --git a/net/py-bittornado/files/btshowmetainfo.1 b/net/py-bittornado/files/btshowmetainfo.1
deleted file mode 100644
index 9f784a47f8a9..000000000000
--- a/net/py-bittornado/files/btshowmetainfo.1
+++ /dev/null
@@ -1,38 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH "BTSHOWMETAINFO" 1 "Jan 18 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-btshowmetainfo \- display information in bittorrent files
-.SH SYNOPSIS
-\fBbtshowmetainfo\fP \fIfile\fP [ file ... ] 
-.SH DESCRIPTION
-This manual page documents briefly the \fBbtshowmetainfo\fP
-command.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBbtshowmetainfo\fP is a program which will display the information
-stored in a bittorrent file. 
-
-.SH SEE ALSO
-.BR bittorrent-downloader (1),
-.BR btmakemetafile (1).
-.br
-.SH AUTHOR
-This manual page was written by Michael Janssen <jamuraa@debian.org>,
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/net/py-bittornado/files/bttrack.1 b/net/py-bittornado/files/bttrack.1
deleted file mode 100644
index 844fc01f4c80..000000000000
--- a/net/py-bittornado/files/bttrack.1
+++ /dev/null
@@ -1,86 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH "BTTRACK" 1 "Jan 18 2003"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-bttrack \- tracker for bittorrent
-.SH SYNOPSIS
-.B bttrack \fI [ option ... ]
-.SH DESCRIPTION
-This manual page documents briefly the \fIbttrack\fP
-command.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
-.\" respectively.
-\fBbttrack\fP is a program that serves as a "tracker" for 
-bittorrent clients.  This program keeps track of the completion
-of each client, and communcates that information when requested
-to other clients.
-.SH OPTIONS
-These programs follow the usual GNU command line syntax, with long
-options starting with two dashes (`-').
-A summary of options is included below.
-.TP
-.B \-\-port \fIportnum\fP
-listen on port \fIportnum\fP (default 80)
-.TP
-.B \-\-dfile \fIfilename\fP
-store recent downloader info in \fIfilename\fP
-.TP
-.B \-\-bind \fIip\fP
-bind to \fIip\fP instead of the default
-.TP
-.B \-\-socket_timeout \fIsecs\fP
-timeout for closing connections (default 15)
-.TP
-.B \-\-save_dfile_interval \fIsecs\fP
-seconds between saving dfile (default 300)
-.TP
-.B \-\-timeout_downloaders_interval \fIsecs\fP
-seconds between expiring downloaders (default 2700)
-.TP
-.B \-\-reannounce_interval \fIsecs\fP
-seconds downloaders should wait between reannouncements (default 1800)
-.TP
-.B \-\-response_size \fInum\fP
-number of peers to send in an info message (default 50)
-.TP
-.B \-\-timeout_check_interval \fIsecs\fP
-time to wait between checking if any connections have timed out (default 5)
-.TP
-.B \-\-nat_check \fI[ 1 | 0 ]\fP
-whether to check back and ban downloaders behind NAT (default 1)
-.TP
-.B \-\-min_time_between_log_flushes \fIsecs\fP
-minimum time it must have been since the last flush to do another one (default 3.0)
-.TP
-.B \-\-allowed_dir \fIpath\fP
-only allow downloads for .torrents in this directory (default '')
-.TP
-.B \-\-parse_allowed_interval \fImins\fP
-minutes between reloading of allowed_dir (default 15)
-.TP
-.B \-\-show_names \fI[ 1 | 0 ]\fP
-whether to display names from alowed dir (default 1)
-
-.SH SEE ALSO
-.BR bittorrent-downloader (1),
-.BR btmakemetafile (1).
-.br
-.SH AUTHOR
-This manual page was written by Michael Janssen <jamuraa@debian.org>,
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/net/py-bittornado/files/extra-gui-patch-setup.py b/net/py-bittornado/files/extra-gui-patch-setup.py
index 55dbef22e429..199767cabc33 100644
--- a/net/py-bittornado/files/extra-gui-patch-setup.py
+++ b/net/py-bittornado/files/extra-gui-patch-setup.py
@@ -10,7 +10,7 @@ $FreeBSD$
 -        ]
 +        ],
 +    data_files = [('share/BitTornado', 
-+	['alloc.gif','black1.ico','black.ico','blue.ico','green1.ico','green.ico',
-+          'icon_bt.ico','icon_done.ico','red.ico','white.ico',
-+         'yellow1.ico','yellow.ico'])]
++	['icons/alloc.gif','icons/black1.ico','icons/black.ico','icons/blue.ico','icons/green1.ico','icons/green.ico',
++          'icons/icon_bt.ico','icons/icon_done.ico','icons/red.ico','icons/white.ico',
++         'icons/yellow1.ico','icons/yellow.ico'])]
      )
diff --git a/net/py-bittornado/files/extra-nogui-patch-setup.py b/net/py-bittornado/files/extra-nogui-patch-setup.py
index 72c7bc5350b1..b8e5e56e7107 100644
--- a/net/py-bittornado/files/extra-nogui-patch-setup.py
+++ b/net/py-bittornado/files/extra-nogui-patch-setup.py
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- setup.py.orig	Sun May 16 13:40:26 2004
-+++ setup.py	Tue May 25 10:21:43 2004
-@@ -18,12 +18,16 @@
+--- setup.py.orig	Wed Oct  6 11:50:10 2004
++++ setup.py	Fri Dec 17 17:42:32 2004
+@@ -18,11 +18,15 @@
      
      packages = ["BitTornado","BitTornado.BT1"],
  
@@ -13,14 +13,13 @@ $FreeBSD$
 -        "btdownloadcurses.py", "btcompletedirgui.py", "btlaunchmanycurses.py", 
 +        "btdownloadcurses.py", "btlaunchmanycurses.py", 
          "btmakemetafile.py", "btreannounce.py", "btrename.py", "btshowmetainfo.py",
-         "bttest.py",
 -        'btmaketorrentgui.py', 'btcopyannounce.py', 'btsethttpseeds.py',
 +        'btcopyannounce.py', 'btsethttpseeds.py',
          'bt-t-make.py',
 -        ]
 +        ],
 +    data_files = [('share/BitTornado', 
-+	['alloc.gif','black1.ico','black.ico','blue.ico','green1.ico','green.ico',
-+          'icon_bt.ico','icon_done.ico','red.ico','white.ico',
-+         'yellow1.ico','yellow.ico'])]
++	['icons/alloc.gif','icons/black1.ico','icons/black.ico','icons/blue.ico','icons/green1.ico','icons/green.ico',
++          'icons/icon_bt.ico','icons/icon_done.ico','icons/red.ico','icons/white.ico',
++         'icons/yellow1.ico','icons/yellow.ico'])]
      )
diff --git a/net/py-bittornado/pkg-plist b/net/py-bittornado/pkg-plist
index 03fcd2e87b2a..66ac07ec7c7e 100644
--- a/net/py-bittornado/pkg-plist
+++ b/net/py-bittornado/pkg-plist
@@ -13,7 +13,6 @@ bin/btreannounce.py
 bin/btrename.py
 bin/btsethttpseeds.py
 bin/btshowmetainfo.py
-bin/bttest.py
 bin/bttrack.py
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/Choker.py
 %%PYTHON_SITELIBDIR%%/BitTornado/BT1/Choker.pyc
@@ -156,34 +155,32 @@ bin/bttrack.py
 %%PYTHON_SITELIBDIR%%/BitTornado/zurllib.py
 %%PYTHON_SITELIBDIR%%/BitTornado/zurllib.pyc
 %%PYTHON_SITELIBDIR%%/BitTornado/zurllib.pyo
-share/BitTornado/alloc.gif
-share/BitTornado/black1.ico
-share/BitTornado/black.ico
-share/BitTornado/blue.ico
-share/BitTornado/green1.ico
-share/BitTornado/green.ico
-share/BitTornado/icon_bt.ico
-share/BitTornado/icon_done.ico
-share/BitTornado/red.ico
-share/BitTornado/white.ico
-share/BitTornado/yellow1.ico
-share/BitTornado/yellow.ico
+%%DATADIR%%/alloc.gif
+%%DATADIR%%/black1.ico
+%%DATADIR%%/black.ico
+%%DATADIR%%/blue.ico
+%%DATADIR%%/green1.ico
+%%DATADIR%%/green.ico
+%%DATADIR%%/icon_bt.ico
+%%DATADIR%%/icon_done.ico
+%%DATADIR%%/red.ico
+%%DATADIR%%/white.ico
+%%DATADIR%%/yellow1.ico
+%%DATADIR%%/yellow.ico
 %%PORTDOCS%%%%DOCSDIR%%/BUILD.windows.txt
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.txt
 %%PORTDOCS%%%%DOCSDIR%%/IMPORTANT-multitracker-readme.txt
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.unix.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/README-Psyco.txt
-%%PORTDOCS%%%%DOCSDIR%%/README-experimental.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/credits.txt
 %%PORTDOCS%%%%DOCSDIR%%/multitracker-spec.txt
 %%PORTDOCS%%%%DOCSDIR%%/multitracker_README.txt
-%%PORTDOCS%%%%DOCSDIR%%/todo.txt
 %%PORTDOCS%%%%DOCSDIR%%/webseed-spec.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTDOCS%%%%EXAMPLESDIR%%/bittornado.sh.sample
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/BitTornado/BT1
 @dirrm %%PYTHON_SITELIBDIR%%/BitTornado
-@dirrm share/BitTornado/
+@dirrm %%DATADIR%%