13 files changed, 191 insertions, 89 deletions

diff --git a/math/eigen2/Makefile b/math/eigen2/Makefile
index aae34acd1b79..e9a582d280c6 100644
--- a/math/eigen2/Makefile
+++ b/math/eigen2/Makefile
@@ -5,9 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	eigen
-DISTVERSION=	2.0.2
+DISTVERSION=	2.0.52
 CATEGORIES=	math
-MASTER_SITES=	http://download.tuxfamily.org/eigen/
+MASTER_SITES=	http://ns.ael.ru/~fluffy.khv/ \
+		http://download.tuxfamily.org/eigen/
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Lightweight library for vector and matrix math
@@ -17,4 +18,8 @@ USE_CMAKE=	yes
 
 LATEST_LINK=	${PORTNAME}2
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|g' \
+		${WRKSRC}/CMakeLists.txt
+
 .include <bsd.port.mk>
diff --git a/math/eigen2/distinfo b/math/eigen2/distinfo
index 3ca40082c5ce..ce0b7f05d9d1 100644
--- a/math/eigen2/distinfo
+++ b/math/eigen2/distinfo
@@ -1,3 +1,3 @@
-MD5 (eigen-2.0.2.tar.bz2) = b2c34144943671a8689b6fab20c52836
-SHA256 (eigen-2.0.2.tar.bz2) = 9e7d84f07538e61a69064e7056324e30ac6fe7a7bb2e7d3227a79ff8c7311743
-SIZE (eigen-2.0.2.tar.bz2) = 348996
+MD5 (eigen-2.0.52.tar.bz2) = 13e71c84309288047e79c93d79ffedac
+SHA256 (eigen-2.0.52.tar.bz2) = 67fc9233b5fa5acc167fdd0ff3f59ea3e426b062980378c2f1dadbdc247d4658
+SIZE (eigen-2.0.52.tar.bz2) = 420384
diff --git a/math/eigen2/files/patch-Eigen__src__Core__util__Memory.h b/math/eigen2/files/patch-Eigen__src__Core__util__Memory.h
deleted file mode 100644
index 63c1b0d4503c..000000000000
--- a/math/eigen2/files/patch-Eigen__src__Core__util__Memory.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Eigen/src/Core/util/Memory.h.orig	2009-05-22 17:41:27.000000000 +0400
-+++ ./Eigen/src/Core/util/Memory.h	2009-05-22 23:12:08.000000000 +0400
-@@ -27,7 +27,7 @@
- #ifndef EIGEN_MEMORY_H
- #define EIGEN_MEMORY_H
- 
--#if defined(__APPLE__) || defined(_WIN64)
-+#if defined(__APPLE__) || defined(_WIN64) || defined (__FreeBSD__)
-   #define EIGEN_MALLOC_ALREADY_ALIGNED 1
- #else
-   #define EIGEN_MALLOC_ALREADY_ALIGNED 0
diff --git a/math/eigen2/pkg-plist b/math/eigen2/pkg-plist
index 0ae417f73744..03b97f0fab37 100644
--- a/math/eigen2/pkg-plist
+++ b/math/eigen2/pkg-plist
@@ -13,21 +13,23 @@ include/eigen2/Eigen/src/Array/BooleanRedux.h
 include/eigen2/Eigen/src/Array/CwiseOperators.h
 include/eigen2/Eigen/src/Array/Functors.h
 include/eigen2/Eigen/src/Array/Norms.h
-include/eigen2/Eigen/src/Array/PartialRedux.h
 include/eigen2/Eigen/src/Array/Random.h
+include/eigen2/Eigen/src/Array/Replicate.h
+include/eigen2/Eigen/src/Array/Reverse.h
 include/eigen2/Eigen/src/Array/Select.h
+include/eigen2/Eigen/src/Array/VectorwiseOp.h
 include/eigen2/Eigen/src/Cholesky/LDLT.h
 include/eigen2/Eigen/src/Cholesky/LLT.h
 include/eigen2/Eigen/src/Core/Assign.h
 include/eigen2/Eigen/src/Core/Block.h
-include/eigen2/Eigen/src/Core/CacheFriendlyProduct.h
 include/eigen2/Eigen/src/Core/Coeffs.h
 include/eigen2/Eigen/src/Core/CommaInitializer.h
 include/eigen2/Eigen/src/Core/Cwise.h
 include/eigen2/Eigen/src/Core/CwiseBinaryOp.h
 include/eigen2/Eigen/src/Core/CwiseNullaryOp.h
 include/eigen2/Eigen/src/Core/CwiseUnaryOp.h
-include/eigen2/Eigen/src/Core/DiagonalCoeffs.h
+include/eigen2/Eigen/src/Core/CwiseUnaryView.h
+include/eigen2/Eigen/src/Core/Diagonal.h
 include/eigen2/Eigen/src/Core/DiagonalMatrix.h
 include/eigen2/Eigen/src/Core/DiagonalProduct.h
 include/eigen2/Eigen/src/Core/Dot.h
