4 files changed, 105 insertions, 68 deletions

diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile
index eb93d7d3e4a4..ae4a248cbaf6 100644
--- a/x11-fm/krusader2/Makefile
+++ b/x11-fm/krusader2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	krusader
-PORTVERSION=	1.20
+PORTVERSION=	1.30
 CATEGORIES=	x11-fm kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=krusader
@@ -18,8 +18,24 @@ USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
+QTDIR?=${X11BASE}/bin
+KDEDIR?=${LOCALBASE}/bin
 CONFIGURE_TARGET=
+CONFIGURE_ENV+=QTDIR=${QTDIR} KDEDIR=${KDEDIR}
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+USE_LIBTOOL=	yes
+INSTALLS_SHLIB=	yes
+
+MAN1=	krusader.1
+
+pre-everything::
+	@${ECHO_MSG}
+	@${ECHO_MSG} "The following settings are assumed:"
+	@${ECHO_MSG} "Installation directory of qt3: QTDIR=${QTDIR}"
+	@${ECHO_MSG} "Installation directory of KDE3: KDEDIR=${KDEDIR}"
+	@${ECHO_MSG} "If these assumptions are wrong, stop the build NOW and set the variables correpondingly!"
+	@${ECHO_MSG}
+	@sleep 3
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/x11-fm/krusader2/distinfo b/x11-fm/krusader2/distinfo
index 46f750d15e58..efa50a8a85cc 100644
--- a/x11-fm/krusader2/distinfo
+++ b/x11-fm/krusader2/distinfo
@@ -1 +1 @@
-MD5 (krusader-1.20.tar.gz) = cc0d59ab5a8129b3bbbb329487ab1062
+MD5 (krusader-1.30.tar.gz) = a4f248257f7b30d995caa4dcb014d1ca
diff --git a/x11-fm/krusader2/pkg-descr b/x11-fm/krusader2/pkg-descr
index b128f3c258a6..b3e56f09eff5 100644
--- a/x11-fm/krusader2/pkg-descr
+++ b/x11-fm/krusader2/pkg-descr
@@ -1,14 +1,23 @@
-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 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.
 
-It is (almost) completely customizable, very user friendly,
-fast, and good looking :-)
+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
 
 WWW: http://krusader.sourceforge.net
 
-Heiner
-h.eichmann@gmx.de
+Heiner (h.eichmann@gmx.de)
diff --git a/x11-fm/krusader2/pkg-plist b/x11-fm/krusader2/pkg-plist
index 0df7268cf998..00e95e18f589 100644
--- a/x11-fm/krusader2/pkg-plist
+++ b/x11-fm/krusader2/pkg-plist
@@ -1,126 +1,138 @@
 bin/krusader
-share/doc/HTML/en/krusader/commands.sgml
-share/doc/HTML/en/krusader/credits.sgml
-share/doc/HTML/en/krusader/faq.sgml
-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/konfigurator.sgml
-share/doc/HTML/en/krusader/krusader-tools.sgml
-share/doc/HTML/en/krusader/using-krusader.sgml
-share/doc/HTML/en/krusader/index.cache.bz2
-share/doc/HTML/en/krusader/common
-share/doc/HTML/en/krusader/bookmanadd.png
-share/doc/HTML/en/krusader/bookmanedit.png
-share/doc/HTML/en/krusader/bookmanuse.png
-share/doc/HTML/en/krusader/cmdline.png
-share/doc/HTML/en/krusader/fnkeys.png
-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/krusader1.png
-share/doc/HTML/en/krusader/listpanel.png
-share/doc/HTML/en/krusader/mainwindow.png
-share/doc/HTML/en/krusader/mountman.png
-share/doc/HTML/en/krusader/remoteman.png
-share/doc/HTML/en/krusader/search_advanced.png
-share/doc/HTML/en/krusader/search_general.png
-share/doc/HTML/en/krusader/terminalEmu.png
-share/doc/HTML/en/krusader/toolbar.png
+lib/kde3/kio_krarc.la
+lib/kde3/kio_krarc.so
 share/applnk/Applications/krusader.desktop
