Update to 1.7.0 Required for KDE SC 4.8.0diff -r1.33 -r1.34 pkgsrc/mail/akonadi/Makefile
(markd)
@@ -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 | |||
3 | DISTNAME= akonadi-1.4.0 | 3 | DISTNAME= akonadi-1.7.0 | |
4 | PKGREVISION= 12 | |||
5 | CATEGORIES= mail | 4 | CATEGORIES= mail | |
6 | MASTER_SITES= http://download.akonadi-project.org/ | 5 | MASTER_SITES= ftp://kde.mirror.anlx.net/stable/akonadi/src/ | |
7 | EXTRACT_SUFX= .tar.bz2 | 6 | EXTRACT_SUFX= .tar.bz2 | |
8 | 7 | |||
9 | MAINTAINER= markd@NetBSD.org | 8 | MAINTAINER= markd@NetBSD.org | |
10 | HOMEPAGE= http://pim.kde.org/akonadi/ | 9 | HOMEPAGE= http://pim.kde.org/akonadi/ | |
11 | COMMENT= The KDE PIM Storage Service | 10 | COMMENT= The KDE PIM Storage Service | |
12 | LICENSE= gnu-lgpl-v2.1 | 11 | LICENSE= gnu-lgpl-v2.1 | |
13 | 12 | |||
14 | PKG_DESTDIR_SUPPORT= user-destdir | 13 | PKG_DESTDIR_SUPPORT= user-destdir | |
15 | 14 | |||
16 | # BUILD_MAKE_FLAGS+= VERBOSE=1 | 15 | # BUILD_MAKE_FLAGS+= VERBOSE=1 | |
17 | 16 | |||
18 | BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 | 17 | BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 | |
19 | BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt | 18 | BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt | |
20 | DEPENDS+= 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 | |||
30 | USE_TOOLS+= pkg-config | 22 | USE_TOOLS+= pkg-config | |
31 | USE_LANGUAGES= c c++ | 23 | USE_LANGUAGES= c c++ | |
32 | USE_CMAKE= yes | 24 | USE_CMAKE= yes | |
33 | CMAKE_ARG_PATH= .. | 25 | CMAKE_ARG_PATH= .. | |
34 | CONFIGURE_DIRS= _build | 26 | CONFIGURE_DIRS= _build | |
35 | 27 | |||
36 | pre-configure: | 28 | pre-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 | |||
40 | PKGCONFIG_OVERRIDE+= akonadi.pc.cmake | 32 | PKGCONFIG_OVERRIDE+= akonadi.pc.cmake | |
41 | 33 | |||
42 | SUBST_CLASSES+= mysql | |||
43 | SUBST_STAGE.mysql= post-patch | |||
44 | SUBST_MESSAGE.mysql= Fix mysqld path. | |||
45 | SUBST_FILES.mysql= server/CMakeLists.txt | |||
46 | SUBST_SED.mysql= -e "s:MYSQLD_EXECUTABLE mysqld:MYSQLD_EXECUTABLE mysqld ${PREFIX}/libexec:" | |||
47 | ||||
48 | LDFLAGS.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" |
@@ -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 $ | |
2 | bin/akonadi_agent_launcher | |||
3 | bin/akonadi_agent_server | |||
2 | bin/akonadi_control | 4 | bin/akonadi_control | |
3 | bin/akonadi_rds | 5 | bin/akonadi_rds | |
4 | bin/akonadictl | 6 | bin/akonadictl | |
5 | bin/akonadiserver | 7 | bin/akonadiserver | |
6 | include/akonadi/private/akonadiprotocolinternals_export.h | 8 | include/akonadi/private/akonadiprotocolinternals_export.h | |
7 | include/akonadi/private/capabilities_p.h | 9 | include/akonadi/private/capabilities_p.h | |
8 | include/akonadi/private/imapparser_p.h | 10 | include/akonadi/private/imapparser_p.h | |
9 | include/akonadi/private/imapset_p.h | 11 | include/akonadi/private/imapset_p.h | |
10 | include/akonadi/private/notificationmessage_p.h | 12 | include/akonadi/private/notificationmessage_p.h | |
11 | include/akonadi/private/protocol_p.h | 13 | include/akonadi/private/protocol_p.h | |
12 | include/akonadi/private/xdgbasedirs_p.h | 14 | include/akonadi/private/xdgbasedirs_p.h | |
13 | lib/cmake/Akonadi/AkonadiConfig.cmake | 15 | lib/cmake/Akonadi/AkonadiConfig.cmake | |
14 | lib/cmake/Akonadi/AkonadiConfigVersion.cmake | 16 | lib/cmake/Akonadi/AkonadiConfigVersion.cmake | |
15 | lib/libakonadiprivate.so | 17 | lib/cmake/Akonadi/AkonadiTargetsWithPrefix-noconfig.cmake | |
16 | lib/libakonadiprivate.so.1 | 18 | lib/cmake/Akonadi/AkonadiTargetsWithPrefix.cmake | |
17 | lib/libakonadiprivate.so.${PKGVERSION} | |||
18 | lib/libakonadiprotocolinternals.so | 19 | lib/libakonadiprotocolinternals.so | |
19 | lib/libakonadiprotocolinternals.so.1 | 20 | lib/libakonadiprotocolinternals.so.1 | |
20 | lib/libakonadiprotocolinternals.so.${PKGVERSION} | 21 | lib/libakonadiprotocolinternals.so.${PKGVERSION} | |
21 | lib/pkgconfig/akonadi.pc | 22 | lib/pkgconfig/akonadi.pc | |
22 | lib/qt4/plugins/sqldrivers/libqsqlite3.so | 23 | ${PLIST.sqlite}qt4/plugins/sqldrivers/libqsqlite3.so | |
23 | share/config/akonadi/mysql-global-mobile.conf | 24 | share/config/akonadi/mysql-global-mobile.conf | |
24 | share/config/akonadi/mysql-global.conf | 25 | share/config/akonadi/mysql-global.conf | |
25 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Control.xml | 26 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Control.xml | |
26 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Status.xml | 27 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Status.xml | |
27 | share/dbus-1/interfaces/org.freedesktop.Akonadi.AgentManager.xml | 28 | share/dbus-1/interfaces/org.freedesktop.Akonadi.AgentManager.xml | |
28 | share/dbus-1/interfaces/org.freedesktop.Akonadi.ControlManager.xml | 29 | share/dbus-1/interfaces/org.freedesktop.Akonadi.ControlManager.xml | |
29 | share/dbus-1/interfaces/org.freedesktop.Akonadi.DebugInterface.xml | 30 | share/dbus-1/interfaces/org.freedesktop.Akonadi.DebugInterface.xml | |
30 | share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationManager.xml | 31 | share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationManager.xml | |
32 | share/dbus-1/interfaces/org.freedesktop.Akonadi.NotificationSource.xml | |||
31 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Preprocessor.xml | 33 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Preprocessor.xml | |
32 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Resource.xml | 34 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Resource.xml | |
33 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Server.xml | 35 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Server.xml | |
34 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Tracer.xml | 36 | share/dbus-1/interfaces/org.freedesktop.Akonadi.Tracer.xml | |
35 | share/dbus-1/interfaces/org.freedesktop.Akonadi.TracerNotification.xml | 37 | share/dbus-1/interfaces/org.freedesktop.Akonadi.TracerNotification.xml | |
36 | share/dbus-1/services/org.freedesktop.Akonadi.Control.service | 38 | share/dbus-1/services/org.freedesktop.Akonadi.Control.service | |
37 | share/mime/packages/akonadi-mime.xml | 39 | share/mime/packages/akonadi-mime.xml |
@@ -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 | |||
3 | BUILDLINK_TREE+= akonadi | 3 | BUILDLINK_TREE+= akonadi | |
4 | 4 | |||
5 | .if !defined(AKONADI_BUILDLINK3_MK) | 5 | .if !defined(AKONADI_BUILDLINK3_MK) | |
6 | AKONADI_BUILDLINK3_MK:= | 6 | AKONADI_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.akonadi+= akonadi>=0.82.0 | 8 | BUILDLINK_API_DEPENDS.akonadi+= akonadi>=0.82.0 | |
9 | BUILDLINK_ABI_DEPENDS.akonadi?= akonadi>=1.4.0nb12 | 9 | BUILDLINK_ABI_DEPENDS.akonadi?= akonadi>=1.4.81 | |
10 | BUILDLINK_PKGSRCDIR.akonadi?= ../../mail/akonadi | 10 | BUILDLINK_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 | |||
16 | BUILDLINK_TREE+= -akonadi | 16 | BUILDLINK_TREE+= -akonadi |
@@ -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 | |||
3 | SHA1 (akonadi-1.4.0.tar.bz2) = a83943aa46537fee4e07953fedf29f5c13487937 | 3 | SHA1 (akonadi-1.7.0.tar.bz2) = 794be377ed42d6ec906a3c9eb36af28493d7ea56 | |
4 | RMD160 (akonadi-1.4.0.tar.bz2) = a69885807127684aa40e6203bd76cc09275dc427 | 4 | RMD160 (akonadi-1.7.0.tar.bz2) = 0125b31a02143be7e50f427162bc9e7d0421a94d | |
5 | Size (akonadi-1.4.0.tar.bz2) = 229349 bytes | 5 | Size (akonadi-1.7.0.tar.bz2) = 210281 bytes | |
6 | SHA1 (patch-cmake_modules_FindSqlite.cmake) = 863e5324c07dff18306c1a3e358122d700debd9e |
# $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
$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)