[kde-freebsd] [SVN Commit] branches/plasma5

[Raphael Kubo da Costa]

SVN commit 12068 by rakuco:

Merge ^/trunk/area51 r11953-12067.

We were lagging behind with the merges _again_. This one was a bit tricky
because there were merges from plasma5 to trunk and changes that had been
done differently in plasma5.


 _M            . (directory)  
 M  +1 -1      KDE/Mk/Uses/kde.mk  
 M  +3 -1      KDE/devel/py-pykde4/Makefile  
 M  +2 -2      KDE/x11/kdelibs4/Makefile  
 A             PORTS/audio/amarok-kde4/files/patch-git_fec8817   trunk/area51/PORTS/audio/amarok-kde4/files/patch-git_fec8817#12041
 M  +1 -1      PORTS/deskutils/libstreamanalyzer/Makefile  
 M  +1 -0      PORTS/deskutils/libstreams/Makefile  
 M  +1 -3      PORTS/devel/kdevelop-kde4/Makefile  
 M  +2 -2      PORTS/devel/kdevelop-kde4/distinfo  
 A             PORTS/devel/kdevelop-kde4/files/patch-po-CMakeLists.patch   trunk/area51/PORTS/devel/kdevelop-kde4/files/patch-po-CMakeLists.patch#11959
 M  +0 -58     PORTS/devel/kdevelop-kde4/pkg-plist  
 M  +1 -1      PORTS/devel/kdevelop-php-docs/Makefile  
 M  +2 -2      PORTS/devel/kdevelop-php-docs/distinfo  
 M  +0 -29     PORTS/devel/kdevelop-php-docs/pkg-plist  
 M  +1 -1      PORTS/devel/kdevelop-php/Makefile  
 M  +2 -2      PORTS/devel/kdevelop-php/distinfo  
 A             PORTS/devel/kdevelop-php/files (directory)  
 M  +1 -1      PORTS/devel/kdevplatform/Makefile  
 M  +2 -2      PORTS/devel/kdevplatform/distinfo  
 D             PORTS/devel/kdevplatform/files/patch-git-fix-subversion-1.9  
 A             PORTS/devel/kdevplatform/files/patch-po-CMakeLists.patch   trunk/area51/PORTS/devel/kdevplatform/files/patch-po-CMakeLists.patch#11959
 M  +1 -1      PORTS/graphics/digikam/Makefile  
 M  +1 -1      PORTS/graphics/skanlite/Makefile  
 M  +1 -0      PORTS/multimedia/gstreamer1-qt4/Makefile  
 A             PORTS/multimedia/phonon-gstreamer/files/patch-CMakeLists.txt   trunk/area51/PORTS/multimedia/phonon-gstreamer/files/patch-CMakeLists.txt#12040
 M  +18 -46    PORTS/net-im/telepathy-qt4/Makefile  
 M  +2 -2      PORTS/net-im/telepathy-qt4/distinfo  
 A             PORTS/net-im/telepathy-qt4/files (directory)  
 D             PORTS/net-im/telepathy-qt4/files/patch-cmake_modules_FindGStreamer.cmake  
 D             PORTS/net-im/telepathy-qt4/files/patch-cmake_modules_FindGlib.cmake  
 D             PORTS/net-im/telepathy-qt4/files/patch-cmake_modules_LibFindMacros.cmake  
 A             PORTS/net-im/telepathy-qt4/files/patch-git_ec4a3d6   trunk/area51/PORTS/net-im/telepathy-qt4/files/patch-git_ec4a3d6#12061
 M  +3 -0      PORTS/net-im/telepathy-qt4/pkg-plist  
 M  +1 -0      PORTS/net/libkfbapi/Makefile  
 M  +1 -0      PORTS/textproc/ebook-tools/Makefile  
 M  +1 -0      PORTS/textproc/raptor2/Makefile  
 M  +1 -0      PORTS/textproc/soprano/Makefile  
 M  +1 -1      PORTS/www/choqok/Makefile  
 M  +14 -2     PORTS/x11-toolkits/attica/Makefile  
 D             PORTS/x11-toolkits/attica/files (directory)  
 M  +43 -43    PORTS/x11-toolkits/attica/pkg-plist  
 M  +2 -30     QT/databases/qt4-ibase-plugin/Makefile  
 D             QT/databases/qt4-ibase-plugin/files (directory)  
 D             QT/databases/qt4-ibase-plugin/pkg-plist  
 M  +4 -28     QT/databases/qt4-mysql-plugin/Makefile  
 D             QT/databases/qt4-mysql-plugin/files (directory)  
 D             QT/databases/qt4-mysql-plugin/pkg-plist  
 M  +4 -31     QT/databases/qt4-odbc-plugin/Makefile  
 D             QT/databases/qt4-odbc-plugin/files (directory)  
 D             QT/databases/qt4-odbc-plugin/pkg-plist  
 M  +3 -30     QT/databases/qt4-pgsql-plugin/Makefile  
 D             QT/databases/qt4-pgsql-plugin/files (directory)  
 D             QT/databases/qt4-pgsql-plugin/pkg-plist  
 M  +2 -30     QT/databases/qt4-sqlite-plugin/Makefile  
 D             QT/databases/qt4-sqlite-plugin/files (directory)  
 D             QT/databases/qt4-sqlite-plugin/pkg-plist  
 M  +2 -30     QT/databases/qt4-sqlite3-plugin/Makefile  
 D             QT/databases/qt4-sqlite3-plugin/files (directory)  
 D             QT/databases/qt4-sqlite3-plugin/pkg-plist  
 M  +1 -0      QT/devel/qt4-corelib/Makefile  
 A             QT/devel/qt4/Makefile.sqldrivers   trunk/area51/QT/devel/qt4/Makefile.sqldrivers#12067