12 files changed, 51 insertions, 51 deletions

diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index 19eba46391fb..512306167cb5 100644
--- a/sysutils/kdeadmin4/Makefile
+++ b/sysutils/kdeadmin4/Makefile
@@ -14,8 +14,6 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE Admin applications
 
-RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
-
 LATEST_LINK=	${PORTNAME}4
 
 USE_BZIP2=	yes
@@ -26,7 +24,6 @@ USE_OPENSSL=	yes
 QT_COMPONENTS=	corelib opengl dbus qt3support designer network svg qtestlib \
 		network porting_build qmake_build moc_build rcc_build \
 		uic_build uic3_build
-#USE_OPENLDAP=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -41,5 +38,10 @@ post-patch:
 	${REINPLACE_CMD} -e \
 	's,$${LIB_INSTALL_DIR}/pkgconfig,libdata/pkgconfig,' \
 	${PATCH_WRKSRC}/knetworkconf/backends/CMakeLists.txt
-
+#disable documentation for kpackage
+	${REINPLACE_CMD} -e '/add_subdirectory(kpackage)/d' \
+		${PATCH_WRKSRC}/doc/CMakeLists.txt
+#disable system-config-printer-kde, it comes with print/kdeadmin4-system-config-printer-kde
+	${REINPLACE_CMD} -e '/add_subdirectory.*system-config-printer-kde/d' \
+		${WRKSRC}/../CMakeLists.txt
 .include <bsd.port.mk>
diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo
index 1c319a8a61c5..037e7f909269 100644
--- a/sysutils/kdeadmin4/distinfo
+++ b/sysutils/kdeadmin4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeadmin-4.2.2.tar.bz2) = b9104de38fa36962a2812aa9cae8fc5f
-SHA256 (KDE/kdeadmin-4.2.2.tar.bz2) = 956f43fa1bf640451d1f7bc532895e90952d56aafd9b824083ae9a4683670bef
-SIZE (KDE/kdeadmin-4.2.2.tar.bz2) = 1923811
+MD5 (KDE/kdeadmin-4.2.3.tar.bz2) = dc352ccb03c285a87fcc68d7d18e9d43
+SHA256 (KDE/kdeadmin-4.2.3.tar.bz2) = 200127b5e4490bb1cd4bdcc3bb58c4b3ff1e7fe94b6e857338c1ef050f5dd53b
+SIZE (KDE/kdeadmin-4.2.3.tar.bz2) = 1923269
diff --git a/sysutils/kdeadmin4/pkg-plist b/sysutils/kdeadmin4/pkg-plist
index 04d92cac0d9a..9941d953254c 100644
--- a/sysutils/kdeadmin4/pkg-plist
+++ b/sysutils/kdeadmin4/pkg-plist
@@ -2,7 +2,6 @@ bin/ksystemlog
 bin/kuser
 lib/kde4/kcm_cron.so
 lib/kde4/kcm_knetworkconfmodule.so
-libdata/pkgconfig/system-tools-backends.pc
 share/applications/kde4/ksystemlog.desktop
 share/applications/kde4/kuser.desktop
 share/apps/knetworkconf/backends/debug.pl
@@ -66,21 +65,6 @@ share/doc/HTML/en/kcron/kcronstart.png
 share/doc/HTML/en/kcron/newtask.png
 share/doc/HTML/en/kcron/newvariable.png
 share/doc/HTML/en/kcron/print.png
-share/doc/HTML/en/kpackage/common
-share/doc/HTML/en/kpackage/handle.png
-share/doc/HTML/en/kpackage/index.cache.bz2
-share/doc/HTML/en/kpackage/index.docbook
-share/doc/HTML/en/kpackage/install.png
-share/doc/HTML/en/kpackage/left.png
-share/doc/HTML/en/kpackage/right-change.png
-share/doc/HTML/en/kpackage/right-dep.png
-share/doc/HTML/en/kpackage/right-files.png
-share/doc/HTML/en/kpackage/right-prop.png
-share/doc/HTML/en/kpackage/root-prompt.png
-share/doc/HTML/en/kpackage/search.png
-share/doc/HTML/en/kpackage/searchf.png
-share/doc/HTML/en/kpackage/searchl.png
-share/doc/HTML/en/kpackage/uninstall.png
 share/doc/HTML/en/ksystemlog/common
 share/doc/HTML/en/ksystemlog/filter-process.png
 share/doc/HTML/en/ksystemlog/first-opening.png
