Upgrade to 1.60.0

PR:		79800
Submitted by:	Heiner Eichmann <h.eichmann@gmx.de>

16 files changed, 70 insertions, 116 deletions

diff --git a/x11-fm/krusader/Makefile b/x11-fm/krusader/Makefile
index e9a257d9002b..1dad4d309a43 100644
--- a/x11-fm/krusader/Makefile
+++ b/x11-fm/krusader/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	krusader
-PORTVERSION=	1.51
-PORTREVISION=	1
+PORTVERSION=	1.60.0
 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 0bab718b2714..6ad5d9aaccfd 100644
--- a/x11-fm/krusader/distinfo
+++ b/x11-fm/krusader/distinfo
@@ -1,2 +1,2 @@
-MD5 (krusader-1.51.tar.gz) = 3b31a49db60b9e7f0884d78ed1ee3eb6
-SIZE (krusader-1.51.tar.gz) = 2898752
+MD5 (krusader-1.60.0.tar.gz) = 95f7900799bbd2810e6ac06fbf628536
+SIZE (krusader-1.60.0.tar.gz) = 3216697
diff --git a/x11-fm/krusader/files/patch-krusader-Synchronizer-synchronizer.cpp b/x11-fm/krusader/files/patch-krusader-Synchronizer-synchronizer.cpp
new file mode 100644
index 000000000000..194522348842
--- /dev/null
+++ b/x11-fm/krusader/files/patch-krusader-Synchronizer-synchronizer.cpp
@@ -0,0 +1,20 @@
+--- krusader/Synchronizer/synchronizer.cpp.orig	Sat Feb 12 13:54:06 2005
++++ krusader/Synchronizer/synchronizer.cpp	Fri Apr 15 21:39:03 2005
+@@ -1192,8 +1192,6 @@
+   waitWindow->setProgress( percent );
+ }
+ 
+-void Synchronizer::synchronizeWithKGet()
+-{
+   class KgetProgressDialog : public KDialogBase
+   {
+   public:
+@@ -1243,6 +1241,8 @@
+     bool       mPaused;
+   };  
+ 
++void Synchronizer::synchronizeWithKGet()
++{
+   bool isLeftLocal = vfs::fromPathOrURL( leftBaseDirectory() ).isLocalFile();
+   KgetProgressDialog *progDlg = 0;
+   int  processedCount = 0, totalCount = 0;
diff --git a/x11-fm/krusader/files/patch-krusader_DiskUsage_filelightParts_fileTree.h b/x11-fm/krusader/files/patch-krusader_DiskUsage_filelightParts_fileTree.h
deleted file mode 100644
index 7493ed864f4c..000000000000
--- a/x11-fm/krusader/files/patch-krusader_DiskUsage_filelightParts_fileTree.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- krusader/DiskUsage/filelightParts/fileTree.h.orig	Tue Nov 23 07:52:07 2004
-+++ krusader/DiskUsage/filelightParts/fileTree.h	Thu Dec 16 18:35:46 2004
-@@ -5,6 +5,7 @@
- #define FILETREE_H
- 
- #include <stdlib.h>
-+#include <sys/types.h>
- #include <kio/global.h>
- 
- //TODO these are pointlessly general purpose now, make them incredibly specific
diff --git a/x11-fm/krusader/files/patch-krusader_DiskUsage_radialMap_map.cpp b/x11-fm/krusader/files/patch-krusader_DiskUsage_radialMap_map.cpp
deleted file mode 100644
index d07b4c470039..000000000000
--- a/x11-fm/krusader/files/patch-krusader_DiskUsage_radialMap_map.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- krusader/DiskUsage/radialMap/map.cpp.orig	Tue Nov 23 00:45:27 2004
-+++ krusader/DiskUsage/radialMap/map.cpp	Thu Dec 16 19:30:23 2004
-@@ -392,3 +392,14 @@
- 
-    paint.end();
- }
-+
-+#if __GLIBC__ < 2 ||  __GLIBC__ == 2 && __GLIBC_MINOR__ < 1
-+   
-+   void
-+   sincos( double angleRadians, double *Sin, double *Cos )
-+   {
-+      *Sin = sin( angleRadians );
-+      *Cos = cos( angleRadians );
-+   }
-+
-+#endif
diff --git a/x11-fm/krusader/files/patch-krusader_DiskUsage_radialMap_sincos.h b/x11-fm/krusader/files/patch-krusader_DiskUsage_radialMap_sincos.h
deleted file mode 100644
index 4ad41281f895..000000000000
--- a/x11-fm/krusader/files/patch-krusader_DiskUsage_radialMap_sincos.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- krusader/DiskUsage/radialMap/sincos.h.orig	Mon Nov 22 23:55:25 2004
-+++ krusader/DiskUsage/radialMap/sincos.h	Thu Dec 16 19:30:32 2004
-@@ -7,13 +7,9 @@
- #include <math.h>
- 
- #if __GLIBC__ < 2 ||  __GLIBC__ == 2 && __GLIBC_MINOR__ < 1
--
-+   
-    void
--   sincos( int angleRadians, int *Sin, int *Cos )
--   {
--      *Sin = sin( angleRadians );
--      *Cos = cos( angleRadians );
--   }
-+   sincos( double angleRadians, double *Sin, double *Cos );
- 
- #endif
- 
diff --git a/x11-fm/krusader/pkg-descr b/x11-fm/krusader/pkg-descr
index d262214f3219..d687563ed06b 100644
--- a/x11-fm/krusader/pkg-descr
+++ b/x11-fm/krusader/pkg-descr
@@ -11,14 +11,5 @@ 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! :-) 
 
