Mon Mar 19 11:39:16 2012 UTC ()
Update to 1.7.0

Required for KDE SC 4.8.0


(markd)
diff -r1.33 -r1.34 pkgsrc/mail/akonadi/Makefile
diff -r1.6 -r1.7 pkgsrc/mail/akonadi/PLIST
diff -r1.13 -r1.14 pkgsrc/mail/akonadi/buildlink3.mk
diff -r1.10 -r1.11 pkgsrc/mail/akonadi/distinfo
diff -r0 -r1.1 pkgsrc/mail/akonadi/options.mk
diff -r0 -r1.1 pkgsrc/mail/akonadi/patches/patch-cmake_modules_FindSqlite.cmake

cvs diff -r1.33 -r1.34 pkgsrc/mail/akonadi/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/akonadi/Makefile 2012/03/03 00:12:26 1.33
+++ pkgsrc/mail/akonadi/Makefile 2012/03/19 11:39:15 1.34
@@ -1,58 +1,41 @@ @@ -1,58 +1,41 @@
1# $NetBSD: Makefile,v 1.33 2012/03/03 00:12:26 wiz Exp $ 1# $NetBSD: Makefile,v 1.34 2012/03/19 11:39:15 markd Exp $
2 2
3DISTNAME= akonadi-1.4.0 3DISTNAME= akonadi-1.7.0
4PKGREVISION= 12 
5CATEGORIES= mail 4CATEGORIES= mail
6MASTER_SITES= http://download.akonadi-project.org/ 5MASTER_SITES= ftp://kde.mirror.anlx.net/stable/akonadi/src/
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= markd@NetBSD.org 8MAINTAINER= markd@NetBSD.org
10HOMEPAGE= http://pim.kde.org/akonadi/ 9HOMEPAGE= http://pim.kde.org/akonadi/
11COMMENT= The KDE PIM Storage Service 10COMMENT= The KDE PIM Storage Service
12LICENSE= gnu-lgpl-v2.1 11LICENSE= gnu-lgpl-v2.1
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
16# BUILD_MAKE_FLAGS+= VERBOSE=1 15# BUILD_MAKE_FLAGS+= VERBOSE=1
17 16
18BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 17BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4
19BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 18BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
20DEPENDS+= qt4-mysql-[0-9]*:../../x11/qt4-mysql 19
21.include "../../mk/mysql.buildlink3.mk" 20.include "options.mk"
22.if ${_MYSQL_VERSION} == "55" 
23.include "../../databases/mysql55-server/buildlink3.mk" 
24.elif ${_MYSQL_VERSION} == "51" 
25.include "../../databases/mysql51-server/buildlink3.mk" 
26.else 
27.include "../../databases/mysql5-server/buildlink3.mk" 
28.endif 
29 21
30USE_TOOLS+= pkg-config 22USE_TOOLS+= pkg-config
31USE_LANGUAGES= c c++ 23USE_LANGUAGES= c c++
32USE_CMAKE= yes 24USE_CMAKE= yes
33CMAKE_ARG_PATH= .. 25CMAKE_ARG_PATH= ..
34CONFIGURE_DIRS= _build 26CONFIGURE_DIRS= _build
35 27
36pre-configure: 28pre-configure:
37 ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ 29 ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
38 ${MKDIR} ${WRKSRC}/_build 30 ${MKDIR} ${WRKSRC}/_build
39 31
40PKGCONFIG_OVERRIDE+= akonadi.pc.cmake 32PKGCONFIG_OVERRIDE+= akonadi.pc.cmake
41 33
42SUBST_CLASSES+= mysql 
43SUBST_STAGE.mysql= post-patch 
44SUBST_MESSAGE.mysql= Fix mysqld path. 
45SUBST_FILES.mysql= server/CMakeLists.txt 
46SUBST_SED.mysql= -e "s:MYSQLD_EXECUTABLE mysqld:MYSQLD_EXECUTABLE mysqld ${PREFIX}/libexec:" 
47 
48LDFLAGS.SunOS+= -lsocket 
49 
50.include "../../databases/shared-mime-info/buildlink3.mk" 34.include "../../databases/shared-mime-info/buildlink3.mk"
51.include "../../databases/sqlite3/buildlink3.mk" 
52.include "../../devel/boost-libs/buildlink3.mk" 35.include "../../devel/boost-libs/buildlink3.mk"
53.include "../../textproc/soprano/buildlink3.mk" 36.include "../../textproc/soprano/buildlink3.mk"
54.include "../../x11/qt4-libs/buildlink3.mk" 37.include "../../x11/qt4-libs/buildlink3.mk"
55.include "../../x11/qt4-tools/buildlink3.mk" 38.include "../../x11/qt4-tools/buildlink3.mk"
56.include "../../x11/qt4-qdbus/buildlink3.mk" 39.include "../../x11/qt4-qdbus/buildlink3.mk"
57 40
58.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"

