10 files changed, 114 insertions, 62 deletions

diff --git a/x11-fm/krusader/Makefile b/x11-fm/krusader/Makefile
index ff0b871e8972..202c04055e65 100644
--- a/x11-fm/krusader/Makefile
+++ b/x11-fm/krusader/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	krusader
-PORTVERSION=	1.30
-PORTREVISION=	2
+PORTVERSION=	1.40
 CATEGORIES=	x11-fm kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=krusader
diff --git a/x11-fm/krusader/distinfo b/x11-fm/krusader/distinfo
index 08217a162bb4..c7fdc657acc0 100644
--- a/x11-fm/krusader/distinfo
+++ b/x11-fm/krusader/distinfo
@@ -1,2 +1,2 @@
-MD5 (krusader-1.30.tar.gz) = a4f248257f7b30d995caa4dcb014d1ca
-SIZE (krusader-1.30.tar.gz) = 2134612
+MD5 (krusader-1.40.tar.gz) = 9fe6f4ccdd9b8a5a1ff2e331ba449ff8
+SIZE (krusader-1.40.tar.gz) = 2630534
diff --git a/x11-fm/krusader/pkg-descr b/x11-fm/krusader/pkg-descr
index b3e56f09eff5..8cb20558081d 100644
--- a/x11-fm/krusader/pkg-descr
+++ b/x11-fm/krusader/pkg-descr
@@ -1,23 +1,27 @@
-Krusader is a File Manager for KDE, patterned after old-school managers like 
-Midnight Commander and Norton Commander. It features basically all your 
-file-management needs, plus extensive archive handling, supporting many archive
-formats, mounted filesystems support, ftp, and much much more.
+Krusader is an advanced twin-panel (commander-style) file-manager for KDE 3.x 
+(similar to Midnight or Total Commander) but with many extras. It provides all 
+the file-management features you could possibly want.
+Plus: extensive archive handling, mounted filesystem support, FTP, advanced 
+search module, viewer/editor, directory synchronisation, file content 
+comparisons, powerful batch renaming and much much more.
+It supports the following archive formats: tar, zip, bzip2, gzip, rar, ace, 
+arj and rpm and can handle other KIOSlaves such as smb:// or fish://
+It is (almost) completely customizable, very user friendly, fast and looks 
+great on your desktop! :-)
 
-List of changes of MAJOR changes from 1.20 version:
-* Creating new files with SHIFT+F4
-* Tabbed - browsing! (click the middle or right mouse button on a folder)
-* a new view dialog, click SHIFT-F3 
-* Panel swapping by Ctrl+U
-* Right click menu, can now "open" multiple files (with the same mimetype)
-* Updates to the search module
-* A new command line widget, with many tweaks (ctrl+enter,ctrl+shift+enter,...)
-* run-in-terminal keeps the terminal open.
-* A new bookmark system is here! courtasy of Jan Halasa
-* In-place renaming (thanks to Heiner Eichmann)
-* New KIO slaves to handle archives.
-* Support for multi-file properties.
-* Krusader now obeys KDE's date time format
+Many things changed since 1.30, so here's some hightlights:
+* Configuring custom color for the panel (much requested feature)
+* Quick-mode for mountman (just press and HOLD the mountman icon)
+* Panel is now configurable (which columns to show, show icons or not ...)
+* Support for single-click selection mode
+* New toolbar for the panel
+* a Locate frontend
+* A new konfigurator (thanks to csaba)
+* New quick-search mode for the panel (thanks to heiner)
+* Ability to edit/view files from the search results window
+* A folder-history button, a-la-total commander. thanks to Hans Loffler
+* Synchronizer (thanks csaba)
+* File splitter
 
 WWW: http://krusader.sourceforge.net
-
-Heiner (h.eichmann@gmx.de)
+Heiner (h.eichmann@gmx.de)
\ No newline at end of file
diff --git a/x11-fm/krusader/pkg-message b/x11-fm/krusader/pkg-message
index 48cf4cd544e4..401b21d365e4 100644
--- a/x11-fm/krusader/pkg-message
+++ b/x11-fm/krusader/pkg-message
@@ -1,5 +1,4 @@
-If you would like to use more archivers that this
-program supports, install the following ports:
+Krusder supports the following additional archivers:
 
 archivers/zip
 archivers/unzip
@@ -9,3 +8,10 @@ archivers/unrar
 archivers/unace
 archivers/unarj
 archivers/rpm
