Update KDE4 PIM libraries package to 4.10.2.

x11/kde4/pimlibs/Makefile

@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.13 2013/02/03 13:21:42 zhuk Exp $
+# $OpenBSD: Makefile,v 1.14 2013/04/24 20:03:39 zhuk Exp $
 
-COMMENT =		K Desktop Environment, pimlibs
-DISTNAME =		kdepimlibs-${VERSION}
-REVISION =		0
+COMMENT =	libraries for KDE PIM services
+DISTNAME =	kdepimlibs-${MODKDE4_VERSION}
 
-SHARED_LIBS +=	kabc                 5.0      # .4.0
+SHARED_LIBS =	kabc                 5.0      # .4.0
 SHARED_LIBS +=	kabc_file_core       0.0      # .4.0
+SHARED_LIBS +=	kalarmcal	     0.0      # 2.7
 SHARED_LIBS +=	kcal                 5.0      # .4.0
 SHARED_LIBS +=	kldap                0.0      # .4.0
 SHARED_LIBS +=	kmime                6.0      # .4.0
@@ -26,36 +26,48 @@ SHARED_LIBS +=	akonadi-kabc	     0.0      # .4.4
 SHARED_LIBS +=	akonadi-kcal	     0.0      # .4.4
 SHARED_LIBS +=	akonadi-kde	     0.0      # .4.4
 SHARED_LIBS +=	akonadi-kmime	     0.0      # .4.4
+SHARED_LIBS +=	akonadi-notes	     0.0      # 4.7
 SHARED_LIBS +=	kholidays	     0.0      # .4.4
 SHARED_LIBS +=	kontactinterface     0.0      # .4.4
 SHARED_LIBS +=	kpimtextedit	     0.0      # .4.4
-SHARED_LIBS += 	gpgme++-pthread	     0.0      # .2.4
-SHARED_LIBS += 	gpgme++		     0.0      # .2.4
 SHARED_LIBS +=	microblog	     0.0      # .4.4
 
-# XXX bug in cmake, remove after cmake 2.8.2
-SHARED_LIBS += 	gpgmepp-pthread	     0.0      # .2.4
-SHARED_LIBS += 	gpgmepp		     0.0      # .2.4
+SHARED_LIBS +=  akonadi-calendar	0.0 # 4.7
+SHARED_LIBS +=  kcalcore		0.0 # 4.7
+SHARED_LIBS +=  kcalutils		0.0 # 4.7
+SHARED_LIBS +=  kmbox			0.0 # 4.7
 
-MODULES =	devel/gettext
+SHARED_LIBS +=  akonadi-socialutils	0.0 # 4.10
 
-BUILD_DEPENDS += devel/boost \
-		devel/automoc
-LIB_DEPENDS +=	x11/kde4/libs \
-		security/cyrus-sasl2 \
+WANTLIB =  c m pthread stdc++
+WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtSql
+WANTLIB += lib/qt4/QtSvg lib/qt4/QtTest lib/qt4/QtXml
+WANTLIB += ${KDE4LIB}/kcmutils ${KDE4LIB}/kdeui ${KDE4LIB}/kemoticons
+WANTLIB += ${KDE4LIB}/kio ${KDE4LIB}/kparts ${KDE4LIB}/nepomuk
+WANTLIB += ${KDE4LIB}/nepomukcore ${KDE4LIB}/nepomukutils ${KDE4LIB}/solid
+WANTLIB += akonadiprotocolinternals assuan e2fs-uuid gpg-error gpgme
+WANTLIB += gpgme-pthread ical icalss lber ldap prison qjson sasl2 soprano
+
+MODULES =	devel/gettext multimedia/phonon
+
+MODKDE4_USE =	libs
+
+BUILD_DEPENDS =	devel/boost \
+		misc/shared-mime-info \
+		misc/shared-desktop-ontologies>=0.10
+
+RUN_DEPENDS =	misc/shared-mime-info \
+		misc/shared-desktop-ontologies>=0.10
+
+LIB_DEPENDS =	${MODKDE4_DEP_DIR}/nepomuk-core>=${MODKDE4_DEP_VERSION} \
 		databases/openldap \
+		databases/soprano>=${MIN_SOPRANO_VERSION} \
+		devel/qjson \
+		graphics/prison \
+		productivity/akonadi>=${MIN_AKONADI_VERSION} \
+		security/cyrus-sasl2 \
 		security/gpgme>=0.4.5 \