@@ -116,7 +100,6 @@ share/kde4/services/kcm_cron.desktop
 share/kde4/services/kcm_knetworkconfmodule.desktop
 @dirrm share/doc/HTML/en/kuser
 @dirrm share/doc/HTML/en/ksystemlog
-@dirrm share/doc/HTML/en/kpackage
 @dirrm share/doc/HTML/en/kcron
 @dirrm share/doc/HTML/en/kcontrol/knetworkconf
 @dirrm share/apps/kuser/pics
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index d1ab65405c28..bd21ac898aaf 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -14,16 +14,16 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 
-LIB_DEPENDS=    gmp.7:${PORTSDIR}/math/libgmp4 \
+LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		zip.1:${PORTSDIR}/archivers/libzip \
 		qimageblitz.4:${PORTSDIR}/x11/qimageblitz
-RUN_DEPENDS=    gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
 
 LATEST_LINK=	${PORTNAME}4
 
 USE_BZIP2=	yes
 USE_QT_VER=	4
-KDE4_BUILDENV= yes
+KDE4_BUILDENV=	yes
 USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4
 QT_COMPONENTS=	network gui porting xml \
 		qmake_build moc_build rcc_build uic_build
@@ -34,4 +34,9 @@ MAN1=		ark.1
 post-extract:
 	${MKDIR} ${WRKSRC}
 
+post-patch:
+#disable printer-applet, it comes with print/kdeutils4-printer-applet
+	${REINPLACE_CMD} -e '/add_subdirectory.*printer-applet/d' \
+		${WRKSRC}/../CMakeLists.txt
+
 .include <bsd.port.mk>
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index 076fd4604272..d39e54bf8490 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-4.2.2.tar.bz2) = 3df5186f9dacddbce48a1c7eb35515cd
-SHA256 (KDE/kdeutils-4.2.2.tar.bz2) = b005a16f5c4cb5ce0a3e2b886f6b5a051d1d2170c013cdc154528a357ac3bb8b
-SIZE (KDE/kdeutils-4.2.2.tar.bz2) = 2376713
+MD5 (KDE/kdeutils-4.2.3.tar.bz2) = 8fddacea28f6c0a6c2ac2462750b7e50
+SHA256 (KDE/kdeutils-4.2.3.tar.bz2) = 154b37701adb4ba7c870020b95621e128c51145ae78aee6cbd181b17cb25a224
+SIZE (KDE/kdeutils-4.2.3.tar.bz2) = 2378200
diff --git a/sysutils/kdf/pkg-plist b/sysutils/kdf/pkg-plist
index 6fa2d33299a7..bdd61ec32069 100644
--- a/sysutils/kdf/pkg-plist
+++ b/sysutils/kdf/pkg-plist
@@ -155,16 +155,16 @@ share/doc/HTML/en/ktimer/two.at.once.png
 share/doc/HTML/en/kwallet/common
 share/doc/HTML/en/kwallet/edit1.png
 share/doc/HTML/en/kwallet/edit2.png
+share/doc/HTML/en/kwallet/first-open-request.png
 share/doc/HTML/en/kwallet/index.cache.bz2
 share/doc/HTML/en/kwallet/index.docbook
 share/doc/HTML/en/kwallet/kwalletmanager.png
-share/doc/HTML/en/kwallet/save-login-information.png
-share/doc/HTML/en/kwallet/oxygen48-status-wallet-open.png
 share/doc/HTML/en/kwallet/openwallet-request.png
 share/doc/HTML/en/kwallet/oxygen48-status-wallet-closed.png
