5 files changed, 177 insertions, 66 deletions

diff --git a/ftp/kbear/Makefile b/ftp/kbear/Makefile
index 1c8da316f3c0..7e10f22bb0af 100644
--- a/ftp/kbear/Makefile
+++ b/ftp/kbear/Makefile
@@ -5,17 +5,16 @@
 # $FreeBSD$
 
 PORTNAME=		kbear
-PORTVERSION=		2.1
-PORTREVISION=		1
+PORTVERSION=		3.0.a.1
 CATEGORIES=		ftp kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=		${PORTNAME}-${PORTVERSION}-1.src
+DISTNAME=		${PORTNAME}-${PORTVERSION:S/.a.1/alpha1b/}-1.src
 
 MAINTAINER=		arved@FreeBSD.org
 COMMENT=		A graphical FTP client for KDE
 
-WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.a.1/alpha1b/}
 INSTALLS_SHLIB=		yes
 USE_KDELIBS_VER=	3
 USE_REINPLACE=		yes
diff --git a/ftp/kbear/distinfo b/ftp/kbear/distinfo
index 5ab930fcdd8d..36db1dae27d0 100644
--- a/ftp/kbear/distinfo
+++ b/ftp/kbear/distinfo
@@ -1 +1 @@
-MD5 (kbear-2.1-1.src.tar.bz2) = 4b603a843b42e233fdb89e035ebc9c7f
+MD5 (kbear-3.0alpha1b-1.src.tar.bz2) = 4c2e050b6012ffcee53194dfed431bb1
diff --git a/ftp/kbear/files/patch-kbearsynchjob.cpp b/ftp/kbear/files/patch-kbearsynchjob.cpp
new file mode 100644
index 000000000000..ec6862ee4e53
--- /dev/null
+++ b/ftp/kbear/files/patch-kbearsynchjob.cpp
@@ -0,0 +1,10 @@
+--- kbear/lib/jobclasses/kbearsynchjob.cpp.orig	Fri Jul 18 12:56:43 2003
++++ kbear/lib/jobclasses/kbearsynchjob.cpp	Fri Jul 18 12:56:53 2003
+@@ -19,6 +19,7 @@
+ #include "kbearcopyjob.h"
+ #include "kbeardeletejob.h"
+ #include "kbearlistjob.h"
++#include "connectionmanager.h"
+ 
+ using namespace KBear;
+ 
diff --git a/ftp/kbear/files/patch-sitemanager.xml b/ftp/kbear/files/patch-sitemanager.xml
index 10e60f2ddcba..ec559094c576 100644
--- a/ftp/kbear/files/patch-sitemanager.xml
+++ b/ftp/kbear/files/patch-sitemanager.xml
@@ -1,19 +1,19 @@
---- 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
+--- kbear/plugins/sitemanager/sitemanager.xml.orig	Fri Jul 18 13:00:26 2003
++++ kbear/plugins/sitemanager/sitemanager.xml	Fri Jul 18 13:00:27 2003
 @@ -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="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>
@@ -68,7 +68,7 @@
 +   </site>
 +
 +   </group>
-+   <group label="FreeBSD mirrors in Asia">
++   <group label="FreeBSD Mirrors in Asia">
 +   <site label="China" >
 +    <protocol>ftp</protocol>
 +    <host>ftp.cn.freebsd.org</host>
@@ -965,6 +965,6 @@
 +   </site>
 +   </group>
 +  </group>
-   <site label="NetBSD" >
-    <protocol>ftp</protocol>
-    <host>ftp.netbsd.org</host>
+ <site label="NetBSD" >
+ <protocol>ftp</protocol>
+ <host>ftp.netbsd.org</host>
diff --git a/ftp/kbear/pkg-plist b/ftp/kbear/pkg-plist
index ba034ed39e18..945143b92fd4 100644
--- a/ftp/kbear/pkg-plist
+++ b/ftp/kbear/pkg-plist
@@ -1,74 +1,149 @@
 bin/kbear
 bin/kbearsitemanagerdb
-include/kbear/connection.h
+include/kbear/SITEMANAGER_TAGS.html
+include/kbear/connectionmanager.h
 include/kbear/group.h