-		x11/kde4/akonadi \
+		sysutils/e2fsprogs \
 		textproc/libical
 
-# these come from libs in real case
-pre-install:
-	mkdir -p ${PREFIX}/share/doc/HTML/en/common
-
-WANTLIB += akonadiprotocolinternals c gpg-error gpgme gpgme-pthread ical \
-	icalss kdecore.>=8 kdeui kio kparts kutils lber ldap \
-	lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtSql \
-	lib/qt4/QtSvg lib/qt4/QtXml m phonon pthread sasl2 solid stdc++
-
-
 .include <bsd.port.mk>

x11/kde4/pimlibs/distinfo

@@ -1,5 +1,2 @@
-MD5 (kde/kdepimlibs-4.4.5.tar.bz2) = TDKX4uf11hylky9Z7GKguA==
-RMD160 (kde/kdepimlibs-4.4.5.tar.bz2) = O6lqwp4VHnvOvpA5RTXYI0UQI0Y=
-SHA1 (kde/kdepimlibs-4.4.5.tar.bz2) = vE2aR4+A4BOsOXEPlj7miWHV82k=
-SHA256 (kde/kdepimlibs-4.4.5.tar.bz2) = REgLKmJ/5ObadvGqiBM6YNsF1jwOqc49uYnBztBrKxo=
-SIZE (kde/kdepimlibs-4.4.5.tar.bz2) = 2432146
+SHA256 (kde/kdepimlibs-4.10.2.tar.xz) = n15vcDNy/xuvI7Mr1IsuovNm4ps5kqVhQEU2raGkptQ=
+SIZE (kde/kdepimlibs-4.10.2.tar.xz) = 2808532

x11/kde4/pimlibs/patches/patch-CMakeLists_txt

@@ -0,0 +1,12 @@
+$OpenBSD: patch-CMakeLists_txt,v 1.1 2013/04/24 20:03:39 zhuk Exp $
+--- CMakeLists.txt.orig	Wed Jan 30 01:58:03 2013
++++ CMakeLists.txt	Thu Feb  7 14:23:28 2013
+@@ -156,6 +156,8 @@ else()
+   set(LIBRARY_TYPE SHARED)
+ endif()
+ 
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}")
++
+ 
+ ############### Now, we add the KDEPIMLibs components ###############
+ # These targets will always be built

x11/kde4/pimlibs/patches/patch-ConfigureChecks_cmake

@@ -0,0 +1,12 @@
+$OpenBSD: patch-ConfigureChecks_cmake,v 1.1 2013/04/24 20:03:39 zhuk Exp $
+--- ConfigureChecks.cmake.orig	Sat Jun  2 11:43:13 2012
++++ ConfigureChecks.cmake	Sat Jun  2 11:43:12 2012
+@@ -1,5 +1,5 @@
+ include(CheckIncludeFiles)
+ 
+-check_include_files(sys/select.h  HAVE_SYS_SELECT_H)
+-check_include_files(sys/socket.h  HAVE_SYS_SOCKET_H)
+-check_include_files(sys/types.h   HAVE_SYS_TYPES_H)
++check_include_files("sys/types.h"              HAVE_SYS_TYPES_H)
++check_include_files("sys/types.h;sys/select.h" HAVE_SYS_SELECT_H)
++check_include_files("sys/types.h;sys/socket.h" HAVE_SYS_SOCKET_H)

x11/kde4/pimlibs/patches/patch-KdepimLibsConfig_cmake_in