-Many things changed since 1.40, so here's some hightlights:
-* New user-action system, which allows you to define your own
-  personal krusader-actions.
-  Please take a look at the tutorial that comes in the doc\ section
-* 3rd Panel: new popup-panel that can display quick view, tree etc. Just click
-  the little arrow button on the bottom of each panel.
-* ISO protocol now allows you to step into .iso files
-* Cut, Copy and Paste: ctrl-v, ctrl-c and ctrl-x is working
-
 WWW: http://krusader.sourceforge.net
 Heiner (h.eichmann@gmx.de)
diff --git a/x11-fm/krusader/pkg-plist b/x11-fm/krusader/pkg-plist
index 2630ba90e4c1..043967e03436 100644
--- a/x11-fm/krusader/pkg-plist
+++ b/x11-fm/krusader/pkg-plist
@@ -4,6 +4,7 @@ lib/kde3/kio_iso.so
 lib/kde3/kio_krarc.la
 lib/kde3/kio_krarc.so
 share/applnk/Applications/krusader.desktop
+share/applnk/Applications/krusader_root-mode.desktop
 share/apps/konqueror/servicemenus/isoservice.desktop
 share/apps/krusader/about.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_addbookmark.png
@@ -90,8 +91,14 @@ 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
 share/apps/krusader/icons/hicolor/32x32/actions/kr_unselectall.png
+share/apps/krusader/icons/hicolor/32x32/actions/kr_useractions.png
 share/apps/krusader/konfig_small.jpg
 share/apps/krusader/krusaderui.rc
+share/apps/krusader/midnight_commander.color
+share/apps/krusader/total_commander.color
+share/apps/krusader/total_commander.keymap
+share/apps/krusader/total_commander.keymap.info
+share/apps/krusader/useractions.xml
 share/config/kio_isorc
 share/doc/HTML/en/krusader/bookmanadd.png
 share/doc/HTML/en/krusader/bookmanedit.png
@@ -125,12 +132,16 @@ 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/22x22/apps/krusader_shield.png
 share/icons/hicolor/32x32/apps/krusader.png
 share/icons/hicolor/32x32/apps/krusader_red.png
+share/icons/hicolor/32x32/apps/krusader_shield.png
 share/icons/hicolor/48x48/apps/krusader.png
 share/icons/hicolor/48x48/apps/krusader_red.png
+share/icons/hicolor/48x48/apps/krusader_shield.png
 share/icons/hicolor/64x64/apps/krusader.png
 share/icons/hicolor/64x64/apps/krusader_red.png
+share/icons/hicolor/64x64/apps/krusader_shield.png
 share/locale/bg/LC_MESSAGES/krusader.mo
 share/locale/bs/LC_MESSAGES/krusader.mo
 share/locale/ca/LC_MESSAGES/krusader.mo
@@ -147,6 +158,7 @@ share/locale/pl/LC_MESSAGES/krusader.mo
 share/locale/pt/LC_MESSAGES/krusader.mo
 share/locale/ru/LC_MESSAGES/krusader.mo
 share/locale/sk/LC_MESSAGES/krusader.mo
+share/locale/sl/LC_MESSAGES/krusader.mo
 share/locale/sv/LC_MESSAGES/krusader.mo
 share/locale/uk/LC_MESSAGES/krusader.mo
 share/locale/zh_CN/LC_MESSAGES/krusader.mo
diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile
index e9a257d9002b..1dad4d309a43 100644
--- a/x11-fm/krusader2/Makefile
+++ b/x11-fm/krusader2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	krusader
-PORTVERSION=	1.51
-PORTREVISION=	1
+PORTVERSION=	1.60.0
 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 0bab718b2714..6ad5d9aaccfd 100644
--- a/x11-fm/krusader2/distinfo
+++ b/x11-fm/krusader2/distinfo
@@ -1,2 +1,2 @@
-MD5 (krusader-1.51.tar.gz) = 3b31a49db60b9e7f0884d78ed1ee3eb6
-SIZE (krusader-1.51.tar.gz) = 2898752
+MD5 (krusader-1.60.0.tar.gz) = 95f7900799bbd2810e6ac06fbf628536
+SIZE (krusader-1.60.0.tar.gz) = 3216697
diff --git a/x11-fm/krusader2/files/patch-krusader-Synchronizer-synchronizer.cpp b/x11-fm/krusader2/files/patch-krusader-Synchronizer-synchronizer.cpp
new file mode 100644
index 000000000000..194522348842
--- /dev/null
+++ b/x11-fm/krusader2/files/patch-krusader-Synchronizer-synchronizer.cpp
@@ -0,0 +1,20 @@
+--- krusader/Synchronizer/synchronizer.cpp.orig	Sat Feb 12 13:54:06 2005
++++ krusader/Synchronizer/synchronizer.cpp	Fri Apr 15 21:39:03 2005
+@@ -1192,8 +1192,6 @@
+   waitWindow->setProgress( percent );
+ }
+ 
+-void Synchronizer::synchronizeWithKGet()
+-{
+   class KgetProgressDialog : public KDialogBase
+   {
+   public:
+@@ -1243,6 +1241,8 @@
+     bool       mPaused;
+   };  
+ 
++void Synchronizer::synchronizeWithKGet()
++{
+   bool isLeftLocal = vfs::fromPathOrURL( leftBaseDirectory() ).isLocalFile();
+   KgetProgressDialog *progDlg = 0;
+   int  processedCount = 0, totalCount = 0;
diff --git a/x11-fm/krusader2/files/patch-krusader_DiskUsage_filelightParts_fileTree.h b/x11-fm/krusader2/files/patch-krusader_DiskUsage_filelightParts_fileTree.h
deleted file mode 100644
index 7493ed864f4c..000000000000
--- a/x11-fm/krusader2/files/patch-krusader_DiskUsage_filelightParts_fileTree.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- krusader/DiskUsage/filelightParts/fileTree.h.orig	Tue Nov 23 07:52:07 2004
-+++ krusader/DiskUsage/filelightParts/fileTree.h	Thu Dec 16 18:35:46 2004
-@@ -5,6 +5,7 @@
- #define FILETREE_H
- 
- #include <stdlib.h>
-+#include <sys/types.h>
- #include <kio/global.h>
- 
- //TODO these are pointlessly general purpose now, make them incredibly specific
diff --git a/x11-fm/krusader2/files/patch-krusader_DiskUsage_radialMap_map.cpp b/x11-fm/krusader2/files/patch-krusader_DiskUsage_radialMap_map.cpp
deleted file mode 100644
index d07b4c470039..000000000000
--- a/x11-fm/krusader2/files/patch-krusader_DiskUsage_radialMap_map.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- krusader/DiskUsage/radialMap/map.cpp.orig	Tue Nov 23 00:45:27 2004
-+++ krusader/DiskUsage/radialMap/map.cpp	Thu Dec 16 19:30:23 2004
-@@ -392,3 +392,14 @@
- 
-    paint.end();
- }
-+
-+#if __GLIBC__ < 2 ||  __GLIBC__ == 2 && __GLIBC_MINOR__ < 1
-+   
-+   void
-+   sincos( double angleRadians, double *Sin, double *Cos )
-+   {
-+      *Sin = sin( angleRadians );
-+      *Cos = cos( angleRadians );
-+   }
-+
-+#endif
diff --git a/x11-fm/krusader2/files/patch-krusader_DiskUsage_radialMap_sincos.h b/x11-fm/krusader2/files/patch-krusader_DiskUsage_radialMap_sincos.h
deleted file mode 100644
index 4ad41281f895..000000000000
--- a/x11-fm/krusader2/files/patch-krusader_DiskUsage_radialMap_sincos.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- krusader/DiskUsage/radialMap/sincos.h.orig	Mon Nov 22 23:55:25 2004
-+++ krusader/DiskUsage/radialMap/sincos.h	Thu Dec 16 19:30:32 2004
-@@ -7,13 +7,9 @@
- #include <math.h>
- 
- #if __GLIBC__ < 2 ||  __GLIBC__ == 2 && __GLIBC_MINOR__ < 1
--
-+   
-    void
--   sincos( int angleRadians, int *Sin, int *Cos )
--   {
--      *Sin = sin( angleRadians );
--      *Cos = cos( angleRadians );
--   }
-+   sincos( double angleRadians, double *Sin, double *Cos );
- 
- #endif
- 
diff --git a/x11-fm/krusader2/pkg-descr b/x11-fm/krusader2/pkg-descr
index d262214f3219..d687563ed06b 100644
--- a/x11-fm/krusader2/pkg-descr
+++ b/x11-fm/krusader2/pkg-descr
@@ -11,14 +11,5 @@ 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! :-) 
 