+
+To use 'update DB' button in the locate dialog, open Settings->Konfigurator, 
+Dependencies and write '/usr/libexec/locate.updatedb' into the field 'updatedb'.
+
+Krusader allows to diff file with kdiff3 (textproc/kdiff3) or kompare (devel/kdesdk).
+
+Krusader supports krename (sysutils/krename) for renaming operations.
diff --git a/x11-fm/krusader/pkg-plist b/x11-fm/krusader/pkg-plist
index 00e95e18f589..0d5dac12d9a3 100644
--- a/x11-fm/krusader/pkg-plist
+++ b/x11-fm/krusader/pkg-plist
@@ -10,6 +10,7 @@ share/apps/krusader/icons/hicolor/16x16/actions/kr_arc_unpack.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_bookman.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_bookmark.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_calc.png
+share/apps/krusader/icons/hicolor/16x16/actions/kr_combine.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_compare.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_comparedirs.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_ftp_connect.png
@@ -22,6 +23,8 @@ share/apps/krusader/icons/hicolor/16x16/actions/kr_mountman.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_properties.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_select.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_selectall.png
+share/apps/krusader/icons/hicolor/16x16/actions/kr_split.png
+share/apps/krusader/icons/hicolor/16x16/actions/kr_syncdirs.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_terminal.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_treeview.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_unselect.png
@@ -33,6 +36,7 @@ share/apps/krusader/icons/hicolor/22x22/actions/kr_arc_unpack.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_bookman.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_bookmark.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_calc.png
+share/apps/krusader/icons/hicolor/22x22/actions/kr_combine.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_compare.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_comparedirs.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_ftp_connect.png
@@ -45,6 +49,8 @@ share/apps/krusader/icons/hicolor/22x22/actions/kr_mountman.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_properties.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_select.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_selectall.png
+share/apps/krusader/icons/hicolor/22x22/actions/kr_split.png
+share/apps/krusader/icons/hicolor/22x22/actions/kr_syncdirs.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_terminal.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_treeview.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_unselect.png
@@ -56,8 +62,10 @@ share/apps/krusader/icons/hicolor/32x32/actions/kr_arc_unpack.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_bookman.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_bookmark.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_calc.png
+share/apps/krusader/icons/hicolor/32x32/actions/kr_combine.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_compare.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_comparedirs.png
+share/apps/krusader/icons/hicolor/32x32/actions/kr_dependencies.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_ftp_connect.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_ftp_disconnect.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_ftp_new.png
@@ -68,6 +76,8 @@ share/apps/krusader/icons/hicolor/32x32/actions/kr_mountman.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_properties.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_select.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_selectall.png
+share/apps/krusader/icons/hicolor/32x32/actions/kr_split.png
+share/apps/krusader/icons/hicolor/32x32/actions/kr_syncdirs.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_terminal.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_treeview.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_unselect.png
@@ -105,9 +115,18 @@ share/doc/HTML/en/krusader/tabbed_browsing.png
 share/doc/HTML/en/krusader/terminalEmu.png
 share/doc/HTML/en/krusader/toolbar.png
 share/doc/HTML/en/krusader/using-krusader.sgml
+share/icons/hicolor/16x16/apps/krusader.png
+share/icons/hicolor/16x16/apps/krusader_red.png
+share/icons/hicolor/22x22/apps/krusader.png
+share/icons/hicolor/22x22/apps/krusader_red.png
 share/icons/hicolor/32x32/apps/krusader.png
-share/icons/hicolor/32x32/apps/krusader2.png
-share/icons/locolor/16x16/apps/krusader.png
+share/icons/hicolor/32x32/apps/krusader_red.png
+share/icons/hicolor/48x48/apps/krusader.png
+share/icons/hicolor/48x48/apps/krusader_red.png
+share/icons/hicolor/64x64/apps/krusader.png
+share/icons/hicolor/64x64/apps/krusader_red.png
+share/locale/bg/LC_MESSAGES/krusader.mo
+share/locale/ca/LC_MESSAGES/krusader.mo
 share/locale/cs/LC_MESSAGES/krusader.mo
 share/locale/de/LC_MESSAGES/krusader.mo
 share/locale/dk/LC_MESSAGES/krusader.mo
@@ -122,9 +141,7 @@ share/locale/pl/LC_MESSAGES/krusader.mo
 share/locale/ru/LC_MESSAGES/krusader.mo
 share/locale/sk/LC_MESSAGES/krusader.mo
 share/locale/sv/LC_MESSAGES/krusader.mo
-share/mimelnk/application/x-ace.desktop
-share/nls/POSIX
-share/nls/en_US.US-ASCII
+share/locale/zh_CN/LC_MESSAGES/krusader.mo
 share/services/krarc.protocol
 @dirrm share/doc/HTML/en/krusader
 @dirrm share/apps/krusader/icons/hicolor/32x32/actions
diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile
index ff0b871e8972..202c04055e65 100644
--- a/x11-fm/krusader2/Makefile
+++ b/x11-fm/krusader2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	krusader
-PORTVERSION=	1.30
-PORTREVISION=	2
+PORTVERSION=	1.40
 CATEGORIES=	x11-fm kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=krusader
diff --git a/x11-fm/krusader2/distinfo b/x11-fm/krusader2/distinfo
index 08217a162bb4..c7fdc657acc0 100644
--- a/x11-fm/krusader2/distinfo
+++ b/x11-fm/krusader2/distinfo
@@ -1,2 +1,2 @@
-MD5 (krusader-1.30.tar.gz) = a4f248257f7b30d995caa4dcb014d1ca
-SIZE (krusader-1.30.tar.gz) = 2134612
+MD5 (krusader-1.40.tar.gz) = 9fe6f4ccdd9b8a5a1ff2e331ba449ff8
+SIZE (krusader-1.40.tar.gz) = 2630534
diff --git a/x11-fm/krusader2/pkg-descr b/x11-fm/krusader2/pkg-descr
index b3e56f09eff5..8cb20558081d 100644
--- a/x11-fm/krusader2/pkg-descr
+++ b/x11-fm/krusader2/pkg-descr
@@ -1,23 +1,27 @@
-Krusader is a File Manager for KDE, patterned after old-school managers like 
-Midnight Commander and Norton Commander. It features basically all your 
-file-management needs, plus extensive archive handling, supporting many archive
-formats, mounted filesystems support, ftp, and much much more.
+Krusader is an advanced twin-panel (commander-style) file-manager for KDE 3.x 
+(similar to Midnight or Total Commander) but with many extras. It provides all 
+the file-management features you could possibly want.
+Plus: extensive archive handling, mounted filesystem support, FTP, advanced 
+search module, viewer/editor, directory synchronisation, file content 
+comparisons, powerful batch renaming and much much more.
+It supports the following archive formats: tar, zip, bzip2, gzip, rar, ace, 
+arj and rpm and can handle other KIOSlaves such as smb:// or fish://
+It is (almost) completely customizable, very user friendly, fast and looks 
+great on your desktop! :-)
 
-List of changes of MAJOR changes from 1.20 version:
-* Creating new files with SHIFT+F4
-* Tabbed - browsing! (click the middle or right mouse button on a folder)
-* a new view dialog, click SHIFT-F3 
-* Panel swapping by Ctrl+U
-* Right click menu, can now "open" multiple files (with the same mimetype)
-* Updates to the search module
-* A new command line widget, with many tweaks (ctrl+enter,ctrl+shift+enter,...)
-* run-in-terminal keeps the terminal open.
-* A new bookmark system is here! courtasy of Jan Halasa
-* In-place renaming (thanks to Heiner Eichmann)
-* New KIO slaves to handle archives.
-* Support for multi-file properties.
-* Krusader now obeys KDE's date time format
+Many things changed since 1.30, so here's some hightlights:
+* Configuring custom color for the panel (much requested feature)
+* Quick-mode for mountman (just press and HOLD the mountman icon)
+* Panel is now configurable (which columns to show, show icons or not ...)
+* Support for single-click selection mode
+* New toolbar for the panel
+* a Locate frontend
+* A new konfigurator (thanks to csaba)
+* New quick-search mode for the panel (thanks to heiner)
+* Ability to edit/view files from the search results window
+* A folder-history button, a-la-total commander. thanks to Hans Loffler
+* Synchronizer (thanks csaba)
+* File splitter
 
 WWW: http://krusader.sourceforge.net
-
-Heiner (h.eichmann@gmx.de)
+Heiner (h.eichmann@gmx.de)
\ No newline at end of file
diff --git a/x11-fm/krusader2/pkg-message b/x11-fm/krusader2/pkg-message
index 48cf4cd544e4..401b21d365e4 100644
--- a/x11-fm/krusader2/pkg-message
+++ b/x11-fm/krusader2/pkg-message
@@ -1,5 +1,4 @@
-If you would like to use more archivers that this
-program supports, install the following ports:
+Krusder supports the following additional archivers:
 
 archivers/zip
 archivers/unzip
@@ -9,3 +8,10 @@ archivers/unrar
 archivers/unace
 archivers/unarj
 archivers/rpm
