Date: Tue, 18 Feb 2014 13:55:27 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344889 - in head: databases/akonadi databases/akonadi/files devel/grantlee devel/libkgapi devel/libkolab textproc/libkolabxml Message-ID: <201402181355.s1IDtR5n051107@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Tue Feb 18 13:55:27 2014 New Revision: 344889 URL: http://svnweb.freebsd.org/changeset/ports/344889 QAT: https://qat.redports.org/buildarchive/r344889/ Log: Merge from area51 in preparation for KDE SC 4.12: databases/akonadi: - Update to 1.11.0 - Drop ipv6 from CATEGORIES - Squeeze MASTER_SITES/SUBDIR - Add dependency on modern compiler to fix build on 9.x - Use options helpers - Remove QT_PREFIX from PLIST_SUB, it's already set in bsd.qt.mk - Realign commented lines devel/grantlee: update to 0.4.0 - Remove broken DOXYGEN option - Add list of ports that need modification on grantlee update - Remove MAKE_JOBS_UNSAFE devel/libkgapi: - Update to 2.0.1 devel/libkolab: - Update to 0.5.0 textproc/libkolabxml: - Update to 1.0.1 Modified: head/databases/akonadi/Makefile head/databases/akonadi/distinfo head/databases/akonadi/files/patch-server__src__storage__dbconfigmysql.cpp head/databases/akonadi/pkg-plist head/devel/grantlee/Makefile head/devel/grantlee/distinfo head/devel/grantlee/pkg-plist head/devel/libkgapi/Makefile head/devel/libkgapi/distinfo head/devel/libkgapi/pkg-plist head/devel/libkolab/Makefile head/devel/libkolab/distinfo head/devel/libkolab/pkg-plist head/textproc/libkolabxml/Makefile head/textproc/libkolabxml/distinfo head/textproc/libkolabxml/pkg-plist Modified: head/databases/akonadi/Makefile ============================================================================== --- head/databases/akonadi/Makefile Tue Feb 18 13:41:52 2014 (r344888) +++ head/databases/akonadi/Makefile Tue Feb 18 13:55:27 2014 (r344889) @@ -2,13 +2,10 @@ # $FreeBSD$ PORTNAME= akonadi -PORTVERSION= 1.10.3 -PORTREVISION= 1 -CATEGORIES= databases kde ipv6 -MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTNAME}/src +PORTVERSION= 1.11.0 +CATEGORIES= databases kde +MASTER_SITES= KDE/stable/${PORTNAME}/src DIST_SUBDIR= KDE -DISTVERSIONSUFFIX= -1 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} MAINTAINER= kde@FreeBSD.org @@ -21,8 +18,8 @@ LIB_DEPENDS= libboost_thread.so:${PORTSD LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt -USE_KDE4= kdehier kdeprefix sharedmime automoc4 soprano -USES= cmake:outsource +USE_KDE4= kdehier kdeprefix automoc4 soprano +USES= cmake:outsource shared-mime-info compiler:c++11-lang USE_QT4= corelib dbus gui network qtestlib_build sql xml \ moc_build qmake_build rcc_build uic_build USE_BZIP2= yes @@ -31,56 +28,40 @@ CMAKE_ARGS+= -DAKONADI_BUILD_TESTS:BOOL= -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" USE_LDCONFIG= yes -PLIST_SUB+= QT_PREFIX=${QT_PREFIX} - OPTIONS_MULTI= DB OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE +OPTIONS_SUB= yes # SQLITE MYSQL_DESC= Install MySQL Qt plugin and server -PGSQL_DESC= Install PostgreSQL Qt plugin -SQLITE_DESC= Enable SQLite backend - -OPTIONS_DEFAULT= MYSQL - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= server -USE_QT4+= sql-mysql_run -.endif +MYSQL_USE= MYSQL=server +MYSQL_USE= QT4=sql-mysql_run -.if ${PORT_OPTIONS:MPGSQL} +PGSQL_DESC= Install PostgreSQL Qt plugin # Do not add a dependency on PostgreSQL server as someone preferring # it over MySQL might like to use some advanced configuration, like a # remote server. -#USE_PGSQL= server -USE_QT4+= sql-pgsql_run -.endif - -.if ${PORT_OPTIONS:MSQLITE} -USE_SQLITE= 3 -PLIST_SUB+= SQLITE="" -.else -PLIST_SUB+= SQLITE="@comment " -.endif +#PGSQL_USE= PGSQL=server +PGSQL_USE= QT4=sql-pgsql_run + +SQLITE_DESC= Enable SQLite backend +SQLITE_USE= SQLITE=3 +SQLITE_CMAKE_OFF= -DAKONADI_BUILD_QSQLITE=off + +OPTIONS_DEFAULT= MYSQL post-patch: -.if ${PORT_OPTIONS:MSQLITE} == "" - ${REINPLACE_CMD} -e '/find_package(Sqlite)/ d' \ - ${PATCH_WRKSRC}/CMakeLists.txt -.endif ${REINPLACE_CMD} -e '/akonadi.pc/ s|pkgconfig|../libdata/pkgconfig|' \ ${PATCH_WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} -e '/find_program/ s|mysqld|mysqld_safe ${LOCALBASE}/bin|g' \ ${PATCH_WRKSRC}/server/CMakeLists.txt ${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${PATCH_WRKSRC}/server/src/storage/dbconfigmysql.cpp - # To avoid overflow, MySQL settings need to be lower than - # INT_MAX / kern.hz. This setting assumes kern.hz=2000, and - # it's nothing but a temporary hack. +# To avoid overflow, MySQL settings need to be lower than +# INT_MAX / kern.hz. This setting assumes kern.hz=2000, and +# it's nothing but a temporary hack. ${REINPLACE_CMD} -e '/wait_timeout/ s|31536000|1073741|' \ ${PATCH_WRKSRC}/server/src/storage/*.conf - # Prevent updating MIME during build. +# Prevent updating MIME during build. ${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d' \ -e '/find_package(SharedMimeInfo/ d' \ ${PATCH_WRKSRC}/CMakeLists.txt Modified: head/databases/akonadi/distinfo ============================================================================== --- head/databases/akonadi/distinfo Tue Feb 18 13:41:52 2014 (r344888) +++ head/databases/akonadi/distinfo Tue Feb 18 13:55:27 2014 (r344889) @@ -1,2 +1,2 @@ -SHA256 (KDE/akonadi-1.10.3-1.tar.bz2) = a8f66eec479c235ec67e77befac50c42743f627663fe2bb49238e82e6fbfffb0 -SIZE (KDE/akonadi-1.10.3-1.tar.bz2) = 228633 +SHA256 (KDE/akonadi-1.11.0.tar.bz2) = 0cb257509d53927241b71d85c42efb0b5776efc37fc8dc732e75f6813b8a264d +SIZE (KDE/akonadi-1.11.0.tar.bz2) = 235101 Modified: head/databases/akonadi/files/patch-server__src__storage__dbconfigmysql.cpp ============================================================================== --- head/databases/akonadi/files/patch-server__src__storage__dbconfigmysql.cpp Tue Feb 18 13:41:52 2014 (r344888) +++ head/databases/akonadi/files/patch-server__src__storage__dbconfigmysql.cpp Tue Feb 18 13:55:27 2014 (r344889) @@ -1,11 +1,11 @@ --- ./server/src/storage/dbconfigmysql.cpp.orig 2012-06-13 02:11:19.473370856 +0200 +++ ./server/src/storage/dbconfigmysql.cpp 2012-06-13 02:11:50.113468897 +0200 -@@ -242,7 +242,7 @@ +@@ -265,7 +265,7 @@ void DbConfigMysql::startInternalServer() // first run, some MySQL versions need a mysql_install_db run for that - const QString confFile = XdgBaseDirs::findResourceFile( "config", QLatin1String("akonadi/mysql-global.conf" )); + const QString confFile = XdgBaseDirs::findResourceFile( "config", QLatin1String( "akonadi/mysql-global.conf" ) ); if ( QDir( dataDir ).entryList( QDir::NoDotAndDotDot | QDir::AllEntries ).isEmpty() && !mMysqlInstallDbPath.isEmpty() ) { -- const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1").arg(confFile) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ); -+ const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1").arg(confFile) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ) << QString::fromLatin1( "--basedir=%%LOCALBASE%%" ); +- const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1" ).arg( confFile ) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ); ++ const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1" ).arg( confFile ) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ) << QString::fromLatin1( "--basedir=%%LOCALBASE%%" ); QProcess::execute( mMysqlInstallDbPath, arguments ); } Modified: head/databases/akonadi/pkg-plist ============================================================================== --- head/databases/akonadi/pkg-plist Tue Feb 18 13:41:52 2014 (r344888) +++ head/databases/akonadi/pkg-plist Tue Feb 18 13:55:27 2014 (r344889) @@ -19,7 +19,7 @@ lib/cmake/Akonadi/AkonadiTargetsWithPref lib/cmake/Akonadi/AkonadiTargetsWithPrefix.cmake lib/libakonadiprotocolinternals.so lib/libakonadiprotocolinternals.so.1 -lib/libakonadiprotocolinternals.so.1.10.3 +lib/libakonadiprotocolinternals.so.1.11.0 libdata/pkgconfig/akonadi.pc share/config/akonadi/mysql-global-mobile.conf share/config/akonadi/mysql-global.conf @@ -33,6 +33,7 @@ share/dbus-1/interfaces/org.freedesktop. 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 +share/dbus-1/interfaces/org.freedesktop.Akonadi.StorageDebugger.xml share/dbus-1/interfaces/org.freedesktop.Akonadi.Tracer.xml share/dbus-1/interfaces/org.freedesktop.Akonadi.TracerNotification.xml share/dbus-1/services/org.freedesktop.Akonadi.Control.service Modified: head/devel/grantlee/Makefile ============================================================================== --- head/devel/grantlee/Makefile Tue Feb 18 13:41:52 2014 (r344888) +++ head/devel/grantlee/Makefile Tue Feb 18 13:55:27 2014 (r344889) @@ -1,14 +1,23 @@ # Created by: Dima Panov <fluffy@FreeBSD.org> # $FreeBSD$ +# Some ports install files into versioned grantlee directory (GRANTLEE_VER) +# they must be fixed whenever grantlee gets version bump +# Known ports: +# deskutils/kdepim4 +# devel/kdevplatform +# finance/skrooge +# misk/kdehier4 +# + PORTNAME= grantlee -DISTVERSION= 0.3.0 +DISTVERSION= 0.4.0 CATEGORIES= devel MASTER_SITES= http://downloads.${PORTNAME}.org/ \ http://www.loegria.net/${PORTNAME}/ MAINTAINER= kde@FreeBSD.org -COMMENT= String template engine for Qt4 +COMMENT= String template engine for Qt 4 LICENSE= LGPL21 @@ -16,22 +25,9 @@ USE_QT4= corelib gui qtestlib_build scri qmake_build moc_build rcc_build uic_build USES= cmake:outsource CMAKE_ARGS+= -DBUILD_TESTS:BOOL=FALSE -MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes -OPTIONS_DEFINE= DOXYGEN - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MDOXYGEN} -BUILD_DEPENDS+= doxygen:${PORTSDIR}/devel/doxygen \ - dot:${PORTSDIR}/graphics/graphviz -PORTDOCS= * - -post-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${BUILD_WRKSRC} && ${MAKE} docs - cd ${BUILD_WRKSRC}/apidox && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} -.endif +PLIST_SUB= SHLIB_VER=${PORTVERSION} \ + GRANTLEE_VER=${PORTVERSION:R} .include <bsd.port.mk> Modified: head/devel/grantlee/distinfo ============================================================================== --- head/devel/grantlee/distinfo Tue Feb 18 13:41:52 2014 (r344888) +++ head/devel/grantlee/distinfo Tue Feb 18 13:55:27 2014 (r344889) @@ -1,2 +1,2 @@ -SHA256 (grantlee-0.3.0.tar.gz) = fb7ebcc9beb5f74077a5e2fb4e9893d280dd3346e7f5f58155f0dcc9a2e25f30 -SIZE (grantlee-0.3.0.tar.gz) = 1132163 +SHA256 (grantlee-0.4.0.tar.gz) = 13a2d8121392404bb3be4ed470b211bc098cd98da795ef7bf41517d2fb640d3f +SIZE (grantlee-0.4.0.tar.gz) = 1171445 Modified: head/devel/grantlee/pkg-plist ============================================================================== --- head/devel/grantlee/pkg-plist Tue Feb 18 13:41:52 2014 (r344888) +++ head/devel/grantlee/pkg-plist Tue Feb 18 13:55:27 2014 (r344889) @@ -31,24 +31,24 @@ include/grantlee/util.h include/grantlee/variable.h include/grantlee_core.h include/grantlee_templates.h +include/grantlee_textdocument.h lib/cmake/grantlee/GrantleeConfig.cmake lib/cmake/grantlee/GrantleeConfigVersion.cmake -lib/cmake/grantlee/GrantleeParseArguments.cmake lib/cmake/grantlee/GrantleeTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/grantlee/GrantleeTargets.cmake lib/cmake/grantlee/GrantleeUse.cmake -lib/grantlee/0.3/grantlee_defaultfilters.so -lib/grantlee/0.3/grantlee_defaulttags.so -lib/grantlee/0.3/grantlee_i18ntags.so -lib/grantlee/0.3/grantlee_loadertags.so +lib/grantlee/%%GRANTLEE_VER%%/grantlee_defaultfilters.so +lib/grantlee/%%GRANTLEE_VER%%/grantlee_defaulttags.so +lib/grantlee/%%GRANTLEE_VER%%/grantlee_i18ntags.so +lib/grantlee/%%GRANTLEE_VER%%/grantlee_loadertags.so lib/libgrantlee_core.so lib/libgrantlee_core.so.0 -lib/libgrantlee_core.so.0.3.0 +lib/libgrantlee_core.so.%%SHLIB_VER%% lib/libgrantlee_gui.so lib/libgrantlee_gui.so.0 -lib/libgrantlee_gui.so.0.3.0 -@dirrm lib/grantlee/0.3 -@dirrm lib/grantlee +lib/libgrantlee_gui.so.%%SHLIB_VER%% +@dirrmtry lib/grantlee/%%GRANTLEE_VER%% +@dirrmtry lib/grantlee @dirrm lib/cmake/grantlee @dirrmtry lib/cmake @dirrm include/grantlee Modified: head/devel/libkgapi/Makefile ============================================================================== --- head/devel/libkgapi/Makefile Tue Feb 18 13:41:52 2014 (r344888) +++ head/devel/libkgapi/Makefile Tue Feb 18 13:55:27 2014 (r344889) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libkgapi -PORTVERSION= 0.4.4 +PORTVERSION= 2.0.1 CATEGORIES= devel kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/libkgapi/${PORTVERSION}/src @@ -14,18 +14,15 @@ LICENSE= GPLv2 LIB_DEPENDS= qjson.0:${PORTSDIR}/devel/qjson -CONFLICTS= akonadi-google-0.* - USE_BZIP2= yes -USES= cmake +USES= cmake:outsource USE_KDE4= automoc4 kdelibs kdeprefix kdehier pimlibs USE_LDCONFIG= yes USE_QT4= corelib network webkit xml \ qmake_build moc_build rcc_build uic_build -NO_STAGE= yes pre-configure: ${REINPLACE_CMD} -e '/pkgconfig/ s/$${LIB_INSTALL_DIR}/libdata/' \ - ${WRKSRC}/libkgapi/CMakeLists.txt + ${WRKSRC}/libkgapi*/CMakeLists.txt .include <bsd.port.mk> Modified: head/devel/libkgapi/distinfo ============================================================================== --- head/devel/libkgapi/distinfo Tue Feb 18 13:41:52 2014 (r344888) +++ head/devel/libkgapi/distinfo Tue Feb 18 13:55:27 2014 (r344889) @@ -1,2 +1,2 @@ -SHA256 (KDE/libkgapi-0.4.4.tar.bz2) = 2decce55e5872dc3f5de6b227bb03de8649d0890f6754126595e4b1a93548bb1 -SIZE (KDE/libkgapi-0.4.4.tar.bz2) = 50992 +SHA256 (KDE/libkgapi-2.0.1.tar.bz2) = 00e01a9544143a3fce009206c98a95e31a9925cda7e64ae4879029d57272c3f9 +SIZE (KDE/libkgapi-2.0.1.tar.bz2) = 112614 Modified: head/devel/libkgapi/pkg-plist ============================================================================== --- head/devel/libkgapi/pkg-plist Tue Feb 18 13:41:52 2014 (r344888) +++ head/devel/libkgapi/pkg-plist Tue Feb 18 13:55:27 2014 (r344889) @@ -1,3 +1,58 @@ +include/LibKGAPI2/Account +include/LibKGAPI2/AccountInfo/AccountInfo +include/LibKGAPI2/AccountInfo/AccountInfoFetchJob +include/LibKGAPI2/AuthJob +include/LibKGAPI2/Calendar/Calendar +include/LibKGAPI2/Calendar/CalendarCreateJob +include/LibKGAPI2/Calendar/CalendarDeleteJob +include/LibKGAPI2/Calendar/CalendarFetchJob +include/LibKGAPI2/Calendar/CalendarModifyJob +include/LibKGAPI2/Calendar/Event +include/LibKGAPI2/Calendar/EventCreateJob +include/LibKGAPI2/Calendar/EventDeleteJob +include/LibKGAPI2/Calendar/EventFetchJob +include/LibKGAPI2/Calendar/EventModifyJob +include/LibKGAPI2/Calendar/EventMoveJob +include/LibKGAPI2/Calendar/Reminder +include/LibKGAPI2/Contacts/Contact +include/LibKGAPI2/Contacts/ContactCreateJob +include/LibKGAPI2/Contacts/ContactDeleteJob +include/LibKGAPI2/Contacts/ContactFetchJob +include/LibKGAPI2/Contacts/ContactFetchPhotoJob +include/LibKGAPI2/Contacts/ContactModifyJob +include/LibKGAPI2/Contacts/ContactsGroup +include/LibKGAPI2/Contacts/ContactsGroupCreateJob +include/LibKGAPI2/Contacts/ContactsGroupDeleteJob +include/LibKGAPI2/Contacts/ContactsGroupFetchJob +include/LibKGAPI2/Contacts/ContactsGroupModifyJob +include/LibKGAPI2/CreateJob +include/LibKGAPI2/DeleteJob +include/LibKGAPI2/FetchJob +include/LibKGAPI2/Job +include/LibKGAPI2/Latitude/Location +include/LibKGAPI2/Latitude/LocationCreateJob +include/LibKGAPI2/Latitude/LocationDeleteJob +include/LibKGAPI2/Latitude/LocationFetchHistoryJob +include/LibKGAPI2/Latitude/LocationFetchJob +include/LibKGAPI2/ModifyJob +include/LibKGAPI2/Object +include/LibKGAPI2/StaticMaps/StaticMapMarker +include/LibKGAPI2/StaticMaps/StaticMapPath +include/LibKGAPI2/StaticMaps/StaticMapTileFetchJob +include/LibKGAPI2/StaticMaps/StaticMapUrl +include/LibKGAPI2/Tasks/Task +include/LibKGAPI2/Tasks/TaskCreateJob +include/LibKGAPI2/Tasks/TaskDeleteJob +include/LibKGAPI2/Tasks/TaskFetchJob +include/LibKGAPI2/Tasks/TaskList +include/LibKGAPI2/Tasks/TaskListCreateJob +include/LibKGAPI2/Tasks/TaskListDeleteJob +include/LibKGAPI2/Tasks/TaskListFetchJob +include/LibKGAPI2/Tasks/TaskListModifyJob +include/LibKGAPI2/Tasks/TaskModifyJob +include/LibKGAPI2/Tasks/TaskMoveJob +include/LibKGAPI2/Types +include/LibKGAPI2/Ui/AuthWidget include/libkgapi/accessmanager.h include/libkgapi/account.h include/libkgapi/auth.h @@ -10,6 +65,11 @@ include/libkgapi/objects/calendar.h include/libkgapi/objects/contact.h include/libkgapi/objects/contactsgroup.h include/libkgapi/objects/event.h +include/libkgapi/objects/location.h +include/libkgapi/objects/reminder.h +include/libkgapi/objects/staticmapmarker.h +include/libkgapi/objects/staticmappath.h +include/libkgapi/objects/staticmapurl.h include/libkgapi/objects/task.h include/libkgapi/objects/tasklist.h include/libkgapi/reply.h @@ -18,20 +78,102 @@ include/libkgapi/service.h include/libkgapi/services/accountinfo.h include/libkgapi/services/calendar.h include/libkgapi/services/contacts.h +include/libkgapi/services/latitude.h +include/libkgapi/services/staticmap.h include/libkgapi/services/tasks.h include/libkgapi/ui/accountscombo.h include/libkgapi/ui/authwidget.h +include/libkgapi2/account.h +include/libkgapi2/accountinfo/accountinfo.h +include/libkgapi2/accountinfo/accountinfofetchjob.h +include/libkgapi2/authjob.h +include/libkgapi2/calendar/calendar.h +include/libkgapi2/calendar/calendarcreatejob.h +include/libkgapi2/calendar/calendardeletejob.h +include/libkgapi2/calendar/calendarfetchjob.h +include/libkgapi2/calendar/calendarmodifyjob.h +include/libkgapi2/calendar/event.h +include/libkgapi2/calendar/eventcreatejob.h +include/libkgapi2/calendar/eventdeletejob.h +include/libkgapi2/calendar/eventfetchjob.h +include/libkgapi2/calendar/eventmodifyjob.h +include/libkgapi2/calendar/eventmovejob.h +include/libkgapi2/calendar/reminder.h +include/libkgapi2/contacts/contact.h +include/libkgapi2/contacts/contactcreatejob.h +include/libkgapi2/contacts/contactdeletejob.h +include/libkgapi2/contacts/contactfetchjob.h +include/libkgapi2/contacts/contactfetchphotojob.h +include/libkgapi2/contacts/contactmodifyjob.h +include/libkgapi2/contacts/contactsgroup.h +include/libkgapi2/contacts/contactsgroupcreatejob.h +include/libkgapi2/contacts/contactsgroupdeletejob.h +include/libkgapi2/contacts/contactsgroupfetchjob.h +include/libkgapi2/contacts/contactsgroupmodifyjob.h +include/libkgapi2/createjob.h +include/libkgapi2/deletejob.h +include/libkgapi2/fetchjob.h +include/libkgapi2/job.h +include/libkgapi2/latitude/location.h +include/libkgapi2/latitude/locationcreatejob.h +include/libkgapi2/latitude/locationdeletejob.h +include/libkgapi2/latitude/locationfetchhistoryjob.h +include/libkgapi2/latitude/locationfetchjob.h +include/libkgapi2/libkgapi2_export.h +include/libkgapi2/modifyjob.h +include/libkgapi2/object.h +include/libkgapi2/staticmaps/staticmapmarker.h +include/libkgapi2/staticmaps/staticmappath.h +include/libkgapi2/staticmaps/staticmaptilefetchjob.h +include/libkgapi2/staticmaps/staticmapurl.h +include/libkgapi2/tasks/task.h +include/libkgapi2/tasks/taskcreatejob.h +include/libkgapi2/tasks/taskdeletejob.h +include/libkgapi2/tasks/taskfetchjob.h +include/libkgapi2/tasks/tasklist.h +include/libkgapi2/tasks/tasklistcreatejob.h +include/libkgapi2/tasks/tasklistdeletejob.h +include/libkgapi2/tasks/tasklistfetchjob.h +include/libkgapi2/tasks/tasklistmodifyjob.h +include/libkgapi2/tasks/taskmodifyjob.h +include/libkgapi2/tasks/taskmovejob.h +include/libkgapi2/types.h +include/libkgapi2/ui/authwidget.h lib/cmake/LibKGAPI/LibKGAPIConfig.cmake lib/cmake/LibKGAPI/LibKGAPIConfigVersion.cmake lib/cmake/LibKGAPI/LibKGAPITargetsWithPrefix-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/LibKGAPI/LibKGAPITargetsWithPrefix.cmake +lib/cmake/LibKGAPI2/LibKGAPI2Config.cmake +lib/cmake/LibKGAPI2/LibKGAPI2ConfigVersion.cmake +lib/cmake/LibKGAPI2/LibKGAPI2TargetsWithPrefix-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/LibKGAPI2/LibKGAPI2TargetsWithPrefix.cmake lib/libkgapi.so -lib/libkgapi.so.0 -lib/libkgapi.so.0.4.4 +lib/libkgapi.so.1 +lib/libkgapi.so.2.0.1 +lib/libkgapi2.so +lib/libkgapi2.so.2 +lib/libkgapi2.so.2.0.1 libdata/pkgconfig/libkgapi.pc +libdata/pkgconfig/libkgapi2.pc +@dirrm lib/cmake/LibKGAPI2 @dirrm lib/cmake/LibKGAPI -@dirrmtry lib/cmake +@dirrm include/libkgapi2/ui +@dirrm include/libkgapi2/tasks +@dirrm include/libkgapi2/staticmaps +@dirrm include/libkgapi2/latitude +@dirrm include/libkgapi2/contacts +@dirrm include/libkgapi2/calendar +@dirrm include/libkgapi2/accountinfo +@dirrm include/libkgapi2 @dirrm include/libkgapi/ui @dirrm include/libkgapi/services @dirrm include/libkgapi/objects @dirrm include/libkgapi +@dirrm include/LibKGAPI2/Ui +@dirrm include/LibKGAPI2/Tasks +@dirrm include/LibKGAPI2/StaticMaps +@dirrm include/LibKGAPI2/Latitude +@dirrm include/LibKGAPI2/Contacts +@dirrm include/LibKGAPI2/Calendar +@dirrm include/LibKGAPI2/AccountInfo +@dirrm include/LibKGAPI2 Modified: head/devel/libkolab/Makefile ============================================================================== --- head/devel/libkolab/Makefile Tue Feb 18 13:41:52 2014 (r344888) +++ head/devel/libkolab/Makefile Tue Feb 18 13:55:27 2014 (r344889) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= libkolab -PORTVERSION= 0.4.2 +PORTVERSION= 0.5.0 CATEGORIES= devel kde MASTER_SITES= http://mirror.kolabsys.com/pub/releases/ @@ -12,17 +12,24 @@ COMMENT= Advanced Kolab Object Handling # itself to be LGPL3-licensed (and so are all the installed headers). LICENSE= LGPL3 -LIB_DEPENDS= kolabxml:${PORTSDIR}/textproc/libkolabxml +LIB_DEPENDS= libkolabxml.so:${PORTSDIR}/textproc/libkolabxml # TODO: Conditionally enable the bindings based on OPTIONs. CMAKE_ARGS= -DBUILD_TESTS:BOOL=OFF \ -DPHP_BINDINGS:BOOL=OFF \ -DPYTHON_BINDINGS:BOOL=OFF \ -DUSE_LIBCALENDARING:BOOL=OFF -USES= cmake +USES= cmake:outsource USE_KDE4= automoc4 kdelibs pimlibs USE_LDCONFIG= yes USE_QT4= corelib gui xml \ moc_build qmake_build rcc_build uic_build +PLIST_SUB= SHLIB_VER=${PORTVERSION} + +post-patch: +# Remove utils, installs nothing, but fails without BUILD_TESTS + ${REINPLACE_CMD} -e '/add_subdirectory(utils)/d' \ + ${WRKSRC}/CMakeLists.txt + .include <bsd.port.mk> Modified: head/devel/libkolab/distinfo ============================================================================== --- head/devel/libkolab/distinfo Tue Feb 18 13:41:52 2014 (r344888) +++ head/devel/libkolab/distinfo Tue Feb 18 13:55:27 2014 (r344889) @@ -1,2 +1,2 @@ -SHA256 (libkolab-0.4.2.tar.gz) = 46cfe99bfe97941caa92b54b598d23c69a8886f9c696619b38e492a00579abf1 -SIZE (libkolab-0.4.2.tar.gz) = 164417 +SHA256 (libkolab-0.5.0.tar.gz) = f3f0ed54f554dcc2052ee3ac6311e78879912aa1641c0f6ae7875ecafed1720a +SIZE (libkolab-0.5.0.tar.gz) = 186211 Modified: head/devel/libkolab/pkg-plist ============================================================================== --- head/devel/libkolab/pkg-plist Tue Feb 18 13:41:52 2014 (r344888) +++ head/devel/libkolab/pkg-plist Tue Feb 18 13:55:27 2014 (r344889) @@ -7,13 +7,15 @@ include/kolab/kcalconversion.h include/kolab/kolab_export.h include/kolab/kolabdefinitions.h include/kolab/kolabobject.h +include/kolab/mimeobject.h +include/kolab/xmlobject.h lib/cmake/Libkolab/LibkolabConfig.cmake lib/cmake/Libkolab/LibkolabConfigVersion.cmake lib/cmake/Libkolab/LibkolabTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Libkolab/LibkolabTargets.cmake lib/libkolab.so lib/libkolab.so.0 -lib/libkolab.so.0.4.2 +lib/libkolab.so.%%SHLIB_VER%% @dirrm lib/cmake/Libkolab @dirrmtry lib/cmake @dirrm include/kolab Modified: head/textproc/libkolabxml/Makefile ============================================================================== --- head/textproc/libkolabxml/Makefile Tue Feb 18 13:41:52 2014 (r344888) +++ head/textproc/libkolabxml/Makefile Tue Feb 18 13:55:27 2014 (r344889) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= libkolabxml -PORTVERSION= 0.8.4 -PORTREVISION= 2 +PORTVERSION= 1.0.1 CATEGORIES= textproc MASTER_SITES= http://mirror.kolabsys.com/pub/releases/ Modified: head/textproc/libkolabxml/distinfo ============================================================================== --- head/textproc/libkolabxml/distinfo Tue Feb 18 13:41:52 2014 (r344888) +++ head/textproc/libkolabxml/distinfo Tue Feb 18 13:55:27 2014 (r344889) @@ -1,2 +1,2 @@ -SHA256 (libkolabxml-0.8.4.tar.gz) = 581cbb45f50f27943c4be26f7054e9b9732ec9f7ecc8d6f6ba3fc26c6b84ed21 -SIZE (libkolabxml-0.8.4.tar.gz) = 116957 +SHA256 (libkolabxml-1.0.1.tar.gz) = b0a310aca6ce61d3a3b18ddd5768d9491a908b55ef477b781a471eb5f495bfea +SIZE (libkolabxml-1.0.1.tar.gz) = 124465 Modified: head/textproc/libkolabxml/pkg-plist ============================================================================== --- head/textproc/libkolabxml/pkg-plist Tue Feb 18 13:41:52 2014 (r344888) +++ head/textproc/libkolabxml/pkg-plist Tue Feb 18 13:55:27 2014 (r344889) @@ -16,7 +16,7 @@ lib/cmake/Libkolabxml/LibkolabxmlConfigV lib/cmake/Libkolabxml/LibkolabxmlTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Libkolabxml/LibkolabxmlTargets.cmake lib/libkolabxml.so -lib/libkolabxml.so.0 +lib/libkolabxml.so.1 lib/libkolabxml.so.%%SHLIB_VER%% @dirrm lib/cmake/Libkolabxml @dirrmtry lib/cmake
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402181355.s1IDtR5n051107>