@@ -0,0 +1,13 @@
+$OpenBSD: patch-KdepimLibsConfig_cmake_in,v 1.1 2013/04/24 20:03:39 zhuk Exp $
+kdepimlibs headers have references to Boost.
+--- KdepimLibsConfig.cmake.in.orig	Sat Feb  9 18:12:47 2013
++++ KdepimLibsConfig.cmake.in	Sat Feb  9 18:13:20 2013
+@@ -15,7 +15,7 @@ set(KDEPIMLIBS_DATA_DIR            "@KDEPIMLIBS_DATA_D
+ set(KDEPIMLIBS_DBUS_INTERFACES_DIR "@KDEPIMLIBS_DBUS_INTERFACES_DIR@")
+ set(KDEPIMLIBS_DBUS_SERVICES_DIR   "@KDEPIMLIBS_DBUS_SERVICES_DIR@")
+ set(KDEPIMLIBS_INCLUDE_DIR         "@KDEPIMLIBS_INCLUDE_DIR@")
+-set(KDEPIMLIBS_INCLUDE_DIRS        "@KDEPIMLIBS_INCLUDE_DIR@" "@KDEPIMLIBS_INCLUDE_DIR@/KDE")
++set(KDEPIMLIBS_INCLUDE_DIRS        "@KDEPIMLIBS_INCLUDE_DIR@" "@KDEPIMLIBS_INCLUDE_DIR@/KDE" "@Boost_INCLUDE_DIR@")
+ set(KDEPIMLIBS_LIB_DIR             "@KDEPIMLIBS_LIB_DIR@")
+ set(KDEPIMLIBS_BIN_DIR             "@KDEPIMLIBS_BIN_DIR@")
+ set(KDEPIMLIBS_LIBEXEC_DIR         "@KDEPIMLIBS_LIBEXEC_DIR@")

x11/kde4/pimlibs/patches/patch-kcalcore_CMakeLists_txt

@@ -0,0 +1,12 @@
+$OpenBSD: patch-kcalcore_CMakeLists_txt,v 1.1 2013/04/24 20:03:39 zhuk Exp $
+--- kcalcore/CMakeLists.txt.orig	Thu Aug  9 12:27:08 2012
++++ kcalcore/CMakeLists.txt	Thu Aug  9 12:37:22 2012
+@@ -85,7 +85,7 @@ kde4_add_library(kcalcore ${LIBRARY_TYPE} ${kcalcore_L
+ 
+ target_link_libraries(kcalcore ${KDE4_KDECORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${LIBICAL_LIBRARIES})
+ if(HAVE_UUID_LIBRARY)
+-  target_link_libraries(kcalcore uuid)
++  target_link_libraries(kcalcore "${UUID_LIBRARY}")
+ endif()
+ 
+ set_target_properties(kcalcore PROPERTIES

x11/kde4/pimlibs/patches/patch-kcalcore_ConfigureChecks_cmake

@@ -0,0 +1,12 @@
+$OpenBSD: patch-kcalcore_ConfigureChecks_cmake,v 1.1 2013/04/24 20:03:39 zhuk Exp $
+--- kcalcore/ConfigureChecks.cmake.orig	Wed May 23 03:48:56 2012
++++ kcalcore/ConfigureChecks.cmake	Thu Aug  9 12:37:02 2012
+@@ -2,4 +2,7 @@ include(CheckIncludeFiles)
+ include(CheckLibraryExists)
+ 
+ check_include_files(uuid/uuid.h HAVE_UUID_UUID_H)
+-check_library_exists(uuid uuid_generate_random "" HAVE_UUID_LIBRARY)
++find_library(UUID_LIBRARY NAMES e2fs-uuid uuid)
++if(UUID_LIBRARY)
++  check_library_exists("${UUID_LIBRARY}" uuid_generate_random "${LIB_INSTALL_DIR}" HAVE_UUID_LIBRARY)
++endif(UUID_LIBRARY)

x11/kde4/pimlibs/patches/patch-kioslave_smtp_command_cpp

@@ -0,0 +1,12 @@
+$OpenBSD: patch-kioslave_smtp_command_cpp,v 1.1 2013/04/24 20:03:39 zhuk Exp $
+--- kioslave/smtp/command.cpp.orig	Mon Dec 17 23:51:57 2012
++++ kioslave/smtp/command.cpp	Mon Dec 17 23:52:14 2012
+@@ -29,6 +29,8 @@
+     your version.
+ */
+ 
++#include <sys/types.h>
++
+ #include "command.h"
+ 
+ #include "smtpsessioninterface.h"

x11/kde4/pimlibs/pkg/DESCR

@@ -1,22 +1,6 @@
 This module includes libraries that are central to the development and
 execution of a KDE-PIM application.
 
-The KDE-PIM project aims to bring together those who wish to help design,
-implement, test, etc. anything that's to do with personal information
-management.
-
-The kdepimlibs module exists to:
-
-1. restrain the size of the kdepim module
-2. co-locate code in kdelibs which is closely associated to kdepim
-  (i.e.,kresources and kabc).  That this code is in kdelibs, but
-  other similar code like libkcal is not, can only be understood by
-  historical  reasons.
-3. provide access to the PIM libraries for code from other modules.
-
-In summary, kdepimlibs is a controlled extension and modularization of
-kdelibs to the PIM space.
-
 Currently, kdepimlibs includes:
 
 * kcal: C++ API for the iCalendar and vCalendar formats