cvs diff -r1.6 -r1.7 pkgsrc/mail/akonadi/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/akonadi/PLIST 2010/10/25 20:19:15 1.6
+++ pkgsrc/mail/akonadi/PLIST 2012/03/19 11:39:15 1.7
@@ -1,37 +1,39 @@ @@ -1,37 +1,39 @@
1@comment $NetBSD: PLIST,v 1.6 2010/10/25 20:19:15 markd Exp $ 1@comment $NetBSD: PLIST,v 1.7 2012/03/19 11:39:15 markd Exp $
 2bin/akonadi_agent_launcher
 3bin/akonadi_agent_server
2bin/akonadi_control 4bin/akonadi_control
3bin/akonadi_rds 5bin/akonadi_rds
4bin/akonadictl 6bin/akonadictl
5bin/akonadiserver 7bin/akonadiserver
6include/akonadi/private/akonadiprotocolinternals_export.h 8include/akonadi/private/akonadiprotocolinternals_export.h
7include/akonadi/private/capabilities_p.h 9include/akonadi/private/capabilities_p.h
8include/akonadi/private/imapparser_p.h 10include/akonadi/private/imapparser_p.h
9include/akonadi/private/imapset_p.h 11include/akonadi/private/imapset_p.h
10include/akonadi/private/notificationmessage_p.h 12include/akonadi/private/notificationmessage_p.h
11include/akonadi/private/protocol_p.h 13include/akonadi/private/protocol_p.h
12include/akonadi/private/xdgbasedirs_p.h 14include/akonadi/private/xdgbasedirs_p.h
13lib/cmake/Akonadi/AkonadiConfig.cmake 15lib/cmake/Akonadi/AkonadiConfig.cmake
14lib/cmake/Akonadi/AkonadiConfigVersion.cmake 16lib/cmake/Akonadi/AkonadiConfigVersion.cmake
15lib/libakonadiprivate.so 17lib/cmake/Akonadi/AkonadiTargetsWithPrefix-noconfig.cmake
16lib/libakonadiprivate.so.1 18lib/cmake/Akonadi/AkonadiTargetsWithPrefix.cmake
17lib/libakonadiprivate.so.${PKGVERSION} 
18lib/libakonadiprotocolinternals.so 19lib/libakonadiprotocolinternals.so
19lib/libakonadiprotocolinternals.so.1 20lib/libakonadiprotocolinternals.so.1
20lib/libakonadiprotocolinternals.so.${PKGVERSION} 21lib/libakonadiprotocolinternals.so.${PKGVERSION}
21lib/pkgconfig/akonadi.pc 22lib/pkgconfig/akonadi.pc
22lib/qt4/plugins/sqldrivers/libqsqlite3.so 23${PLIST.sqlite}qt4/plugins/sqldrivers/libqsqlite3.so
23share/config/akonadi/mysql-global-mobile.conf 24share/config/akonadi/mysql-global-mobile.conf
24share/config/akonadi/mysql-global.conf 25share/config/akonadi/mysql-global.conf
25share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Control.xml 26share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Control.xml
26share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Status.xml 27share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Status.xml
27share/dbus-1/interfaces/org.freedesktop.Akonadi.AgentManager.xml 28share/dbus-1/interfaces/org.freedesktop.Akonadi.AgentManager.xml
28share/dbus-1/interfaces/org.freedesktop.Akonadi.ControlManager.xml 29share/dbus-1/interfaces/org.freedesktop.Akonadi.ControlManager.xml
29share/dbus-1/interfaces/org.freedesktop.Akonadi.DebugInterface.xml 30share/dbus-1/interfaces/org.freedesktop.Akonadi.DebugInterface.xml
30share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationManager.xml 31share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationManager.xml
 32share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationSource.xml