@@ -47,14 +49,18 @@ include/eigen2/Eigen/src/Core/NestByValue.h
 include/eigen2/Eigen/src/Core/NumTraits.h
 include/eigen2/Eigen/src/Core/Part.h
 include/eigen2/Eigen/src/Core/Product.h
+include/eigen2/Eigen/src/Core/ReturnByValue.h
 include/eigen2/Eigen/src/Core/Redux.h
 include/eigen2/Eigen/src/Core/SolveTriangular.h
-include/eigen2/Eigen/src/Core/Sum.h
 include/eigen2/Eigen/src/Core/Swap.h
 include/eigen2/Eigen/src/Core/Transpose.h
 include/eigen2/Eigen/src/Core/Visitor.h
 include/eigen2/Eigen/src/Core/arch/AltiVec/PacketMath.h
+include/eigen2/Eigen/src/Core/arch/SSE/MathFunctions.h
 include/eigen2/Eigen/src/Core/arch/SSE/PacketMath.h
+include/eigen2/Eigen/src/Core/products/GeneralMatrixMatrix.h
+include/eigen2/Eigen/src/Core/products/GeneralMatrixVector.h
+include/eigen2/Eigen/src/Core/products/SelfadjointMatrixVector.h
 include/eigen2/Eigen/src/Core/util/Constants.h
 include/eigen2/Eigen/src/Core/util/DisableMSVCWarnings.h
 include/eigen2/Eigen/src/Core/util/EnableMSVCWarnings.h
@@ -67,6 +73,7 @@ include/eigen2/Eigen/src/Core/util/XprHelper.h
 include/eigen2/Eigen/src/Geometry/AlignedBox.h
 include/eigen2/Eigen/src/Geometry/AngleAxis.h
 include/eigen2/Eigen/src/Geometry/EulerAngles.h
+include/eigen2/Eigen/src/Geometry/Homogeneous.h
 include/eigen2/Eigen/src/Geometry/Hyperplane.h
 include/eigen2/Eigen/src/Geometry/OrthoMethods.h
 include/eigen2/Eigen/src/Geometry/ParametrizedLine.h
@@ -76,9 +83,12 @@ include/eigen2/Eigen/src/Geometry/RotationBase.h
 include/eigen2/Eigen/src/Geometry/Scaling.h
 include/eigen2/Eigen/src/Geometry/Transform.h
 include/eigen2/Eigen/src/Geometry/Translation.h
+include/eigen2/Eigen/src/Geometry/Umeyama.h
+include/eigen2/Eigen/src/Geometry/arch/Geometry_SSE.h
 include/eigen2/Eigen/src/LU/Determinant.h
 include/eigen2/Eigen/src/LU/Inverse.h
 include/eigen2/Eigen/src/LU/LU.h
+include/eigen2/Eigen/src/LU/PartialLU.h
 include/eigen2/Eigen/src/LeastSquares/LeastSquares.h
 include/eigen2/Eigen/src/QR/EigenSolver.h
 include/eigen2/Eigen/src/QR/HessenbergDecomposition.h
@@ -98,6 +108,7 @@ include/eigen2/Eigen/src/Sparse/SparseBlock.h
 include/eigen2/Eigen/src/Sparse/SparseCwise.h
 include/eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h
 include/eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h
+include/eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h
 include/eigen2/Eigen/src/Sparse/SparseDot.h
 include/eigen2/Eigen/src/Sparse/SparseFlagged.h
 include/eigen2/Eigen/src/Sparse/SparseFuzzy.h
@@ -109,19 +120,46 @@ include/eigen2/Eigen/src/Sparse/SparseMatrixBase.h
 include/eigen2/Eigen/src/Sparse/SparseProduct.h
 include/eigen2/Eigen/src/Sparse/SparseRedux.h
 include/eigen2/Eigen/src/Sparse/SparseTranspose.h
+include/eigen2/Eigen/src/Sparse/SparseTriangular.h
 include/eigen2/Eigen/src/Sparse/SparseUtil.h
 include/eigen2/Eigen/src/Sparse/SparseVector.h
 include/eigen2/Eigen/src/Sparse/SuperLUSupport.h
 include/eigen2/Eigen/src/Sparse/TaucsSupport.h
 include/eigen2/Eigen/src/Sparse/TriangularSolver.h
 include/eigen2/Eigen/src/Sparse/UmfPackSupport.h
