8 files changed, 88 insertions, 68 deletions

diff --git a/x11-fm/krusader/Makefile b/x11-fm/krusader/Makefile
index 202c04055e65..7f32f8b97325 100644
--- a/x11-fm/krusader/Makefile
+++ b/x11-fm/krusader/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	krusader
-PORTVERSION=	1.40
+PORTVERSION=	1.50
 CATEGORIES=	x11-fm kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=krusader
@@ -23,7 +23,6 @@ KDEDIR?=${LOCALBASE}/bin
 CONFIGURE_TARGET=
 CONFIGURE_ENV+=QTDIR=${QTDIR} KDEDIR=${KDEDIR}
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 MAN1=	krusader.1
@@ -37,6 +36,10 @@ pre-everything::
 	@${ECHO_MSG}
 	@sleep 3
 
+pre-configure:
+	${RM} ${WRKSRC}/admin/cvs.sh
+	${TOUCH} ${WRKSRC}/admin/cvs.sh
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/x11-fm/krusader/distinfo b/x11-fm/krusader/distinfo
index c7fdc657acc0..54c6ec3f071b 100644
--- a/x11-fm/krusader/distinfo
+++ b/x11-fm/krusader/distinfo
@@ -1,2 +1,2 @@
-MD5 (krusader-1.40.tar.gz) = 9fe6f4ccdd9b8a5a1ff2e331ba449ff8
-SIZE (krusader-1.40.tar.gz) = 2630534
+MD5 (krusader-1.50.tar.gz) = 24f86f89aa8fc10afa64afe9b966ca94
+SIZE (krusader-1.50.tar.gz) = 2755404
diff --git a/x11-fm/krusader/pkg-descr b/x11-fm/krusader/pkg-descr
index 8cb20558081d..d262214f3219 100644
--- a/x11-fm/krusader/pkg-descr
+++ b/x11-fm/krusader/pkg-descr
@@ -1,27 +1,24 @@
-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.
+Krusader is an advanced twin panel (commander style) file manager for KDE 3.1
+or later, similar to Midnight or Total Commander, 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! :-)
+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.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
+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)
\ No newline at end of file
+Heiner (h.eichmann@gmx.de)
diff --git a/x11-fm/krusader/pkg-plist b/x11-fm/krusader/pkg-plist
index 0d5dac12d9a3..557d98865bdd 100644
--- a/x11-fm/krusader/pkg-plist
+++ b/x11-fm/krusader/pkg-plist
@@ -1,7 +1,10 @@
 bin/krusader
+lib/kde3/kio_iso.la
+lib/kde3/kio_iso.so
 lib/kde3/kio_krarc.la
 lib/kde3/kio_krarc.so
 share/applnk/Applications/krusader.desktop
+share/apps/konqueror/servicemenus/isoservice.desktop
 share/apps/krusader/about.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_addbookmark.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_arc_pack.png
@@ -20,10 +23,13 @@ share/apps/krusader/icons/hicolor/16x16/actions/kr_fullview.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_hwinfo.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_invert.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_mountman.png
+share/apps/krusader/icons/hicolor/16x16/actions/kr_profile.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_syncbrowse_off.png
+share/apps/krusader/icons/hicolor/16x16/actions/kr_syncbrowse_on.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
@@ -46,6 +52,7 @@ share/apps/krusader/icons/hicolor/22x22/actions/kr_fullview.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_hwinfo.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_invert.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_mountman.png
+share/apps/krusader/icons/hicolor/22x22/actions/kr_profile.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
@@ -73,6 +80,7 @@ share/apps/krusader/icons/hicolor/32x32/actions/kr_fullview.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_hwinfo.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_invert.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_mountman.png
+share/apps/krusader/icons/hicolor/32x32/actions/kr_profile.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
@@ -84,25 +92,26 @@ share/apps/krusader/icons/hicolor/32x32/actions/kr_unselect.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_unselectall.png
 share/apps/krusader/konfig_small.jpg
 share/apps/krusader/krusaderui.rc
+share/config/kio_isorc
 share/doc/HTML/en/krusader/bookmanadd.png
 share/doc/HTML/en/krusader/bookmanedit.png
 share/doc/HTML/en/krusader/cmdline.png
-share/doc/HTML/en/krusader/commands.sgml
+share/doc/HTML/en/krusader/commands.docbook
 share/doc/HTML/en/krusader/common
-share/doc/HTML/en/krusader/credits.sgml
-share/doc/HTML/en/krusader/faq.sgml
+share/doc/HTML/en/krusader/credits.docbook
+share/doc/HTML/en/krusader/faq.docbook
 share/doc/HTML/en/krusader/fnkeys.png
 share/doc/HTML/en/krusader/index.cache.bz2
 share/doc/HTML/en/krusader/index.docbook