31share/dbus-1/interfaces/org.freedesktop.Akonadi.Preprocessor.xml 33share/dbus-1/interfaces/org.freedesktop.Akonadi.Preprocessor.xml
32share/dbus-1/interfaces/org.freedesktop.Akonadi.Resource.xml 34share/dbus-1/interfaces/org.freedesktop.Akonadi.Resource.xml
33share/dbus-1/interfaces/org.freedesktop.Akonadi.Server.xml 35share/dbus-1/interfaces/org.freedesktop.Akonadi.Server.xml
34share/dbus-1/interfaces/org.freedesktop.Akonadi.Tracer.xml 36share/dbus-1/interfaces/org.freedesktop.Akonadi.Tracer.xml
35share/dbus-1/interfaces/org.freedesktop.Akonadi.TracerNotification.xml 37share/dbus-1/interfaces/org.freedesktop.Akonadi.TracerNotification.xml
36share/dbus-1/services/org.freedesktop.Akonadi.Control.service 38share/dbus-1/services/org.freedesktop.Akonadi.Control.service
37share/mime/packages/akonadi-mime.xml 39share/mime/packages/akonadi-mime.xml

cvs diff -r1.13 -r1.14 pkgsrc/mail/akonadi/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mail/akonadi/buildlink3.mk 2012/03/03 00:12:26 1.13
+++ pkgsrc/mail/akonadi/buildlink3.mk 2012/03/19 11:39:15 1.14
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: buildlink3.mk,v 1.13 2012/03/03 00:12:26 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.14 2012/03/19 11:39:15 markd Exp $
2 2
3BUILDLINK_TREE+= akonadi 3BUILDLINK_TREE+= akonadi
4 4
5.if !defined(AKONADI_BUILDLINK3_MK) 5.if !defined(AKONADI_BUILDLINK3_MK)
6AKONADI_BUILDLINK3_MK:= 6AKONADI_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.akonadi+= akonadi>=0.82.0 8BUILDLINK_API_DEPENDS.akonadi+= akonadi>=0.82.0
9BUILDLINK_ABI_DEPENDS.akonadi?= akonadi>=1.4.0nb12 9BUILDLINK_ABI_DEPENDS.akonadi?= akonadi>=1.4.81
10BUILDLINK_PKGSRCDIR.akonadi?= ../../mail/akonadi 10BUILDLINK_PKGSRCDIR.akonadi?= ../../mail/akonadi
11 11
12.include "../../x11/qt4-libs/buildlink3.mk" 12.include "../../x11/qt4-libs/buildlink3.mk"
13.include "../../x11/qt4-qdbus/buildlink3.mk" 13.include "../../x11/qt4-qdbus/buildlink3.mk"
14.endif # AKONADI_BUILDLINK3_MK 14.endif # AKONADI_BUILDLINK3_MK
15 15
16BUILDLINK_TREE+= -akonadi 16BUILDLINK_TREE+= -akonadi