+include/eigen2/unsupported/Eigen/AdolcForward
+include/eigen2/unsupported/Eigen/AlignedVector3
+include/eigen2/unsupported/Eigen/AutoDiff
+include/eigen2/unsupported/Eigen/BVH
+include/eigen2/unsupported/Eigen/IterativeSolvers
+include/eigen2/unsupported/Eigen/MatrixFunctions
+include/eigen2/unsupported/Eigen/MoreVectorization
+include/eigen2/unsupported/Eigen/src/AutoDiff/AutoDiffJacobian.h
+include/eigen2/unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h
+include/eigen2/unsupported/Eigen/src/AutoDiff/AutoDiffVector.h
+include/eigen2/unsupported/Eigen/src/BVH/BVAlgorithms.h
+include/eigen2/unsupported/Eigen/src/BVH/KdBVH.h
+include/eigen2/unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h
+include/eigen2/unsupported/Eigen/src/IterativeSolvers/IterationController.h
+include/eigen2/unsupported/Eigen/src/MoreVectorization/MathFunctions.h
+libdata/pkgconfig/eigen2.pc
+@dirrm include/eigen2/unsupported/Eigen/src/MoreVectorization
+@dirrm include/eigen2/unsupported/Eigen/src/MatrixFunctions
+@dirrm include/eigen2/unsupported/Eigen/src/IterativeSolvers
+@dirrm include/eigen2/unsupported/Eigen/src/BVH
+@dirrm include/eigen2/unsupported/Eigen/src/AutoDiff
+@dirrm include/eigen2/unsupported/Eigen/src
+@dirrm include/eigen2/unsupported/Eigen
+@dirrm include/eigen2/unsupported
 @dirrm include/eigen2/Eigen/src/Sparse
 @dirrm include/eigen2/Eigen/src/SVD
 @dirrm include/eigen2/Eigen/src/QR
 @dirrm include/eigen2/Eigen/src/LeastSquares
 @dirrm include/eigen2/Eigen/src/LU
+@dirrm include/eigen2/Eigen/src/Geometry/arch
 @dirrm include/eigen2/Eigen/src/Geometry
 @dirrm include/eigen2/Eigen/src/Core/util
+@dirrm include/eigen2/Eigen/src/Core/products
 @dirrm include/eigen2/Eigen/src/Core/arch/SSE
 @dirrm include/eigen2/Eigen/src/Core/arch/AltiVec
 @dirrm include/eigen2/Eigen/src/Core/arch
diff --git a/math/eigen3/Makefile b/math/eigen3/Makefile
index aae34acd1b79..e9a582d280c6 100644
--- a/math/eigen3/Makefile
+++ b/math/eigen3/Makefile
@@ -5,9 +5,10 @@
 # $FreeBSD$
 
 PORTNAME=	eigen
-DISTVERSION=	2.0.2
+DISTVERSION=	2.0.52
 CATEGORIES=	math
-MASTER_SITES=	http://download.tuxfamily.org/eigen/
+MASTER_SITES=	http://ns.ael.ru/~fluffy.khv/ \
+		http://download.tuxfamily.org/eigen/
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Lightweight library for vector and matrix math
@@ -17,4 +18,8 @@ USE_CMAKE=	yes
 
 LATEST_LINK=	${PORTNAME}2
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|g' \
+		${WRKSRC}/CMakeLists.txt
+
 .include <bsd.port.mk>
diff --git a/math/eigen3/distinfo b/math/eigen3/distinfo
index 3ca40082c5ce..ce0b7f05d9d1 100644
--- a/math/eigen3/distinfo
+++ b/math/eigen3/distinfo
@@ -1,3 +1,3 @@
-MD5 (eigen-2.0.2.tar.bz2) = b2c34144943671a8689b6fab20c52836
-SHA256 (eigen-2.0.2.tar.bz2) = 9e7d84f07538e61a69064e7056324e30ac6fe7a7bb2e7d3227a79ff8c7311743
-SIZE (eigen-2.0.2.tar.bz2) = 348996
+MD5 (eigen-2.0.52.tar.bz2) = 13e71c84309288047e79c93d79ffedac
+SHA256 (eigen-2.0.52.tar.bz2) = 67fc9233b5fa5acc167fdd0ff3f59ea3e426b062980378c2f1dadbdc247d4658
+SIZE (eigen-2.0.52.tar.bz2) = 420384
diff --git a/math/eigen3/files/patch-Eigen__src__Core__util__Memory.h b/math/eigen3/files/patch-Eigen__src__Core__util__Memory.h
deleted file mode 100644
index 63c1b0d4503c..000000000000
--- a/math/eigen3/files/patch-Eigen__src__Core__util__Memory.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Eigen/src/Core/util/Memory.h.orig	2009-05-22 17:41:27.000000000 +0400
-+++ ./Eigen/src/Core/util/Memory.h	2009-05-22 23:12:08.000000000 +0400
-@@ -27,7 +27,7 @@
- #ifndef EIGEN_MEMORY_H
- #define EIGEN_MEMORY_H
- 
--#if defined(__APPLE__) || defined(_WIN64)
-+#if defined(__APPLE__) || defined(_WIN64) || defined (__FreeBSD__)
-   #define EIGEN_MALLOC_ALREADY_ALIGNED 1
- #else
-   #define EIGEN_MALLOC_ALREADY_ALIGNED 0
diff --git a/math/eigen3/pkg-plist b/math/eigen3/pkg-plist
index 0ae417f73744..03b97f0fab37 100644
--- a/math/eigen3/pkg-plist
+++ b/math/eigen3/pkg-plist
@@ -13,21 +13,23 @@ include/eigen2/Eigen/src/Array/BooleanRedux.h
 include/eigen2/Eigen/src/Array/CwiseOperators.h
 include/eigen2/Eigen/src/Array/Functors.h
 include/eigen2/Eigen/src/Array/Norms.h