+
+To use 'update DB' button in the locate dialog, open Settings->Konfigurator, 
+Dependencies and write '/usr/libexec/locate.updatedb' into the field 'updatedb'.
+
+Krusader allows to diff file with kdiff3 (textproc/kdiff3) or kompare (devel/kdesdk).
+
+Krusader supports krename (sysutils/krename) for renaming operations.
diff --git a/x11-fm/krusader2/pkg-plist b/x11-fm/krusader2/pkg-plist
index 00e95e18f589..0d5dac12d9a3 100644
--- a/x11-fm/krusader2/pkg-plist
+++ b/x11-fm/krusader2/pkg-plist
@@ -10,6 +10,7 @@ share/apps/krusader/icons/hicolor/16x16/actions/kr_arc_unpack.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_bookman.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_bookmark.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_calc.png
+share/apps/krusader/icons/hicolor/16x16/actions/kr_combine.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_compare.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_comparedirs.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_ftp_connect.png
@@ -22,6 +23,8 @@ share/apps/krusader/icons/hicolor/16x16/actions/kr_mountman.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_properties.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_select.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_selectall.png
+share/apps/krusader/icons/hicolor/16x16/actions/kr_split.png
+share/apps/krusader/icons/hicolor/16x16/actions/kr_syncdirs.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_terminal.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_treeview.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_unselect.png
@@ -33,6 +36,7 @@ share/apps/krusader/icons/hicolor/22x22/actions/kr_arc_unpack.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_bookman.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_bookmark.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_calc.png
+share/apps/krusader/icons/hicolor/22x22/actions/kr_combine.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_compare.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_comparedirs.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_ftp_connect.png
@@ -45,6 +49,8 @@ share/apps/krusader/icons/hicolor/22x22/actions/kr_mountman.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_properties.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_select.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_selectall.png
+share/apps/krusader/icons/hicolor/22x22/actions/kr_split.png
+share/apps/krusader/icons/hicolor/22x22/actions/kr_syncdirs.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_terminal.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_treeview.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_unselect.png
@@ -56,8 +62,10 @@ share/apps/krusader/icons/hicolor/32x32/actions/kr_arc_unpack.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_bookman.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_bookmark.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_calc.png
+share/apps/krusader/icons/hicolor/32x32/actions/kr_combine.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_compare.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_comparedirs.png
+share/apps/krusader/icons/hicolor/32x32/actions/kr_dependencies.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_ftp_connect.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_ftp_disconnect.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_ftp_new.png
@@ -68,6 +76,8 @@ share/apps/krusader/icons/hicolor/32x32/actions/kr_mountman.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_properties.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_select.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_selectall.png
+share/apps/krusader/icons/hicolor/32x32/actions/kr_split.png
+share/apps/krusader/icons/hicolor/32x32/actions/kr_syncdirs.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_terminal.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_treeview.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_unselect.png
@@ -105,9 +115,18 @@ share/doc/HTML/en/krusader/tabbed_browsing.png
 share/doc/HTML/en/krusader/terminalEmu.png
 share/doc/HTML/en/krusader/toolbar.png
 share/doc/HTML/en/krusader/using-krusader.sgml
+share/icons/hicolor/16x16/apps/krusader.png
+share/icons/hicolor/16x16/apps/krusader_red.png
+share/icons/hicolor/22x22/apps/krusader.png
+share/icons/hicolor/22x22/apps/krusader_red.png
 share/icons/hicolor/32x32/apps/krusader.png
-share/icons/hicolor/32x32/apps/krusader2.png
-share/icons/locolor/16x16/apps/krusader.png
+share/icons/hicolor/32x32/apps/krusader_red.png
+share/icons/hicolor/48x48/apps/krusader.png
+share/icons/hicolor/48x48/apps/krusader_red.png
+share/icons/hicolor/64x64/apps/krusader.png
+share/icons/hicolor/64x64/apps/krusader_red.png
+share/locale/bg/LC_MESSAGES/krusader.mo
+share/locale/ca/LC_MESSAGES/krusader.mo
 share/locale/cs/LC_MESSAGES/krusader.mo
 share/locale/de/LC_MESSAGES/krusader.mo
 share/locale/dk/LC_MESSAGES/krusader.mo
@@ -122,9 +141,7 @@ share/locale/pl/LC_MESSAGES/krusader.mo
 share/locale/ru/LC_MESSAGES/krusader.mo
 share/locale/sk/LC_MESSAGES/krusader.mo
 share/locale/sv/LC_MESSAGES/krusader.mo
-share/mimelnk/application/x-ace.desktop
-share/nls/POSIX
-share/nls/en_US.US-ASCII
+share/locale/zh_CN/LC_MESSAGES/krusader.mo
 share/services/krarc.protocol
 @dirrm share/doc/HTML/en/krusader
 @dirrm share/apps/krusader/icons/hicolor/32x32/actions