-include/kbear/site.h
-include/kbear/siteimportfilterpluginiface.h
+include/kbear/kbearapi.h
+include/kbear/kbearchildviewiface.h
+include/kbear/kbearconfigwidgetiface.h
+include/kbear/kbearcore.h
+include/kbear/kbeardetailview.h
+include/kbear/kbeardirlisteriface.h
+include/kbear/kbeardirview.h
+include/kbear/kbeardomhelper.h
+include/kbear/kbearfilesyspartiface.h
+include/kbear/kbearfilesyswidget.h
+include/kbear/kbeariconview.h
+include/kbear/kbearmainwiniface.h
+include/kbear/kbearpartiface.h
+include/kbear/kbearpartmanageriface.h
+include/kbear/kbearplugin.h
+include/kbear/kbearpluginmanageriface.h
+include/kbear/kbearsiteimportfilterpluginiface.h
+include/kbear/kbeartabview.h
+include/kbear/kbeartags.h
+include/kbear/kbeartextedit.h
+include/kbear/kbeartreeview.h
+include/kbear/kbeartreeviewitem.h
+include/kbear/kfilednddetailview.h
+include/kbear/kfiledndiconview.h
+include/kbear/kmdichildarea.h
+include/kbear/kmdichildfrm.h
+include/kbear/kmdichildfrmcaption.h
+include/kbear/kmdichildview.h
+include/kbear/kmdidefines.h
+include/kbear/kmdiiterator.h
+include/kbear/kmdilistiterator.h
+include/kbear/kmdimainfrm.h
+include/kbear/kmdinulliterator.h
+include/kbear/kmditaskbar.h
+include/kbear/misc.h
+include/kbear/siteinfo.h
+include/kbear/transfer.h
+include/kbear/transfergroup.h
+include/kbear/transfermanager.h
+lib/kde3/kbearconsole.la
+lib/kde3/kbearconsole.so
+lib/kde3/kbearfilediff.la
+lib/kde3/kbearfilediff.so
+lib/kde3/kbearfirewall.la
+lib/kde3/kbearfirewall.so
+lib/kde3/kbeargftpimportfilter.la
+lib/kde3/kbeargftpimportfilter.so
+lib/kde3/kbearimportfilter.la
+lib/kde3/kbearimportfilter.so
+lib/kde3/kbearkrusaderimportfilter.la
+lib/kde3/kbearkrusaderimportfilter.so
+lib/kde3/kbearlogoutput.la
+lib/kde3/kbearlogoutput.so
+lib/kde3/kbearncftpimportfilter.la
+lib/kde3/kbearncftpimportfilter.so
+lib/kde3/kbearrecentconnections.la
+lib/kde3/kbearrecentconnections.so
+lib/kde3/kbearsitemanager.la
+lib/kde3/kbearsitemanager.so
+lib/kde3/kbearsystemtraydock.la
+lib/kde3/kbearsystemtraydock.so
+lib/kde3/kbeartipofday.la
+lib/kde3/kbeartipofday.so
+lib/kde3/kbeartools.la
+lib/kde3/kbeartools.so
+lib/kde3/kbeartransferoutput.la
+lib/kde3/kbeartransferoutput.so
+lib/kde3/kbeartransferqueue.la
+lib/kde3/kbeartransferqueue.so
+lib/kde3/kbearurllistimportfilter.la
+lib/kde3/kbearurllistimportfilter.so
+lib/kde3/kbearwincommanderimportfilter.la
+lib/kde3/kbearwincommanderimportfilter.so
+lib/kde3/kbearwizard.la
+lib/kde3/kbearwizard.so
+lib/kde3/kbearwsftpimportfilter.la
+lib/kde3/kbearwsftpimportfilter.so
 lib/kde3/kio_kbearftp.la
 lib/kde3/kio_kbearftp.so