-include/eigen2/Eigen/src/Array/PartialRedux.h
 include/eigen2/Eigen/src/Array/Random.h
+include/eigen2/Eigen/src/Array/Replicate.h
+include/eigen2/Eigen/src/Array/Reverse.h
 include/eigen2/Eigen/src/Array/Select.h
+include/eigen2/Eigen/src/Array/VectorwiseOp.h
 include/eigen2/Eigen/src/Cholesky/LDLT.h
 include/eigen2/Eigen/src/Cholesky/LLT.h
 include/eigen2/Eigen/src/Core/Assign.h
 include/eigen2/Eigen/src/Core/Block.h
-include/eigen2/Eigen/src/Core/CacheFriendlyProduct.h
 include/eigen2/Eigen/src/Core/Coeffs.h
 include/eigen2/Eigen/src/Core/CommaInitializer.h
 include/eigen2/Eigen/src/Core/Cwise.h
 include/eigen2/Eigen/src/Core/CwiseBinaryOp.h
 include/eigen2/Eigen/src/Core/CwiseNullaryOp.h
 include/eigen2/Eigen/src/Core/CwiseUnaryOp.h
-include/eigen2/Eigen/src/Core/DiagonalCoeffs.h
+include/eigen2/Eigen/src/Core/CwiseUnaryView.h
+include/eigen2/Eigen/src/Core/Diagonal.h
 include/eigen2/Eigen/src/Core/DiagonalMatrix.h
 include/eigen2/Eigen/src/Core/DiagonalProduct.h
 include/eigen2/Eigen/src/Core/Dot.h
@@ -47,14 +49,18 @@ include/eigen2/Eigen/src/Core/NestByValue.h
 include/eigen2/Eigen/src/Core/NumTraits.h
 include/eigen2/Eigen/src/Core/Part.h
 include/eigen2/Eigen/src/Core/Product.h
+include/eigen2/Eigen/src/Core/ReturnByValue.h
 include/eigen2/Eigen/src/Core/Redux.h
 include/eigen2/Eigen/src/Core/SolveTriangular.h
-include/eigen2/Eigen/src/Core/Sum.h
 include/eigen2/Eigen/src/Core/Swap.h
 include/eigen2/Eigen/src/Core/Transpose.h
 include/eigen2/Eigen/src/Core/Visitor.h
 include/eigen2/Eigen/src/Core/arch/AltiVec/PacketMath.h
+include/eigen2/Eigen/src/Core/arch/SSE/MathFunctions.h
 include/eigen2/Eigen/src/Core/arch/SSE/PacketMath.h
+include/eigen2/Eigen/src/Core/products/GeneralMatrixMatrix.h
+include/eigen2/Eigen/src/Core/products/GeneralMatrixVector.h
+include/eigen2/Eigen/src/Core/products/SelfadjointMatrixVector.h
 include/eigen2/Eigen/src/Core/util/Constants.h
 include/eigen2/Eigen/src/Core/util/DisableMSVCWarnings.h
 include/eigen2/Eigen/src/Core/util/EnableMSVCWarnings.h
@@ -67,6 +73,7 @@ include/eigen2/Eigen/src/Core/util/XprHelper.h
 include/eigen2/Eigen/src/Geometry/AlignedBox.h
 include/eigen2/Eigen/src/Geometry/AngleAxis.h
 include/eigen2/Eigen/src/Geometry/EulerAngles.h
+include/eigen2/Eigen/src/Geometry/Homogeneous.h
 include/eigen2/Eigen/src/Geometry/Hyperplane.h
 include/eigen2/Eigen/src/Geometry/OrthoMethods.h
 include/eigen2/Eigen/src/Geometry/ParametrizedLine.h
@@ -76,9 +83,12 @@ include/eigen2/Eigen/src/Geometry/RotationBase.h
 include/eigen2/Eigen/src/Geometry/Scaling.h
 include/eigen2/Eigen/src/Geometry/Transform.h
 include/eigen2/Eigen/src/Geometry/Translation.h
+include/eigen2/Eigen/src/Geometry/Umeyama.h
+include/eigen2/Eigen/src/Geometry/arch/Geometry_SSE.h
 include/eigen2/Eigen/src/LU/Determinant.h
 include/eigen2/Eigen/src/LU/Inverse.h
 include/eigen2/Eigen/src/LU/LU.h
+include/eigen2/Eigen/src/LU/PartialLU.h
 include/eigen2/Eigen/src/LeastSquares/LeastSquares.h
 include/eigen2/Eigen/src/QR/EigenSolver.h
 include/eigen2/Eigen/src/QR/HessenbergDecomposition.h