+share/doc/HTML/en/kwallet/oxygen48-status-wallet-open.png
 share/doc/HTML/en/kwallet/password1.png
-share/doc/HTML/en/kwallet/first-open-request.png
 share/doc/HTML/en/kwallet/password2.png
+share/doc/HTML/en/kwallet/save-login-information.png
 share/doc/HTML/en/okteta/basics.docbook
 share/doc/HTML/en/okteta/common
 share/doc/HTML/en/okteta/credits.docbook
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index d1ab65405c28..bd21ac898aaf 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -14,16 +14,16 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 
-LIB_DEPENDS=    gmp.7:${PORTSDIR}/math/libgmp4 \
+LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		zip.1:${PORTSDIR}/archivers/libzip \
 		qimageblitz.4:${PORTSDIR}/x11/qimageblitz
-RUN_DEPENDS=    gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
 
 LATEST_LINK=	${PORTNAME}4
 
 USE_BZIP2=	yes
 USE_QT_VER=	4
-KDE4_BUILDENV= yes
+KDE4_BUILDENV=	yes
 USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4
 QT_COMPONENTS=	network gui porting xml \
 		qmake_build moc_build rcc_build uic_build
@@ -34,4 +34,9 @@ MAN1=		ark.1
 post-extract:
 	${MKDIR} ${WRKSRC}
 
+post-patch:
+#disable printer-applet, it comes with print/kdeutils4-printer-applet
+	${REINPLACE_CMD} -e '/add_subdirectory.*printer-applet/d' \
+		${WRKSRC}/../CMakeLists.txt
+
 .include <bsd.port.mk>
diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index 076fd4604272..d39e54bf8490 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-4.2.2.tar.bz2) = 3df5186f9dacddbce48a1c7eb35515cd
-SHA256 (KDE/kdeutils-4.2.2.tar.bz2) = b005a16f5c4cb5ce0a3e2b886f6b5a051d1d2170c013cdc154528a357ac3bb8b
-SIZE (KDE/kdeutils-4.2.2.tar.bz2) = 2376713
+MD5 (KDE/kdeutils-4.2.3.tar.bz2) = 8fddacea28f6c0a6c2ac2462750b7e50
+SHA256 (KDE/kdeutils-4.2.3.tar.bz2) = 154b37701adb4ba7c870020b95621e128c51145ae78aee6cbd181b17cb25a224
+SIZE (KDE/kdeutils-4.2.3.tar.bz2) = 2378200
diff --git a/sysutils/kfloppy/pkg-plist b/sysutils/kfloppy/pkg-plist
index 6fa2d33299a7..bdd61ec32069 100644
--- a/sysutils/kfloppy/pkg-plist
+++ b/sysutils/kfloppy/pkg-plist
@@ -155,16 +155,16 @@ share/doc/HTML/en/ktimer/two.at.once.png
 share/doc/HTML/en/kwallet/common
 share/doc/HTML/en/kwallet/edit1.png
 share/doc/HTML/en/kwallet/edit2.png
+share/doc/HTML/en/kwallet/first-open-request.png
 share/doc/HTML/en/kwallet/index.cache.bz2
 share/doc/HTML/en/kwallet/index.docbook
 share/doc/HTML/en/kwallet/kwalletmanager.png
-share/doc/HTML/en/kwallet/save-login-information.png
-share/doc/HTML/en/kwallet/oxygen48-status-wallet-open.png
 share/doc/HTML/en/kwallet/openwallet-request.png
 share/doc/HTML/en/kwallet/oxygen48-status-wallet-closed.png
+share/doc/HTML/en/kwallet/oxygen48-status-wallet-open.png
 share/doc/HTML/en/kwallet/password1.png
-share/doc/HTML/en/kwallet/first-open-request.png
 share/doc/HTML/en/kwallet/password2.png
