1. fix a bug where kbear would crash if you clicked on an MP3 file

2. add FreeBSD mirrors to the default kbear bookmarks
3. bump PORTREVISION

PR:		40731
Submitted by:	maintainer
Obtained from:	kbear author (1)

3 files changed, 1061 insertions, 0 deletions

diff --git a/ftp/kbear/Makefile b/ftp/kbear/Makefile
index 153ca74..b42b847 100644
--- a/ftp/kbear/Makefile
+++ b/ftp/kbear/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=		kbear
 PORTVERSION=		2.0.b.1
+PORTREVISION=		1
 CATEGORIES=		ftp kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/ftp/kbear/files/patch-kbeardirlister.cpp b/ftp/kbear/files/patch-kbeardirlister.cpp
new file mode 100644
index 0000000..121bc3c
--- /dev/null
+++ b/ftp/kbear/files/patch-kbeardirlister.cpp
@@ -0,0 +1,90 @@
+--- kbear/parts/filesyspart/kbeardirlister.cpp	Thu Jun 20 18:51:32 2002
++++ kbear/parts/filesyspart/kbeardirlister.cpp	Wed Jul 17 10:18:18 2002
+@@ -30,16 +30,17 @@
+ #include <kdirlister.h>
+ #include <kapplication.h>
+ #include <kdirwatch.h>
+ #include <kconfig.h>
+ #include <kio/slave.h>
+ #include <kio/scheduler.h>
+ #include <kparts/part.h>
+ #include <kparts/componentfactory.h>
++#include <ktrader.h>
+ #include <kdebug.h>
+ //////////////////////////////////////////////////////////////////////
+ // Application specific include files
+ #include "kbeardirlister.h"
+ #include "../../base/kbearlistjob.h"
+ #include "../../base/kbeardeletejob.h"
+ #include "../../base/kbearconnectionmanager.h"
+ 
+@@ -98,34 +99,40 @@
+ }
+ //-----------------------------------------------
+ KParts::ReadOnlyPart* KBearDirLister::getPreviewPartInternal( const QString& mime ) {
+ 	kdDebug()<<"KBearDirLister::getPreviewPartInternal() mime in="<<mime<<endl;
+ 	// first we need to find out if user want ReadOnly, ReadWrite or want to be asked
+ 	QString oldGroup = kapp->config()->group();
+ 	kapp->config()->setGroup("General");
+ 	unsigned int viewMode = kapp->config()->readUnsignedNumEntry( "Preview Mode", 0 );
++
+ 	if( viewMode == 2 ) { // Ask
+ 		int ret = KMessageBox::questionYesNoCancel( 0L, i18n( "Do you want to open the file in read only mode or in read/write mode ?"),
+ 													i18n("Select view mode..."), KGuiItem(i18n("Read only")), KGuiItem(i18n("Read/write")) );
+ 		if( ret == KMessageBox::Cancel )
+ 			m_partViewer = (KParts::ReadOnlyPart*)1;	
+ 		else if( ret == KMessageBox::No )
+ 			viewMode = 1; // ReadWrite						
+ 	}
++
++	QObject* obj = 0L;
+ 	if( viewMode == 1 ) { // ReadWrite
+-		m_partViewer = KParts::ComponentFactory::
+-							createPartInstanceFromQuery<KParts::ReadWritePart>
+-							( mime, QString::null, m_partViewerWidget, "PreviewWidget", m_partViewerWidget, "PreviewPart" );
+-	}
+-	if( ! m_partViewer ) { // ReadOnly
+-		m_partViewer = KParts::ComponentFactory::
+-							createPartInstanceFromQuery<KParts::ReadOnlyPart>
+-							( mime, QString::null, m_partViewerWidget, "PreviewWidget", m_partViewerWidget, "PreviewPart" );
++		obj = KParts::ComponentFactory::
++							createInstanceFromQuery<KParts::ReadWritePart>
++							( mime, QString::null, m_partViewerWidget, "PreviewPart" );
++	}
++	if( ! obj ) { // ReadOnly
++		obj = KParts::ComponentFactory::
++							createInstanceFromQuery<KParts::ReadOnlyPart>
++							( mime, QString::null, m_partViewerWidget, "PreviewPart" );
+ 	}
++	if( obj )
++		m_partViewer = dynamic_cast<KParts::ReadOnlyPart*>( obj );
++
+ 	kapp->config()->setGroup( oldGroup );
+ 	return m_partViewer;
+ }
+ //-----------------------------------------------
+ KParts::ReadOnlyPart* KBearDirLister::getPreviewPart( const KURL& url, QWidget* parent ) {
+ 	kdDebug()<<"KBearDirLister::getPreviewPart url="<<url.prettyURL()<<endl;
+ 	m_previewURL = url;
+ 	m_mime = QString::null;
+@@ -173,18 +180,18 @@
+ 		KMessageBox::detailedError( 0L, list[1], list[2], list[0] );
+ 	}
+ 	m_mime = "error";
+ }
+ //-----------------------------------------------
+ void KBearDirLister::slotMimeType( KIO::Job*, const QString& mime ) {
+ 	kdDebug()<<"KBearDirLister::slotMimeType() mime="<<mime<<endl;
+ 	m_partViewer = getPreviewPartInternal( mime );
+-	if( (int)m_partViewer > 1 ) {
+-	connectionManager->putOnHold( (unsigned long)this );
++	if( m_partViewer && (int)m_partViewer > 1 ) {
++		connectionManager->putOnHold( (unsigned long)this );
+ 		connect( m_slave, SIGNAL( infoMessage( const QString& ) ),
+ 					this, SIGNAL( infoMessage( const QString& ) ) );
+ 	}
+ 	m_mime = mime;
+ }
+ //-----------------------------------------------
+ void KBearDirLister::slotDisconnectSlaveInfo() {
+ 	disconnect( m_slave, SIGNAL( infoMessage( const QString& ) ),
diff --git a/ftp/kbear/files/patch-sitemanager.xml b/ftp/kbear/files/patch-sitemanager.xml
new file mode 100644
index 0000000..10e60f2
--- /dev/null
+++ b/ftp/kbear/files/patch-sitemanager.xml
@@ -0,0 +1,970 @@
+--- kbear/plugins/sitemanager/sitemanager.xml.orig	Thu Jul 18 18:00:11 2002
++++ kbear/plugins/sitemanager/sitemanager.xml	Thu Jul 18 21:28:50 2002
+@@ -345,16 +345,957 @@
+  <group label="Imported Bookmarks" />
+  <group label="Personal" />
+  <group label="BSD Sites" >
+-  <site label="FreeBSD" >
+-   <protocol>ftp</protocol>
+-   <host>ftp.freebsd.org</host>
+-   <port>21</port>
+-   <remote_path>/pub/FreeBSD</remote_path>
+-   <description/>
+-   <anonymous/>
+-   <mark_partial/>
+-   <auto_reconnect sleep="30" count="10" />
+-  </site>
++  <group label="FreeBSD">
++   <site label="FreeBSD" >
++    <protocol>ftp</protocol>
++    <host>ftp.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <group label="FreeBSD Mirrors in Africa">
++   <site label="South Africa" >
++    <protocol>ftp</protocol>
++    <host>ftp.za.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="South Africa (ftp2)" >
++    <protocol>ftp</protocol>
++    <host>ftp2.za.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="South Africa (ftp3)" >
++    <protocol>ftp</protocol>
++    <host>ftp3.za.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="South Africa (ftp4)" >
++    <protocol>ftp</protocol>
++    <host>ftp4.za.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++
++   </group>
++   <group label="FreeBSD mirrors in Asia">
++   <site label="China" >
++    <protocol>ftp</protocol>
++    <host>ftp.cn.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Hong Kong" >
++    <protocol>ftp</protocol>
++    <host>ftp.hk.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Israel" >
++    <protocol>ftp</protocol>
++    <host>ftp.il.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Japan" >
++    <protocol>ftp</protocol>
++    <host>ftp.jp.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Japan (ftp2)" >
++    <protocol>ftp</protocol>
++    <host>ftp2.jp.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Japan (ftp3)" >
++    <protocol>ftp</protocol>
++    <host>ftp3.jp.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Japan (ftp4)" >
++    <protocol>ftp</protocol>
++    <host>ftp4.jp.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Japan (ftp5)" >
++    <protocol>ftp</protocol>
++    <host>ftp5.jp.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Japan (ftp6)" >
++    <protocol>ftp</protocol>
++    <host>ftp6.jp.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Japan (ftp7)" >
++    <protocol>ftp</protocol>
++    <host>ftp7.jp.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++
++   <site label="Korea" >
++    <protocol>ftp</protocol>
++    <host>ftp.kr.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Korea (ftp3)" >
++    <protocol>ftp</protocol>
++    <host>ftp3.kr.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Korea (ftp4)" >
++    <protocol>ftp</protocol>
++    <host>ftp4.kr.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Korea (ftp5)" >
++    <protocol>ftp</protocol>
++    <host>ftp5.kr.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Korea (ftp6)" >
++    <protocol>ftp</protocol>
++    <host>ftp6.kr.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Korea (ftp7)" >
++    <protocol>ftp</protocol>
++    <host>ftp7.kr.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Saudi Arabia" >
++    <protocol>ftp</protocol>
++    <host>ftp.sa.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Taiwan" >
++    <protocol>ftp</protocol>
++    <host>ftp.tw.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Taiwan (ftp3)" >
++    <protocol>ftp</protocol>
++    <host>ftp3.tw.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Taiwan (ftp4)" >
++    <protocol>ftp</protocol>
++    <host>ftp4.tw.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Taiwan (ftp8)" >
++    <protocol>ftp</protocol>
++    <host>ftp8.tw.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Taiwan (ftp9)" >
++    <protocol>ftp</protocol>
++    <host>ftp9.tw.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Taiwan (ftp10)" >
++    <protocol>ftp</protocol>
++    <host>ftp10.tw.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Taiwan (ftp11)" >
++    <protocol>ftp</protocol>
++    <host>ftp11.tw.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Thailand" >
++    <protocol>ftp</protocol>
++    <host>ftp.nectec.or.th</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++
++   </group>
++   <group label="FreeBSD Mirrors in Europe">
++   <site label="Austria" >
++    <protocol>ftp</protocol>
++    <host>ftp.at.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Czech Republic" >
++    <protocol>ftp</protocol>
++    <host>ftp.cz.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Denmark" >
++    <protocol>ftp</protocol>
++    <host>ftp.dk.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Denmark (ftp2)" >
++    <protocol>ftp</protocol>
++    <host>ftp2.dk.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Denmark (ftp3)" >
++    <protocol>ftp</protocol>
++    <host>ftp3.dk.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Estonia" >
++    <protocol>ftp</protocol>
++    <host>ftp.ee.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Finland" >
++    <protocol>ftp</protocol>
++    <host>ftp.fi.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="France" >
++    <protocol>ftp</protocol>
++    <host>ftp.fr.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="France (ftp3)" >
++    <protocol>ftp</protocol>
++    <host>ftp3.fr.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="France (ftp6)" >
++    <protocol>ftp</protocol>
++    <host>ftp6.fr.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="France (ftp8)" >
++    <protocol>ftp</protocol>
++    <host>ftp8.fr.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Germany" >
++    <protocol>ftp</protocol>
++    <host>ftp.de.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Germany (ftp2)" >
++    <protocol>ftp</protocol>
++    <host>ftp2.de.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Germany (ftp3)" >
++    <protocol>ftp</protocol>
++    <host>ftp3.de.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Germany (ftp4)" >
++    <protocol>ftp</protocol>
++    <host>ftp4.de.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Germany (ftp7)" >
++    <protocol>ftp</protocol>
++    <host>ftp7.de.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Iceland" >
++    <protocol>ftp</protocol>
++    <host>ftp.is.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Ireland" >
++    <protocol>ftp</protocol>
++    <host>ftp.ie.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Lithuania" >
++    <protocol>ftp</protocol>
++    <host>ftp.lt.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++  <site label="Netherlands" >
++    <protocol>ftp</protocol>
++    <host>ftp.nl.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++  <site label="Netherlands (ftp2)" >
++    <protocol>ftp</protocol>
++    <host>ftp2.nl.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++  <site label="Poland" >
++    <protocol>ftp</protocol>
++    <host>ftp.pl.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++  <site label="Poland (ftp2)" >
++    <protocol>ftp</protocol>
++    <host>ftp2.pl.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Portugal" >
++    <protocol>ftp</protocol>
++    <host>ftp.pt.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Portugal (ftp2)" >
++    <protocol>ftp</protocol>
++    <host>ftp2.pt.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Romania" >
++    <protocol>ftp</protocol>
++    <host>ftp.ro.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Slovak Republic" >
++    <protocol>ftp</protocol>
++    <host>ftp.sk.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Slovenia" >
++    <protocol>ftp</protocol>
++    <host>ftp.si.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Spain" >
++    <protocol>ftp</protocol>
++    <host>ftp.es.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Sweden" >
++    <protocol>ftp</protocol>
++    <host>ftp.se.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Sweden (ftp2)" >
++    <protocol>ftp</protocol>
++    <host>ftp2.se.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Sweden (ftp3)" >
++    <protocol>ftp</protocol>
++    <host>ftp3.se.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Ukraine" >
++    <protocol>ftp</protocol>
++    <host>ftp.ua.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="UK" >
++    <protocol>ftp</protocol>
++    <host>ftp.uk.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="UK (ftp2)" >
++    <protocol>ftp</protocol>
++    <host>ftp2.uk.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="UK (ftp3)" >
++    <protocol>ftp</protocol>
++    <host>ftp3.uk.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="UK (ftp4)" >
++    <protocol>ftp</protocol>
++    <host>ftp4.uk.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="UK (ftp5)" >
++    <protocol>ftp</protocol>
++    <host>ftp5.uk.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   </group>
++   <group label="FreeBSD Mirrors in Russia">
++   <site label="Russia" >
++    <protocol>ftp</protocol>
++    <host>ftp.ru.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Russia (ftp3)" >
++    <protocol>ftp</protocol>
++    <host>ftp3.ru.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   </group>
++   <group label="FreeBSD Mirrors in North America">
++   <site label="Canada" >
++    <protocol>ftp</protocol>
++    <host>ftp.ca.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="USA (ftp2)" >
++    <protocol>ftp</protocol>
++    <host>ftp2.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="USA (ftp3)" >
++    <protocol>ftp</protocol>
++    <host>ftp3.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="USA (ftp4)" >
++    <protocol>ftp</protocol>
++    <host>ftp4.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="USA (ftp5)" >
++    <protocol>ftp</protocol>
++    <host>ftp5.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="USA (ftp6)" >
++    <protocol>ftp</protocol>
++    <host>ftp6.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="USA (ftp7)" >
++    <protocol>ftp</protocol>
++    <host>ftp7.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="USA (ftp8)" >
++    <protocol>ftp</protocol>
++    <host>ftp8.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="USA (ftp9)" >
++    <protocol>ftp</protocol>
++    <host>ftp9.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="USA (ftp10)" >
++    <protocol>ftp</protocol>
++    <host>ftp10.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="USA (ftp11)" >
++    <protocol>ftp</protocol>
++    <host>ftp11.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="USA (ftp12)" >
++    <protocol>ftp</protocol>
++    <host>ftp12.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="USA (ftp13)" >
++    <protocol>ftp</protocol>
++    <host>ftp13.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++
++   </group>
++   <group label="FreeBSD Mirrors in South America">
++   <site label="Argentina" >
++    <protocol>ftp</protocol>
++    <host>ftp.ar.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Brazil" >
++    <protocol>ftp</protocol>
++    <host>ftp.br.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Brazil (ftp2)" >
++    <protocol>ftp</protocol>
++    <host>ftp2.br.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Brazil (ftp3)" >
++    <protocol>ftp</protocol>
++    <host>ftp3.br.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Brazil (ftp4)" >
++    <protocol>ftp</protocol>
++    <host>ftp4.br.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Brazil (ftp5)" >
++    <protocol>ftp</protocol>
++    <host>ftp5.br.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Brazil (ftp6)" >
++    <protocol>ftp</protocol>
++    <host>ftp6.br.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   <site label="Brazil (ftp7)" >
++    <protocol>ftp</protocol>
++    <host>ftp7.br.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++
++   </group>
++   <group label="FreeBSD Mirrors in Australia, New Zealand">
++   <site label="Australia" >
++    <protocol>ftp</protocol>
++    <host>ftp.au.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++  <site label="New Zealand" >
++    <protocol>ftp</protocol>
++    <host>ftp.nz.freebsd.org</host>
++    <port>21</port>
++    <remote_path>/pub/FreeBSD</remote_path>
++    <description/>
++    <anonymous/>
++    <mark_partial/>
++    <auto_reconnect sleep="30" count="10" />
++   </site>
++   </group>
++  </group>
+   <site label="NetBSD" >
+    <protocol>ftp</protocol>
+    <host>ftp.netbsd.org</host>