@@ -98,6 +108,7 @@ include/eigen2/Eigen/src/Sparse/SparseBlock.h
 include/eigen2/Eigen/src/Sparse/SparseCwise.h
 include/eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h
 include/eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h
+include/eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h
 include/eigen2/Eigen/src/Sparse/SparseDot.h
 include/eigen2/Eigen/src/Sparse/SparseFlagged.h
 include/eigen2/Eigen/src/Sparse/SparseFuzzy.h
@@ -109,19 +120,46 @@ include/eigen2/Eigen/src/Sparse/SparseMatrixBase.h
 include/eigen2/Eigen/src/Sparse/SparseProduct.h
 include/eigen2/Eigen/src/Sparse/SparseRedux.h
 include/eigen2/Eigen/src/Sparse/SparseTranspose.h
+include/eigen2/Eigen/src/Sparse/SparseTriangular.h
 include/eigen2/Eigen/src/Sparse/SparseUtil.h
 include/eigen2/Eigen/src/Sparse/SparseVector.h
 include/eigen2/Eigen/src/Sparse/SuperLUSupport.h
 include/eigen2/Eigen/src/Sparse/TaucsSupport.h
 include/eigen2/Eigen/src/Sparse/TriangularSolver.h
 include/eigen2/Eigen/src/Sparse/UmfPackSupport.h
+include/eigen2/unsupported/Eigen/AdolcForward
+include/eigen2/unsupported/Eigen/AlignedVector3
+include/eigen2/unsupported/Eigen/AutoDiff
+include/eigen2/unsupported/Eigen/BVH
+include/eigen2/unsupported/Eigen/IterativeSolvers
+include/eigen2/unsupported/Eigen/MatrixFunctions
+include/eigen2/unsupported/Eigen/MoreVectorization
+include/eigen2/unsupported/Eigen/src/AutoDiff/AutoDiffJacobian.h
+include/eigen2/unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h
+include/eigen2/unsupported/Eigen/src/AutoDiff/AutoDiffVector.h
+include/eigen2/unsupported/Eigen/src/BVH/BVAlgorithms.h
+include/eigen2/unsupported/Eigen/src/BVH/KdBVH.h
+include/eigen2/unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h
+include/eigen2/unsupported/Eigen/src/IterativeSolvers/IterationController.h
+include/eigen2/unsupported/Eigen/src/MoreVectorization/MathFunctions.h
+libdata/pkgconfig/eigen2.pc
+@dirrm include/eigen2/unsupported/Eigen/src/MoreVectorization
+@dirrm include/eigen2/unsupported/Eigen/src/MatrixFunctions
+@dirrm include/eigen2/unsupported/Eigen/src/IterativeSolvers
+@dirrm include/eigen2/unsupported/Eigen/src/BVH
+@dirrm include/eigen2/unsupported/Eigen/src/AutoDiff
+@dirrm include/eigen2/unsupported/Eigen/src
+@dirrm include/eigen2/unsupported/Eigen
+@dirrm include/eigen2/unsupported
 @dirrm include/eigen2/Eigen/src/Sparse
 @dirrm include/eigen2/Eigen/src/SVD
 @dirrm include/eigen2/Eigen/src/QR
 @dirrm include/eigen2/Eigen/src/LeastSquares
 @dirrm include/eigen2/Eigen/src/LU
+@dirrm include/eigen2/Eigen/src/Geometry/arch
 @dirrm include/eigen2/Eigen/src/Geometry
 @dirrm include/eigen2/Eigen/src/Core/util
+@dirrm include/eigen2/Eigen/src/Core/products
 @dirrm include/eigen2/Eigen/src/Core/arch/SSE
 @dirrm include/eigen2/Eigen/src/Core/arch/AltiVec
 @dirrm include/eigen2/Eigen/src/Core/arch
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index b1cb76a28610..4f3ef3b2ecf0 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -17,6 +16,7 @@ COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 
 LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4 \
 		zip.1:${PORTSDIR}/archivers/libzip \
+		lzma.0:${PORTSDIR}/archivers/lzmautils-devel \
 		qimageblitz.4:${PORTSDIR}/x11/qimageblitz
 RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
 
@@ -24,18 +24,28 @@ LATEST_LINK=	${PORTNAME}4
 
 USE_BZIP2=	yes
 USE_QT_VER=	4
+USE_PYTHON=	2.5+
 KDE4_BUILDENV=	yes
-USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4
+USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4 kdeexp
 QT_COMPONENTS=	network gui porting xml \
 		qmake_build moc_build rcc_build uic_build
-MAKE_JOBS_UNSAFE=	yes
+MAKE_JOBS_SAFE=	yes
 
 MAN1=		ark.1
 
