Index: head/deskutils/kdepim4/Makefile
===================================================================
--- head/deskutils/kdepim4/Makefile	(revision 436960)
+++ head/deskutils/kdepim4/Makefile	(revision 436961)
@@ -1,57 +1,57 @@
 # Created by: Martin Wilke <miwi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kdepim
-PORTVERSION=	${KDE4_KDELIBS_VERSION}
+PORTVERSION=	${KDE4_KDEPIM_VERSION}
 PORTREVISION=	4
 CATEGORIES=	deskutils kde
 MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE PIM applications
 
 LIB_DEPENDS=	libgpgme.so:security/gpgme \
 		libassuan.so:security/libassuan \
 		libsasl2.so:security/cyrus-sasl2 \
 		libboost_thread.so:devel/boost-libs \
 		libkgapi2.so:devel/libkgapi
 RUN_DEPENDS=	${KDE_PREFIX}/bin/accountwizard:deskutils/kdepim4-runtime \
 		${LOCALBASE}/bin/gmd5sum:sysutils/coreutils
 
 CONFLICTS_INSTALL=	kdepim44-4.*
 
 USE_GNOME=	libxml2 libxslt:build
 USE_KDE=	kdelibs pimlibs kactivities \
 		akonadi automoc4 soprano nepomuk-widgets baloo
 USES=		cmake:outsource gmake grantlee:4 iconv kde:4 shebangfix tar:xz
 SHEBANG_FILES=	agents/mailfilteragent/kconf_update/migrate-kmail-filters.pl \
 		kalarm/*.pl kmail/kconf_update/*.pl \
 		libkpgp/kconf_update/kpgp-3.1-upgrade-address-data.pl
 USE_OPENLDAP=	yes
 USE_QT4=	corelib dbus declarative designer_build gui network opengl \
 		qt3support script sql webkit xml \
 		qmake_build moc_build rcc_build uic_build
 USE_XORG=	x11 xscrnsaver
 CMAKE_ARGS+=	-DKDEPIM_BUILD_MOBILE:BOOL=FALSE
 # Avoids Clang error:
 # https://git.reviewboard.kde.org/r/108617
 CXXFLAGS+=	-Wno-error=return-type
 USE_LDCONFIG=	yes
 MAKE_ENV=	XDG_CONFIG_HOME=/dev/null
 
 post-patch:
 # Remove BOM
 	${REINPLACE_CMD} -e '1 s|^.*/|/|g' \
 		${WRKSRC}/knotes/configdialog/knotecollectionconfigwidget.cpp
 
 # net-im/kopete-kde4 needs Kleopatra's headers for its Cryptography plugin.
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/kde4/kleo
 	${INSTALL_DATA} ${WRKSRC}/libkleo/kleo/*.h \
 		${STAGEDIR}${PREFIX}/include/kde4/kleo
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/kde4/kleo/ui
 	${INSTALL_DATA} ${WRKSRC}/libkleo/ui/*.h \
 		${STAGEDIR}${PREFIX}/include/kde4/kleo/ui
 
 .include <bsd.port.mk>
Index: head/deskutils/kdepim4-runtime/Makefile
===================================================================
--- head/deskutils/kdepim4-runtime/Makefile	(revision 436960)
+++ head/deskutils/kdepim4-runtime/Makefile	(revision 436961)
@@ -1,41 +1,41 @@
 # Created by: miwi
 # $FreeBSD$
 
 PORTNAME=	kdepim-runtime
-PORTVERSION=	${KDE4_KDELIBS_VERSION}
+PORTVERSION=	${KDE4_KDEPIM_VERSION}
 PORTREVISION=	2
 CATEGORIES=	deskutils kde
 MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE PIM tools and services
 
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libkgapi2.so:devel/libkgapi \
 		libkolab.so:devel/libkolab \
 		libkolabxml.so:textproc/libkolabxml \
 		libkfbapi.so:net/libkfbapi \
 		libqjson.so:devel/qjson
 
 CONFLICTS_INSTALL=	kdepim-runtime44-4.*
 
 USES=		cmake:outsource kde:4 shared-mime-info tar:xz
 USE_GNOME=	libxml2 libxslt:build
 USE_KDE=	kdelibs pimlibs \
 		akonadi automoc4
 USE_QT4=	corelib dbus declarative designer_build gui network qtestlib \
 		script xml xmlpatterns \
 		qmake_build moc_build rcc_build uic_build
 USE_LDCONFIG=	yes
 MAKE_ENV=	XDG_CONFIG_HOME=/dev/null
 CMAKE_ARGS=	-DKDEPIM_MOBILE_UI:BOOL=OFF
 
 post-patch:
 # Prevent updating MIME during build.
 	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d' \
 		${PATCH_WRKSRC}/CMakeLists.txt \
 		${PATCH_WRKSRC}/accountwizard/CMakeLists.txt \
 		${PATCH_WRKSRC}/resources/facebook/serializer/CMakeLists.txt
 
 .include <bsd.port.mk>
Index: head/deskutils/kdepimlibs4/Makefile
===================================================================
--- head/deskutils/kdepimlibs4/Makefile	(revision 436960)
+++ head/deskutils/kdepimlibs4/Makefile	(revision 436961)
@@ -1,41 +1,41 @@
 # Created by: arved
 # $FreeBSD$
 
 PORTNAME=	kdepimlibs
-PORTVERSION=	${KDE4_KDELIBS_VERSION}
+PORTVERSION=	${KDE4_KDEPIM_VERSION}
 PORTREVISION=	7
 CATEGORIES=	deskutils kde
 MASTER_SITES=	KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE PIM Libraries
 
 BUILD_DEPENDS=	xsltproc:textproc/libxslt
 LIB_DEPENDS=	libgpgme.so:security/gpgme \
 		libsasl2.so:security/cyrus-sasl2 \
 		libboost_thread.so:devel/boost-libs \
 		libical.so:devel/libical \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libprison.so:graphics/prison \
 		libqjson.so:devel/qjson
 
 USES=		cmake:outsource kde:4 shared-mime-info shebangfix tar:xz
 USE_KDE=	kdelibs akonadi \
 		automoc4 ontologies soprano
 SHEBANG_FILES=	mailtransport/kconf_update/migrate-transports.pl
 USE_OPENLDAP=	yes
 USE_QT4=	corelib dbus declarative designer_build gui network sql xml \
 		qmake_build moc_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${PATCH_WRKSRC}/cmake/modules/*.cmake
 	${REINPLACE_CMD} -e 's|%%KDE_PREFIX%%|${KDE_PREFIX}|g' \
 		${PATCH_WRKSRC}/cmake/modules/FindQGpgme.cmake
 # Prevent updating MIME during build.
 	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d' \
 		${PATCH_WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>