diff options
| author | Alberto Villa <avilla@FreeBSD.org> | 2010-12-16 07:57:56 +0000 |
|---|---|---|
| committer | Alberto Villa <avilla@FreeBSD.org> | 2010-12-16 07:57:56 +0000 |
| commit | 63e84c48ade41d32b2f9cc82a3a54dd513169553 (patch) | |
| tree | 414b3647b2d3ac5ee46211439d48c96c2c5769ff | |
| parent | 6f337f74cdbb13a64a36cc170eb240c0e93c6ec9 (diff) | |
Notes
| -rw-r--r-- | UPDATING | 15 | ||||
| -rw-r--r-- | databases/akonadi/Makefile | 14 | ||||
| -rw-r--r-- | databases/akonadi/pkg-plist | 6 |
3 files changed, 30 insertions, 5 deletions
@@ -5,6 +5,21 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20101216: + AFFECTS: users of databases/akonadi + AUTHOR: avilla@FreeBSD.org + + With SQLite 3 installed, Akonadi used to build its plugin and + install it in a wrong place, without it being listed in plist. To + remove the orphaned file, run the following commands PRIOR TO the + Akonadi upgrade: + + # cd /usr/ports/databases/akonadi + # rm `make -V KDE4_PREFIX`/`make -V QT_PLUGINDIR_REL`/sqldrivers/libqsqlite3.so + # rmdir `make -V KDE4_PREFIX`/`make -V QT_PLUGINDIR_REL`/sqldrivers \ + `make -V KDE4_PREFIX`/`make -V QT_PLUGINDIR_REL` \ + `make -V KDE4_PREFIX`/`make -V QT_LIBDIR_REL` + 20101214: AFFECTS: users of devel/icu AUTHOR: bapt@FreeBSD.org diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile index e125a45e233a..32bb4dee72f6 100644 --- a/databases/akonadi/Makefile +++ b/databases/akonadi/Makefile @@ -6,14 +6,17 @@ PORTNAME= akonadi PORTVERSION= 1.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases kde ipv6 -MASTER_SITES= http://download.akonadi-project.org/ +MASTER_SITES= http://download.${PORTNAME}-project.org/ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Storage server for kdepim +LICENSE= LGPL21 +LICENSE_FILE= ${WRKSRC}/lgpl-license + LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs \ soprano.4:${PORTSDIR}/textproc/soprano BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \ @@ -22,9 +25,12 @@ RUN_DEPENDS= ${QT_PREFIX}/lib/qt4/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR} # Let process generate meaningful backtrace on core dump LIB_DEPENDS+= execinfo.1:${PORTSDIR}/devel/libexecinfo -CMAKE_ARGS+= -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" +CMAKE_ARGS+= -DAKONADI_BUILD_TESTS:BOOL=FALSE \ + -DINSTALL_QSQLITE_IN_QT_PREFIX:BOOL=TRUE \ + -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" USE_BZIP2= yes +USE_SQLITE= 3 USE_QT_VER= 4 QT_COMPONENTS= corelib network qtestlib dbus sql \ qmake_build moc_build rcc_build uic_build @@ -32,6 +38,8 @@ USE_MYSQL= server USE_KDE4= kdeprefix kdehier automoc4 sharedmime KDE4_BUILDENV= yes +PLIST_SUB+= QT_PREFIX=${QT_PREFIX} + post-patch: ${REINPLACE_CMD} -e '/akonadi.pc/s|pkgconfig|../libdata/pkgconfig|' \ ${PATCH_WRKSRC}/CMakeLists.txt diff --git a/databases/akonadi/pkg-plist b/databases/akonadi/pkg-plist index c56a1bbb4288..dc51761d2c4a 100644 --- a/databases/akonadi/pkg-plist +++ b/databases/akonadi/pkg-plist @@ -18,8 +18,8 @@ lib/libakonadiprotocolinternals.so lib/libakonadiprotocolinternals.so.1 lib/libakonadiprotocolinternals.so.1.4.1 libdata/pkgconfig/akonadi.pc -share/config/akonadi/mysql-global.conf share/config/akonadi/mysql-global-mobile.conf +share/config/akonadi/mysql-global.conf share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Control.xml share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Status.xml share/dbus-1/interfaces/org.freedesktop.Akonadi.AgentManager.xml @@ -35,8 +35,10 @@ share/dbus-1/services/org.freedesktop.Akonadi.Control.service share/mime/packages/akonadi-mime.xml @dirrm share/config/akonadi @dirrm lib/cmake/Akonadi -@dirrm lib/cmake +@dirrmtry lib/cmake @dirrmtry include/akonadi/private @dirrmtry include/akonadi @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true +@cwd %%QT_PREFIX%% +%%QT_PLUGINDIR_REL%%/sqldrivers/libqsqlite3.so |