-lib/libkbeardirsynchpart.so
-lib/libkbeardirsynchpart.la
-lib/kde3/libkbeargftpimportfilter.la
-lib/kde3/libkbeargftpimportfilter.so
-lib/kde3/libkbearimportfilter.la
-lib/kde3/libkbearimportfilter.so
-lib/kde3/libkbearkrusaderimportfilter.la
-lib/kde3/libkbearkrusaderimportfilter.so
-lib/kde3/libkbearncftpimportfilter.la
-lib/kde3/libkbearncftpimportfilter.so
-lib/kde3/libkbearsitemanager.la
-lib/kde3/libkbearsitemanager.so
-lib/kde3/libkbeartoolsplugin.la
-lib/kde3/libkbeartoolsplugin.so
-lib/kde3/libkbearwincommanderimportfilter.la
-lib/kde3/libkbearwincommanderimportfilter.so
-lib/kde3/libkbearwsftpimportfilter.la
-lib/kde3/libkbearwsftpimportfilter.so
-lib/libkbear.la
-lib/libkbear.so
-lib/libkbear.so.2
-lib/libkbearfilesyspart.la
-lib/libkbearfilesyspart.so
+lib/kde3/libkbearlocalfilesyspart.la
+lib/kde3/libkbearlocalfilesyspart.so
+lib/kde3/libkbearremotefilesyspart.la
+lib/kde3/libkbearremotefilesyspart.so
+lib/libkbearcore.la
+lib/libkbearcore.so.3
+lib/libkbearqextmdi.la
+lib/libkbearqextmdi.so.3
 share/applnk/Internet/kbear.desktop
-share/apps/kbear/detailview_thumb.png
+share/apps/kbear/detailview_thumb.jpg
 share/apps/kbear/icons/hicolor/16x16/actions/kde1.png
 share/apps/kbear/icons/hicolor/16x16/actions/kde2.png
 share/apps/kbear/icons/hicolor/16x16/actions/kde3.png
 share/apps/kbear/icons/hicolor/16x16/actions/kde4.png
 share/apps/kbear/icons/hicolor/16x16/actions/kde5.png
 share/apps/kbear/icons/hicolor/16x16/actions/kde6.png
-share/apps/kbear/iconview_thumb.png
+share/apps/kbear/iconview_thumb.jpg
 share/apps/kbear/kbear-logo-bottom.jpg
 share/apps/kbear/kbear-logo-top.jpg
+share/apps/kbear/kbearfilesyspartiface.rc
 share/apps/kbear/kbearui.rc
-share/apps/kbear/kpartplugins/kbearsitemanagerui.rc
-share/apps/kbear/kpartplugins/kbeartoolsplugin.rc
 share/apps/kbear/sitemanager.xml
 share/apps/kbear/tips
-share/apps/kbeardirsynchpart/kbeardirsynchpartui.rc
-share/apps/kbearfilesyspart/kbearfilesyspart.rc
+share/apps/kbearfilediff/kbearfilediff.rc
+share/apps/kbearlocalfilesyspart/kbearlocalfilesyspart.rc
+share/apps/kbearrecentconnections/kbearrecentconnections.rc
+share/apps/kbearremotefilesyspart/kbearremotefilesyspart.rc
+share/apps/kbearsitemanager/kbearsitemanagerui.rc
+share/apps/kbearsystemtraydock/kbearsystemtraydockplugin.rc
+share/apps/kbeartipofday/kbeartipofdayplugin.rc
+share/apps/kbeartools/kbeartoolsplugin.rc
+share/apps/kbeartransferoutput/kbeartransferoutputplugin.rc
+share/apps/kbeartransferqueue/kbeartransferqueueplugin.rc
+share/apps/kbearwizard/kbearwizardplugin.rc
+share/config/kbearrc
 share/doc/HTML/cs/kbear/index.cache.bz2
 share/doc/HTML/cs/kbear/index.docbook
+share/doc/HTML/cs/kbear/index_cs.po
 share/doc/HTML/cs/kbear/common
 share/doc/HTML/en/kbear/index.cache.bz2
+share/doc/HTML/en/kbear/index-shifted.docbook
 share/doc/HTML/en/kbear/index.docbook
+share/doc/HTML/en/kbear/index_en.pot
 share/doc/HTML/en/kbear/common
-share/doc/HTML/es/kbear/index.cache.bz2
-share/doc/HTML/es/kbear/index.docbook
-share/doc/HTML/es/kbear/common
 share/doc/HTML/fr/kbear/index.cache.bz2
 share/doc/HTML/fr/kbear/index.docbook
+share/doc/HTML/fr/kbear/index_fr.po
 share/doc/HTML/fr/kbear/common
 share/doc/HTML/sv/kbear/index.cache.bz2
 share/doc/HTML/sv/kbear/index.docbook
+share/doc/HTML/sv/kbear/index_sv.po
 share/doc/HTML/sv/kbear/common
