1 files changed, 21 insertions, 16 deletions

diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 4b1ac34e69aa..bbda8b1f5f8a 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,11 +8,9 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
-PKGNAMESUFFIX?=	# empty
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -22,7 +20,6 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell \
 		${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies \
 		${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml \
 		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
-
 LIB_DEPENDS=	searchclient:${PORTSDIR}/deskutils/strigi \
 		soprano.4:${PORTSDIR}/textproc/soprano \
 		IlmImf:${PORTSDIR}/graphics/OpenEXR \
@@ -37,18 +34,21 @@ LIB_DEPENDS=	searchclient:${PORTSDIR}/deskutils/strigi \
 		idn:${PORTSDIR}/dns/libidn \
 		hal.1:${PORTSDIR}/sysutils/hal \
 		qca.2:${PORTSDIR}/devel/qca \
+		HUpnp.1:${PORTSDIR}/net/hupnp \
 		attica.0:${PORTSDIR}/x11-toolkits/attica \
-		polkit-qt-core.0:${PORTSDIR}/sysutils/policykit-qt \
+		polkit-qt-core-1.1:${PORTSDIR}/sysutils/polkit-qt \
 		smbclient.0:${PORTSDIR}/net/samba-libsmbclient \
-		dbusmenu-qt.2:${PORTSDIR}/devel/libdbusmenu-qt
-
+		dbusmenu-qt.2:${PORTSDIR}/devel/libdbusmenu-qt \
+		grantlee_gui.0:${PORTSDIR}/devel/grantlee
 RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		${LOCALBASE}/share/ontology/core/rdf.ontology:${PORTSDIR}/x11-toolkits/shared-desktop-ontologies \
 		showrgb:${PORTSDIR}/x11/rgb \
 		iceauth:${PORTSDIR}/x11/iceauth \
-		xauth:${PORTSDIR}/x11/xauth
+		xauth:${PORTSDIR}/x11/xauth \
+		${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml \
+		${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
 
-CONFLICTS=	kdebase-workspace-4.1.* kdebase-workspace-4.3.[1-4] kdelibs-experimental-4.3*
+CONFLICTS=	kdebase-runtime-4.5.[0-5]
 
 LATEST_LINK=	${PORTNAME}4
 
@@ -64,10 +64,12 @@ QT_COMPONENTS=	corelib dbus gui network opengl qt3support \
 		assistant svg qdbusviewer makeqpf imageformats \
 		qmake_build moc_build rcc_build uic_build
 USE_GNOME=	libxml2 libxslt
+USE_FAM=	yes
 MAKE_JOBS_SAFE=	yes
 
-CMAKE_ARGS+=	-DWITH_FAM:BOOL=Off \
-		-DWITH_ACL:BOOL=Off
+CMAKE_ARGS+=	-DWITH_ACL:BOOL=Off \
+		-DWITH_FAM:BOOL=On
+CMAKE_ARGS+=	-DHUPNP_INCLUDE_PATH:PATH="${LOCALBASE}/include"
 
 MAN1=	checkXML.1 \
 	kde4-config.1 \
@@ -115,6 +117,12 @@ post-patch:
 #Fix rgb named colors database path.
 	${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
 		${PATCH_WRKSRC}/kdeui/colors/kcolordialog.cpp
+# Ports fails to locate pimlibs and workspace when PREFIX!=KDE4_PREFIX.
+# More search paths resolve the problem.
+.for module in KdepimLibs KDE4Workspace
+	${REINPLACE_CMD} -e '/find_package/s,PATHS,PATHS ${KDE4_PREFIX}/lib/cmake/${module},' \
+		${PATCH_WRKSRC}/cmake/modules/Find${module}.cmake
+.endfor
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
@@ -126,15 +134,12 @@ pre-configure:
 		${PATCH_WRKSRC}/cmake/modules/FindDNSSD.cmake
 	${REINPLACE_CMD} -e 's|soprano/cmake|cmake/Modules|g' \
 		${PATCH_WRKSRC}/cmake/modules/FindSoprano.cmake
-#	FindBerkeleyDB.cmake should be rewritten to support multiple version
-#	provided by ports, instead of hardcoding one of them
+# FindBerkeleyDB.cmake should be rewritten to support multiple version
+# provided by ports, instead of hardcoding one of them
 #	${REINPLACE_CMD} -e 's|/usr/local/include/db4|${BDB_INCLUDE_DIR}|' \
 #		-e 's|NAMES db|NAMES ${BDB_LIB_NAME} ${LOCALBASE}/lib|' \
 #		${PATCH_WRKSRC}/cmake/modules/FindBerkeleyDB.cmake
-#	prevent updating mime during build
-#	${REINPLACE_CMD} -e '/^update_xdg_mimetypes/d; /SharedMimeInfo/d' \
-#		${PATCH_WRKSRC}/mimetypes/CMakeLists.txt
-#	default KDEHOME dir
+# default KDEHOME dir
 	${REINPLACE_CMD} -e '/KDE_DEFAULT_HOME/s|.kde|.kde4|' \
 		${PATCH_WRKSRC}/CMakeLists.txt