- Update to 2.4.0-beta3

- Trim Makefile header
- Use DISTVERSION and simplify MASTER_SITES/DISTNAME
- Adjust COMMENT
- Get rid of indirect dependencies (iconv, Qt4)
- Don't use KDE4_BUILDENV (it's for KDE SC ports only),
  enable CMAKE_OUTSOURCE
- Mark MAKE_JOBS_SAFE
- Don't remove directories from kdehier4

Approved by:	fluffy (maintainer)
Feature safe:	yes

3 files changed, 191 insertions, 26 deletions

diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile
index 69cabbd076e0..b7eb5b54b1dc 100644
--- a/x11-fm/krusader2/Makefile
+++ b/x11-fm/krusader2/Makefile
@@ -1,33 +1,22 @@
-# New ports collection makefile for:	krusader
-# Date created:		21-04-2003
-# Whom:			Heiner <h.eichmann@gmx.de>
-#
+# Created by: Heiner <h.eichmann@gmx.de>
 # $FreeBSD$
-#
 
 PORTNAME=	krusader
-PORTVERSION=	2.4.0.b1
-PORTREVISION=	2
+DISTVERSION=	2.4.0-beta3
 CATEGORIES=	x11-fm kde
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/.b/-beta/}/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/-beta/}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}/
 
 MAINTAINER=	fluffy@FreeBSD.org
-COMMENT=	A two window file-manager for KDE, like midnight or norton commander
+COMMENT=	Twin panel file manager for KDE, like midnight or norton commander
 
-USE_KDE4=	kdelibs kdeprefix kdehier automoc4
-KDE4_BUILDENV=	yes
-USE_QT4=	gui network xml moc_build qmake_build \
-		rcc_build uic_build
 USE_BZIP2=	yes
+USE_CMAKE=	yes
 USE_GETTEXT=	yes
-USE_ICONV=	yes
-MAKE_JOBS_UNSAFE=	yes
-LATEST_LINK=	${PORTNAME}2
-
-MAN1=		krusader.1
+USE_KDE4=	kdelibs kdeprefix kdehier automoc4
+USE_QT4=	moc_build qmake_build rcc_build uic_build
 
-post-extract:
-	${MKDIR} ${WRKSRC}
+CMAKE_OUTSOURCE=	yes
+MAKE_JOBS_SAFE=	yes
+LATEST_LINK=	${PORTNAME}2
 
 .include <bsd.port.mk>
diff --git a/x11-fm/krusader2/distinfo b/x11-fm/krusader2/distinfo
index d73c6ae1f0ad..67155c63bfe8 100644
--- a/x11-fm/krusader2/distinfo
+++ b/x11-fm/krusader2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (krusader-2.4.0-beta1.tar.bz2) = 469e6ce593b2c54acca6009c55d001291df659d499db7edb0da48aff252335e0
-SIZE (krusader-2.4.0-beta1.tar.bz2) = 3430913
+SHA256 (krusader-2.4.0-beta3.tar.bz2) = ca43ddeef91e2821142b723d13c0be4bf0d138a9718cccd914cecb675cc97dae
+SIZE (krusader-2.4.0-beta3.tar.bz2) = 4305463
diff --git a/x11-fm/krusader2/pkg-plist b/x11-fm/krusader2/pkg-plist
index 7335e895f610..4465a1f81d34 100644
--- a/x11-fm/krusader2/pkg-plist
+++ b/x11-fm/krusader2/pkg-plist
@@ -421,7 +421,6 @@ share/doc/HTML/en/krusader/index.cache.bz2
 share/doc/HTML/en/krusader/index.docbook
 share/doc/HTML/en/krusader/installation.docbook
 share/doc/HTML/en/krusader/introduction.docbook
-share/doc/HTML/en/krusader/java.docbook
 share/doc/HTML/en/krusader/keyboard-commands.docbook
 share/doc/HTML/en/krusader/kgstartup.png
 share/doc/HTML/en/krusader/konfigurator.docbook
@@ -454,6 +453,175 @@ share/doc/HTML/en/krusader/useraction-xml.docbook
 share/doc/HTML/en/krusader/useractions.docbook
 share/doc/HTML/en/krusader/vfs.docbook
 share/doc/HTML/en/krusader/viewer-editor.docbook