+share/icons/hicolor/16x16/actions/dirsynch.png
+share/icons/hicolor/16x16/actions/dirsynch_new.png
 share/icons/hicolor/16x16/actions/kbearsitemanager.png
-share/icons/hicolor/16x16/actions/kbearsitemanagerdb.png
 share/icons/hicolor/16x16/apps/kbear.png
-share/icons/hicolor/22x22/actions/kbearsitemanager.png
+share/icons/hicolor/32x32/actions/dirsynch.png
+share/icons/hicolor/32x32/actions/dirsynch_new.png
 share/icons/hicolor/32x32/actions/kbear-firewall.png
 share/icons/hicolor/32x32/actions/kbearsitemanager.png
 share/icons/hicolor/32x32/apps/kbear.png
+share/icons/hicolor/48x48/actions/kbearsitemanager.png
 share/icons/hicolor/48x48/apps/kbear.png
 share/locale/cs/LC_MESSAGES/kbear.mo
 share/locale/de/LC_MESSAGES/kbear.mo
@@ -77,28 +152,55 @@ share/locale/fr/LC_MESSAGES/kbear.mo
 share/locale/he/LC_MESSAGES/kbear.mo
 share/locale/id/LC_MESSAGES/kbear.mo
 share/locale/it/LC_MESSAGES/kbear.mo
+share/locale/ja/LC_MESSAGES/kbear.mo
 share/locale/nl/LC_MESSAGES/kbear.mo
+share/locale/pl/LC_MESSAGES/kbear.mo
 share/locale/pt/LC_MESSAGES/kbear.mo
+share/locale/pt_BR/LC_MESSAGES/kbear.mo
 share/locale/ro/LC_MESSAGES/kbear.mo
 share/locale/ru/LC_MESSAGES/kbear.mo
 share/locale/sv/LC_MESSAGES/kbear.mo
 share/locale/zh_TW/LC_MESSAGES/kbear.mo
+share/services/kbearconsole.desktop
+share/services/kbearfilediff.desktop
+share/services/kbearfirewall.desktop
 share/services/kbearftp.protocol
 share/services/kbeargftimportfilter.desktop
 share/services/kbearkrusaderimportfilter.desktop
+share/services/kbearlocalfilesys.desktop
+share/services/kbearlogoutput.desktop
 share/services/kbearncftpimportfilter.desktop
 share/services/kbearoldimportfilter.desktop
+share/services/kbearrecentconnections.desktop
+share/services/kbearremotefilesys.desktop
+share/services/kbearsitemanager.desktop
+share/services/kbearsystemtraydock.desktop
+share/services/kbeartipofday.desktop
+share/services/kbeartools.desktop
+share/services/kbeartransferoutput.desktop
+share/services/kbeartransferqueue.desktop
 share/services/kbearwincommanderimportfilter.desktop
+share/services/kbearwizard.desktop
 share/services/kbearws_ftpimportfilter.desktop
-share/servicetypes/kbearimportfilter.desktop
+share/services/urllistimportfilter.desktop
+share/servicetypes/kbearfilesyspart.desktop
+share/servicetypes/kbearpart.desktop
+share/servicetypes/kbearplugin.desktop
+share/servicetypes/kbearsiteimportfilterplugin.desktop
 @dirrm share/doc/HTML/sv/kbear
 @dirrm share/doc/HTML/fr/kbear
 @dirrm share/doc/HTML/en/kbear
-@dirrm share/doc/HTML/es/kbear
 @dirrm share/doc/HTML/cs/kbear
-@dirrm share/apps/kbeardirsynchpart
-@dirrm share/apps/kbearfilesyspart
-@dirrm share/apps/kbear/kpartplugins
+@dirrm share/apps/kbearfilediff
+@dirrm share/apps/kbearlocalfilesyspart
+@dirrm share/apps/kbearremotefilesyspart
+@dirrm share/apps/kbearsitemanager
+@dirrm share/apps/kbearsystemtraydock
+@dirrm share/apps/kbeartipofday
+@dirrm share/apps/kbeartools
+@dirrm share/apps/kbeartransferoutput
+@dirrm share/apps/kbeartransferqueue
+@dirrm share/apps/kbearwizard
 @dirrm share/apps/kbear/icons/hicolor/16x16/actions
 @dirrm share/apps/kbear/icons/hicolor/16x16
 @dirrm share/apps/kbear/icons/hicolor