+share/doc/HTML/en/kwallet/save-login-information.png
 share/doc/HTML/en/okteta/basics.docbook
 share/doc/HTML/en/okteta/common
 share/doc/HTML/en/okteta/credits.docbook
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index d1ab65405c28..bd21ac898aaf 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -14,16 +14,16 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 
-LIB_DEPENDS=    gmp.7:${PORTSDIR}/math/libgmp4 \
+LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4 \
 		zip.1:${PORTSDIR}/archivers/libzip \
 		qimageblitz.4:${PORTSDIR}/x11/qimageblitz
-RUN_DEPENDS=    gpg:${PORTSDIR}/security/gnupg
+RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
 
 LATEST_LINK=	${PORTNAME}4
 
 USE_BZIP2=	yes
 USE_QT_VER=	4
-KDE4_BUILDENV= yes
+KDE4_BUILDENV=	yes
 USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4
 QT_COMPONENTS=	network gui porting xml \
 		qmake_build moc_build rcc_build uic_build
@@ -34,4 +34,9 @@ MAN1=		ark.1
 post-extract:
 	${MKDIR} ${WRKSRC}
 
+post-patch:
+#disable printer-applet, it comes with print/kdeutils4-printer-applet
+	${REINPLACE_CMD} -e '/add_subdirectory.*printer-applet/d' \
+		${WRKSRC}/../CMakeLists.txt
+
 .include <bsd.port.mk>
diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo
index 076fd4604272..d39e54bf8490 100644
--- a/sysutils/sweeper/distinfo
+++ b/sysutils/sweeper/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-4.2.2.tar.bz2) = 3df5186f9dacddbce48a1c7eb35515cd
-SHA256 (KDE/kdeutils-4.2.2.tar.bz2) = b005a16f5c4cb5ce0a3e2b886f6b5a051d1d2170c013cdc154528a357ac3bb8b
-SIZE (KDE/kdeutils-4.2.2.tar.bz2) = 2376713
+MD5 (KDE/kdeutils-4.2.3.tar.bz2) = 8fddacea28f6c0a6c2ac2462750b7e50
+SHA256 (KDE/kdeutils-4.2.3.tar.bz2) = 154b37701adb4ba7c870020b95621e128c51145ae78aee6cbd181b17cb25a224
+SIZE (KDE/kdeutils-4.2.3.tar.bz2) = 2378200
diff --git a/sysutils/sweeper/pkg-plist b/sysutils/sweeper/pkg-plist
index 6fa2d33299a7..bdd61ec32069 100644
--- a/sysutils/sweeper/pkg-plist
+++ b/sysutils/sweeper/pkg-plist
@@ -155,16 +155,16 @@ share/doc/HTML/en/ktimer/two.at.once.png
 share/doc/HTML/en/kwallet/common
 share/doc/HTML/en/kwallet/edit1.png
 share/doc/HTML/en/kwallet/edit2.png
+share/doc/HTML/en/kwallet/first-open-request.png
 share/doc/HTML/en/kwallet/index.cache.bz2
 share/doc/HTML/en/kwallet/index.docbook
 share/doc/HTML/en/kwallet/kwalletmanager.png
-share/doc/HTML/en/kwallet/save-login-information.png
-share/doc/HTML/en/kwallet/oxygen48-status-wallet-open.png
 share/doc/HTML/en/kwallet/openwallet-request.png
 share/doc/HTML/en/kwallet/oxygen48-status-wallet-closed.png
+share/doc/HTML/en/kwallet/oxygen48-status-wallet-open.png
 share/doc/HTML/en/kwallet/password1.png
-share/doc/HTML/en/kwallet/first-open-request.png
 share/doc/HTML/en/kwallet/password2.png
+share/doc/HTML/en/kwallet/save-login-information.png
 share/doc/HTML/en/okteta/basics.docbook
 share/doc/HTML/en/okteta/common
 share/doc/HTML/en/okteta/credits.docbook