-Many things changed since 1.40, so here's some hightlights:
-* New user-action system, which allows you to define your own
-  personal krusader-actions.
-  Please take a look at the tutorial that comes in the doc\ section
-* 3rd Panel: new popup-panel that can display quick view, tree etc. Just click
-  the little arrow button on the bottom of each panel.
-* ISO protocol now allows you to step into .iso files
-* Cut, Copy and Paste: ctrl-v, ctrl-c and ctrl-x is working
-
 WWW: http://krusader.sourceforge.net
 Heiner (h.eichmann@gmx.de)
diff --git a/x11-fm/krusader2/pkg-plist b/x11-fm/krusader2/pkg-plist
index 2630ba90e4c1..043967e03436 100644
--- a/x11-fm/krusader2/pkg-plist
+++ b/x11-fm/krusader2/pkg-plist
@@ -4,6 +4,7 @@ lib/kde3/kio_iso.so
 lib/kde3/kio_krarc.la
 lib/kde3/kio_krarc.so
 share/applnk/Applications/krusader.desktop
+share/applnk/Applications/krusader_root-mode.desktop
 share/apps/konqueror/servicemenus/isoservice.desktop
 share/apps/krusader/about.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_addbookmark.png
@@ -90,8 +91,14 @@ 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
 share/apps/krusader/icons/hicolor/32x32/actions/kr_unselectall.png
+share/apps/krusader/icons/hicolor/32x32/actions/kr_useractions.png
 share/apps/krusader/konfig_small.jpg
 share/apps/krusader/krusaderui.rc
+share/apps/krusader/midnight_commander.color
+share/apps/krusader/total_commander.color
+share/apps/krusader/total_commander.keymap
+share/apps/krusader/total_commander.keymap.info
+share/apps/krusader/useractions.xml
 share/config/kio_isorc
 share/doc/HTML/en/krusader/bookmanadd.png
 share/doc/HTML/en/krusader/bookmanedit.png
@@ -125,12 +132,16 @@ 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/22x22/apps/krusader_shield.png
 share/icons/hicolor/32x32/apps/krusader.png
 share/icons/hicolor/32x32/apps/krusader_red.png
+share/icons/hicolor/32x32/apps/krusader_shield.png
 share/icons/hicolor/48x48/apps/krusader.png
 share/icons/hicolor/48x48/apps/krusader_red.png
+share/icons/hicolor/48x48/apps/krusader_shield.png
 share/icons/hicolor/64x64/apps/krusader.png
 share/icons/hicolor/64x64/apps/krusader_red.png
+share/icons/hicolor/64x64/apps/krusader_shield.png
 share/locale/bg/LC_MESSAGES/krusader.mo
 share/locale/bs/LC_MESSAGES/krusader.mo
 share/locale/ca/LC_MESSAGES/krusader.mo
@@ -147,6 +158,7 @@ share/locale/pl/LC_MESSAGES/krusader.mo
 share/locale/pt/LC_MESSAGES/krusader.mo
 share/locale/ru/LC_MESSAGES/krusader.mo
 share/locale/sk/LC_MESSAGES/krusader.mo
+share/locale/sl/LC_MESSAGES/krusader.mo
 share/locale/sv/LC_MESSAGES/krusader.mo
 share/locale/uk/LC_MESSAGES/krusader.mo
 share/locale/zh_CN/LC_MESSAGES/krusader.mo