+share/doc/HTML/pt/krusader/advanced-functions.docbook
+share/doc/HTML/pt/krusader/archives.docbook
+share/doc/HTML/pt/krusader/basic-functions.docbook
+share/doc/HTML/pt/krusader/bookmarks.docbook
+share/doc/HTML/pt/krusader/checksum.docbook
+share/doc/HTML/pt/krusader/common
+share/doc/HTML/pt/krusader/compare.docbook
+share/doc/HTML/pt/krusader/configuration-files.docbook
+share/doc/HTML/pt/krusader/credits-and-license.docbook
+share/doc/HTML/pt/krusader/diskusage.docbook
+share/doc/HTML/pt/krusader/editors-note.docbook
+share/doc/HTML/pt/krusader/faq.docbook
+share/doc/HTML/pt/krusader/features.docbook
+share/doc/HTML/pt/krusader/glossary.docbook
+share/doc/HTML/pt/krusader/help.docbook
+share/doc/HTML/pt/krusader/index.cache.bz2
+share/doc/HTML/pt/krusader/index.docbook
+share/doc/HTML/pt/krusader/installation.docbook
+share/doc/HTML/pt/krusader/introduction.docbook
+share/doc/HTML/pt/krusader/java.docbook
+share/doc/HTML/pt/krusader/keyboard-commands.docbook
+share/doc/HTML/pt/krusader/konfigurator.docbook
+share/doc/HTML/pt/krusader/krusader-tools.docbook
+share/doc/HTML/pt/krusader/locate.docbook
+share/doc/HTML/pt/krusader/man-krusader.1.docbook
+share/doc/HTML/pt/krusader/menu-commands.docbook
+share/doc/HTML/pt/krusader/mount.docbook
+share/doc/HTML/pt/krusader/mouse-commands.docbook
+share/doc/HTML/pt/krusader/occupied-space.docbook
+share/doc/HTML/pt/krusader/profiles.docbook
+share/doc/HTML/pt/krusader/release-overview.docbook
+share/doc/HTML/pt/krusader/remote-connections.docbook
+share/doc/HTML/pt/krusader/search.docbook
+share/doc/HTML/pt/krusader/splitter.docbook
+share/doc/HTML/pt/krusader/synchronizer.docbook
+share/doc/HTML/pt/krusader/user-interface.docbook
+share/doc/HTML/pt/krusader/useraction-xml.docbook
+share/doc/HTML/pt/krusader/useractions.docbook
+share/doc/HTML/pt/krusader/vfs.docbook
+share/doc/HTML/pt/krusader/viewer-editor.docbook
+share/doc/HTML/pt_BR/krusader/advanced-functions.docbook
+share/doc/HTML/pt_BR/krusader/archives.docbook
+share/doc/HTML/pt_BR/krusader/basic-functions.docbook
+share/doc/HTML/pt_BR/krusader/bookmarks.docbook
+share/doc/HTML/pt_BR/krusader/checksum.docbook
+share/doc/HTML/pt_BR/krusader/common
+share/doc/HTML/pt_BR/krusader/compare.docbook
+share/doc/HTML/pt_BR/krusader/configuration-files.docbook
+share/doc/HTML/pt_BR/krusader/credits-and-license.docbook
+share/doc/HTML/pt_BR/krusader/diskusage.docbook
+share/doc/HTML/pt_BR/krusader/editors-note.docbook
+share/doc/HTML/pt_BR/krusader/faq.docbook
+share/doc/HTML/pt_BR/krusader/features.docbook
+share/doc/HTML/pt_BR/krusader/glossary.docbook
+share/doc/HTML/pt_BR/krusader/help.docbook
+share/doc/HTML/pt_BR/krusader/index.cache.bz2
+share/doc/HTML/pt_BR/krusader/index.docbook
+share/doc/HTML/pt_BR/krusader/installation.docbook
+share/doc/HTML/pt_BR/krusader/introduction.docbook
+share/doc/HTML/pt_BR/krusader/keyboard-commands.docbook
+share/doc/HTML/pt_BR/krusader/konfigurator.docbook
+share/doc/HTML/pt_BR/krusader/krusader-tools.docbook
+share/doc/HTML/pt_BR/krusader/locate.docbook
+share/doc/HTML/pt_BR/krusader/man-krusader.1.docbook
+share/doc/HTML/pt_BR/krusader/menu-commands.docbook
+share/doc/HTML/pt_BR/krusader/mount.docbook
+share/doc/HTML/pt_BR/krusader/mouse-commands.docbook
+share/doc/HTML/pt_BR/krusader/occupied-space.docbook
+share/doc/HTML/pt_BR/krusader/profiles.docbook
+share/doc/HTML/pt_BR/krusader/release-overview.docbook
+share/doc/HTML/pt_BR/krusader/remote-connections.docbook
+share/doc/HTML/pt_BR/krusader/search.docbook
+share/doc/HTML/pt_BR/krusader/splitter.docbook
+share/doc/HTML/pt_BR/krusader/synchronizer.docbook
+share/doc/HTML/pt_BR/krusader/user-interface.docbook
+share/doc/HTML/pt_BR/krusader/useraction-xml.docbook
+share/doc/HTML/pt_BR/krusader/useractions.docbook
+share/doc/HTML/pt_BR/krusader/vfs.docbook
+share/doc/HTML/pt_BR/krusader/viewer-editor.docbook
+share/doc/HTML/sv/krusader/advanced-functions.docbook
+share/doc/HTML/sv/krusader/archives.docbook
+share/doc/HTML/sv/krusader/basic-functions.docbook
+share/doc/HTML/sv/krusader/bookmarks.docbook
+share/doc/HTML/sv/krusader/checksum.docbook
+share/doc/HTML/sv/krusader/common
+share/doc/HTML/sv/krusader/compare.docbook
+share/doc/HTML/sv/krusader/configuration-files.docbook
+share/doc/HTML/sv/krusader/credits-and-license.docbook
+share/doc/HTML/sv/krusader/diskusage.docbook
+share/doc/HTML/sv/krusader/editors-note.docbook
+share/doc/HTML/sv/krusader/faq.docbook
+share/doc/HTML/sv/krusader/features.docbook
+share/doc/HTML/sv/krusader/glossary.docbook
+share/doc/HTML/sv/krusader/help.docbook
+share/doc/HTML/sv/krusader/index.cache.bz2
+share/doc/HTML/sv/krusader/index.docbook
+share/doc/HTML/sv/krusader/installation.docbook
+share/doc/HTML/sv/krusader/introduction.docbook
+share/doc/HTML/sv/krusader/keyboard-commands.docbook
+share/doc/HTML/sv/krusader/konfigurator.docbook
+share/doc/HTML/sv/krusader/krusader-tools.docbook
+share/doc/HTML/sv/krusader/locate.docbook
+share/doc/HTML/sv/krusader/man-krusader.1.docbook
+share/doc/HTML/sv/krusader/menu-commands.docbook
+share/doc/HTML/sv/krusader/mount.docbook
+share/doc/HTML/sv/krusader/mouse-commands.docbook
+share/doc/HTML/sv/krusader/occupied-space.docbook
+share/doc/HTML/sv/krusader/profiles.docbook
+share/doc/HTML/sv/krusader/release-overview.docbook
+share/doc/HTML/sv/krusader/remote-connections.docbook
+share/doc/HTML/sv/krusader/search.docbook
+share/doc/HTML/sv/krusader/splitter.docbook
+share/doc/HTML/sv/krusader/synchronizer.docbook
+share/doc/HTML/sv/krusader/user-interface.docbook
+share/doc/HTML/sv/krusader/useraction-xml.docbook
+share/doc/HTML/sv/krusader/useractions.docbook
+share/doc/HTML/sv/krusader/vfs.docbook
+share/doc/HTML/sv/krusader/viewer-editor.docbook
+share/doc/HTML/uk/krusader/actionman.png
+share/doc/HTML/uk/krusader/advanced-functions.docbook
+share/doc/HTML/uk/krusader/archives.docbook
+share/doc/HTML/uk/krusader/basic-functions.docbook
+share/doc/HTML/uk/krusader/bookmanadd.png
+share/doc/HTML/uk/krusader/bookmanedit.png
+share/doc/HTML/uk/krusader/bookmarks.docbook
+share/doc/HTML/uk/krusader/checksum.docbook
+share/doc/HTML/uk/krusader/common
+share/doc/HTML/uk/krusader/compare.docbook
+share/doc/HTML/uk/krusader/configuration-files.docbook
+share/doc/HTML/uk/krusader/credits-and-license.docbook
+share/doc/HTML/uk/krusader/diskusage.docbook
+share/doc/HTML/uk/krusader/editors-note.docbook
+share/doc/HTML/uk/krusader/faq.docbook
+share/doc/HTML/uk/krusader/features.docbook
+share/doc/HTML/uk/krusader/fnkeys.png
+share/doc/HTML/uk/krusader/glossary.docbook
+share/doc/HTML/uk/krusader/help.docbook
+share/doc/HTML/uk/krusader/index.cache.bz2
+share/doc/HTML/uk/krusader/index.docbook
+share/doc/HTML/uk/krusader/installation.docbook
+share/doc/HTML/uk/krusader/introduction.docbook
+share/doc/HTML/uk/krusader/keyboard-commands.docbook
+share/doc/HTML/uk/krusader/kgstartup.png
+share/doc/HTML/uk/krusader/konfigurator.docbook
+share/doc/HTML/uk/krusader/krusader-tools.docbook
+share/doc/HTML/uk/krusader/krusader1.png
+share/doc/HTML/uk/krusader/listpanel.png
+share/doc/HTML/uk/krusader/locate.docbook
+share/doc/HTML/uk/krusader/mainwindow.png
+share/doc/HTML/uk/krusader/man-krusader.1.docbook
+share/doc/HTML/uk/krusader/menu-commands.docbook
+share/doc/HTML/uk/krusader/mount.docbook
+share/doc/HTML/uk/krusader/mountman.png
+share/doc/HTML/uk/krusader/mouse-commands.docbook
+share/doc/HTML/uk/krusader/occupied-space.docbook
+share/doc/HTML/uk/krusader/profiles.docbook
+share/doc/HTML/uk/krusader/release-overview.docbook
+share/doc/HTML/uk/krusader/remote-connections.docbook
+share/doc/HTML/uk/krusader/search.docbook
+share/doc/HTML/uk/krusader/search_advanced.png
+share/doc/HTML/uk/krusader/search_general.png
+share/doc/HTML/uk/krusader/splitter.docbook
+share/doc/HTML/uk/krusader/syncdir.png
+share/doc/HTML/uk/krusader/synchronizer.docbook
+share/doc/HTML/uk/krusader/user-interface.docbook
+share/doc/HTML/uk/krusader/useraction-xml.docbook
+share/doc/HTML/uk/krusader/useractions.docbook
+share/doc/HTML/uk/krusader/vfs.docbook
+share/doc/HTML/uk/krusader/viewer-editor.docbook
 share/icons/hicolor/128x128/apps/krusader_root.png
 share/icons/hicolor/128x128/apps/krusader_user.png
 share/icons/hicolor/16x16/apps/krusader_blue.png