cvs diff -r1.10 -r1.11 pkgsrc/mail/akonadi/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/akonadi/distinfo 2010/10/25 20:19:15 1.10
+++ pkgsrc/mail/akonadi/distinfo 2012/03/19 11:39:15 1.11
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
1$NetBSD: distinfo,v 1.10 2010/10/25 20:19:15 markd Exp $ 1$NetBSD: distinfo,v 1.11 2012/03/19 11:39:15 markd Exp $
2 2
3SHA1 (akonadi-1.4.0.tar.bz2) = a83943aa46537fee4e07953fedf29f5c13487937 3SHA1 (akonadi-1.7.0.tar.bz2) = 794be377ed42d6ec906a3c9eb36af28493d7ea56
4RMD160 (akonadi-1.4.0.tar.bz2) = a69885807127684aa40e6203bd76cc09275dc427 4RMD160 (akonadi-1.7.0.tar.bz2) = 0125b31a02143be7e50f427162bc9e7d0421a94d
5Size (akonadi-1.4.0.tar.bz2) = 229349 bytes 5Size (akonadi-1.7.0.tar.bz2) = 210281 bytes
 6SHA1 (patch-cmake_modules_FindSqlite.cmake) = 863e5324c07dff18306c1a3e358122d700debd9e

File Added: pkgsrc/mail/akonadi/options.mk
# $NetBSD: options.mk,v 1.1 2012/03/19 11:39:16 markd Exp $

PKG_OPTIONS_VAR=		PKG_OPTIONS.akonadi

PKG_OPTIONS_REQUIRED_GROUPS=	db
PKG_OPTIONS_GROUP.db=		mysql sqlite

PKG_SUGGESTED_OPTIONS=		sqlite

.include "../../mk/bsd.options.mk"

###
### Use mysql backend
###
.if !empty(PKG_OPTIONS:Mmysql)
.	include "../../mk/mysql.buildlink3.mk"
.include "../../mk/mysql.buildlink3.mk"
DEPENDS+=	qt4-mysql-[0-9]*:../../x11/qt4-mysql
CMAKE_ARGS+=	-DAKONADI_BUILD_QSQLITE=off
.  if ${_MYSQL_VERSION} == "55"
.    include "../../databases/mysql55-server/buildlink3.mk"
.  elif ${_MYSQL_VERSION} == "51"
.    include "../../databases/mysql51-server/buildlink3.mk"
.  else
.    include "../../databases/mysql5-server/buildlink3.mk"
.  endif
SUBST_CLASSES+=		mysql
SUBST_STAGE.mysql=	post-patch
SUBST_MESSAGE.mysql=	Fix mysqld path.
SUBST_FILES.mysql=	server/CMakeLists.txt
SUBST_SED.mysql=	-e "s:MYSQLD_EXECUTABLE mysqld:MYSQLD_EXECUTABLE mysqld ${PREFIX}/libexec:"
.endif

###
### Use postgresql backend
###
.if !empty(PKG_OPTIONS:Mpgsql)
.	include "../../mk/pgsql.buildlink3.mk"
# XXX Not yet tested in pkgsrc
.endif

###
### Use sqlite backend
###
PLIST_VARS+=	sqlite
.if !empty(PKG_OPTIONS:Msqlite)
.	include "../../databases/sqlite3/buildlink3.mk"
CMAKE_ARGS+=	-DDATABASE_BACKEND=SQLITE
CMAKE_ARGS+=	-DINSTALL_QSQLITE_IN_QT_PREFIX=true
PLIST.sqlite=	yes
.endif

File Added: pkgsrc/mail/akonadi/patches/patch-cmake_modules_FindSqlite.cmake
$NetBSD: patch-cmake_modules_FindSqlite.cmake,v 1.1 2012/03/19 11:39:16 markd Exp $

If pkg-config provides a sqlite version, use it in preference

PC_SQLITE_{INCLUDE,LIB}DIR may be null if in default path so need to 
include default path in search.