-share/doc/HTML/en/krusader/installation.sgml
-share/doc/HTML/en/krusader/introduction.sgml
+share/doc/HTML/en/krusader/installation.docbook
+share/doc/HTML/en/krusader/introduction.docbook
 share/doc/HTML/en/krusader/kgadvanced.png
 share/doc/HTML/en/krusader/kgarchives.png
 share/doc/HTML/en/krusader/kggeneral.png
 share/doc/HTML/en/krusader/kglookfeel.png
 share/doc/HTML/en/krusader/kgstartup.png
-share/doc/HTML/en/krusader/konfigurator.sgml
-share/doc/HTML/en/krusader/krusader-tools.sgml
+share/doc/HTML/en/krusader/konfigurator.docbook
+share/doc/HTML/en/krusader/krusader-tools.docbook
 share/doc/HTML/en/krusader/krusader1.png
 share/doc/HTML/en/krusader/krusader_title.png
 share/doc/HTML/en/krusader/listpanel.png
@@ -114,7 +123,7 @@ share/doc/HTML/en/krusader/search_general.png
 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/doc/HTML/en/krusader/using-krusader.docbook
 share/icons/hicolor/16x16/apps/krusader.png
 share/icons/hicolor/16x16/apps/krusader_red.png
 share/icons/hicolor/22x22/apps/krusader.png
@@ -126,22 +135,23 @@ 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/bs/LC_MESSAGES/krusader.mo
 share/locale/ca/LC_MESSAGES/krusader.mo
 share/locale/cs/LC_MESSAGES/krusader.mo
+share/locale/da/LC_MESSAGES/krusader.mo
 share/locale/de/LC_MESSAGES/krusader.mo
-share/locale/dk/LC_MESSAGES/krusader.mo
 share/locale/es/LC_MESSAGES/krusader.mo
 share/locale/fr/LC_MESSAGES/krusader.mo
 share/locale/hu/LC_MESSAGES/krusader.mo
 share/locale/it/LC_MESSAGES/krusader.mo
 share/locale/ja/LC_MESSAGES/krusader.mo
-share/locale/jp/LC_MESSAGES/krusader.mo
 share/locale/nl/LC_MESSAGES/krusader.mo
 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/locale/zh_CN/LC_MESSAGES/krusader.mo
+share/services/iso.protocol
 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 202c04055e65..7f32f8b97325 100644
--- a/x11-fm/krusader2/Makefile
+++ b/x11-fm/krusader2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	krusader
-PORTVERSION=	1.40
+PORTVERSION=	1.50
 CATEGORIES=	x11-fm kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=krusader
@@ -23,7 +23,6 @@ KDEDIR?=${LOCALBASE}/bin
 CONFIGURE_TARGET=
 CONFIGURE_ENV+=QTDIR=${QTDIR} KDEDIR=${KDEDIR}
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-USE_INC_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
 
 MAN1=	krusader.1
@@ -37,6 +36,10 @@ pre-everything::
 	@${ECHO_MSG}
 	@sleep 3
 
+pre-configure:
+	${RM} ${WRKSRC}/admin/cvs.sh
+	${TOUCH} ${WRKSRC}/admin/cvs.sh
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/x11-fm/krusader2/distinfo b/x11-fm/krusader2/distinfo
index c7fdc657acc0..54c6ec3f071b 100644
--- a/x11-fm/krusader2/distinfo
+++ b/x11-fm/krusader2/distinfo
@@ -1,2 +1,2 @@
-MD5 (krusader-1.40.tar.gz) = 9fe6f4ccdd9b8a5a1ff2e331ba449ff8
-SIZE (krusader-1.40.tar.gz) = 2630534
+MD5 (krusader-1.50.tar.gz) = 24f86f89aa8fc10afa64afe9b966ca94
+SIZE (krusader-1.50.tar.gz) = 2755404
diff --git a/x11-fm/krusader2/pkg-descr b/x11-fm/krusader2/pkg-descr
index 8cb20558081d..d262214f3219 100644
--- a/x11-fm/krusader2/pkg-descr
+++ b/x11-fm/krusader2/pkg-descr
@@ -1,27 +1,24 @@
-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.
+Krusader is an advanced twin panel (commander style) file manager for KDE 3.1
+or later, similar to Midnight or Total Commander, 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! :-)
+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.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
+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)
\ No newline at end of file
+Heiner (h.eichmann@gmx.de)
diff --git a/x11-fm/krusader2/pkg-plist b/x11-fm/krusader2/pkg-plist
index 0d5dac12d9a3..557d98865bdd 100644
--- a/x11-fm/krusader2/pkg-plist
+++ b/x11-fm/krusader2/pkg-plist
@@ -1,7 +1,10 @@
 bin/krusader
