Tue Jan 27 10:47:19 2009 UTC ()
Update akonadi to 1.1.1

- Fix code that was not executed in a release build.
- Require CMake 2.6.0 which fixes boost detection.
- Don't try to restart an agent that has been deleted.


(markd)
diff -r1.4 -r1.5 pkgsrc/mail/akonadi/Makefile
diff -r1.3 -r1.4 pkgsrc/mail/akonadi/distinfo
cvs diff -r1.4 -r1.5 pkgsrc/mail/akonadi/Makefile (switch to unified diff)

--- pkgsrc/mail/akonadi/Makefile 2009/01/09 23:08:23 1.4
+++ pkgsrc/mail/akonadi/Makefile 2009/01/27 10:47:19 1.5
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: Makefile,v 1.4 2009/01/09 23:08:23 markd Exp $ 1# $NetBSD: Makefile,v 1.5 2009/01/27 10:47:19 markd Exp $
2 2
3DISTNAME= akonadi-1.1.0 3DISTNAME= akonadi-1.1.1
4CATEGORIES= mail 4CATEGORIES= mail
5MASTER_SITES= http://download.akonadi-project.org/ 5MASTER_SITES= http://download.akonadi-project.org/
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= markd@NetBSD.org 8MAINTAINER= markd@NetBSD.org
9HOMEPAGE= http://pim.kde.org/akonadi/ 9HOMEPAGE= http://pim.kde.org/akonadi/
10COMMENT= The KDE PIM Storage Service 10COMMENT= The KDE PIM Storage Service
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14# BUILD_MAKE_FLAGS+= VERBOSE=1 14# BUILD_MAKE_FLAGS+= VERBOSE=1
15 15
16BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 16BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4
17BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 17BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
18 18
19USE_DIRS+= kde4-1.0 19USE_DIRS+= kde4-1.0
20USE_TOOLS+= pkg-config 20USE_TOOLS+= pkg-config
21USE_LANGUAGES= c c++ 21USE_LANGUAGES= c c++
22USE_CMAKE= yes 22USE_CMAKE= yes
23CMAKE_ARG_PATH= .. 23CMAKE_ARG_PATH= ..
24CONFIGURE_DIRS= _build 24CONFIGURE_DIRS= _build
25 25
26pre-configure: 26pre-configure:
27 ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ 27 ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/
28 ${MKDIR} ${WRKSRC}/_build 28 ${MKDIR} ${WRKSRC}/_build
29 29
30PKGCONFIG_OVERRIDE+= akonadi.pc.cmake 30PKGCONFIG_OVERRIDE+= akonadi.pc.cmake
31 31
32.include "../../databases/shared-mime-info/buildlink3.mk" 32.include "../../databases/shared-mime-info/buildlink3.mk"
33.include "../../devel/boost-libs/buildlink3.mk" 33.include "../../devel/boost-libs/buildlink3.mk"
34.include "../../x11/qt4-libs/buildlink3.mk" 34.include "../../x11/qt4-libs/buildlink3.mk"
35.include "../../x11/qt4-tools/buildlink3.mk" 35.include "../../x11/qt4-tools/buildlink3.mk"
36.include "../../x11/qt4-qdbus/buildlink3.mk" 36.include "../../x11/qt4-qdbus/buildlink3.mk"
37 37
38.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/mail/akonadi/distinfo (switch to unified diff)

--- pkgsrc/mail/akonadi/distinfo 2009/01/09 23:08:23 1.3
+++ pkgsrc/mail/akonadi/distinfo 2009/01/27 10:47:19 1.4
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.3 2009/01/09 23:08:23 markd Exp $ 1$NetBSD: distinfo,v 1.4 2009/01/27 10:47:19 markd Exp $
2 2
3SHA1 (akonadi-1.1.0.tar.bz2) = d8ee17760c9179743ffbdb51de97af1d20b9308b 3SHA1 (akonadi-1.1.1.tar.bz2) = 797d90b9a5c17cb852408cbbc9cbd86e0ac711ac
4RMD160 (akonadi-1.1.0.tar.bz2) = c262afd5e69461287394846800e896ddd6418ab4 4RMD160 (akonadi-1.1.1.tar.bz2) = 716fc9f410213f96dce38601580048d0e061dedb
5Size (akonadi-1.1.0.tar.bz2) = 139743 bytes 5Size (akonadi-1.1.1.tar.bz2) = 134761 bytes