--- cmake/modules/FindSqlite.cmake.orig	2011-05-07 09:22:49.000000000 +0000
+++ cmake/modules/FindSqlite.cmake
@@ -38,13 +38,11 @@ if(PC_SQLITE_FOUND)
   find_path(SQLITE_INCLUDE_DIR
             NAMES sqlite3.h
             PATHS ${PC_SQLITE_INCLUDEDIR}
-            NO_DEFAULT_PATH
            )
 
   find_library(SQLITE_LIBRARIES
                NAMES sqlite3
                PATHS ${PC_SQLITE_LIBDIR}
-               NO_DEFAULT_PATH
               )
 else(PC_SQLITE_FOUND)
   find_path(SQLITE_INCLUDE_DIR
@@ -67,22 +65,26 @@ else( UNIX )
   set( SQLITE_STATIC_LIBRARIES ${SQLITE_LIBRARIES} )
 endif( UNIX )
 
-if(EXISTS ${SQLITE_INCLUDE_DIR}/sqlite3.h)
-  file(READ ${SQLITE_INCLUDE_DIR}/sqlite3.h SQLITE3_H_CONTENT)
-  string(REGEX MATCH "SQLITE_VERSION[ ]*\"[0-9.]*\"\n" SQLITE_VERSION_MATCH "${SQLITE3_H_CONTENT}")
-
-  if(SQLITE_VERSION_MATCH)
-    string(REGEX REPLACE ".*SQLITE_VERSION[ ]*\"(.*)\"\n" "\\1" SQLITE_VERSION ${SQLITE_VERSION_MATCH})
-
-    if(SQLITE_VERSION VERSION_LESS "${SQLITE_MIN_VERSION}")
-        message(STATUS "Sqlite ${SQLITE_VERSION} was found, but at least version ${SQLITE_MIN_VERSION} is required")
-        set(SQLITE_VERSION_OK FALSE)
-    else(SQLITE_VERSION VERSION_LESS "${SQLITE_MIN_VERSION}")
-        set(SQLITE_VERSION_OK TRUE)
-    endif(SQLITE_VERSION VERSION_LESS "${SQLITE_MIN_VERSION}")
-
-  endif(SQLITE_VERSION_MATCH)
-
+if( PC_SQLITE_VERSION )
+  set( SQLITE_VERSION ${PC_SQLITE_VERSION})
+else( PC_SQLITE_VERSION )
+  if(EXISTS ${SQLITE_INCLUDE_DIR}/sqlite3.h)
+    file(READ ${SQLITE_INCLUDE_DIR}/sqlite3.h SQLITE3_H_CONTENT)
+    string(REGEX MATCH "SQLITE_VERSION[ ]*\"[0-9.]*\"\n" SQLITE_VERSION_MATCH "${SQLITE3_H_CONTENT}")
+
+    if(SQLITE_VERSION_MATCH)
+      string(REGEX REPLACE ".*SQLITE_VERSION[ ]*\"(.*)\"\n" "\\1" SQLITE_VERSION ${SQLITE_VERSION_MATCH})
+    endif(SQLITE_VERSION_MATCH)
+  endif()
+endif( PC_SQLITE_VERSION )
+
+if (SQLITE_VERSION)
+  if(SQLITE_VERSION VERSION_LESS "${SQLITE_MIN_VERSION}")
+      message(STATUS "Sqlite ${SQLITE_VERSION} was found, but at least version ${SQLITE_MIN_VERSION} is required")
+      set(SQLITE_VERSION_OK FALSE)
+  else(SQLITE_VERSION VERSION_LESS "${SQLITE_MIN_VERSION}")
+      set(SQLITE_VERSION_OK TRUE)
+  endif(SQLITE_VERSION VERSION_LESS "${SQLITE_MIN_VERSION}")
 endif()
 
 include(FindPackageHandleStandardArgs)