+lib/kde3/kio_iso.la
+lib/kde3/kio_iso.so
 lib/kde3/kio_krarc.la
 lib/kde3/kio_krarc.so
 share/applnk/Applications/krusader.desktop
+share/apps/konqueror/servicemenus/isoservice.desktop
 share/apps/krusader/about.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_addbookmark.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_arc_pack.png
@@ -20,10 +23,13 @@ share/apps/krusader/icons/hicolor/16x16/actions/kr_fullview.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_hwinfo.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_invert.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_mountman.png
+share/apps/krusader/icons/hicolor/16x16/actions/kr_profile.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_syncbrowse_off.png
+share/apps/krusader/icons/hicolor/16x16/actions/kr_syncbrowse_on.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
@@ -46,6 +52,7 @@ share/apps/krusader/icons/hicolor/22x22/actions/kr_fullview.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_hwinfo.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_invert.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_mountman.png
+share/apps/krusader/icons/hicolor/22x22/actions/kr_profile.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
@@ -73,6 +80,7 @@ share/apps/krusader/icons/hicolor/32x32/actions/kr_fullview.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_hwinfo.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_invert.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_mountman.png
+share/apps/krusader/icons/hicolor/32x32/actions/kr_profile.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
@@ -84,25 +92,26 @@ share/apps/krusader/icons/hicolor/32x32/actions/kr_unselect.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_unselectall.png
 share/apps/krusader/konfig_small.jpg
 share/apps/krusader/krusaderui.rc
+share/config/kio_isorc
 share/doc/HTML/en/krusader/bookmanadd.png
 share/doc/HTML/en/krusader/bookmanedit.png
 share/doc/HTML/en/krusader/cmdline.png
-share/doc/HTML/en/krusader/commands.sgml
+share/doc/HTML/en/krusader/commands.docbook
 share/doc/HTML/en/krusader/common
-share/doc/HTML/en/krusader/credits.sgml
-share/doc/HTML/en/krusader/faq.sgml
+share/doc/HTML/en/krusader/credits.docbook
+share/doc/HTML/en/krusader/faq.docbook
 share/doc/HTML/en/krusader/fnkeys.png
 share/doc/HTML/en/krusader/index.cache.bz2
 share/doc/HTML/en/krusader/index.docbook
-share/doc/HTML/en/krusader/installation.sgml
-share/doc/HTML/en/krusader/introduction.sgml
+share/doc/HTML/en/krusader/installation.docbook
+share/doc/HTML/en/krusader/introduction.docbook
 share/doc/HTML/en/krusader/kgadvanced.png
 share/doc/HTML/en/krusader/kgarchives.png
 share/doc/HTML/en/krusader/kggeneral.png
 share/doc/HTML/en/krusader/kglookfeel.png
 share/doc/HTML/en/krusader/kgstartup.png
-share/doc/HTML/en/krusader/konfigurator.sgml
-share/doc/HTML/en/krusader/krusader-tools.sgml
+share/doc/HTML/en/krusader/konfigurator.docbook
+share/doc/HTML/en/krusader/krusader-tools.docbook
 share/doc/HTML/en/krusader/krusader1.png
 share/doc/HTML/en/krusader/krusader_title.png
 share/doc/HTML/en/krusader/listpanel.png
@@ -114,7 +123,7 @@ share/doc/HTML/en/krusader/search_general.png
 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/doc/HTML/en/krusader/using-krusader.docbook
 share/icons/hicolor/16x16/apps/krusader.png
 share/icons/hicolor/16x16/apps/krusader_red.png
 share/icons/hicolor/22x22/apps/krusader.png
@@ -126,22 +135,23 @@ 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/bs/LC_MESSAGES/krusader.mo
 share/locale/ca/LC_MESSAGES/krusader.mo
 share/locale/cs/LC_MESSAGES/krusader.mo
+share/locale/da/LC_MESSAGES/krusader.mo
 share/locale/de/LC_MESSAGES/krusader.mo
-share/locale/dk/LC_MESSAGES/krusader.mo
 share/locale/es/LC_MESSAGES/krusader.mo
 share/locale/fr/LC_MESSAGES/krusader.mo
 share/locale/hu/LC_MESSAGES/krusader.mo
 share/locale/it/LC_MESSAGES/krusader.mo
 share/locale/ja/LC_MESSAGES/krusader.mo
-share/locale/jp/LC_MESSAGES/krusader.mo
 share/locale/nl/LC_MESSAGES/krusader.mo
 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/locale/zh_CN/LC_MESSAGES/krusader.mo
+share/services/iso.protocol
 share/services/krarc.protocol
 @dirrm share/doc/HTML/en/krusader
 @dirrm share/apps/krusader/icons/hicolor/32x32/actions