@@ -497,6 +665,7 @@ share/locale/en_GB/LC_MESSAGES/krusader.mo
 share/locale/eo/LC_MESSAGES/krusader.mo
 share/locale/es/LC_MESSAGES/krusader.mo
 share/locale/et/LC_MESSAGES/krusader.mo
+share/locale/fi/LC_MESSAGES/krusader.mo
 share/locale/fr/LC_MESSAGES/krusader.mo
 share/locale/ga/LC_MESSAGES/krusader.mo
 share/locale/gl/LC_MESSAGES/krusader.mo
@@ -510,6 +679,7 @@ share/locale/mai/LC_MESSAGES/krusader.mo
 share/locale/nb/LC_MESSAGES/krusader.mo
 share/locale/nds/LC_MESSAGES/krusader.mo
 share/locale/nl/LC_MESSAGES/krusader.mo
+share/locale/pa/LC_MESSAGES/krusader.mo
 share/locale/pl/LC_MESSAGES/krusader.mo
 share/locale/pt/LC_MESSAGES/krusader.mo
 share/locale/pt_BR/LC_MESSAGES/krusader.mo
@@ -517,19 +687,25 @@ share/locale/ro/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/sr/LC_MESSAGES/krusader.mo
+share/locale/sr@ijekavian/LC_MESSAGES/krusader.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/krusader.mo
+share/locale/sr@latin/LC_MESSAGES/krusader.mo
 share/locale/sv/LC_MESSAGES/krusader.mo
 share/locale/tr/LC_MESSAGES/krusader.mo
 share/locale/ug/LC_MESSAGES/krusader.mo
 share/locale/uk/LC_MESSAGES/krusader.mo
 share/locale/zh_CN/LC_MESSAGES/krusader.mo
 share/locale/zh_TW/LC_MESSAGES/krusader.mo
-@dirrmtry share/locale/ug/LC_MESAGES
-@dirrmtry share/locale/ug
 @dirrmtry share/icons/locolor/32x32/apps
 @dirrmtry share/icons/locolor/32x32
 @dirrmtry share/icons/locolor/16x16/apps
 @dirrmtry share/icons/locolor/16x16
 @dirrmtry share/icons/locolor
+@dirrm share/doc/HTML/uk/krusader
+@dirrm share/doc/HTML/sv/krusader
+@dirrm share/doc/HTML/pt_BR/krusader
+@dirrm share/doc/HTML/pt/krusader
 @dirrm share/doc/HTML/en/krusader
 @dirrm share/apps/krusader/icons/hicolor/64x64/mimetypes
 @dirrm share/apps/krusader/icons/hicolor/64x64/devices