diff options
author | markd <markd> | 2012-03-19 11:39:15 +0000 |
---|---|---|
committer | markd <markd> | 2012-03-19 11:39:15 +0000 |
commit | 196c4a9136ee0f7cc4d26c8daef48376c4084bb8 (patch) | |
tree | 772ffa51d6a1dcce0f8dd01afa1559bed054f04b /mail/akonadi | |
parent | b9d9b3bd3cb524e25ed66287a7a0e1cf9d4deb64 (diff) | |
download | pkgsrc-196c4a9136ee0f7cc4d26c8daef48376c4084bb8.tar.gz |
Update to 1.7.0
Required for KDE SC 4.8.0
Diffstat (limited to 'mail/akonadi')
-rw-r--r-- | mail/akonadi/Makefile | 27 | ||||
-rw-r--r-- | mail/akonadi/PLIST | 12 | ||||
-rw-r--r-- | mail/akonadi/buildlink3.mk | 4 | ||||
-rw-r--r-- | mail/akonadi/distinfo | 9 | ||||
-rw-r--r-- | mail/akonadi/options.mk | 51 | ||||
-rw-r--r-- | mail/akonadi/patches/patch-cmake_modules_FindSqlite.cmake | 66 |
6 files changed, 136 insertions, 33 deletions
diff --git a/mail/akonadi/Makefile b/mail/akonadi/Makefile index 12cb20476fd..efc4369e7e8 100644 --- a/mail/akonadi/Makefile +++ b/mail/akonadi/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.33 2012/03/03 00:12:26 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2012/03/19 11:39:15 markd Exp $ -DISTNAME= akonadi-1.4.0 -PKGREVISION= 12 +DISTNAME= akonadi-1.7.0 CATEGORIES= mail -MASTER_SITES= http://download.akonadi-project.org/ +MASTER_SITES= ftp://kde.mirror.anlx.net/stable/akonadi/src/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= markd@NetBSD.org @@ -17,15 +16,8 @@ PKG_DESTDIR_SUPPORT= user-destdir BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt -DEPENDS+= qt4-mysql-[0-9]*:../../x11/qt4-mysql -.include "../../mk/mysql.buildlink3.mk" -.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 + +.include "options.mk" USE_TOOLS+= pkg-config USE_LANGUAGES= c c++ @@ -39,16 +31,7 @@ pre-configure: PKGCONFIG_OVERRIDE+= akonadi.pc.cmake -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:" - -LDFLAGS.SunOS+= -lsocket - .include "../../databases/shared-mime-info/buildlink3.mk" -.include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk" .include "../../textproc/soprano/buildlink3.mk" .include "../../x11/qt4-libs/buildlink3.mk" diff --git a/mail/akonadi/PLIST b/mail/akonadi/PLIST index 79d7d70d3f9..ae856364306 100644 --- a/mail/akonadi/PLIST +++ b/mail/akonadi/PLIST @@ -1,4 +1,6 @@ -@comment $NetBSD: PLIST,v 1.6 2010/10/25 20:19:15 markd Exp $ +@comment $NetBSD: PLIST,v 1.7 2012/03/19 11:39:15 markd Exp $ +bin/akonadi_agent_launcher +bin/akonadi_agent_server bin/akonadi_control bin/akonadi_rds bin/akonadictl @@ -12,14 +14,13 @@ include/akonadi/private/protocol_p.h include/akonadi/private/xdgbasedirs_p.h lib/cmake/Akonadi/AkonadiConfig.cmake lib/cmake/Akonadi/AkonadiConfigVersion.cmake -lib/libakonadiprivate.so -lib/libakonadiprivate.so.1 -lib/libakonadiprivate.so.${PKGVERSION} +lib/cmake/Akonadi/AkonadiTargetsWithPrefix-noconfig.cmake +lib/cmake/Akonadi/AkonadiTargetsWithPrefix.cmake lib/libakonadiprotocolinternals.so lib/libakonadiprotocolinternals.so.1 lib/libakonadiprotocolinternals.so.${PKGVERSION} lib/pkgconfig/akonadi.pc -lib/qt4/plugins/sqldrivers/libqsqlite3.so +${PLIST.sqlite}qt4/plugins/sqldrivers/libqsqlite3.so share/config/akonadi/mysql-global-mobile.conf share/config/akonadi/mysql-global.conf share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Control.xml @@ -28,6 +29,7 @@ share/dbus-1/interfaces/org.freedesktop.Akonadi.AgentManager.xml share/dbus-1/interfaces/org.freedesktop.Akonadi.ControlManager.xml share/dbus-1/interfaces/org.freedesktop.Akonadi.DebugInterface.xml share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationManager.xml +share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationSource.xml share/dbus-1/interfaces/org.freedesktop.Akonadi.Preprocessor.xml share/dbus-1/interfaces/org.freedesktop.Akonadi.Resource.xml share/dbus-1/interfaces/org.freedesktop.Akonadi.Server.xml diff --git a/mail/akonadi/buildlink3.mk b/mail/akonadi/buildlink3.mk index fce79250283..e1b1a409400 100644 --- a/mail/akonadi/buildlink3.mk +++ b/mail/akonadi/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2012/03/03 00:12:26 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2012/03/19 11:39:15 markd Exp $ BUILDLINK_TREE+= akonadi @@ -6,7 +6,7 @@ BUILDLINK_TREE+= akonadi AKONADI_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.akonadi+= akonadi>=0.82.0 -BUILDLINK_ABI_DEPENDS.akonadi?= akonadi>=1.4.0nb12 +BUILDLINK_ABI_DEPENDS.akonadi?= akonadi>=1.4.81 BUILDLINK_PKGSRCDIR.akonadi?= ../../mail/akonadi .include "../../x11/qt4-libs/buildlink3.mk" diff --git a/mail/akonadi/distinfo b/mail/akonadi/distinfo index b52ef198a8b..b9f0359f437 100644 --- a/mail/akonadi/distinfo +++ b/mail/akonadi/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.10 2010/10/25 20:19:15 markd Exp $ +$NetBSD: distinfo,v 1.11 2012/03/19 11:39:15 markd Exp $ -SHA1 (akonadi-1.4.0.tar.bz2) = a83943aa46537fee4e07953fedf29f5c13487937 -RMD160 (akonadi-1.4.0.tar.bz2) = a69885807127684aa40e6203bd76cc09275dc427 -Size (akonadi-1.4.0.tar.bz2) = 229349 bytes +SHA1 (akonadi-1.7.0.tar.bz2) = 794be377ed42d6ec906a3c9eb36af28493d7ea56 +RMD160 (akonadi-1.7.0.tar.bz2) = 0125b31a02143be7e50f427162bc9e7d0421a94d +Size (akonadi-1.7.0.tar.bz2) = 210281 bytes +SHA1 (patch-cmake_modules_FindSqlite.cmake) = 863e5324c07dff18306c1a3e358122d700debd9e diff --git a/mail/akonadi/options.mk b/mail/akonadi/options.mk new file mode 100644 index 00000000000..d4410e07400 --- /dev/null +++ b/mail/akonadi/options.mk @@ -0,0 +1,51 @@ +# $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 diff --git a/mail/akonadi/patches/patch-cmake_modules_FindSqlite.cmake b/mail/akonadi/patches/patch-cmake_modules_FindSqlite.cmake new file mode 100644 index 00000000000..4adfbcd6a70 --- /dev/null +++ b/mail/akonadi/patches/patch-cmake_modules_FindSqlite.cmake @@ -0,0 +1,66 @@ +$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) |