-OPTIONS=	PRINTER_APPLET "Install printer system tray utility" off
+OPTIONS=	PRINTER_APPLET "Install printer system tray utility" off \
+		KONQUI		"Konqueror UI integration" off
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_KONQUI)
+USE_KDE4+=	kdebase
+PLIST_SUB+=	KONQUI=""
+.else
+PLIST_SUB+=	KONQUI="@comment "
+
+.endif
+
 .if defined(WITH_PRINTER_APPLET)
 RUN_DEPENDS+=	${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet
 .endif
diff --git a/math/kcalc/distinfo b/math/kcalc/distinfo
index 9dff5bcea695..80d48a0439d0 100644
--- a/math/kcalc/distinfo
+++ b/math/kcalc/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-4.2.4.tar.bz2) = e7214cb1e84d2e6793d3dbeb8f33a3fe
-SHA256 (KDE/kdeutils-4.2.4.tar.bz2) = 82b9908d4ecbbd5864be9cdeef1eeff5cd190a4c661b25b2f056775b7fe5120f
-SIZE (KDE/kdeutils-4.2.4.tar.bz2) = 2377830
+MD5 (KDE/kdeutils-4.3.0.tar.bz2) = 9d17d3d7bf25be5af1cbd4abf04e4c99
+SHA256 (KDE/kdeutils-4.3.0.tar.bz2) = c94f3462ea8bf375f3a83806380470c234465dcde8b7c63629d89965edc21d40
+SIZE (KDE/kdeutils-4.3.0.tar.bz2) = 2521985
diff --git a/math/kcalc/files/patch-ark_plugins_libarchive-libarchivehandler.cpp b/math/kcalc/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
deleted file mode 100644
index 6f6752537061..000000000000
--- a/math/kcalc/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../ark/plugins/libarchive/libarchivehandler.cpp.orig	2009-02-01 00:16:54.000000000 +0100
-+++ ../ark/plugins/libarchive/libarchivehandler.cpp	2009-02-01 00:19:50.000000000 +0100
-@@ -567,7 +567,7 @@
- 		}
- 	}
- 
--	ret = archive_write_finish(arch_writer);
-+	archive_write_finish(arch_writer);
- 
- 	if (!creatingNewFile) {
- 		archive_read_finish( arch_reader );
-@@ -700,7 +700,7 @@
- 		archive_entry_clear( entry );
- 	}
- 
--	ret = archive_write_finish(arch_writer);
-+	archive_write_finish(arch_writer);
- 
- 	archive_read_finish( arch_reader );
- 
diff --git a/math/kcalc/files/patch-ark_plugins_libzipplugin-zipplugin.cpp b/math/kcalc/files/patch-ark_plugins_libzipplugin-zipplugin.cpp
deleted file mode 100644
index eb03ee5e2287..000000000000
--- a/math/kcalc/files/patch-ark_plugins_libzipplugin-zipplugin.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../ark/plugins/libzipplugin/zipplugin.cpp.orig	2008-12-10 16:13:03.000000000 +0000
-+++ ../ark/plugins/libzipplugin/zipplugin.cpp	2008-12-29 22:16:13.000000000 +0000
-@@ -28,8 +28,8 @@
- 
- #ifdef LIBZIP_COMPILED_WITH_32BIT_OFF_T
- 
--#define __off_t_defined
--typedef quint32 off_t;
-+// #define __off_t_defined
-+// typedef quint32 off_t;
- 
- #endif /* LIBZIP_COMPILED_WITH_32BIT_OFF_T */
- 
diff --git a/math/kcalc/pkg-plist b/math/kcalc/pkg-plist
index bdd61ec32069..7bf4309ec709 100644
--- a/math/kcalc/pkg-plist
+++ b/math/kcalc/pkg-plist
@@ -1,4 +1,5 @@
 bin/ark
+bin/irkick
 bin/kcalc
 bin/kcharselect
 bin/kdessh
@@ -13,17 +14,25 @@ bin/superkaramba
 bin/sweeper
 lib/kde4/kcm_kdf.so
 lib/kde4/kcm_kwallet.so
-lib/kde4/kerfuffle_7zip.so
+lib/kde4/kcm_lirc.so
+lib/kde4/kerfuffle_7z.so
+lib/kde4/kerfuffle_clirar.so
+lib/kde4/kerfuffle_clizip.so
 lib/kde4/kerfuffle_libarchive.so
+lib/kde4/kerfuffle_libbz2.so
 lib/kde4/kerfuffle_libgz.so
-lib/kde4/kerfuffle_libzip.so
-lib/kde4/kerfuffle_rar.so
+lib/kde4/kerfuffle_libxz.so
 lib/kde4/libarkpart.so
+%%KONQUI%%lib/kde4/libextracthere.so
 lib/kde4/libkbytearrayedit.so
 lib/kde4/liboktetapart.so
 lib/kde4/plasma_package_superkaramba.so
 lib/kde4/plasma_scriptengine_superkaramba.so
+lib/libkdeinit4_irkick.so
 lib/libkdeinit4_kcalc.so
+lib/libkdelirc_shared.so
+lib/libkdelirc_shared.so.1
+lib/libkdelirc_shared.so.1.0.0
 lib/libkerfuffle.so
 lib/libkerfuffle.so.5
 lib/libkerfuffle.so.5.0.1