-share/icons/hicolor/32x32/apps/krusader.png
-share/icons/hicolor/32x32/apps/krusader2.png
-share/icons/locolor/16x16/apps/krusader.png
-share/apps/krusader/krusaderui.rc
 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
 share/apps/krusader/icons/hicolor/16x16/actions/kr_arc_test.png
 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_compare.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_comparedirs.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_ftp_connect.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_ftp_disconnect.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_ftp_new.png
-share/apps/krusader/icons/hicolor/16x16/actions/kr_addbookmark.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_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_treeview.png
-share/apps/krusader/icons/hicolor/16x16/actions/kr_unselect.png
 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_terminal.png
+share/apps/krusader/icons/hicolor/16x16/actions/kr_treeview.png
+share/apps/krusader/icons/hicolor/16x16/actions/kr_unselect.png
 share/apps/krusader/icons/hicolor/16x16/actions/kr_unselectall.png
+share/apps/krusader/icons/hicolor/22x22/actions/kr_addbookmark.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_arc_pack.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_arc_test.png
 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_compare.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_comparedirs.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_ftp_connect.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_ftp_disconnect.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_ftp_new.png
-share/apps/krusader/icons/hicolor/22x22/actions/kr_addbookmark.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_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_treeview.png
-share/apps/krusader/icons/hicolor/22x22/actions/kr_unselect.png
 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_terminal.png
+share/apps/krusader/icons/hicolor/22x22/actions/kr_treeview.png
+share/apps/krusader/icons/hicolor/22x22/actions/kr_unselect.png
 share/apps/krusader/icons/hicolor/22x22/actions/kr_unselectall.png
+share/apps/krusader/icons/hicolor/32x32/actions/kr_addbookmark.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_arc_pack.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_arc_test.png
 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_compare.png
 share/apps/krusader/icons/hicolor/32x32/actions/kr_comparedirs.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
-share/apps/krusader/icons/hicolor/32x32/actions/kr_addbookmark.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_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_treeview.png
-share/apps/krusader/icons/hicolor/32x32/actions/kr_unselect.png
 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_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/konfig_small.jpg
-share/mimelnk/application/x-ace.desktop
+share/apps/krusader/krusaderui.rc
+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/common
+share/doc/HTML/en/krusader/credits.sgml
+share/doc/HTML/en/krusader/faq.sgml
+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/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/krusader1.png
+share/doc/HTML/en/krusader/krusader_title.png
+share/doc/HTML/en/krusader/listpanel.png
+share/doc/HTML/en/krusader/mainwindow.png
+share/doc/HTML/en/krusader/mountman.png
+share/doc/HTML/en/krusader/remoteman.png
+share/doc/HTML/en/krusader/search_advanced.png
+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/icons/hicolor/32x32/apps/krusader.png
+share/icons/hicolor/32x32/apps/krusader2.png
+share/icons/locolor/16x16/apps/krusader.png
 share/locale/cs/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/pl/LC_MESSAGES/krusader.mo
-share/locale/sv/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/mimelnk/application/x-ace.desktop
+share/nls/POSIX
+share/nls/en_US.US-ASCII
+share/services/krarc.protocol
 @dirrm share/doc/HTML/en/krusader
-@dirrm share/apps/krusader/icons/hicolor/16x16/actions
-@dirrm share/apps/krusader/icons/hicolor/16x16
-@dirrm share/apps/krusader/icons/hicolor/22x22/actions
-@dirrm share/apps/krusader/icons/hicolor/22x22
 @dirrm share/apps/krusader/icons/hicolor/32x32/actions
 @dirrm share/apps/krusader/icons/hicolor/32x32
+@dirrm share/apps/krusader/icons/hicolor/22x22/actions
+@dirrm share/apps/krusader/icons/hicolor/22x22
+@dirrm share/apps/krusader/icons/hicolor/16x16/actions
+@dirrm share/apps/krusader/icons/hicolor/16x16
 @dirrm share/apps/krusader/icons/hicolor
 @dirrm share/apps/krusader/icons
 @dirrm share/apps/krusader