@@ -39,6 +48,7 @@ lib/libsuperkaramba.so.5.0.1
 share/applications/kde4/KCharSelect.desktop
 share/applications/kde4/KFloppy.desktop
 share/applications/kde4/ark.desktop
+share/applications/kde4/irkick.desktop
 share/applications/kde4/kcalc.desktop
 share/applications/kde4/kdf.desktop
 share/applications/kde4/kgpg.desktop
@@ -51,14 +61,13 @@ share/applications/kde4/superkaramba.desktop
 share/applications/kde4/sweeper.desktop
 share/apps/ark/ark_part.rc
 share/apps/ark/arkui.rc
+share/apps/irkick/irkick.notifyrc
 share/apps/kcalc/kcalcui.rc
 share/apps/kcalc/scienceconstants.xml
 share/apps/kcharselect/kcharselectui.rc
 share/apps/kconf_update/kcalcrc.upd
 share/apps/kconf_update/kcharselect.upd
 share/apps/kdf/kdfui.rc
-share/apps/kdf/pics/delete.png
-share/apps/kdf/pics/tick.png
 share/apps/kgpg/icons/oxygen/16x16/actions/document-export-key.png
 share/apps/kgpg/icons/oxygen/16x16/actions/document-import-key.png
 share/apps/kgpg/icons/oxygen/16x16/actions/document-properties-key.png
@@ -102,8 +111,29 @@ share/apps/kwalletmanager/kwalleteditor.rc
 share/apps/kwalletmanager/kwalletmanager.rc
 share/apps/okteta/oktetaui.rc
 share/apps/oktetapart/oktetapartui.rc
+share/apps/profiles/amarok.profile.xml
+share/apps/profiles/dragonplayer.profile.xml
+share/apps/profiles/klauncher.profile.xml
+share/apps/profiles/kmix.profile.xml
+share/apps/profiles/konqueror.profile.xml
+share/apps/profiles/noatun.profile.xml
+share/apps/profiles/okular.profile.xml
+share/apps/profiles/profile.dtd
+share/apps/profiles/shutdown.profile.xml
+share/apps/profiles/suspend.profile.xml
+share/apps/profiles/vlc.profile.xml
+share/apps/remotes/AppleRemote.remote.xml
+share/apps/remotes/AsusDH.remote.xml
+share/apps/remotes/RM-0010.remote.xml
+share/apps/remotes/cimr100.remote.xml
+share/apps/remotes/hauppauge.remote.xml
+share/apps/remotes/packbell.remote.xml
+share/apps/remotes/remote.dtd
+share/apps/remotes/sherwood.remote.xml
+share/apps/remotes/sonytv.remote.xml
 share/apps/superkaramba/superkarambaui.rc
 share/apps/sweeper/sweeperui.rc
+share/autostart/irkick.desktop
 share/autostart/kgpg.desktop
 share/config.kcfg/ark.kcfg
 share/config.kcfg/kcalc.kcfg
@@ -116,6 +146,9 @@ share/doc/HTML/en/ark/common
 share/doc/HTML/en/ark/index.cache.bz2
 share/doc/HTML/en/ark/index.docbook
 share/doc/HTML/en/ark/man-ark.1.docbook
+share/doc/HTML/en/irkick/common
+share/doc/HTML/en/irkick/index.cache.bz2
+share/doc/HTML/en/irkick/index.docbook
 share/doc/HTML/en/kcalc/commands.docbook
 share/doc/HTML/en/kcalc/common
 share/doc/HTML/en/kcalc/index.cache.bz2
@@ -123,6 +156,9 @@ share/doc/HTML/en/kcalc/index.docbook
 share/doc/HTML/en/kcharselect/common
 share/doc/HTML/en/kcharselect/index.cache.bz2
 share/doc/HTML/en/kcharselect/index.docbook
+share/doc/HTML/en/kcmlirc/common
+share/doc/HTML/en/kcmlirc/index.cache.bz2
+share/doc/HTML/en/kcmlirc/index.docbook
 share/doc/HTML/en/kcontrol/blockdevices/common
 share/doc/HTML/en/kcontrol/blockdevices/index.cache.bz2
 share/doc/HTML/en/kcontrol/blockdevices/index.docbook
@@ -142,6 +178,7 @@ share/doc/HTML/en/kgpg/keygen.png
 share/doc/HTML/en/kgpg/keymanage.png
 share/doc/HTML/en/kgpg/keyprop.png
 share/doc/HTML/en/kgpg/keys.png
+share/doc/HTML/en/kgpg/keyserver-search.png
 share/doc/HTML/en/kgpg/keyserver.png
 share/doc/HTML/en/kgpg/kicker.png
 share/doc/HTML/en/kgpg/options.png
@@ -192,6 +229,7 @@ share/icons/hicolor/16x16/apps/kwalletmanager2.png
 share/icons/hicolor/16x16/apps/kwikdisk.png
 share/icons/hicolor/16x16/apps/okteta.png
 share/icons/hicolor/16x16/apps/superkaramba.png
+share/icons/hicolor/22x22/apps/irkick.png
 share/icons/hicolor/22x22/apps/kdf.png
 share/icons/hicolor/22x22/apps/kfloppy.png
 share/icons/hicolor/22x22/apps/kgpg.png
@@ -222,30 +260,50 @@ share/icons/hicolor/64x64/apps/kwalletmanager.png
 share/icons/hicolor/64x64/apps/kwalletmanager2.png
 share/icons/hicolor/64x64/apps/kwikdisk.png
 share/icons/hicolor/64x64/apps/superkaramba.png
+share/icons/hicolor/scalable/apps/irkick.svgz
 share/icons/hicolor/scalable/apps/superkaramba.svgz
+share/icons/oxygen/128x128/devices/infrared-remote.png
 share/icons/oxygen/16x16/apps/kcmdf.png
+share/icons/oxygen/16x16/devices/infrared-remote.png
+share/icons/oxygen/22x22/actions/irkickflash.png
+share/icons/oxygen/22x22/actions/irkickoff.png
 share/icons/oxygen/22x22/apps/kcmdf.png
+share/icons/oxygen/22x22/devices/infrared-remote.png
 share/icons/oxygen/32x32/apps/kcmdf.png
+share/icons/oxygen/32x32/devices/infrared-remote.png
+share/icons/oxygen/42x42/devices/infrared-remote.png
+share/icons/oxygen/48x48/devices/infrared-remote.png
+share/icons/oxygen/64x64/devices/infrared-remote.png
+share/icons/oxygen/8x8/devices/infrared-remote.png
+share/icons/oxygen/scalable/actions/irkickflash.svgz
+share/icons/oxygen/scalable/actions/irkickoff.svgz
+share/icons/oxygen/scalable/devices/infrared-remote.svgz
 share/kde4/services/ServiceMenus/ark_addtoservicemenu.desktop
 share/kde4/services/ServiceMenus/ark_servicemenu.desktop
 share/kde4/services/ServiceMenus/encryptfile.desktop
 share/kde4/services/ServiceMenus/encryptfolder.desktop
 share/kde4/services/ServiceMenus/floppy_format.desktop
 share/kde4/services/ServiceMenus/viewdecrypted.desktop
+%%KONQUI%%share/kde4/services/ark_dndextract.desktop
 share/kde4/services/ark_part.desktop
 share/kde4/services/kbytearrayedit.desktop
+share/kde4/services/kcm_lirc.desktop
 share/kde4/services/kcmdf.desktop
-share/kde4/services/kerfuffle_7zip.desktop
+share/kde4/services/kerfuffle_7z.desktop
+share/kde4/services/kerfuffle_clirar.desktop
+share/kde4/services/kerfuffle_clizip.desktop
 share/kde4/services/kerfuffle_libarchive.desktop
+share/kde4/services/kerfuffle_libbz2.desktop
 share/kde4/services/kerfuffle_libgz.desktop
-share/kde4/services/kerfuffle_libzip.desktop
-share/kde4/services/kerfuffle_rar.desktop
+share/kde4/services/kerfuffle_libxz.desktop
 share/kde4/services/kwalletconfig.desktop
 share/kde4/services/kwalletmanager_show.desktop
 share/kde4/services/oktetapart.desktop
 share/kde4/services/plasma-package-superkaramba.desktop
 share/kde4/services/plasma-scriptengine-superkaramba.desktop
 share/kde4/servicetypes/kerfufflePlugin.desktop
+@dirrmtry share/icons/oxygen/42x42/devices
+@dirrmtry share/icons/oxygen/42x42
 @dirrm share/doc/HTML/en/superkaramba
 @dirrm share/doc/HTML/en/okteta
 @dirrm share/doc/HTML/en/kwallet
@@ -254,11 +312,14 @@ share/kde4/servicetypes/kerfufflePlugin.desktop
 @dirrm share/doc/HTML/en/kfloppy
 @dirrm share/doc/HTML/en/kdf
 @dirrm share/doc/HTML/en/kcontrol/blockdevices
+@dirrm share/doc/HTML/en/kcmlirc
 @dirrm share/doc/HTML/en/kcharselect
 @dirrm share/doc/HTML/en/kcalc
+@dirrm share/doc/HTML/en/irkick
 @dirrm share/doc/HTML/en/ark
 @dirrm share/apps/sweeper
 @dirrm share/apps/superkaramba
+@dirrm share/apps/remotes
 @dirrm share/apps/oktetapart
 @dirrm share/apps/okteta
 @dirrm share/apps/kwalletmanager/icons/oxygen/22x22/actions
@@ -285,7 +346,7 @@ share/kde4/servicetypes/kerfufflePlugin.desktop
 @dirrm share/apps/kgpg/icons/oxygen
 @dirrm share/apps/kgpg/icons
 @dirrm share/apps/kgpg
-@dirrm share/apps/kdf/pics
 @dirrm share/apps/kdf
 @dirrm share/apps/kcalc
+@dirrm share/apps/irkick
 @dirrm share/apps/ark