aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/Makefile7
-rw-r--r--devel/kdebindings4-kross-interpreters/Makefile42
-rw-r--r--devel/kdebindings4-kross-interpreters/distinfo2
-rw-r--r--devel/kdebindings4-kross-interpreters/pkg-descr3
-rw-r--r--devel/kdebindings4-python-krosspython/Makefile22
-rw-r--r--devel/kdebindings4-python-krosspython/distinfo2
-rw-r--r--devel/kdebindings4-python-pykde4/Makefile49
-rw-r--r--devel/kdebindings4-python-pykde4/distinfo4
-rw-r--r--devel/kdebindings4-python-pykde4/files/patch-__init__.py (renamed from devel/kdebindings4-python-pykde4/files/patch-python__pykde4____init__.py)4
-rw-r--r--devel/kdebindings4-python-pykde4/files/patch-kpythonpluginfactory__kpythonpluginfactory.cpp (renamed from devel/kdebindings4-python-pykde4/files/patch-python_pykde4_kpythonpluginfactory_kpythonpluginfactory.cpp)6
-rw-r--r--devel/kdebindings4-python-pykde4/pkg-plist29
-rw-r--r--devel/kdebindings4-python-pykdeuic4/Makefile31
-rw-r--r--devel/kdebindings4-python-pykdeuic4/distinfo2
-rw-r--r--devel/kdebindings4-python-pykdeuic4/files/patch-CMakeLists.txt9
-rw-r--r--devel/kdebindings4-python-pykdeuic4/files/patch-python__pykde4__tools__CMakeLists.txt8
-rw-r--r--devel/kdebindings4-python/Makefile18
-rw-r--r--devel/kdebindings4-ruby-korundum/Makefile59
-rw-r--r--devel/kdebindings4-ruby-korundum/distinfo2
-rw-r--r--devel/kdebindings4-ruby-korundum/files/pkg-message.in (renamed from devel/kdebindings4-ruby/files/pkg-message.in)0
-rw-r--r--devel/kdebindings4-ruby-korundum/files/ruby-kdebindings-env.sh.in (renamed from devel/kdebindings4-ruby/files/ruby-kdebindings-env.sh.in)0
-rw-r--r--devel/kdebindings4-ruby-korundum/pkg-descr3
-rw-r--r--devel/kdebindings4-ruby-korundum/pkg-plist38
-rw-r--r--devel/kdebindings4-ruby-krossruby/Makefile41
-rw-r--r--devel/kdebindings4-ruby-krossruby/pkg-descr3
-rw-r--r--devel/kdebindings4-ruby-krossruby/pkg-plist1
-rw-r--r--devel/kdebindings4-ruby-qtruby/Makefile53
-rw-r--r--devel/kdebindings4-ruby-qtruby/distinfo2
-rw-r--r--devel/kdebindings4-ruby-qtruby/pkg-descr3
-rw-r--r--devel/kdebindings4-ruby-qtruby/pkg-plist (renamed from devel/kdebindings4-ruby/pkg-plist)42
-rw-r--r--devel/kdebindings4-ruby/Makefile72
-rw-r--r--devel/kdebindings4-ruby/distinfo2
-rw-r--r--devel/kdebindings4-ruby/files/patch-ruby__CMakeLists.txt9
-rw-r--r--devel/kdebindings4-ruby/files/patch-ruby__korundum__CMakeLists.txt7
-rw-r--r--devel/kdebindings4-ruby/files/patch-ruby__korundum__modules__plasma__CMakeLists.txt5
-rw-r--r--devel/kdebindings4-ruby/files/patch-ruby__qtruby__src__CMakeLists.txt21
-rw-r--r--devel/kdebindings4-ruby/pkg-descr2
-rw-r--r--devel/kdebindings4-smoke-smokegen/Makefile34
-rw-r--r--devel/kdebindings4-smoke-smokegen/distinfo2
-rw-r--r--devel/kdebindings4-smoke-smokegen/files/patch-cmake__CMakeLists.txt9
-rw-r--r--devel/kdebindings4-smoke-smokegen/pkg-descr5
-rw-r--r--devel/kdebindings4-smoke-smokegen/pkg-plist36
-rw-r--r--devel/kdebindings4-smoke-smokekde/Makefile42
-rw-r--r--devel/kdebindings4-smoke-smokekde/distinfo2
-rw-r--r--devel/kdebindings4-smoke-smokekde/pkg-descr5
-rw-r--r--devel/kdebindings4-smoke-smokekde/pkg-plist87
-rw-r--r--devel/kdebindings4-smoke-smokeqt/Makefile38
-rw-r--r--devel/kdebindings4-smoke-smokeqt/distinfo2
-rw-r--r--devel/kdebindings4-smoke-smokeqt/pkg-descr5
-rw-r--r--devel/kdebindings4-smoke-smokeqt/pkg-plist88
-rw-r--r--devel/kdebindings4-smoke/Makefile44
-rw-r--r--devel/kdebindings4-smoke/distinfo2
-rw-r--r--devel/kdebindings4-smoke/pkg-descr4
-rw-r--r--devel/kdebindings4-smoke/pkg-plist192
-rw-r--r--devel/kdebindings4/Makefile29
-rw-r--r--devel/kdebindings4/files/Makefile.kdebindings53
-rw-r--r--devel/kdebindings4/pkg-descr2
-rw-r--r--devel/kdesdk4/Makefile42
-rw-r--r--devel/kdesdk4/distinfo4
-rw-r--r--devel/kdesdk4/pkg-plist386
59 files changed, 922 insertions, 794 deletions
diff --git a/devel/Makefile b/devel/Makefile
index da8f304b7dd9..d67cdf71f9f4 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -727,12 +727,19 @@
SUBDIR += kcachegrind
SUBDIR += kdbg
SUBDIR += kdebindings4
+ SUBDIR += kdebindings4-kross-interpreters
SUBDIR += kdebindings4-python
SUBDIR += kdebindings4-python-krosspython
SUBDIR += kdebindings4-python-pykde4
SUBDIR += kdebindings4-python-pykdeuic4
SUBDIR += kdebindings4-ruby
+ SUBDIR += kdebindings4-ruby-korundum
+ SUBDIR += kdebindings4-ruby-krossruby
+ SUBDIR += kdebindings4-ruby-qtruby
SUBDIR += kdebindings4-smoke
+ SUBDIR += kdebindings4-smoke-smokegen
+ SUBDIR += kdebindings4-smoke-smokekde
+ SUBDIR += kdebindings4-smoke-smokeqt
SUBDIR += kdesdk3
SUBDIR += kdesdk4
SUBDIR += kdesvn-kde4
diff --git a/devel/kdebindings4-kross-interpreters/Makefile b/devel/kdebindings4-kross-interpreters/Makefile
new file mode 100644
index 000000000000..8c0d279bc5be
--- /dev/null
+++ b/devel/kdebindings4-kross-interpreters/Makefile
@@ -0,0 +1,42 @@
+# New ports collection makefile for: kdebindings4-kross-interpreters
+# Date created: 1 September 2011
+# Whom: Alberto Villa <avilla@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= kross-interpreters
+PORTVERSION= ${KDE4_VERSION}
+CATEGORIES= devel kde
+MASTER_SITES= # empty
+PKGNAMEPREFIX= kdebindings-
+DISTFILES= # empty
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Meta port of Kross scripting libraries for KDE 4
+
+USE_KDE4= kdeprefix
+USE_RUBY= yes
+RUBY_NO_BUILD_DEPENDS= yes
+RUBY_NO_RUN_DEPENDS= yes
+NO_BUILD= yes
+
+OPTIONS= KROSSPYTHON "Kross Python scripting library" on \
+ KROSSRUBY "Kross Ruby scripting library (broken with Ruby 1.9)" on
+
+.include <bsd.port.options.mk>
+
+.if !defined(WITHOUT_KROSSPYTHON)
+RUN_DEPENDS+= ${KDE4_PREFIX}/lib/kde4/krosspython.so:${PORTSDIR}/devel/kdebindings4-python-krosspython
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_KROSSRUBY) && ${RUBY_VER} != 1.9
+RUN_DEPENDS+= ${KDE4_PREFIX}/lib/kde4/krossruby.so:${PORTSDIR}/devel/kdebindings4-ruby-krossruby
+.endif
+
+do-install:
+ ${DO_NADA}
+
+.include <bsd.port.post.mk>
diff --git a/devel/kdebindings4-kross-interpreters/distinfo b/devel/kdebindings4-kross-interpreters/distinfo
new file mode 100644
index 000000000000..3cf352ecd8b4
--- /dev/null
+++ b/devel/kdebindings4-kross-interpreters/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/kross-interpreters-4.7.2.tar.bz2) = 4235dfee6adc37d693ffdb4664bb4c13c15fe104e615cb1a57df225983946f34
+SIZE (KDE/kross-interpreters-4.7.2.tar.bz2) = 134896
diff --git a/devel/kdebindings4-kross-interpreters/pkg-descr b/devel/kdebindings4-kross-interpreters/pkg-descr
new file mode 100644
index 000000000000..4f1d94643d35
--- /dev/null
+++ b/devel/kdebindings4-kross-interpreters/pkg-descr
@@ -0,0 +1,3 @@
+This is a meta port of KDE bindings for Python and Ruby.
+
+WWW: http://www.kde.org/
diff --git a/devel/kdebindings4-python-krosspython/Makefile b/devel/kdebindings4-python-krosspython/Makefile
index fe726afb5263..ef39330ee7f7 100644
--- a/devel/kdebindings4-python-krosspython/Makefile
+++ b/devel/kdebindings4-python-krosspython/Makefile
@@ -5,18 +5,28 @@
# $FreeBSD$
#
-PORTNAME= kdebindings
+PORTNAME= krosspython
PORTVERSION= ${KDE4_VERSION}
CATEGORIES= devel kde python
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}kdebindings-
+DISTNAME= kross-interpreters-${PORTVERSION}
+DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Kross Python scripting library
-BINDLANG= python
-BINDMODULE= krosspython
-
+USE_KDE4= kdehier kdelibs kdeprefix automoc4
USE_PYTHON= 2.5+
-QT_COMPONENTS= gui
+USE_QT_VER= 4
+QT_COMPONENTS= gui qmake_build moc_build uic_build rcc_build
+USE_BZIP2= yes
+DISTINFO_FILE= ${PORTSDIR}/devel/kdebindings4-kross-interpreters/distinfo
+USE_CMAKE= yes
+CMAKE_ARGS+= -DBUILD_falcon:BOOL=FALSE \
+ -DBUILD_ruby:BOOL=FALSE \
+ -DBUILD_java:BOOL=FALSE
+MAKE_JOBS_SAFE= yes
-.include "${.CURDIR}/../../devel/kdebindings4/files/Makefile.kdebindings"
.include <bsd.port.mk>
diff --git a/devel/kdebindings4-python-krosspython/distinfo b/devel/kdebindings4-python-krosspython/distinfo
deleted file mode 100644
index a151a6d05c49..000000000000
--- a/devel/kdebindings4-python-krosspython/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (KDE/kdebindings-4.6.5.tar.bz2) = b87cf7ccd30a75121b032311c5f625d0a4d44c8c7b1f08c45b9292451da8ff91
-SIZE (KDE/kdebindings-4.6.5.tar.bz2) = 7078088
diff --git a/devel/kdebindings4-python-pykde4/Makefile b/devel/kdebindings4-python-pykde4/Makefile
index 5c8cd8c2b586..d6679fb8d22c 100644
--- a/devel/kdebindings4-python-pykde4/Makefile
+++ b/devel/kdebindings4-python-pykde4/Makefile
@@ -5,54 +5,61 @@
# $FreeBSD$
#
-PORTNAME= kdebindings
+PORTNAME= pykde4
PORTVERSION= ${KDE4_VERSION}
CATEGORIES= devel kde python
-PKGNAMESUFFIX= -kde
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}kdebindings-
+DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Python bindings for KDE
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
- ${PYTHON_SITELIBDIR}/PyQt4/QtDeclarative.so:${PORTSDIR}/devel/py-qt4-declarative \
+LIB_DEPENDS= okularcore.1:${PORTSDIR}/graphics/okular \
+ qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
+ soprano.4:${PORTSDIR}/textproc/soprano
+
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/PyQt4/QtDesigner.so:${PORTSDIR}/devel/py-qt4-designer \
+ ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \
${PYTHON_SITELIBDIR}/PyQt4/QtNetwork.so:${PORTSDIR}/net/py-qt4-network \
+ ${PYTHON_SITELIBDIR}/PyQt4/QtOpenGL.so:${PORTSDIR}/x11/py-qt4-opengl \
+ ${PYTHON_SITELIBDIR}/PyQt4/QtSql.so:${PORTSDIR}/databases/py-qt4-sql \
+ ${PYTHON_SITELIBDIR}/PyQt4/QtXml.so:${PORTSDIR}/textproc/py-qt4-xml \
${PYTHON_SITELIBDIR}/PyQt4/QtSvg.so:${PORTSDIR}/graphics/py-qt4-svg \
${PYTHON_SITELIBDIR}/PyQt4/QtWebKit.so:${PORTSDIR}/www/py-qt4-webkit \
- ${PYTHON_SITELIBDIR}/PyQt4/QtXml.so:${PORTSDIR}/textproc/py-qt4-xml \
- ${PYTHON_SITELIBDIR}/PyQt4/phonon.so:${PORTSDIR}/multimedia/py-qt4-phonon
-LIB_DEPENDS= okularcore.1:${PORTSDIR}/graphics/kdegraphics4 \
- qwt.5:${PORTSDIR}/x11-toolkits/qwt5
+ ${PYTHON_SITELIBDIR}/PyQt4/phonon.so:${PORTSDIR}/multimedia/py-qt4-phonon \
+ ${PYTHON_SITELIBDIR}/PyQt4/QtDeclarative.so:${PORTSDIR}/devel/py-qt4-declarative
+
RUN_DEPENDS:= ${BUILD_DEPENDS} \
${PYTHON_SITELIBDIR}/dbus/mainloop/qt.so:${PORTSDIR}/devel/py-qt4-dbus
-BINDLANG= python
-BINDMODULE= pykde4
-
-USE_KDE4= akonadi kdelibs pimlibs
+USE_KDE4= kdehier kdelibs kdeprefix pimlibs akonadi automoc4
USE_PYTHON= 2.5+
+USE_QT_VER= 4
+QT_COMPONENTS= corelib qmake_build moc_build uic_build rcc_build
+USE_BZIP2= yes
+USE_CMAKE= yes
CMAKE_ARGS+= -DWITH_PolkitQt:BOOL=FALSE
MAKE_JOBS_SAFE= yes
SUB_FILES= kdebindings4.pth
SUB_LIST= PYTHONPREFIX_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR}
-EXAMPLESDIR= ${PREFIX}/share/examples/pykde4
-
-.include "${.CURDIR}/../../devel/kdebindings4/files/Makefile.kdebindings"
.include <bsd.port.pre.mk>
post-patch:
.if ${OSVERSION} < 800069
- ${REINPLACE_CMD} -e '/dlopen("kpythonpluginfactory.so"/s,RTLD_NOLOAD |,,' \
- ${PATCH_WRKSRC}/python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp
+ ${REINPLACE_CMD} -e '/dlopen("kpythonpluginfactory.so"/ s,RTLD_NOLOAD |,,' \
+ ${PATCH_WRKSRC}/kpythonpluginfactory/kpythonpluginfactory.cpp
.endif
- ${FIND} -d ${PATCH_WRKSRC}/python/pykde4/sip -name "*.orig" -delete
+ ${FIND} -d ${PATCH_WRKSRC}/sip -name "*.orig" -delete
pre-configure:
- ${REINPLACE_CMD} -e 's,$${SIP_DEFAULT_SIP_DIR},${PREFIX}/${SIPDIR_REL},g' \
+ ${REINPLACE_CMD} -e 's,$${SIP_DEFAULT_SIP_DIR},${PREFIX}/share/py-sip,g' \
${BUILD_WRKSRC}/CMakeLists.txt
- ${REINPLACE_CMD} -e '/ADD_SUBDIRECTORY(examples)/d' \
- -e '/ADD_SUBDIRECTORY(tools)/d' \
+ ${REINPLACE_CMD} -e '/ADD_SUBDIRECTORY(examples)/ d' \
+ -e '/ADD_SUBDIRECTORY(tools)/ d' \
${BUILD_WRKSRC}/CMakeLists.txt
${RM} ${BUILD_WRKSRC}/examples/CMakeLists.txt
diff --git a/devel/kdebindings4-python-pykde4/distinfo b/devel/kdebindings4-python-pykde4/distinfo
index a151a6d05c49..1d48b30389bb 100644
--- a/devel/kdebindings4-python-pykde4/distinfo
+++ b/devel/kdebindings4-python-pykde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdebindings-4.6.5.tar.bz2) = b87cf7ccd30a75121b032311c5f625d0a4d44c8c7b1f08c45b9292451da8ff91
-SIZE (KDE/kdebindings-4.6.5.tar.bz2) = 7078088
+SHA256 (KDE/pykde4-4.7.2.tar.bz2) = 4ec71a9e3fc799118742ce7eec14ffab5ea94a008126bb0ab5878836890557e1
+SIZE (KDE/pykde4-4.7.2.tar.bz2) = 2106075
diff --git a/devel/kdebindings4-python-pykde4/files/patch-python__pykde4____init__.py b/devel/kdebindings4-python-pykde4/files/patch-__init__.py
index 886d3d832997..aad9e5904c5b 100644
--- a/devel/kdebindings4-python-pykde4/files/patch-python__pykde4____init__.py
+++ b/devel/kdebindings4-python-pykde4/files/patch-__init__.py
@@ -1,5 +1,5 @@
---- ./python/pykde4/__init__.py.orig 2008-07-22 04:00:52.000000000 +0400
-+++ ./python/pykde4/__init__.py 2009-05-03 23:18:43.000000000 +0400
+--- ./__init__.py.orig 2011-05-20 22:33:41.000000000 +0200
++++ ./__init__.py 2011-09-01 16:43:57.371033306 +0200
@@ -1,4 +1,3 @@
-import sys,DLFCN
+import sys, ctypes
diff --git a/devel/kdebindings4-python-pykde4/files/patch-python_pykde4_kpythonpluginfactory_kpythonpluginfactory.cpp b/devel/kdebindings4-python-pykde4/files/patch-kpythonpluginfactory__kpythonpluginfactory.cpp
index 7b3574f56007..d1dddd936268 100644
--- a/devel/kdebindings4-python-pykde4/files/patch-python_pykde4_kpythonpluginfactory_kpythonpluginfactory.cpp
+++ b/devel/kdebindings4-python-pykde4/files/patch-kpythonpluginfactory__kpythonpluginfactory.cpp
@@ -1,5 +1,5 @@
---- python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp~ 2009-10-31 16:30:02.000000000 +0200
-+++ python/pykde4/kpythonpluginfactory/kpythonpluginfactory.cpp 2009-10-31 16:35:50.000000000 +0200
+--- ./kpythonpluginfactory/kpythonpluginfactory.cpp.orig 2011-05-20 22:33:41.000000000 +0200
++++ ./kpythonpluginfactory/kpythonpluginfactory.cpp 2011-09-01 16:43:57.371033306 +0200
@@ -18,6 +18,8 @@
Boston, MA 02111-1307, USA.
*/
@@ -9,7 +9,7 @@
#include <QtCore/QCoreApplication>
#include <QFileInfo>
#include <QDir>
-@@ -295,6 +297,8 @@
+@@ -305,6 +307,8 @@
// symbols global and available for later loaded libraries/module.
QLibrary *LoadPythonLibrary()
{
diff --git a/devel/kdebindings4-python-pykde4/pkg-plist b/devel/kdebindings4-python-pykde4/pkg-plist
index 5d83e0223ef9..a54c4084344a 100644
--- a/devel/kdebindings4-python-pykde4/pkg-plist
+++ b/devel/kdebindings4-python-pykde4/pkg-plist
@@ -10,6 +10,7 @@ lib/kde4/kpythonpluginfactory.so
%%PYTHON_SITELIBDIR%%/PyKDE4/kio.so
%%PYTHON_SITELIBDIR%%/PyKDE4/knewstuff.so
%%PYTHON_SITELIBDIR%%/PyKDE4/kparts.so
+%%PYTHON_SITELIBDIR%%/PyKDE4/kterminal.so
%%PYTHON_SITELIBDIR%%/PyKDE4/ktexteditor.so
%%PYTHON_SITELIBDIR%%/PyKDE4/kutils.so
%%PYTHON_SITELIBDIR%%/PyKDE4/nepomuk.so
@@ -44,6 +45,7 @@ lib/kde4/kpythonpluginfactory.so
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kioExamples/__init__.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kpartsExamples/__init__.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kpartsExamples/katepart.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kpartsExamples/konsolepart.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kutilsExamples/__init__.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/polkitqtExamples/PkExampleUi.py
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/polkitqtExamples/README
@@ -334,8 +336,10 @@ share/py-sip/PyKDE4/kdeui/kconfigdialogmanager.sip
share/py-sip/PyKDE4/kdeui/kconfigskeleton.sip
share/py-sip/PyKDE4/kdeui/kcrash.sip
share/py-sip/PyKDE4/kdeui/kcursor.sip
+share/py-sip/PyKDE4/kdeui/kdatecombobox.sip
share/py-sip/PyKDE4/kdeui/kdatepicker.sip
share/py-sip/PyKDE4/kdeui/kdatetable.sip
+share/py-sip/PyKDE4/kdeui/kdatetimeedit.sip
share/py-sip/PyKDE4/kdeui/kdatetimewidget.sip
share/py-sip/PyKDE4/kdeui/kdatewidget.sip
share/py-sip/PyKDE4/kdeui/kdeprintdialog.sip
@@ -359,6 +363,7 @@ share/py-sip/PyKDE4/kdeui/kfontcombobox.sip
share/py-sip/PyKDE4/kdeui/kfontdialog.sip
share/py-sip/PyKDE4/kdeui/kfontrequester.sip
share/py-sip/PyKDE4/kdeui/kfontsizeaction.sip
+share/py-sip/PyKDE4/kdeui/kfontutils.sip
share/py-sip/PyKDE4/kdeui/kgesture.sip
share/py-sip/PyKDE4/kdeui/kglobalaccel.sip
share/py-sip/PyKDE4/kdeui/kglobalsettings.sip
@@ -390,6 +395,7 @@ share/py-sip/PyKDE4/kdeui/kmenu.sip
share/py-sip/PyKDE4/kdeui/kmenubar.sip
share/py-sip/PyKDE4/kdeui/kmessagebox.sip
share/py-sip/PyKDE4/kdeui/kmessageboxmessagehandler.sip
+share/py-sip/PyKDE4/kdeui/kmessagewidget.sip
share/py-sip/PyKDE4/kdeui/kmodelindexproxymapper.sip
share/py-sip/PyKDE4/kdeui/kmodifierkeyinfo.sip
share/py-sip/PyKDE4/kdeui/kmultitabbar.sip
@@ -403,7 +409,6 @@ share/py-sip/PyKDE4/kdeui/kpagemodel.sip
share/py-sip/PyKDE4/kdeui/kpageview.sip
share/py-sip/PyKDE4/kdeui/kpagewidget.sip
share/py-sip/PyKDE4/kdeui/kpagewidgetmodel.sip
-share/py-sip/PyKDE4/kdeui/kpalette.sip
share/py-sip/PyKDE4/kdeui/kpassivepopup.sip
share/py-sip/PyKDE4/kdeui/kpassivepopupmessagehandler.sip
share/py-sip/PyKDE4/kdeui/kpassworddialog.sip
@@ -458,7 +463,7 @@ share/py-sip/PyKDE4/kdeui/ktabbar.sip
share/py-sip/PyKDE4/kdeui/ktabwidget.sip
share/py-sip/PyKDE4/kdeui/ktextbrowser.sip
share/py-sip/PyKDE4/kdeui/ktextedit.sip
-share/py-sip/PyKDE4/kdeui/ktimezone.sip
+share/py-sip/PyKDE4/kdeui/ktimecombobox.sip
share/py-sip/PyKDE4/kdeui/ktimezonewidget.sip
share/py-sip/PyKDE4/kdeui/ktip.sip
share/py-sip/PyKDE4/kdeui/ktitlewidget.sip
@@ -556,6 +561,7 @@ share/py-sip/PyKDE4/kio/global.sip
share/py-sip/PyKDE4/kio/job.sip
share/py-sip/PyKDE4/kio/jobclasses.sip
share/py-sip/PyKDE4/kio/jobuidelegate.sip
+share/py-sip/PyKDE4/kio/kabstractfileitemactionplugin.sip
share/py-sip/PyKDE4/kio/kabstractfilemodule.sip
share/py-sip/PyKDE4/kio/kabstractfilewidget.sip
share/py-sip/PyKDE4/kio/kacl.sip
@@ -580,7 +586,6 @@ share/py-sip/PyKDE4/kio/kdesktopfileactions.sip
share/py-sip/PyKDE4/kio/kdevicelistmodel.sip
share/py-sip/PyKDE4/kio/kdirlister.sip
share/py-sip/PyKDE4/kio/kdirmodel.sip
-share/py-sip/PyKDE4/kio/kdirnotify.sip
share/py-sip/PyKDE4/kio/kdiroperator.sip
share/py-sip/PyKDE4/kio/kdirselectdialog.sip
share/py-sip/PyKDE4/kio/kdirsortfilterproxymodel.sip
@@ -622,10 +627,12 @@ share/py-sip/PyKDE4/kio/kopenwithdialog.sip
share/py-sip/PyKDE4/kio/kpreviewwidgetbase.sip
share/py-sip/PyKDE4/kio/kpropertiesdialog.sip
share/py-sip/PyKDE4/kio/kprotocolmanager.sip
+share/py-sip/PyKDE4/kio/krecentdirs.sip
share/py-sip/PyKDE4/kio/krecentdocument.sip
share/py-sip/PyKDE4/kio/kremoteencoding.sip
share/py-sip/PyKDE4/kio/krun.sip
share/py-sip/PyKDE4/kio/ksambashare.sip
+share/py-sip/PyKDE4/kio/ksambasharedata.sip
share/py-sip/PyKDE4/kio/kscan.sip
share/py-sip/PyKDE4/kio/kservicegroup.sip
share/py-sip/PyKDE4/kio/kshellcompletion.sip
@@ -721,6 +728,19 @@ share/py-sip/PyKDE4/kparts/sipkpartspart6.cpp
share/py-sip/PyKDE4/kparts/sipkpartspart7.cpp
share/py-sip/PyKDE4/kparts/statusbarextension.sip
share/py-sip/PyKDE4/kparts/textextension.sip
+share/py-sip/PyKDE4/kterminal/kterminal.sip
+share/py-sip/PyKDE4/kterminal/kterminalmod.sip
+share/py-sip/PyKDE4/kterminal/sipAPIkterminal.h
+share/py-sip/PyKDE4/kterminal/sipkterminalpart0.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart1.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart2.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart3.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart4.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart5.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart6.cpp
+share/py-sip/PyKDE4/kterminal/sipkterminalpart7.cpp
+share/py-sip/PyKDE4/kterminal/terminal_interface.sip
+share/py-sip/PyKDE4/kterminal/terminal_interface_v2.sip
share/py-sip/PyKDE4/ktexteditor/attribute.sip
share/py-sip/PyKDE4/ktexteditor/codecompletioninterface.sip
share/py-sip/PyKDE4/ktexteditor/codecompletionmodel.sip
@@ -857,6 +877,7 @@ share/py-sip/PyKDE4/phonon/mediacontroller.sip
share/py-sip/PyKDE4/phonon/medianode.sip
share/py-sip/PyKDE4/phonon/mediaobject.sip
share/py-sip/PyKDE4/phonon/mediasource.sip
+share/py-sip/PyKDE4/phonon/mrl.sip
share/py-sip/PyKDE4/phonon/objectdescription.sip
share/py-sip/PyKDE4/phonon/objectdescriptionmodel.sip
share/py-sip/PyKDE4/phonon/packet.sip
@@ -1002,6 +1023,7 @@ share/py-sip/PyKDE4/solid/genericinterface.sip
share/py-sip/PyKDE4/solid/internetgateway.sip
share/py-sip/PyKDE4/solid/networking.sip
share/py-sip/PyKDE4/solid/networkinterface.sip
+share/py-sip/PyKDE4/solid/networkshare.sip
share/py-sip/PyKDE4/solid/opticaldisc.sip
share/py-sip/PyKDE4/solid/opticaldrive.sip
share/py-sip/PyKDE4/solid/portablemediaplayer.sip
@@ -1103,6 +1125,7 @@ share/py-sip/PyKDE4/soprano/xsd.sip
@dirrm share/py-sip/PyKDE4/nepomuk
@dirrm share/py-sip/PyKDE4/kutils
@dirrm share/py-sip/PyKDE4/ktexteditor
+@dirrm share/py-sip/PyKDE4/kterminal
@dirrm share/py-sip/PyKDE4/kparts
@dirrm share/py-sip/PyKDE4/knewstuff
@dirrm share/py-sip/PyKDE4/kio
diff --git a/devel/kdebindings4-python-pykdeuic4/Makefile b/devel/kdebindings4-python-pykdeuic4/Makefile
index 081a00015053..8d50749bb7df 100644
--- a/devel/kdebindings4-python-pykdeuic4/Makefile
+++ b/devel/kdebindings4-python-pykdeuic4/Makefile
@@ -5,30 +5,31 @@
# $FreeBSD$
#
-PORTNAME= kdebindings
+PORTNAME= pykdeuic4
PORTVERSION= ${KDE4_VERSION}
CATEGORIES= devel kde python
-PKGNAMESUFFIX= -pykdeuic4
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}kdebindings-
+DISTNAME= pykde4-${PORTVERSION}
+DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= An enhanced version of pyuic4
-BINDLANG= python
-BINDMODULE= pykde4
-
+USE_KDE4= kdehier kdelibs kdeprefix automoc4 pykde4
USE_PYTHON= 2.5+
-.include "${.CURDIR}/../../devel/kdebindings4/files/Makefile.kdebindings"
-#override USE_KDE4 from Makefile.kdebindings:
-USE_KDE4= kdelibs automoc4 pykde4
+USE_QT_VER= 4
+QT_COMPONENTS= corelib qmake_build moc_build uic_build rcc_build
+USE_BZIP2= yes
+DISTINFO_FILE= ${PORTSDIR}/devel/kdebindings4-python-pykde4/distinfo
+USE_CMAKE= yes
+MAKE_JOBS_SAFE= yes
-CMAKE_SOURCE_PATH= ${BUILD_WRKSRC}
-CONFIGURE_WRKSRC= ${BUILD_WRKSRC}
-BUILD_WRKSRC= ${WRKSRC}/python/pykde4/tools
-INSTALL_WRKSRC= ${BUILD_WRKSRC}
+WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME}
pre-configure:
- ${REINPLACE_CMD} -e 's,$${SIP_DEFAULT_SIP_DIR},${PREFIX}/${SIPDIR_REL},g' \
- -e 's,$${PYTHON_SITE_PACKAGES_DIR},${PYTHONPREFIX_SITELIBDIR},g' \
- ${BUILD_WRKSRC}/pykdeuic4/CMakeLists.txt
+ ${REINPLACE_CMD} -e 's,$${PYTHON_SITE_PACKAGES_INSTALL_DIR},${PYTHONPREFIX_SITELIBDIR},g' \
+ ${WRKSRC}/CMakeLists.txt
.include <bsd.port.mk>
diff --git a/devel/kdebindings4-python-pykdeuic4/distinfo b/devel/kdebindings4-python-pykdeuic4/distinfo
deleted file mode 100644
index a151a6d05c49..000000000000
--- a/devel/kdebindings4-python-pykdeuic4/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (KDE/kdebindings-4.6.5.tar.bz2) = b87cf7ccd30a75121b032311c5f625d0a4d44c8c7b1f08c45b9292451da8ff91
-SIZE (KDE/kdebindings-4.6.5.tar.bz2) = 7078088
diff --git a/devel/kdebindings4-python-pykdeuic4/files/patch-CMakeLists.txt b/devel/kdebindings4-python-pykdeuic4/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..cf5a57d40046
--- /dev/null
+++ b/devel/kdebindings4-python-pykdeuic4/files/patch-CMakeLists.txt
@@ -0,0 +1,9 @@
+--- ./CMakeLists.txt.orig 2011-05-20 22:33:41.000000000 +0200
++++ ./CMakeLists.txt 2011-09-01 17:21:32.451109357 +0200
+@@ -1,3 +1,6 @@
++find_package(KDE4 REQUIRED)
++FIND_PACKAGE(PythonLibrary REQUIRED)
++INCLUDE(PythonMacros)
+
+ PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/widget-plugins/)
+ PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/)
diff --git a/devel/kdebindings4-python-pykdeuic4/files/patch-python__pykde4__tools__CMakeLists.txt b/devel/kdebindings4-python-pykdeuic4/files/patch-python__pykde4__tools__CMakeLists.txt
deleted file mode 100644
index 5681089a797a..000000000000
--- a/devel/kdebindings4-python-pykdeuic4/files/patch-python__pykde4__tools__CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
---- ./python/pykde4/tools/CMakeLists.txt.orig 2009-12-31 16:34:47.000000000 +0300
-+++ ./python/pykde4/tools/CMakeLists.txt 2010-05-30 17:50:19.644735673 +0400
-@@ -1 +1,5 @@
-+find_package(KDE4 REQUIRED)
-+FIND_PACKAGE(PythonLibrary REQUIRED)
-+INCLUDE(PythonMacros)
-+
- ADD_SUBDIRECTORY(pykdeuic4)
diff --git a/devel/kdebindings4-python/Makefile b/devel/kdebindings4-python/Makefile
index f129082b9e68..0e65477af070 100644
--- a/devel/kdebindings4-python/Makefile
+++ b/devel/kdebindings4-python/Makefile
@@ -7,21 +7,21 @@
PORTNAME= kdebindings
PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= devel kde
+CATEGORIES= devel kde python
MASTER_SITES= # empty
-PKGNAMESUFFIX= -python
-DISTFILES= # none
-UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
+PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
+DISTFILES= # empty
MAINTAINER= kde@FreeBSD.org
-COMMENT= Meta port of Python bindings for KDE
+COMMENT= Meta-port of Python bindings for KDE
USE_KDE4= kdeprefix
+USE_PYTHON= yes
+PYTHON_NO_DEPENDS= yes
NO_BUILD= yes
-# NO_INSTALL= yes
-OPTIONS+= KROSSPYTHON "Kross Python scripting library" on
-OPTIONS+= PYKDE4 "Kde bindings" on
+OPTIONS= KROSSPYTHON "Kross Python scripting library" on \
+ PYKDE4 "KDE bindings" on
.include <bsd.port.options.mk>
@@ -31,7 +31,7 @@ RUN_DEPENDS+= ${KDE4_PREFIX}/lib/kde4/krosspython.so:${PORTSDIR}/devel/kdebindin
.if !defined(WITHOUT_PYKDE4)
RUN_DEPENDS+= ${KDE4_PREFIX}/lib/kde4/kpythonpluginfactory.so:${PORTSDIR}/devel/kdebindings4-python-pykde4 \
- ${LOCALBASE}/bin/pykdeuic4:${PORTSDIR}/devel/kdebindings4-python-pykdeuic4
+ ${KDE4_PREFIX}/bin/pykdeuic4:${PORTSDIR}/devel/kdebindings4-python-pykdeuic4
.endif
do-install:
diff --git a/devel/kdebindings4-ruby-korundum/Makefile b/devel/kdebindings4-ruby-korundum/Makefile
new file mode 100644
index 000000000000..4370aef61819
--- /dev/null
+++ b/devel/kdebindings4-ruby-korundum/Makefile
@@ -0,0 +1,59 @@
+# New ports collection makefile for: korundum
+# Date created: 2 September 2011
+# Whom: Alberto Villa <avilla@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= korundum
+PORTVERSION= ${KDE4_VERSION}
+CATEGORIES= devel kde
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}kdebindings-
+DIST_SUBDIR= KDE
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Ruby bindings for KDE
+
+LIB_DEPENDS= qtruby4shared.2:${PORTSDIR}/devel/kdebindings4-ruby-qtruby \
+ smokekdecore.3:${PORTSDIR}/devel/kdebindings4-smoke-smokekde \
+ smokebase.3:${PORTSDIR}/devel/kdebindings4-smoke-smokegen \
+ soprano.4:${PORTSDIR}/textproc/soprano \
+ kateinterfaces.5:${PORTSDIR}/editors/kate \
+ smokeqtcore.3:${PORTSDIR}/devel/kdebindings4-smoke-smokeqt \
+ okularcore.1:${PORTSDIR}/graphics/okular
+
+CONFLICTS= ruby1[89]-kdebindings-4.[0-6].*
+
+USE_KDE4= kdehier kdelibs kdeprefix pimlibs akonadi automoc4
+USE_QT_VER= 4
+QT_COMPONENTS= dbus network opengl sql svg xml \
+ qmake_build moc_build uic_build rcc_build
+USE_RUBY= yes
+USE_BZIP2= yes
+USE_CMAKE= yes
+MAKE_JOBS_SAFE= yes
+
+SUB_FILES= ruby-kdebindings-env.sh pkg-message
+SUB_LIST+= RUBY_SITELIBDIR=${RUBY_SITELIBDIR} \
+ RUBY_SITEARCHLIBDIR=${RUBY_SITEARCHLIBDIR}
+
+.include <bsd.port.pre.mk>
+
+CMAKE_ARGS+= -DRUBY_LIBRARY=${LOCALBASE}/lib/lib${RUBY_NAME}.so \
+ -DRUBY_INCLUDE_PATH=${LOCALBASE}/lib/ruby/${RUBY_VER}/${RUBY_ARCH} \
+ -DCUSTOM_RUBY_SITE_LIB_DIR=${RUBY_SITELIBDIR} \
+ -DCUSTOM_RUBY_SITE_ARCH_DIR=${RUBY_SITEARCHLIBDIR}
+
+pre-configure:
+ ${REINPLACE_CMD} -e '/examples/ d' \
+ ${WRKSRC}/CMakeLists.txt \
+ ${WRKSRC}/modules/plasma/CMakeLists.txt
+
+post-install:
+ ${MKDIR} ${PREFIX}/env
+ ${INSTALL_SCRIPT} ${WRKDIR}/ruby-kdebindings-env.sh ${PREFIX}/env
+ @${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.post.mk>
diff --git a/devel/kdebindings4-ruby-korundum/distinfo b/devel/kdebindings4-ruby-korundum/distinfo
new file mode 100644
index 000000000000..9309dc4ccf57
--- /dev/null
+++ b/devel/kdebindings4-ruby-korundum/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/korundum-4.7.2.tar.bz2) = cb787541100e29470926f1a7dd7bd5be497fdedadc8ecdfd86da272415cd24b5
+SIZE (KDE/korundum-4.7.2.tar.bz2) = 180137
diff --git a/devel/kdebindings4-ruby/files/pkg-message.in b/devel/kdebindings4-ruby-korundum/files/pkg-message.in
index 859cd8da176a..859cd8da176a 100644
--- a/devel/kdebindings4-ruby/files/pkg-message.in
+++ b/devel/kdebindings4-ruby-korundum/files/pkg-message.in
diff --git a/devel/kdebindings4-ruby/files/ruby-kdebindings-env.sh.in b/devel/kdebindings4-ruby-korundum/files/ruby-kdebindings-env.sh.in
index 041908374ce9..041908374ce9 100644
--- a/devel/kdebindings4-ruby/files/ruby-kdebindings-env.sh.in
+++ b/devel/kdebindings4-ruby-korundum/files/ruby-kdebindings-env.sh.in
diff --git a/devel/kdebindings4-ruby-korundum/pkg-descr b/devel/kdebindings4-ruby-korundum/pkg-descr
new file mode 100644
index 000000000000..45ce4c2ef9ed
--- /dev/null
+++ b/devel/kdebindings4-ruby-korundum/pkg-descr
@@ -0,0 +1,3 @@
+This port provides Ruby bindings for KDE.
+
+WWW: http://www.kde.org/
diff --git a/devel/kdebindings4-ruby-korundum/pkg-plist b/devel/kdebindings4-ruby-korundum/pkg-plist
new file mode 100644
index 000000000000..7021fc3eb073
--- /dev/null
+++ b/devel/kdebindings4-ruby-korundum/pkg-plist
@@ -0,0 +1,38 @@
+bin/krubyapplication
+bin/rbkconfig_compiler4
+env/ruby-kdebindings-env.sh
+lib/kde4/krubypluginfactory.so
+%%RUBY_SITELIBDIR%%/KDE/kate.rb
+%%RUBY_SITELIBDIR%%/KDE/korundum4.rb
+%%RUBY_SITELIBDIR%%/KDE/plasma.rb
+%%RUBY_SITELIBDIR%%/akonadi/akonadi.rb
+%%RUBY_SITEARCHLIBDIR%%/akonadi.so
+%%RUBY_SITEARCHLIBDIR%%/kate.so
+%%RUBY_SITEARCHLIBDIR%%/khtml.so
+%%RUBY_SITEARCHLIBDIR%%/kio.so
+%%RUBY_SITEARCHLIBDIR%%/korundum4.so
+%%RUBY_SITEARCHLIBDIR%%/ktexteditor.so
+%%RUBY_SITEARCHLIBDIR%%/nepomuk.so
+%%RUBY_SITEARCHLIBDIR%%/okular.so
+%%RUBY_SITEARCHLIBDIR%%/plasma_applet.so
+%%RUBY_SITEARCHLIBDIR%%/solid.so
+%%RUBY_SITEARCHLIBDIR%%/soprano.so
+%%RUBY_SITELIBDIR%%/khtml/khtml.rb
+%%RUBY_SITELIBDIR%%/kio/kio.rb
+%%RUBY_SITELIBDIR%%/ktexteditor/ktexteditor.rb
+%%RUBY_SITELIBDIR%%/nepomuk/nepomuk.rb
+%%RUBY_SITELIBDIR%%/okular/okular.rb
+%%RUBY_SITELIBDIR%%/solid/solid.rb
+%%RUBY_SITELIBDIR%%/soprano/soprano.rb
+@dirrm %%RUBY_SITELIBDIR%%/soprano
+@dirrm %%RUBY_SITELIBDIR%%/solid
+@dirrm %%RUBY_SITELIBDIR%%/okular
+@dirrm %%RUBY_SITELIBDIR%%/nepomuk
+@dirrm %%RUBY_SITELIBDIR%%/ktexteditor
+@dirrm %%RUBY_SITELIBDIR%%/kio
+@dirrm %%RUBY_SITELIBDIR%%/khtml
+@dirrmtry %%RUBY_SITEARCHLIBDIR%%
+@dirrm %%RUBY_SITELIBDIR%%/akonadi
+@dirrm %%RUBY_SITELIBDIR%%/KDE
+@dirrmtry %%RUBY_SITELIBDIR%%
+@dirrmtry env
diff --git a/devel/kdebindings4-ruby-krossruby/Makefile b/devel/kdebindings4-ruby-krossruby/Makefile
new file mode 100644
index 000000000000..88fe919bd56c
--- /dev/null
+++ b/devel/kdebindings4-ruby-krossruby/Makefile
@@ -0,0 +1,41 @@
+# New ports collection makefile for: kdebindings4-ruby-krossruby
+# Date created: 1 September 2011
+# Whom: Alberto Villa <avilla@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= krossruby
+PORTVERSION= ${KDE4_VERSION}
+CATEGORIES= devel kde
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}kdebindings-
+DISTNAME= kross-interpreters-${PORTVERSION}
+DIST_SUBDIR= KDE
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Ruby bindings for Qt/KDE
+
+CONFLICTS= ruby1[89]-kdebindings-4.[0-6].*
+
+USE_KDE4= kdehier kdelibs kdeprefix pimlibs automoc4
+USE_QT_VER= 4
+QT_COMPONENTS= gui qmake_build moc_build uic_build rcc_build
+USE_RUBY= yes
+USE_BZIP2= yes
+DISTINFO_FILE= ${PORTSDIR}/devel/kdebindings4-kross-interpreters/distinfo
+USE_CMAKE= yes
+CMAKE_ARGS+= -DBUILD_python:BOOL=FALSE \
+ -DBUILD_falcon:BOOL=FALSE \
+ -DBUILD_java:BOOL=FALSE
+MAKE_JOBS_SAFE= yes
+
+.include <bsd.port.pre.mk>
+
+# Kross Ruby is broken with Ruby 1.9, see http://bugs.kde.org/243565
+.if ${RUBY_VER} == 1.9
+BROKEN= does not build with Ruby 1.9
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/devel/kdebindings4-ruby-krossruby/pkg-descr b/devel/kdebindings4-ruby-krossruby/pkg-descr
new file mode 100644
index 000000000000..88da7c97f8a0
--- /dev/null
+++ b/devel/kdebindings4-ruby-krossruby/pkg-descr
@@ -0,0 +1,3 @@
+This port provides Ruby bindings for Qt and KDE.
+
+WWW: http://www.kde.org/
diff --git a/devel/kdebindings4-ruby-krossruby/pkg-plist b/devel/kdebindings4-ruby-krossruby/pkg-plist
new file mode 100644
index 000000000000..785dd6e6c26e
--- /dev/null
+++ b/devel/kdebindings4-ruby-krossruby/pkg-plist
@@ -0,0 +1 @@
+lib/kde4/krossruby.so
diff --git a/devel/kdebindings4-ruby-qtruby/Makefile b/devel/kdebindings4-ruby-qtruby/Makefile
new file mode 100644
index 000000000000..7c527505805c
--- /dev/null
+++ b/devel/kdebindings4-ruby-qtruby/Makefile
@@ -0,0 +1,53 @@
+# New ports collection makefile for: kdebindings4-ruby
+# Date created: 2008-08-19
+# Whom: Max Brazhnikov <makc@issp.ac.ru>
+#
+# $FreeBSD$
+#
+
+PORTNAME= qtruby
+PORTVERSION= ${KDE4_VERSION}
+CATEGORIES= devel kde
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}kdebindings-
+DIST_SUBDIR= KDE
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Ruby bindings for Qt
+
+LIB_DEPENDS= smokeqtcore.3:${PORTSDIR}/devel/kdebindings4-smoke-smokeqt \
+ qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
+ qscintilla2.5:${PORTSDIR}/devel/qscintilla2
+
+CONFLICTS= ruby1[89]-kdebindings-4.[0-6].*
+
+USE_KDE4= kdehier kdeprefix
+USE_QT_VER= 4
+QT_COMPONENTS= dbus declarative designer gui network \
+ phonon qtestlib script webkit xml \
+ qmake_build moc_build uic_build rcc_build
+USE_RUBY= yes
+USE_BZIP2= yes
+USE_CMAKE= yes
+MAKE_JOBS_SAFE= yes
+USE_LDCONFIG= yes
+
+SUB_LIST+= RUBY_SITELIBDIR=${RUBY_SITELIBDIR} \
+ RUBY_SITEARCHLIBDIR=${RUBY_SITEARCHLIBDIR}
+
+.include <bsd.port.pre.mk>
+
+CMAKE_ARGS+= -DRUBY_LIBRARY=${LOCALBASE}/lib/lib${RUBY_NAME}.so \
+ -DRUBY_INCLUDE_PATH=${LOCALBASE}/lib/ruby/${RUBY_VER}/${RUBY_ARCH} \
+ -DCUSTOM_RUBY_SITE_LIB_DIR=${RUBY_SITELIBDIR} \
+ -DCUSTOM_RUBY_SITE_ARCH_DIR=${RUBY_SITEARCHLIBDIR}
+
+post-patch:
+ ${REINPLACE_CMD} -e 's|QWT_FOUND|Qwt5_FOUND|g' \
+ ${WRKSRC}/src/CMakeLists.txt
+ ${REINPLACE_CMD} -e 's|share/qtruby4/cmake|lib/cmake/qtruby4|g' \
+ ${WRKSRC}/cmake/CMakeLists.txt \
+ ${WRKSRC}/src/CMakeLists.txt
+
+.include <bsd.port.post.mk>
diff --git a/devel/kdebindings4-ruby-qtruby/distinfo b/devel/kdebindings4-ruby-qtruby/distinfo
new file mode 100644
index 000000000000..ed675e1e0764
--- /dev/null
+++ b/devel/kdebindings4-ruby-qtruby/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/qtruby-4.7.2.tar.bz2) = c4be0d334b77360ce0cdc2c4d5bbf421ee232ad520ad7711a2b3e4ef260e2edc
+SIZE (KDE/qtruby-4.7.2.tar.bz2) = 613635
diff --git a/devel/kdebindings4-ruby-qtruby/pkg-descr b/devel/kdebindings4-ruby-qtruby/pkg-descr
new file mode 100644
index 000000000000..4c400b4b5251
--- /dev/null
+++ b/devel/kdebindings4-ruby-qtruby/pkg-descr
@@ -0,0 +1,3 @@
+This port provides Ruby bindings for Qt.
+
+WWW: http://www.kde.org/
diff --git a/devel/kdebindings4-ruby/pkg-plist b/devel/kdebindings4-ruby-qtruby/pkg-plist
index e67987a7613b..6fba11aafbc1 100644
--- a/devel/kdebindings4-ruby/pkg-plist
+++ b/devel/kdebindings4-ruby-qtruby/pkg-plist
@@ -1,9 +1,6 @@
-bin/krubyapplication
-bin/rbkconfig_compiler4
bin/rbqtapi
bin/rbrcc
bin/rbuic4
-env/ruby-kdebindings-env.sh
include/qtruby/marshall.h
include/qtruby/marshall_basetypes.h
include/qtruby/marshall_complex.h
@@ -12,31 +9,19 @@ include/qtruby/marshall_primitives.h
include/qtruby/marshall_types.h
include/qtruby/qtruby.h
include/qtruby/smokeruby.h
-%%KROSS%%lib/kde4/krossruby.so
-lib/kde4/krubypluginfactory.so
+lib/cmake/qtruby4/QtRuby4Config.cmake
+lib/cmake/qtruby4/QtRuby4Export-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/qtruby4/QtRuby4Export.cmake
lib/libqtruby4shared.so
lib/libqtruby4shared.so.2
lib/libqtruby4shared.so.2.0.0
-%%RUBY_SITELIBDIR%%/KDE/kate.rb
-%%RUBY_SITELIBDIR%%/KDE/korundum4.rb
-%%RUBY_SITELIBDIR%%/KDE/plasma.rb
%%RUBY_SITELIBDIR%%/Qt.rb
%%RUBY_SITELIBDIR%%/Qt/active_item_model.rb
%%RUBY_SITELIBDIR%%/Qt/active_table_model.rb
%%RUBY_SITELIBDIR%%/Qt/qtruby4.rb
%%RUBY_SITELIBDIR%%/Qt3.rb
%%RUBY_SITELIBDIR%%/Qt4.rb
-%%RUBY_SITELIBDIR%%/akonadi/akonadi.rb
-%%RUBY_SITEARCHLIBDIR%%/akonadi.so
-%%RUBY_SITEARCHLIBDIR%%/kate.so
-%%RUBY_SITEARCHLIBDIR%%/khtml.so
-%%RUBY_SITEARCHLIBDIR%%/kio.so
-%%RUBY_SITEARCHLIBDIR%%/korundum4.so
-%%RUBY_SITEARCHLIBDIR%%/ktexteditor.so
-%%RUBY_SITEARCHLIBDIR%%/nepomuk.so
-%%RUBY_SITEARCHLIBDIR%%/okular.so
%%RUBY_SITEARCHLIBDIR%%/phonon.so
-%%RUBY_SITEARCHLIBDIR%%/plasma_applet.so
%%RUBY_SITEARCHLIBDIR%%/qscintilla.so
%%RUBY_SITEARCHLIBDIR%%/qtdeclarative.so
%%RUBY_SITEARCHLIBDIR%%/qtruby4.so
@@ -45,13 +30,6 @@ lib/libqtruby4shared.so.2.0.0
%%RUBY_SITEARCHLIBDIR%%/qtuitools.so
%%RUBY_SITEARCHLIBDIR%%/qtwebkit.so
%%RUBY_SITEARCHLIBDIR%%/qwt.so
-%%RUBY_SITEARCHLIBDIR%%/solid.so
-%%RUBY_SITEARCHLIBDIR%%/soprano.so
-%%RUBY_SITELIBDIR%%/khtml/khtml.rb
-%%RUBY_SITELIBDIR%%/kio/kio.rb
-%%RUBY_SITELIBDIR%%/ktexteditor/ktexteditor.rb
-%%RUBY_SITELIBDIR%%/nepomuk/nepomuk.rb
-%%RUBY_SITELIBDIR%%/okular/okular.rb
%%RUBY_SITELIBDIR%%/phonon/phonon.rb
%%RUBY_SITELIBDIR%%/qscintilla/qscintilla.rb
%%RUBY_SITELIBDIR%%/qtdeclarative/qtdeclarative.rb
@@ -60,10 +38,6 @@ lib/libqtruby4shared.so.2.0.0
%%RUBY_SITELIBDIR%%/qtuitools/qtuitools.rb
%%RUBY_SITELIBDIR%%/qtwebkit/qtwebkit.rb
%%RUBY_SITELIBDIR%%/qwt/qwt.rb
-%%RUBY_SITELIBDIR%%/solid/solid.rb
-%%RUBY_SITELIBDIR%%/soprano/soprano.rb
-@dirrm %%RUBY_SITELIBDIR%%/soprano
-@dirrm %%RUBY_SITELIBDIR%%/solid
@dirrm %%RUBY_SITELIBDIR%%/qwt
@dirrm %%RUBY_SITELIBDIR%%/qtwebkit
@dirrm %%RUBY_SITELIBDIR%%/qtuitools
@@ -72,17 +46,11 @@ lib/libqtruby4shared.so.2.0.0
@dirrm %%RUBY_SITELIBDIR%%/qtdeclarative
@dirrm %%RUBY_SITELIBDIR%%/qscintilla
@dirrm %%RUBY_SITELIBDIR%%/phonon
-@dirrm %%RUBY_SITELIBDIR%%/okular
-@dirrm %%RUBY_SITELIBDIR%%/nepomuk
-@dirrm %%RUBY_SITELIBDIR%%/ktexteditor
-@dirrm %%RUBY_SITELIBDIR%%/kio
-@dirrm %%RUBY_SITELIBDIR%%/khtml
@dirrmtry %%RUBY_SITEARCHLIBDIR%%
-@dirrm %%RUBY_SITELIBDIR%%/akonadi
@dirrm %%RUBY_SITELIBDIR%%/Qt
-@dirrm %%RUBY_SITELIBDIR%%/KDE
@dirrmtry %%RUBY_SITELIBDIR%%
@dirrmtry lib/ruby/site_ruby
@dirrmtry lib/ruby
+@dirrm lib/cmake/qtruby4
+@dirrmtry lib/cmake
@dirrm include/qtruby
-@dirrmtry env
diff --git a/devel/kdebindings4-ruby/Makefile b/devel/kdebindings4-ruby/Makefile
index c78b2d4b7cfe..14847f6430bb 100644
--- a/devel/kdebindings4-ruby/Makefile
+++ b/devel/kdebindings4-ruby/Makefile
@@ -1,6 +1,6 @@
# New ports collection makefile for: kdebindings4-ruby
-# Date created: 2008-08-19
-# Whom: Max Brazhnikov <makc@issp.ac.ru>
+# Date created: 1 September 2011
+# Whom: Alberto Villa <avilla@FreeBSD.org>
#
# $FreeBSD$
#
@@ -8,54 +8,40 @@
PORTNAME= kdebindings
PORTVERSION= ${KDE4_VERSION}
CATEGORIES= devel kde
+MASTER_SITES= # empty
+PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
+DISTFILES= # empty
MAINTAINER= kde@FreeBSD.org
-COMMENT= Ruby bindings for Qt/KDE
+COMMENT= Meta port of Ruby bindings for KDE
-LIB_DEPENDS= smokebase.3:${PORTSDIR}/devel/kdebindings4-smoke \
- okularcore.1:${PORTSDIR}/graphics/kdegraphics4 \
- kateinterfaces.5:${PORTSDIR}/devel/kdesdk4 \
- qwt.5:${PORTSDIR}/x11-toolkits/qwt5
+USE_KDE4= kdeprefix
+USE_RUBY= yes
+RUBY_NO_BUILD_DEPENDS= yes
+RUBY_NO_RUN_DEPENDS= yes
+NO_BUILD= yes
-BINDLANG= ruby
+OPTIONS= KORUNDUM "KDE bindings (requires QTRUBY)" on \
+ KROSSRUBY "Kross Ruby scripting library (broken with Ruby 1.9)" on \
+ QTRUBY "Qt bindings" on
+
+.include <bsd.port.options.mk>
+
+.if !defined(WITHOUT_KORUNDUM)
+RUN_DEPENDS+= ${KDE4_PREFIX}/lib/kde4/krubypluginfactory.so:${PORTSDIR}/devel/kdebindings4-ruby-korundum
+.endif
+
+.if !defined(WITHOUT_QTRUBY) || !defined(WITHOUT_KORUNDUM)
+RUN_DEPENDS+= ${KDE4_PREFIX}/lib/libqtruby4shared.so:${PORTSDIR}/devel/kdebindings4-ruby-qtruby
+.endif
-USE_RUBY= yes
-USE_KDE4= pimlibs
-USE_LDCONFIG= yes
-MAKE_JOBS_SAFE= yes
-
-BUILD_WRKSRC= ${WRKSRC}/${BINDLANG}
-
-CMAKE_ARGS+= -DRUBY_LIBRARY=${LOCALBASE}/lib/lib${RUBY_NAME}.so \
- -DRUBY_INCLUDE_PATH=${LOCALBASE}/lib/ruby/${RUBY_VER}/${RUBY_ARCH} \
- -DCUSTOM_RUBY_SITE_LIB_DIR=${RUBY_SITELIBDIR} \
- -DCUSTOM_RUBY_SITE_ARCH_DIR=${RUBY_SITEARCHLIBDIR}
-
-SUB_FILES= ${BINDLANG}-${PORTNAME}-env.sh pkg-message
-SUB_LIST+= RUBY_SITELIBDIR=${RUBY_SITELIBDIR} \
- RUBY_SITEARCHLIBDIR=${RUBY_SITEARCHLIBDIR}
-
-post-patch:
-.for f in Qt.cpp handlers.cpp marshall.h marshall_types.h marshall_types.cpp qtruby.cpp qtruby.h smokeruby.h
- ${REINPLACE_CMD} -e '/include/s,smoke/smoke.h,smoke.h,' ${BUILD_WRKSRC}/qtruby/src/${f}
-.endfor
- ${GREP} -H -r "#include <smoke" ${WRKSRC} | ${CUT} -d: -f1 | uniq | \
- ${XARGS} ${REINPLACE_CMD} -e '/include/s,smoke/qt/,smoke/,' -e '/include/s,smoke/kde/,smoke/,'
-
-post-install:
- ${MKDIR} ${PREFIX}/env
- ${INSTALL_SCRIPT} ${WRKDIR}/${BINDLANG}-${PORTNAME}-env.sh ${PREFIX}/env
- @${CAT} ${PKGMESSAGE}
-
-.include "${.CURDIR}/../../devel/kdebindings4/files/Makefile.kdebindings"
.include <bsd.port.pre.mk>
-#KrossRuby is broken with Ruby 1.9, see http://bugs.kde.org/243565
-.if ${RUBY_VER} == 1.9
-CMAKE_ARGS+= -DENABLE_KROSSRUBY=OFF
-PLIST_SUB+= KROSS="@comment "
-.else
-PLIST_SUB+= KROSS=""
+.if !defined(WITHOUT_KROSSRUBY) && ${RUBY_VER} != 1.9
+RUN_DEPENDS+= ${KDE4_PREFIX}/lib/kde4/krossruby.so:${PORTSDIR}/devel/kdebindings4-ruby-krossruby
.endif
+do-install:
+ ${DO_NADA}
+
.include <bsd.port.post.mk>
diff --git a/devel/kdebindings4-ruby/distinfo b/devel/kdebindings4-ruby/distinfo
deleted file mode 100644
index a151a6d05c49..000000000000
--- a/devel/kdebindings4-ruby/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (KDE/kdebindings-4.6.5.tar.bz2) = b87cf7ccd30a75121b032311c5f625d0a4d44c8c7b1f08c45b9292451da8ff91
-SIZE (KDE/kdebindings-4.6.5.tar.bz2) = 7078088
diff --git a/devel/kdebindings4-ruby/files/patch-ruby__CMakeLists.txt b/devel/kdebindings4-ruby/files/patch-ruby__CMakeLists.txt
deleted file mode 100644
index ab46d3218839..000000000000
--- a/devel/kdebindings4-ruby/files/patch-ruby__CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- ./ruby/CMakeLists.txt.orig 2010-08-27 12:11:01.000000000 +0400
-+++ ./ruby/CMakeLists.txt 2010-08-28 12:11:12.098116402 +0400
-@@ -1,3 +1,6 @@
-+include_directories(${KDE4_INCLUDE_DIR} ${KDE4_INCLUDE_DIR}/smoke)
-+link_directories(${KDE4_LIB_DIR})
-+
- project(Ruby)
-
- set(COMPILE_RUBY FALSE CACHE INTERNAL "")
diff --git a/devel/kdebindings4-ruby/files/patch-ruby__korundum__CMakeLists.txt b/devel/kdebindings4-ruby/files/patch-ruby__korundum__CMakeLists.txt
deleted file mode 100644
index 12f38311fc0b..000000000000
--- a/devel/kdebindings4-ruby/files/patch-ruby__korundum__CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
---- ./ruby/korundum/CMakeLists.txt.orig 2009-12-31 16:35:16.000000000 +0300
-+++ ./ruby/korundum/CMakeLists.txt 2010-06-29 23:56:33.355956607 +0400
-@@ -1,4 +1,3 @@
--add_subdirectory( examples )
- add_subdirectory( src )
- add_subdirectory( tools )
-
diff --git a/devel/kdebindings4-ruby/files/patch-ruby__korundum__modules__plasma__CMakeLists.txt b/devel/kdebindings4-ruby/files/patch-ruby__korundum__modules__plasma__CMakeLists.txt
deleted file mode 100644
index a3a08b7a9d4f..000000000000
--- a/devel/kdebindings4-ruby/files/patch-ruby__korundum__modules__plasma__CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
---- ./ruby/korundum/modules/plasma/CMakeLists.txt.orig 2009-12-31 16:35:17.000000000 +0300
-+++ ./ruby/korundum/modules/plasma/CMakeLists.txt 2010-06-29 23:53:54.555676654 +0400
-@@ -1,2 +1 @@
--add_subdirectory( examples )
- add_subdirectory( src )
diff --git a/devel/kdebindings4-ruby/files/patch-ruby__qtruby__src__CMakeLists.txt b/devel/kdebindings4-ruby/files/patch-ruby__qtruby__src__CMakeLists.txt
deleted file mode 100644
index fdb5d6dac694..000000000000
--- a/devel/kdebindings4-ruby/files/patch-ruby__qtruby__src__CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./ruby/qtruby/src/CMakeLists.txt.orig 2010-12-05 02:02:26.122175928 +1000
-+++ ./ruby/qtruby/src/CMakeLists.txt 2010-12-05 02:02:41.605171951 +1000
-@@ -5,15 +5,15 @@
- ADD_DEFINITIONS (-DQT_QTDBUS)
- ENDIF(QT_QTDBUS_FOUND)
-
--IF(QWT_FOUND)
-+IF(Qwt5_FOUND)
- ADD_DEFINITIONS (-DQT_QWT)
--ENDIF(QWT_FOUND)
-+ENDIF(Qwt5_FOUND)
-
- if(RUBY_VERSION)
- ADD_DEFINITIONS (-DRUBY_VERSION=0x${RUBY_VERSION_NUMBER})
- ENDIF(RUBY_VERSION)
-
--include_directories( ${CMAKE_SOURCE_DIR}/smoke/qt ${CMAKE_SOURCE_DIR}/generator ${RUBY_INCLUDE_DIRS} )
-+include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/smoke/qt ${CMAKE_SOURCE_DIR}/generator ${RUBY_INCLUDE_DIRS} )
- INCLUDE_DIRECTORIES (${QT_INCLUDES})
-
-
diff --git a/devel/kdebindings4-ruby/pkg-descr b/devel/kdebindings4-ruby/pkg-descr
index 88da7c97f8a0..bd5a85c820bf 100644
--- a/devel/kdebindings4-ruby/pkg-descr
+++ b/devel/kdebindings4-ruby/pkg-descr
@@ -1,3 +1,3 @@
-This port provides Ruby bindings for Qt and KDE.
+Ruby bindings for KDE.
WWW: http://www.kde.org/
diff --git a/devel/kdebindings4-smoke-smokegen/Makefile b/devel/kdebindings4-smoke-smokegen/Makefile
new file mode 100644
index 000000000000..0046e6d1a2f8
--- /dev/null
+++ b/devel/kdebindings4-smoke-smokegen/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for: kdebindings4-smoke-smokegen
+# Date crated: 1 September 2011
+# Whom: Alberto Villa <avilla@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME= smokegen
+PORTVERSION= ${KDE4_VERSION}
+CATEGORIES= devel kde
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+PKGNAMEPREFIX= kdebindings-smoke-
+DIST_SUBDIR= KDE
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= SMOKE bindings for KDE
+
+CONFLICTS= kdebindings-smoke-4.[0-6].*
+
+USE_KDE4= kdehier kdeprefix
+USE_QT_VER= 4
+QT_COMPONENTS= xml qmake_build moc_build uic_build rcc_build
+USE_BZIP2= yes
+USE_CMAKE= yes
+CMAKE_ARGS+= -DSMOKE_CMAKE_MODULE_DIR:PATH=${PREFIX}/lib/cmake/smoke
+MAKE_JOBS_SAFE= yes
+USE_LDCONFIG= yes
+
+pre-configure:
+ ${REINPLACE_CMD} -e 's|share/smoke/cmake|lib/cmake/smoke|g' \
+ ${WRKSRC}/smokebase/CMakeLists.txt
+
+.include <bsd.port.mk>
diff --git a/devel/kdebindings4-smoke-smokegen/distinfo b/devel/kdebindings4-smoke-smokegen/distinfo
new file mode 100644
index 000000000000..3b08f1f2b953
--- /dev/null
+++ b/devel/kdebindings4-smoke-smokegen/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/smokegen-4.7.2.tar.bz2) = b30947d42c637921c00bb42eb50cfcf8e30f8ce61dcf7e12663bfa86ace16879
+SIZE (KDE/smokegen-4.7.2.tar.bz2) = 149069
diff --git a/devel/kdebindings4-smoke-smokegen/files/patch-cmake__CMakeLists.txt b/devel/kdebindings4-smoke-smokegen/files/patch-cmake__CMakeLists.txt
new file mode 100644
index 000000000000..c65ef9bbb1e0
--- /dev/null
+++ b/devel/kdebindings4-smoke-smokegen/files/patch-cmake__CMakeLists.txt
@@ -0,0 +1,9 @@
+--- ./cmake/CMakeLists.txt.orig 2011-09-02 10:45:20.417638425 +0200
++++ ./cmake/CMakeLists.txt 2011-09-02 10:47:24.107638581 +0200
+@@ -21,4 +21,5 @@
+ MacroOptionalFindPackage.cmake
+ )
+
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SmokeConfig.cmake ${smoke_cmake_files} DESTINATION ${SMOKE_CMAKE_MODULE_DIR})
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/SmokeConfig.cmake DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/cmake/smoke)
++install(FILES ${smoke_cmake_files} DESTINATION ${SMOKE_CMAKE_MODULE_DIR})
diff --git a/devel/kdebindings4-smoke-smokegen/pkg-descr b/devel/kdebindings4-smoke-smokegen/pkg-descr
new file mode 100644
index 000000000000..39f1e8b9281c
--- /dev/null
+++ b/devel/kdebindings4-smoke-smokegen/pkg-descr
@@ -0,0 +1,5 @@
+SMOKE stands for "Scripting Meta Object Kompiler Engine".
+SMOKE is language-independent enough for other bindings (e.g. to
+other scripting languages) to be based on it.
+
+WWW: http://www.kde.org/
diff --git a/devel/kdebindings4-smoke-smokegen/pkg-plist b/devel/kdebindings4-smoke-smokegen/pkg-plist
new file mode 100644
index 000000000000..d13556025d26
--- /dev/null
+++ b/devel/kdebindings4-smoke-smokegen/pkg-plist
@@ -0,0 +1,36 @@
+bin/smokeapi
+bin/smokegen
+include/smoke.h
+include/smokegen/generator_export.h
+include/smokegen/generatorenvironment.h
+include/smokegen/generatorpreprocessor.h
+include/smokegen/generatorvisitor.h
+include/smokegen/name_compiler.h
+include/smokegen/options.h
+include/smokegen/type.h
+include/smokegen/type_compiler.h
+lib/cmake/smoke/SmokeConfig.cmake
+lib/cmake/smoke/SmokeVersionConfig.cmake
+lib/libcppparser.so
+lib/libsmokebase.so
+lib/libsmokebase.so.3
+lib/libsmokebase.so.3.0.0
+lib/smokegen/generator_dump.so
+lib/smokegen/generator_smoke.so
+share/smoke/cmake/FindLibraryWithDebug.cmake
+share/smoke/cmake/FindPhonon.cmake
+share/smoke/cmake/FindQImageBlitz.cmake
+share/smoke/cmake/FindQScintilla.cmake
+share/smoke/cmake/FindQwt5.cmake
+share/smoke/cmake/HandleImportedTargetsInCMakeRequiredLibraries.cmake
+share/smoke/cmake/MacroLogFeature.cmake
+share/smoke/cmake/MacroOptionalAddBindings.cmake
+share/smoke/cmake/MacroOptionalFindPackage.cmake
+share/smokegen/string.h
+@dirrmtry share/smokegen
+@dirrm share/smoke/cmake
+@dirrm share/smoke
+@dirrm lib/smokegen
+@dirrm lib/cmake/smoke
+@dirrmtry lib/cmake
+@dirrm include/smokegen
diff --git a/devel/kdebindings4-smoke-smokekde/Makefile b/devel/kdebindings4-smoke-smokekde/Makefile
new file mode 100644
index 000000000000..1dd83480d0f0
--- /dev/null
+++ b/devel/kdebindings4-smoke-smokekde/Makefile
@@ -0,0 +1,42 @@
+# New ports collection makefile for: kdebindings4-smoke
+# Date created: 2008-08-19
+# Whom: Max Brazhnikov <makc@issp.ac.ru>
+#
+# $FreeBSD$
+#
+
+PORTNAME= smokekde
+PORTVERSION= ${KDE4_VERSION}
+CATEGORIES= devel kde
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+PKGNAMEPREFIX= kdebindings-smoke-
+DIST_SUBDIR= KDE
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= SMOKE bindings for KDE
+
+LIB_DEPENDS= okularcore.1:${PORTSDIR}/graphics/okular \
+ kateinterfaces.5:${PORTSDIR}/editors/kate \
+ smokeqtcore.3:${PORTSDIR}/devel/kdebindings4-smoke-smokeqt \
+ soprano.4:${PORTSDIR}/textproc/soprano \
+ smokebase.3:${PORTSDIR}/devel/kdebindings4-smoke-smokegen
+
+CONFLICTS= kdebindings-smoke-4.[0-6].*
+
+USE_KDE4= kdehier kdelibs kdeprefix pimlibs akonadi automoc4
+USE_QT_VER= 4
+QT_COMPONENTS= dbus designer gui network opengl qt3support sql svg xml \
+ qmake_build moc_build uic_build rcc_build
+USE_BZIP2= yes
+USE_CMAKE= yes
+# Attica bindings often cause the build to coredump.
+CMAKE_ARGS+= -DWITH_LibAttica:BOOL=FALSE
+MAKE_JOBS_SAFE= yes
+USE_LDCONFIG= yes
+
+pre-configure:
+ ${REINPLACE_CMD} -e '/kde-config.xml/ s|$${SMOKE_GEN_BIN}|smokegen|' \
+ ${WRKSRC}/kdecore/CMakeLists.txt
+
+.include <bsd.port.mk>
diff --git a/devel/kdebindings4-smoke-smokekde/distinfo b/devel/kdebindings4-smoke-smokekde/distinfo
new file mode 100644
index 000000000000..f5a028e05523
--- /dev/null
+++ b/devel/kdebindings4-smoke-smokekde/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/smokekde-4.7.2.tar.bz2) = b1ce3d39ee2d181f56156e29aa77b6240c0b80f05bec734e676cdfb6fa0b15ff
+SIZE (KDE/smokekde-4.7.2.tar.bz2) = 37533
diff --git a/devel/kdebindings4-smoke-smokekde/pkg-descr b/devel/kdebindings4-smoke-smokekde/pkg-descr
new file mode 100644
index 000000000000..39f1e8b9281c
--- /dev/null
+++ b/devel/kdebindings4-smoke-smokekde/pkg-descr
@@ -0,0 +1,5 @@
+SMOKE stands for "Scripting Meta Object Kompiler Engine".
+SMOKE is language-independent enough for other bindings (e.g. to
+other scripting languages) to be based on it.
+
+WWW: http://www.kde.org/
diff --git a/devel/kdebindings4-smoke-smokekde/pkg-plist b/devel/kdebindings4-smoke-smokekde/pkg-plist
new file mode 100644
index 000000000000..7218861c784f
--- /dev/null
+++ b/devel/kdebindings4-smoke-smokekde/pkg-plist
@@ -0,0 +1,87 @@
+include/smoke/akonadi_smoke.h
+@comment include/smoke/attica_smoke.h
+include/smoke/kate_smoke.h
+include/smoke/kdecore_smoke.h
+include/smoke/kdeui_smoke.h
+include/smoke/kfile_smoke.h
+include/smoke/khtml_smoke.h
+include/smoke/kio_smoke.h
+include/smoke/knewstuff2_smoke.h
+include/smoke/knewstuff3_smoke.h
+include/smoke/kparts_smoke.h
+include/smoke/ktexteditor_smoke.h
+include/smoke/kutils_smoke.h
+include/smoke/nepomuk_smoke.h
+include/smoke/nepomukquery_smoke.h
+include/smoke/okular_smoke.h
+include/smoke/plasma_smoke.h
+include/smoke/solid_smoke.h
+include/smoke/soprano_smoke.h
+include/smoke/sopranoclient_smoke.h
+include/smoke/sopranoserver_smoke.h
+lib/libsmokeakonadi.so
+lib/libsmokeakonadi.so.3
+lib/libsmokeakonadi.so.3.0.0
+@comment lib/libsmokeattica.so
+@comment lib/libsmokeattica.so.3
+@comment lib/libsmokeattica.so.3.0.0
+lib/libsmokekate.so
+lib/libsmokekate.so.3
+lib/libsmokekate.so.3.0.0
+lib/libsmokekdecore.so
+lib/libsmokekdecore.so.3
+lib/libsmokekdecore.so.3.0.0
+lib/libsmokekdeui.so
+lib/libsmokekdeui.so.3
+lib/libsmokekdeui.so.3.0.0
+lib/libsmokekfile.so
+lib/libsmokekfile.so.3
+lib/libsmokekfile.so.3.0.0
+lib/libsmokekhtml.so
+lib/libsmokekhtml.so.3
+lib/libsmokekhtml.so.3.0.0
+lib/libsmokekio.so
+lib/libsmokekio.so.3
+lib/libsmokekio.so.3.0.0
+lib/libsmokeknewstuff2.so
+lib/libsmokeknewstuff2.so.3
+lib/libsmokeknewstuff2.so.3.0.0
+lib/libsmokeknewstuff3.so
+lib/libsmokeknewstuff3.so.3
+lib/libsmokeknewstuff3.so.3.0.0
+lib/libsmokekparts.so
+lib/libsmokekparts.so.3
+lib/libsmokekparts.so.3.0.0
+lib/libsmokektexteditor.so
+lib/libsmokektexteditor.so.3
+lib/libsmokektexteditor.so.3.0.0
+lib/libsmokekutils.so
+lib/libsmokekutils.so.3
+lib/libsmokekutils.so.3.0.0
+lib/libsmokenepomuk.so
+lib/libsmokenepomuk.so.3
+lib/libsmokenepomuk.so.3.0.0
+lib/libsmokenepomukquery.so
+lib/libsmokenepomukquery.so.3
+lib/libsmokenepomukquery.so.3.0.0
+lib/libsmokeokular.so
+lib/libsmokeokular.so.3
+lib/libsmokeokular.so.3.0.0
+lib/libsmokeplasma.so
+lib/libsmokeplasma.so.3
+lib/libsmokeplasma.so.3.0.0
+lib/libsmokesolid.so
+lib/libsmokesolid.so.3
+lib/libsmokesolid.so.3.0.0
+lib/libsmokesoprano.so
+lib/libsmokesoprano.so.3
+lib/libsmokesoprano.so.3.0.0
+lib/libsmokesopranoclient.so
+lib/libsmokesopranoclient.so.3
+lib/libsmokesopranoclient.so.3.0.0
+lib/libsmokesopranoserver.so
+lib/libsmokesopranoserver.so.3
+lib/libsmokesopranoserver.so.3.0.0
+share/smokegen/kde-config.xml
+@dirrmtry share/smokegen
+@dirrmtry include/smoke
diff --git a/devel/kdebindings4-smoke-smokeqt/Makefile b/devel/kdebindings4-smoke-smokeqt/Makefile
new file mode 100644
index 000000000000..7fa7be7aa20b
--- /dev/null
+++ b/devel/kdebindings4-smoke-smokeqt/Makefile
@@ -0,0 +1,38 @@
+# New ports collection makefile for: kdebindings4-smoke
+# Date created: 2008-08-19
+# Whom: Max Brazhnikov <makc@issp.ac.ru>
+#
+# $FreeBSD$
+#
+
+PORTNAME= smokeqt
+PORTVERSION= ${KDE4_VERSION}
+CATEGORIES= devel kde
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
+PKGNAMEPREFIX= kdebindings-smoke-
+DIST_SUBDIR= KDE
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= SMOKE bindings for Qt
+
+LIB_DEPENDS= qscintilla2.5:${PORTSDIR}/devel/qscintilla2 \
+ qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
+ qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
+ smokebase.3:${PORTSDIR}/devel/kdebindings4-smoke-smokegen
+
+CONFLICTS= kdebindings-smoke-4.[0-6].*
+
+USE_KDE4= kdehier kdeprefix
+USE_QT_VER= 4
+QT_COMPONENTS= dbus declarative designer gui help multimedia \
+ network opengl phonon qt3support qtestlib \
+ script sql svg xml xmlpatterns webkit \
+ qmake_build moc_build uic_build rcc_build
+USE_BZIP2= yes
+USE_CMAKE= yes
+MAKE_JOBS_SAFE= yes
+CFLAGS+= -I/usr/local/include
+USE_LDCONFIG= yes
+
+.include <bsd.port.mk>
diff --git a/devel/kdebindings4-smoke-smokeqt/distinfo b/devel/kdebindings4-smoke-smokeqt/distinfo
new file mode 100644
index 000000000000..bd721f1d5281
--- /dev/null
+++ b/devel/kdebindings4-smoke-smokeqt/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/smokeqt-4.7.2.tar.bz2) = 2700ba5426d03250f419c3b3e3c0b3ecfbbefa2690d9fdd6ab6e0ef093d71362
+SIZE (KDE/smokeqt-4.7.2.tar.bz2) = 29847
diff --git a/devel/kdebindings4-smoke-smokeqt/pkg-descr b/devel/kdebindings4-smoke-smokeqt/pkg-descr
new file mode 100644
index 000000000000..39f1e8b9281c
--- /dev/null
+++ b/devel/kdebindings4-smoke-smokeqt/pkg-descr
@@ -0,0 +1,5 @@
+SMOKE stands for "Scripting Meta Object Kompiler Engine".
+SMOKE is language-independent enough for other bindings (e.g. to
+other scripting languages) to be based on it.
+
+WWW: http://www.kde.org/
diff --git a/devel/kdebindings4-smoke-smokeqt/pkg-plist b/devel/kdebindings4-smoke-smokeqt/pkg-plist
new file mode 100644
index 000000000000..5002d482b394
--- /dev/null
+++ b/devel/kdebindings4-smoke-smokeqt/pkg-plist
@@ -0,0 +1,88 @@
+include/smoke/phonon_smoke.h
+include/smoke/qimageblitz_smoke.h
+include/smoke/qsci_smoke.h
+include/smoke/qt3support_smoke.h
+include/smoke/qtcore_smoke.h
+include/smoke/qtdbus_smoke.h
+include/smoke/qtdeclarative_smoke.h
+include/smoke/qtgui_smoke.h
+include/smoke/qthelp_smoke.h
+include/smoke/qtmultimedia_smoke.h
+include/smoke/qtnetwork_smoke.h
+include/smoke/qtopengl_smoke.h
+include/smoke/qtscript_smoke.h
+include/smoke/qtsql_smoke.h
+include/smoke/qtsvg_smoke.h
+include/smoke/qttest_smoke.h
+include/smoke/qtuitools_smoke.h
+include/smoke/qtwebkit_smoke.h
+include/smoke/qtxml_smoke.h
+include/smoke/qtxmlpatterns_smoke.h
+include/smoke/qwt_smoke.h
+lib/libsmokephonon.so
+lib/libsmokephonon.so.3
+lib/libsmokephonon.so.3.0.0
+lib/libsmokeqimageblitz.so
+lib/libsmokeqimageblitz.so.3
+lib/libsmokeqimageblitz.so.3.0.0
+lib/libsmokeqsci.so
+lib/libsmokeqsci.so.3
+lib/libsmokeqsci.so.3.0.0
+lib/libsmokeqt3support.so
+lib/libsmokeqt3support.so.3
+lib/libsmokeqt3support.so.3.0.0
+lib/libsmokeqtcore.so
+lib/libsmokeqtcore.so.3
+lib/libsmokeqtcore.so.3.0.0
+lib/libsmokeqtdbus.so
+lib/libsmokeqtdbus.so.3
+lib/libsmokeqtdbus.so.3.0.0
+lib/libsmokeqtdeclarative.so
+lib/libsmokeqtdeclarative.so.3
+lib/libsmokeqtdeclarative.so.3.0.0
+lib/libsmokeqtgui.so
+lib/libsmokeqtgui.so.3
+lib/libsmokeqtgui.so.3.0.0
+lib/libsmokeqthelp.so
+lib/libsmokeqthelp.so.3
+lib/libsmokeqthelp.so.3.0.0
+lib/libsmokeqtmultimedia.so
+lib/libsmokeqtmultimedia.so.3
+lib/libsmokeqtmultimedia.so.3.0.0
+lib/libsmokeqtnetwork.so
+lib/libsmokeqtnetwork.so.3
+lib/libsmokeqtnetwork.so.3.0.0
+lib/libsmokeqtopengl.so
+lib/libsmokeqtopengl.so.3
+lib/libsmokeqtopengl.so.3.0.0
+lib/libsmokeqtscript.so
+lib/libsmokeqtscript.so.3
+lib/libsmokeqtscript.so.3.0.0
+lib/libsmokeqtsql.so
+lib/libsmokeqtsql.so.3
+lib/libsmokeqtsql.so.3.0.0
+lib/libsmokeqtsvg.so
+lib/libsmokeqtsvg.so.3
+lib/libsmokeqtsvg.so.3.0.0
+lib/libsmokeqttest.so
+lib/libsmokeqttest.so.3
+lib/libsmokeqttest.so.3.0.0
+lib/libsmokeqtuitools.so
+lib/libsmokeqtuitools.so.3
+lib/libsmokeqtuitools.so.3.0.0
+lib/libsmokeqtwebkit.so
+lib/libsmokeqtwebkit.so.3
+lib/libsmokeqtwebkit.so.3.0.0
+lib/libsmokeqtxml.so
+lib/libsmokeqtxml.so.3
+lib/libsmokeqtxml.so.3.0.0
+lib/libsmokeqtxmlpatterns.so
+lib/libsmokeqtxmlpatterns.so.3
+lib/libsmokeqtxmlpatterns.so.3.0.0
+lib/libsmokeqwt.so
+lib/libsmokeqwt.so.3
+lib/libsmokeqwt.so.3.0.0
+share/smokegen/qt-config.xml
+share/smokegen/qtdefines
+@dirrmtry share/smokegen
+@dirrmtry include/smoke
diff --git a/devel/kdebindings4-smoke/Makefile b/devel/kdebindings4-smoke/Makefile
index 8f8fd78a1f7c..cb76d81aca63 100644
--- a/devel/kdebindings4-smoke/Makefile
+++ b/devel/kdebindings4-smoke/Makefile
@@ -1,42 +1,36 @@
# New ports collection makefile for: kdebindings4-smoke
-# Date created: 2008-08-19
-# Whom: Max Brazhnikov <makc@issp.ac.ru>
+# Date created: 1 September 2011
+# Whom: Alberto Villa <avilla@FreeBSD.org>
#
# $FreeBSD$
#
-PORTNAME= kdebindings
+PORTNAME= kdebindings-smoke
PORTVERSION= ${KDE4_VERSION}
CATEGORIES= devel kde
+MASTER_SITES= # empty
+DISTFILES= # empty
MAINTAINER= kde@FreeBSD.org
-COMMENT= SMOKE bindings for Qt/KDE
+COMMENT= Meta port of SMOKE bindings for KDE
-LIB_DEPENDS= qscintilla2.5:${PORTSDIR}/devel/qscintilla2 \
- qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
- okularcore.1:${PORTSDIR}/graphics/kdegraphics4 \
- kateinterfaces.5:${PORTSDIR}/devel/kdesdk4 \
- qwt.5:${PORTSDIR}/x11-toolkits/qwt5
+USE_KDE4= kdeprefix
+NO_BUILD= yes
-BINDLANG= smoke
+OPTIONS= SMOKEKDE "KDE bindings (requires SMOKEQT)" on \
+ SMOKEQT "Qt bindings" on
-QT_COMPONENTS= declarative help multimedia qt3support
-USE_KDE4= pimlibs
-CMAKE_ARGS= -DDISABLE_Attica:BOOL=TRUE
-USE_LDCONFIG= yes
-MAKE_JOBS_SAFE= yes
+.include <bsd.port.options.mk>
-BUILD_WRKSRC= ${WRKSRC}/${BINDLANG}
+.if !defined(WITHOUT_SMOKEKDE)
+RUN_DEPENDS+= ${KDE4_PREFIX}/lib/libsmokekdecore.so:${PORTSDIR}/devel/kdebindings4-smoke-smokekde
+.endif
-.include "${.CURDIR}/../../devel/kdebindings4/files/Makefile.kdebindings"
+.if !defined(WITHOUT_SMOKEQT) || !defined(WITHOUT_SMOKEKDE)
+RUN_DEPENDS+= ${KDE4_PREFIX}/lib/libsmokeqtcore.so:${PORTSDIR}/devel/kdebindings4-smoke-smokeqt
+.endif
-pre-configure:
- @cd ${WRKSRC}/generator && ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS}
-
-pre-build:
- @cd ${WRKSRC}/generator && ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS}
-
-pre-install:
- @cd ${WRKSRC}/generator && ${SETENV} ${MAKE_ENV} ${MAKE} ${INSTALL_TARGET}
+do-install:
+ ${DO_NADA}
.include <bsd.port.mk>
diff --git a/devel/kdebindings4-smoke/distinfo b/devel/kdebindings4-smoke/distinfo
deleted file mode 100644
index a151a6d05c49..000000000000
--- a/devel/kdebindings4-smoke/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (KDE/kdebindings-4.6.5.tar.bz2) = b87cf7ccd30a75121b032311c5f625d0a4d44c8c7b1f08c45b9292451da8ff91
-SIZE (KDE/kdebindings-4.6.5.tar.bz2) = 7078088
diff --git a/devel/kdebindings4-smoke/pkg-descr b/devel/kdebindings4-smoke/pkg-descr
index 39f1e8b9281c..e70bbd37fad4 100644
--- a/devel/kdebindings4-smoke/pkg-descr
+++ b/devel/kdebindings4-smoke/pkg-descr
@@ -1,5 +1,3 @@
-SMOKE stands for "Scripting Meta Object Kompiler Engine".
-SMOKE is language-independent enough for other bindings (e.g. to
-other scripting languages) to be based on it.
+SMOKE bindings for KDE.
WWW: http://www.kde.org/
diff --git a/devel/kdebindings4-smoke/pkg-plist b/devel/kdebindings4-smoke/pkg-plist
deleted file mode 100644
index e8c2d37733a4..000000000000
--- a/devel/kdebindings4-smoke/pkg-plist
+++ /dev/null
@@ -1,192 +0,0 @@
-bin/smokeapi
-bin/smokegen
-include/smoke.h
-include/smoke/akonadi_smoke.h
-@comment include/smoke/attica_smoke.h
-include/smoke/kate_smoke.h
-include/smoke/kdecore_smoke.h
-include/smoke/kdeui_smoke.h
-include/smoke/kfile_smoke.h
-include/smoke/khtml_smoke.h
-include/smoke/kio_smoke.h
-include/smoke/knewstuff2_smoke.h
-include/smoke/knewstuff3_smoke.h
-include/smoke/kparts_smoke.h
-include/smoke/ktexteditor_smoke.h
-include/smoke/kutils_smoke.h
-include/smoke/nepomuk_smoke.h
-include/smoke/nepomukquery_smoke.h
-include/smoke/okular_smoke.h
-include/smoke/phonon_smoke.h
-include/smoke/plasma_smoke.h
-include/smoke/qimageblitz_smoke.h
-include/smoke/qsci_smoke.h
-include/smoke/qt3support_smoke.h
-include/smoke/qtcore_smoke.h
-include/smoke/qtdbus_smoke.h
-include/smoke/qtdeclarative_smoke.h
-include/smoke/qtgui_smoke.h
-include/smoke/qthelp_smoke.h
-include/smoke/qtmultimedia_smoke.h
-include/smoke/qtnetwork_smoke.h
-include/smoke/qtopengl_smoke.h
-include/smoke/qtscript_smoke.h
-include/smoke/qtsql_smoke.h
-include/smoke/qtsvg_smoke.h
-include/smoke/qttest_smoke.h
-include/smoke/qtuitools_smoke.h
-include/smoke/qtwebkit_smoke.h
-include/smoke/qtxml_smoke.h
-include/smoke/qtxmlpatterns_smoke.h
-include/smoke/qwt_smoke.h
-include/smoke/solid_smoke.h
-include/smoke/soprano_smoke.h
-include/smoke/sopranoclient_smoke.h
-include/smoke/sopranoserver_smoke.h
-include/smokegen/generator_export.h
-include/smokegen/generatorenvironment.h
-include/smokegen/generatorpreprocessor.h
-include/smokegen/generatorvisitor.h
-include/smokegen/name_compiler.h
-include/smokegen/options.h
-include/smokegen/type.h
-include/smokegen/type_compiler.h
-lib/libcppparser.so
-lib/libsmokeakonadi.so
-lib/libsmokeakonadi.so.3
-lib/libsmokeakonadi.so.3.0.0
-@comment lib/libsmokeattica.so
-@comment lib/libsmokeattica.so.3
-@comment lib/libsmokeattica.so.3.0.0
-lib/libsmokebase.so
-lib/libsmokebase.so.3
-lib/libsmokebase.so.3.0.0
-lib/libsmokekate.so
-lib/libsmokekate.so.3
-lib/libsmokekate.so.3.0.0
-lib/libsmokekdecore.so
-lib/libsmokekdecore.so.3
-lib/libsmokekdecore.so.3.0.0
-lib/libsmokekdeui.so
-lib/libsmokekdeui.so.3
-lib/libsmokekdeui.so.3.0.0
-lib/libsmokekfile.so
-lib/libsmokekfile.so.3
-lib/libsmokekfile.so.3.0.0
-lib/libsmokekhtml.so
-lib/libsmokekhtml.so.3
-lib/libsmokekhtml.so.3.0.0
-lib/libsmokekio.so
-lib/libsmokekio.so.3
-lib/libsmokekio.so.3.0.0
-lib/libsmokeknewstuff2.so
-lib/libsmokeknewstuff2.so.3
-lib/libsmokeknewstuff2.so.3.0.0
-lib/libsmokeknewstuff3.so
-lib/libsmokeknewstuff3.so.3
-lib/libsmokeknewstuff3.so.3.0.0
-lib/libsmokekparts.so
-lib/libsmokekparts.so.3
-lib/libsmokekparts.so.3.0.0
-lib/libsmokektexteditor.so
-lib/libsmokektexteditor.so.3
-lib/libsmokektexteditor.so.3.0.0
-lib/libsmokekutils.so
-lib/libsmokekutils.so.3
-lib/libsmokekutils.so.3.0.0
-lib/libsmokenepomuk.so
-lib/libsmokenepomuk.so.3
-lib/libsmokenepomuk.so.3.0.0
-lib/libsmokenepomukquery.so
-lib/libsmokenepomukquery.so.3
-lib/libsmokenepomukquery.so.3.0.0
-lib/libsmokeokular.so
-lib/libsmokeokular.so.3
-lib/libsmokeokular.so.3.0.0
-lib/libsmokephonon.so
-lib/libsmokephonon.so.3
-lib/libsmokephonon.so.3.0.0
-lib/libsmokeplasma.so
-lib/libsmokeplasma.so.3
-lib/libsmokeplasma.so.3.0.0
-lib/libsmokeqimageblitz.so
-lib/libsmokeqimageblitz.so.3
-lib/libsmokeqimageblitz.so.3.0.0
-lib/libsmokeqsci.so
-lib/libsmokeqsci.so.3
-lib/libsmokeqsci.so.3.0.0
-lib/libsmokeqt3support.so
-lib/libsmokeqt3support.so.3
-lib/libsmokeqt3support.so.3.0.0
-lib/libsmokeqtcore.so
-lib/libsmokeqtcore.so.3
-lib/libsmokeqtcore.so.3.0.0
-lib/libsmokeqtdbus.so
-lib/libsmokeqtdbus.so.3
-lib/libsmokeqtdbus.so.3.0.0
-lib/libsmokeqtdeclarative.so
-lib/libsmokeqtdeclarative.so.3
-lib/libsmokeqtdeclarative.so.3.0.0
-lib/libsmokeqtgui.so
-lib/libsmokeqtgui.so.3
-lib/libsmokeqtgui.so.3.0.0
-lib/libsmokeqthelp.so
-lib/libsmokeqthelp.so.3
-lib/libsmokeqthelp.so.3.0.0
-lib/libsmokeqtmultimedia.so
-lib/libsmokeqtmultimedia.so.3
-lib/libsmokeqtmultimedia.so.3.0.0
-lib/libsmokeqtnetwork.so
-lib/libsmokeqtnetwork.so.3
-lib/libsmokeqtnetwork.so.3.0.0
-lib/libsmokeqtopengl.so
-lib/libsmokeqtopengl.so.3
-lib/libsmokeqtopengl.so.3.0.0
-lib/libsmokeqtscript.so
-lib/libsmokeqtscript.so.3
-lib/libsmokeqtscript.so.3.0.0
-lib/libsmokeqtsql.so
-lib/libsmokeqtsql.so.3
-lib/libsmokeqtsql.so.3.0.0
-lib/libsmokeqtsvg.so
-lib/libsmokeqtsvg.so.3
-lib/libsmokeqtsvg.so.3.0.0
-lib/libsmokeqttest.so
-lib/libsmokeqttest.so.3
-lib/libsmokeqttest.so.3.0.0
-lib/libsmokeqtuitools.so
-lib/libsmokeqtuitools.so.3
-lib/libsmokeqtuitools.so.3.0.0
-lib/libsmokeqtwebkit.so
-lib/libsmokeqtwebkit.so.3
-lib/libsmokeqtwebkit.so.3.0.0
-lib/libsmokeqtxml.so
-lib/libsmokeqtxml.so.3
-lib/libsmokeqtxml.so.3.0.0
-lib/libsmokeqtxmlpatterns.so
-lib/libsmokeqtxmlpatterns.so.3
-lib/libsmokeqtxmlpatterns.so.3.0.0
-lib/libsmokeqwt.so
-lib/libsmokeqwt.so.3
-lib/libsmokeqwt.so.3.0.0
-lib/libsmokesolid.so
-lib/libsmokesolid.so.3
-lib/libsmokesolid.so.3.0.0
-lib/libsmokesoprano.so
-lib/libsmokesoprano.so.3
-lib/libsmokesoprano.so.3.0.0
-lib/libsmokesopranoclient.so
-lib/libsmokesopranoclient.so.3
-lib/libsmokesopranoclient.so.3.0.0
-lib/libsmokesopranoserver.so
-lib/libsmokesopranoserver.so.3
-lib/libsmokesopranoserver.so.3.0.0
-lib/smokegen/generator_dump.so
-lib/smokegen/generator_smoke.so
-share/smokegen/kde-config.xml
-share/smokegen/qt-config.xml
-share/smokegen/qtdefines
-@dirrm share/smokegen
-@dirrm lib/smokegen
-@dirrm include/smokegen
-@dirrm include/smoke
diff --git a/devel/kdebindings4/Makefile b/devel/kdebindings4/Makefile
index d916e69416c5..0d750f10005b 100644
--- a/devel/kdebindings4/Makefile
+++ b/devel/kdebindings4/Makefile
@@ -15,35 +15,24 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= KDE bindings meta port
USE_KDE4= kdeprefix
+USE_PYTHON= yes
+PYTHON_NO_DEPENDS= yes
+USE_RUBY= yes
+RUBY_NO_BUILD_DEPENDS= yes
+RUBY_NO_RUN_DEPENDS= yes
NO_BUILD= yes
-# NO_INSTALL= yes
-# OPTIONS+= CSHARP "C# bindings" on
-# OPTIONS+= JAVA "Java bindings" on
-# OPTIONS+= PHP "PHP bindings" on
-OPTIONS+= PYTHON "Python bindings" on
-OPTIONS+= RUBY "Ruby bindings" on
+OPTIONS= PYTHON "Python bindings" on \
+ RUBY "Ruby bindings" on
.include <bsd.port.options.mk>
-# .if !defined(WITHOUT_CSHARP)
-# RUN_DEPENDS+= kdebindings-csharp>=4.1.0:${PORTSDIR}/devel/kdebindings4-csharp
-# .endif
-#
-# .if !defined(WITHOUT_JAVA)
-# RUN_DEPENDS+= kdebindings-java>=4.1.0:${PORTSDIR}/devel/kdebindings4-java
-# .endif
-#
-# .if !defined(WITHOUT_PHP)
-# RUN_DEPENDS+= kdebindings-php>=4.1.0:${PORTSDIR}/devel/kdebindings4-php
-# .endif
-
.if !defined(WITHOUT_PYTHON)
-RUN_DEPENDS+= kdebindings-python>=4.1.0:${PORTSDIR}/devel/kdebindings4-python
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}kdebindings>=4.1.0:${PORTSDIR}/devel/kdebindings4-python
.endif
.if !defined(WITHOUT_RUBY)
-RUN_DEPENDS+= ${KDE4_PREFIX}/bin/krubyapplication:${PORTSDIR}/devel/kdebindings4-ruby
+RUN_DEPENDS+= ${RUBY_PKGNAMEPREFIX}kdebindings>=4.7.0:${PORTSDIR}/devel/kdebindings4-ruby
.endif
do-install:
diff --git a/devel/kdebindings4/files/Makefile.kdebindings b/devel/kdebindings4/files/Makefile.kdebindings
deleted file mode 100644
index 861317362b1c..000000000000
--- a/devel/kdebindings4/files/Makefile.kdebindings
+++ /dev/null
@@ -1,53 +0,0 @@
-# New ports collection makefile for: kdebindings4
-# Date created: 2008-08-19
-# Whom: Max Brazhnikov <makc@issp.ac.ru>
-#
-# $FreeBSD$
-#
-
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
-PKGNAMEPREFIX?= ${${BINDLANG}_PKGNAMEPREFIX}
-PKGNAMESUFFIX?= ${${BINDLANG}_PKGNAMESUFFIX}
-DIST_SUBDIR= KDE
-UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-
-COMMENT?= ${${BINDLANG}_COMMENT}
-
-USE_BZIP2= yes
-USE_CMAKE= yes
-USE_KDE4+= kdelibs automoc4 kdehier kdeprefix
-USE_QT_VER= 4
-QT_COMPONENTS+= corelib qmake_build moc_build uic_build rcc_build
-
-BUILD_WRKSRC?= ${WRKSRC}/${BINDLANG}/${BINDMODULE}
-INSTALL_WRKSRC?=${BUILD_WRKSRC}
-
-# Available languages
-_BINDLANG_ALL= csharp java perl php python ruby smoke
-
-# csharp_COMMENT= C\# bindings for Qt/KDE: ${BINDMODULE} module
-# java_COMMENT= Java bindings for Qt/KDE: ${BINDMODULE} module
-# perl_COMMENT= Perl bindings for Qt/KDE: ${BINDMODULE} module
-# php_COMMENT= PHP bindings for Qt/KDE: ${BINDMODULE} module
-python_COMMENT= Python bindings for Qt/KDE: ${BINDMODULE} module
-ruby_COMMENT= Ruby bindings for Qt/KDE: ${BINDMODULE} module
-smoke_COMMENT= SMOKE bindings for Qt/KDE: ${BINDMODULE} module
-
-python_PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-ruby_PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
-
-python_PKGNAMESUFFIX= -${BINDMODULE}
-# ruby_PKGNAMESUFFIX= -${BINDMODULE}
-smoke_PKGNAMESUFFIX= -${BINDLANG}
-
-# Don't extract unnecessary stuff
-DO_NOT_EXTRACT?=${_BINDLANG_ALL:S/${BINDLANG}//}
-
-EXTRACT_AFTER_ARGS= | ${TAR} -xf -
-.for dne in ${DO_NOT_EXTRACT}
-EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
-.endfor
-
-#keep syncing this with devel/py-sip
-SIPDIR_REL= share/py-sip
diff --git a/devel/kdebindings4/pkg-descr b/devel/kdebindings4/pkg-descr
index 6f3f76a0a82d..4f1d94643d35 100644
--- a/devel/kdebindings4/pkg-descr
+++ b/devel/kdebindings4/pkg-descr
@@ -1,3 +1,3 @@
-This is a meta port of KDE bindings for C#, Java, PHP, Python and Ruby.
+This is a meta port of KDE bindings for Python and Ruby.
WWW: http://www.kde.org/
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index 2d90c37c4308..3694e9b05cae 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -6,7 +6,6 @@
PORTNAME= kdesdk
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -15,30 +14,35 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Software Development Kit
-BUILD_DEPENDS= ${LOCALBASE}/include/ltdl.h:${PORTSDIR}/devel/libltdl
-RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
LIB_DEPENDS= svn_client-1.0:${PORTSDIR}/devel/subversion \
boost_thread.4:${PORTSDIR}/devel/boost-libs \
- hunspell-1.3.0:${PORTSDIR}/textproc/hunspell
+ hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \
+ searchclient.0:${PORTSDIR}/deskutils/strigi \
+ qca.2:${PORTSDIR}/devel/qca
+
+BUILD_DEPENDS= ${LOCALBASE}/include/ltdl.h:${PORTSDIR}/devel/libltdl \
+ ${LOCALBASE}/include/qimageblitz/qimageblitz.h:${PORTSDIR}/x11/qimageblitz
+
+RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
LATEST_LINK= ${PORTNAME}4
CONFLICTS= kdeutils-4.5.[0-5]
USE_BZIP2= yes
+USE_GNOME= libxml2 libxslt
USE_KDE4= kdelibs pimlibs kdeprefix kdehier \
- automoc4 akonadi kdebase
+ automoc4 akonadi baseapps sharedmime
KDE4_BUILDENV= yes
+USE_PERL5= yes
USE_QT_VER= 4
-QT_COMPONENTS= network gui svg qt3support \
- qmake_build moc_build rcc_build uic_build \
- porting_build uic3_build
+QT_COMPONENTS= dbus designer gui qt3support \
+ script scripttools sql svg xml \
+ qmake_build moc_build rcc_build uic_build uic3_build
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
CMAKE_ARGS+= -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
-OPTIONS+= ANTLR "Support for po2xml and swappo tools" OFF
-
MAN1= adddebug.1 \
cervisia.1 \
cheatmake.1 \
@@ -53,7 +57,6 @@ MAN1= adddebug.1 \
extend_dmalloc.1 \
extractrc.1 \
fixincludes.1 \
- kate.1 \
po2xml.1 \
pruneemptydirs.1 \
qtdoc.1 \
@@ -64,9 +67,12 @@ MAN1= adddebug.1 \
xml2pot.1 \
zonetab2pot.py.1
+OPTIONS= ANTLR "Support for po2xml and swappo tools" off \
+ KATE "Install Kate advanced text editor" on
+
.include <bsd.port.options.mk>
-.if defined(WITH_ANTLR)
+.ifdef(WITH_ANTLR)
BUILD_DEPENDS+= antlr:${PORTSDIR}/devel/antlr
RUN_DEPENDS+= antlr:${PORTSDIR}/devel/antlr
PLIST_SUB+= ANTLR=""
@@ -75,4 +81,16 @@ CMAKE_ARGS+= -DWITH_Antlr2:BOOL=off
PLIST_SUB+= ANTLR="@comment "
.endif
+.ifndef(WITHOUT_KATE)
+RUN_DEPENDS+= ${KDE4_PREFIX}/bin/kate:${PORTSDIR}/editors/kate
+.endif
+
+post-patch:
+ # Prevent updating MIME during build.
+ ${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d; /SharedMimeInfo/ d' \
+ ${PATCH_WRKSRC}/okteta/mimetypes/CMakeLists.txt
+
+post-install:
+ @-update-mime-database ${KDE4_PREFIX}/share/mime
+
.include <bsd.port.mk>
diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo
index ad6f18db906b..a9df12c8940f 100644
--- a/devel/kdesdk4/distinfo
+++ b/devel/kdesdk4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdesdk-4.6.5.tar.bz2) = 4b35eb3381bbf06e4d091dea4b38f6c807ce218d45e04d8719ee17ebd1820ff4
-SIZE (KDE/kdesdk-4.6.5.tar.bz2) = 6063147
+SHA256 (KDE/kdesdk-4.7.2.tar.bz2) = c9377df9429633413c57684574e6405b3dc3b493ac3ab43d9fd429ff3ab920be
+SIZE (KDE/kdesdk-4.7.2.tar.bz2) = 5265267
diff --git a/devel/kdesdk4/pkg-plist b/devel/kdesdk4/pkg-plist
index 67ea02fb00af..9a3e04d9a15a 100644
--- a/devel/kdesdk4/pkg-plist
+++ b/devel/kdesdk4/pkg-plist
@@ -32,7 +32,6 @@ bin/fixuifiles
bin/hotshot2calltree
bin/includemocs
bin/kapptemplate
-bin/kate
bin/kcachegrind
bin/kde-systemsettings-tree.py
bin/kde_generate_export_header
@@ -40,13 +39,11 @@ bin/kdedoc
bin/kdekillall
bin/kdelnk2desktop.py
bin/kdemangen.pl
-bin/kdesrc-build
bin/kio_svn_helper
bin/kompare
bin/kpartloader
bin/krazy-licensecheck
bin/kstartperf
-bin/ktesnippets_editor
bin/kuiviewer
bin/lokalize
bin/makeobj
@@ -283,6 +280,8 @@ include/kasten/bytetabletool.h
include/kasten/bytetabletoolfactory.h
include/kasten/bytetabletoolview.h
include/kasten/bytetabletoolviewfactory.h
+include/kasten/charsetconversiontoolfactory.h
+include/kasten/charsetconversiontoolviewfactory.h
include/kasten/checksumtool.h
include/kasten/checksumtoolfactory.h
include/kasten/checksumtoolview.h
@@ -395,18 +394,8 @@ include/kasten/widgetsdockable.h
include/kasten/zoomable.h
include/kasten/zoombarcontroller.h
include/kasten/zoomcontroller.h
-include/kate/application.h
-include/kate/documentmanager.h
-include/kate/mainwindow.h
-include/kate/plugin.h
-include/kate/pluginconfigpageinterface.h
-include/kate/pluginmanager.h
-include/kate_export.h
include/kompare/kompareinterface.h
include/kprofilemethod.h
-include/ktexteditor_codesnippets_core/completionmodel.h
-include/ktexteditor_codesnippets_core/ktexteditor_codesnippets_core_export.h
-include/ktexteditor_codesnippets_core/repository.h
include/okteta/abstractbytearraycolumnrenderer.h
include/okteta/abstractbytearraymodel.h
include/okteta/abstractbytearrayview.h
@@ -458,28 +447,6 @@ lib/kde4/cervisiapart.so
lib/kde4/fileviewgitplugin.so
lib/kde4/fileviewsvnplugin.so
lib/kde4/kabcformat_kdeaccounts.so
-lib/kde4/kate_kttsd.so
-lib/kde4/katebacktracebrowserplugin.so
-lib/kde4/katebuildplugin.so
-lib/kde4/katectagsplugin.so
-lib/kde4/kateexternaltoolsplugin.so
-lib/kde4/katefilebrowserplugin.so
-lib/kde4/katefiletemplates.so
-lib/kde4/katefiletreeplugin.so
-lib/kde4/katefindinfilesplugin.so
-lib/kde4/kategdbplugin.so
-lib/kde4/katekonsoleplugin.so
-lib/kde4/katemailfilesplugin.so
-lib/kde4/kateopenheaderplugin.so
-lib/kde4/katequickdocumentswitcherplugin.so
-lib/kde4/katesnippets_tngplugin.so
-lib/kde4/katesqlplugin.so
-lib/kde4/katesymbolviewerplugin.so
-lib/kde4/katetabbarextensionplugin.so
-lib/kde4/katetabifyplugin.so
-lib/kde4/katetextfilterplugin.so
-lib/kde4/katexmlcheckplugin.so
-lib/kde4/katexmltoolsplugin.so
lib/kde4/kded_ksvnd.so
lib/kde4/kio_perldoc.so
lib/kde4/kio_svn.so
@@ -489,7 +456,6 @@ lib/kde4/libkbytearrayedit.so
lib/kde4/libkomparenavtreepart.so
lib/kde4/libkomparepart.so
lib/kde4/oktetapart.so
-lib/kde4/plasma_applet_katesession.so
lib/kde4/plugins/designer/oktetadesignerplugin.so
lib/kde4/quithumbnail.so
lib/libkastencontrollers.so
@@ -501,13 +467,9 @@ lib/libkastencore.so.5.0.1
lib/libkastengui.so
lib/libkastengui.so.5
lib/libkastengui.so.5.0.1
-lib/libkateinterfaces.so
-lib/libkateinterfaces.so.5
-lib/libkateinterfaces.so.5.0.1
lib/libkdeinit4_cervisia.so
lib/libkdeinit4_cvsaskpass.so
lib/libkdeinit4_cvsservice.so
-lib/libkdeinit4_kate.so
lib/libkomparedialogpages.so
lib/libkomparedialogpages.so.5
lib/libkomparedialogpages.so.5.0.1
@@ -517,9 +479,6 @@ lib/libkomparediff2.so.5.0.1
lib/libkompareinterface.so
lib/libkompareinterface.so.5
lib/libkompareinterface.so.5.0.1
-lib/libktexteditor_codesnippets_core.so
-lib/libktexteditor_codesnippets_core.so.0
-lib/libktexteditor_codesnippets_core.so.0.0.1
lib/liboktetacore.so
lib/liboktetacore.so.5
lib/liboktetacore.so.5.0.1
@@ -540,11 +499,8 @@ lib/strigi/strigila_po.so
lib/strigi/strigita_ts.so
share/applications/kde4/cervisia.desktop
share/applications/kde4/kapptemplate.desktop
-share/applications/kde4/kate.desktop
share/applications/kde4/kcachegrind.desktop
-share/applications/kde4/kdesrc-build.desktop
share/applications/kde4/kompare.desktop
-share/applications/kde4/ktesnippets_editor.desktop
share/applications/kde4/kuiviewer.desktop
share/applications/kde4/lokalize.desktop
share/applications/kde4/okteta.desktop
@@ -553,56 +509,6 @@ share/apps/cervisia/cervisia.notifyrc
share/apps/cervisia/cervisiashellui.rc
share/apps/cervisiapart/cervisiaui.rc
share/apps/kabc/formats/kdeaccountsplugin.desktop
-share/apps/kate/externaltools
-share/apps/kate/icons/oxygen/16x16/actions/null.png
-share/apps/kate/icons/oxygen/16x16/actions/sql-field-pk.png
-share/apps/kate/icons/oxygen/16x16/actions/sql-field-red.png
-share/apps/kate/icons/oxygen/16x16/actions/sql-field.png
-share/apps/kate/icons/oxygen/16x16/actions/sql-table.png
-share/apps/kate/icons/oxygen/16x16/actions/sql-view.png
-share/apps/kate/kateui.rc
-share/apps/kate/plugins/filetree/ui.rc
-share/apps/kate/plugins/findinfiles/ui.rc
-share/apps/kate/plugins/kate_kttsd/ui.rc
-share/apps/kate/plugins/katebuild/ui.rc
-share/apps/kate/plugins/katectags/ui.rc
-share/apps/kate/plugins/kateexternaltools/ui.rc
-share/apps/kate/plugins/katefiletemplates/templates/cppgpl.cpp.katetemplate
-share/apps/kate/plugins/katefiletemplates/templates/cppgpl.hh.katetemplate
-share/apps/kate/plugins/katefiletemplates/templates/cpplgpl.cpp.katetemplate
-share/apps/kate/plugins/katefiletemplates/templates/cpplgpl.hh.katetemplate
-share/apps/kate/plugins/katefiletemplates/templates/docbookchapter.xml.katetemplate
-share/apps/kate/plugins/katefiletemplates/templates/html.katetemplate
-share/apps/kate/plugins/katefiletemplates/templates/language.xml.katetemplate
-share/apps/kate/plugins/katefiletemplates/ui.rc
-share/apps/kate/plugins/kategdb/ui.rc
-share/apps/kate/plugins/katekonsole/ui.rc
-share/apps/kate/plugins/katemailfiles/ui.rc
-share/apps/kate/plugins/kateopenheader/ui.rc
-share/apps/kate/plugins/katequickdocumentswitcher/ui.rc
-share/apps/kate/plugins/katesnippets_tng/ui.rc
-share/apps/kate/plugins/katesql/ui.rc
-share/apps/kate/plugins/katesymbolviewer/ui.rc
-share/apps/kate/plugins/katetabbarextension/ui.rc
-share/apps/kate/plugins/katetabify/ui.rc
-share/apps/kate/plugins/katetextfilter/ui.rc
-share/apps/kate/plugins/katexmlcheck/ui.rc
-share/apps/kate/plugins/katexmltools/ui.rc
-share/apps/kate/tips
-share/apps/katepart/syntax/katetemplate.xml
-share/apps/katepart/syntax/kdesrc-buildrc.xml
-share/apps/katexmltools/html4-loose.dtd.xml
-share/apps/katexmltools/html4-strict.dtd.xml
-share/apps/katexmltools/kcfg.dtd.xml
-share/apps/katexmltools/kde-docbook.dtd.xml
-share/apps/katexmltools/kpartgui.dtd.xml
-share/apps/katexmltools/language.dtd.xml
-share/apps/katexmltools/simplify_dtd.xsl
-share/apps/katexmltools/testcases.xml
-share/apps/katexmltools/xhtml1-frameset.dtd.xml
-share/apps/katexmltools/xhtml1-strict.dtd.xml
-share/apps/katexmltools/xhtml1-transitional.dtd.xml
-share/apps/katexmltools/xslt-1.0.dtd.xml
share/apps/kcachegrind/icons/hicolor/16x16/actions/move.png
share/apps/kcachegrind/icons/hicolor/16x16/actions/percent.png
share/apps/kcachegrind/icons/hicolor/22x22/actions/hidetemplates.png
@@ -615,7 +521,6 @@ share/apps/kconf_update/cervisia-change_repos_list.pl
share/apps/kconf_update/cervisia-normalize_cvsroot.pl
share/apps/kconf_update/cervisia.upd
share/apps/kconf_update/change_colors.pl
-share/apps/kconf_update/kate-2.4.upd
share/apps/kdevappwizard/template_previews/akonadi-resources.png
share/apps/kdevappwizard/template_previews/akonadi-serializer.png
share/apps/kdevappwizard/template_previews/default.png
@@ -647,11 +552,10 @@ share/apps/kio_perldoc/pod2html.pl
share/apps/kompare/komparepartui.rc
share/apps/kompare/kompareui.rc
share/apps/kpartloader/kpartloaderui.rc
-share/apps/ktexteditor_snippets/data/testsnippets.xml
-share/apps/ktexteditor_snippets/data/testsnippetscpp.xml
share/apps/kuiviewer/kuiviewerui.rc
share/apps/kuiviewerpart/kuiviewer_part.rc
share/apps/lokalize/editorui.rc
+share/apps/lokalize/lokalize.notifyrc
share/apps/lokalize/lokalizemainwindowui.rc
share/apps/lokalize/projectmanagerui.rc
share/apps/lokalize/scripts/find-gui-text.sh
@@ -694,6 +598,23 @@ share/apps/umbrello/headings/heading.py
share/apps/umbrello/headings/heading.rb
share/apps/umbrello/headings/heading.sql
share/apps/umbrello/headings/heading.xsd
+share/apps/umbrello/icons/hicolor/16x16/actions/umbrello_diagram_activity.png
+share/apps/umbrello/icons/hicolor/16x16/actions/umbrello_diagram_class.png
+share/apps/umbrello/icons/hicolor/16x16/actions/umbrello_diagram_collaboration.png
+share/apps/umbrello/icons/hicolor/16x16/actions/umbrello_diagram_component.png
+share/apps/umbrello/icons/hicolor/16x16/actions/umbrello_diagram_deployment.png
+share/apps/umbrello/icons/hicolor/16x16/actions/umbrello_diagram_sequence.png
+share/apps/umbrello/icons/hicolor/16x16/actions/umbrello_diagram_state.png
+share/apps/umbrello/icons/hicolor/16x16/actions/umbrello_diagram_usecase.png
+share/apps/umbrello/icons/hicolor/22x22/actions/umbrello_diagram_activity.png
+share/apps/umbrello/icons/hicolor/22x22/actions/umbrello_diagram_class.png
+share/apps/umbrello/icons/hicolor/22x22/actions/umbrello_diagram_collaboration.png
+share/apps/umbrello/icons/hicolor/22x22/actions/umbrello_diagram_component.png
+share/apps/umbrello/icons/hicolor/22x22/actions/umbrello_diagram_deployment.png
+share/apps/umbrello/icons/hicolor/22x22/actions/umbrello_diagram_entityrelationship.png
+share/apps/umbrello/icons/hicolor/22x22/actions/umbrello_diagram_sequence.png
+share/apps/umbrello/icons/hicolor/22x22/actions/umbrello_diagram_state.png
+share/apps/umbrello/icons/hicolor/22x22/actions/umbrello_diagram_usecase.png
share/apps/umbrello/pics/CVglobal_meth.png
share/apps/umbrello/pics/CVglobal_var.png
share/apps/umbrello/pics/CVimplementation_meth.png
@@ -812,7 +733,6 @@ share/apps/umbrello/pics/exception.png
share/apps/umbrello/pics/final_activity.png
share/apps/umbrello/pics/foreignkey_constraint.png
share/apps/umbrello/pics/generalisation.png
-share/apps/umbrello/pics/hi64-app-umbrello.png
share/apps/umbrello/pics/initial_state.png
share/apps/umbrello/pics/interface.png
share/apps/umbrello/pics/join.png
@@ -851,9 +771,6 @@ share/config.kcfg/fileviewsvnpluginsettings.kcfg
share/config.kcfg/kapptemplate.kcfg
share/config.kcfg/lokalize.kcfg
share/config.kcfg/structviewpreferences.kcfg
-share/config/katefiletemplates.knsrc
-share/config/katerc
-share/config/ktexteditor_codesnippets_core.knsrc
share/config/okteta-structures.knsrc
share/dbus-1/interfaces/org.kde.cervisia.cvsjob.xml
share/dbus-1/interfaces/org.kde.cervisia.cvsloginjob.xml
@@ -889,29 +806,9 @@ share/doc/HTML/en/kapptemplate/pykde4.png
share/doc/HTML/en/kapptemplate/pyqt4app.png
share/doc/HTML/en/kapptemplate/second-page.png
share/doc/HTML/en/kapptemplate/third-page.png
-share/doc/HTML/en/kate/advanced.docbook
-share/doc/HTML/en/kate/common
-share/doc/HTML/en/kate/configdialog01.png
-share/doc/HTML/en/kate/configuring.docbook
-share/doc/HTML/en/kate/fundamentals.docbook
-share/doc/HTML/en/kate/highlighted.png
-share/doc/HTML/en/kate/highlighting.docbook
-share/doc/HTML/en/kate/index.cache.bz2
-share/doc/HTML/en/kate/index.docbook
-share/doc/HTML/en/kate/kate.png
-share/doc/HTML/en/kate/man-kate.1.docbook
-share/doc/HTML/en/kate/mdi.docbook
-share/doc/HTML/en/kate/menus.docbook
-share/doc/HTML/en/kate/part.docbook
-share/doc/HTML/en/kate/plugins.docbook
-share/doc/HTML/en/kate/regular-expressions.docbook
-share/doc/HTML/en/kate/unhighlighted.png
share/doc/HTML/en/kcachegrind/common
share/doc/HTML/en/kcachegrind/index.cache.bz2
share/doc/HTML/en/kcachegrind/index.docbook
-share/doc/HTML/en/kdesrc-build/common
-share/doc/HTML/en/kdesrc-build/index.cache.bz2
-share/doc/HTML/en/kdesrc-build/index.docbook
share/doc/HTML/en/kompare/common
share/doc/HTML/en/kompare/dock.png
share/doc/HTML/en/kompare/index.cache.bz2
@@ -966,8 +863,13 @@ share/doc/HTML/en/umbrello/umbrello-ui.png
share/doc/HTML/en/umbrello/uml_basics.docbook
share/doc/HTML/en/umbrello/use-case-diagram.png
share/doc/HTML/en/umbrello/working_with_umbrello.docbook
+share/icons/hicolor/128x128/actions/vcs-add-svn-kiosvn.png
+share/icons/hicolor/128x128/actions/vcs-branch-svn-kiosvn.png
+share/icons/hicolor/128x128/actions/vcs-merge-svn-kiosvn.png
+share/icons/hicolor/128x128/actions/vcs-remove-svn-kiosvn.png
+share/icons/hicolor/128x128/actions/vcs-status-svn-kiosvn.png
+share/icons/hicolor/128x128/actions/vcs-switch-svn-kiosvn.png
share/icons/hicolor/128x128/apps/kapptemplate.png
-share/icons/hicolor/128x128/apps/kate.png
share/icons/hicolor/128x128/apps/kompare.png
share/icons/hicolor/128x128/apps/lokalize.png
share/icons/hicolor/128x128/apps/umbrello.png
@@ -989,9 +891,20 @@ share/icons/hicolor/16x16/actions/prevtemplate.png
share/icons/hicolor/16x16/actions/prevuntranslated.png
share/icons/hicolor/16x16/actions/search2msgstr.png
share/icons/hicolor/16x16/actions/transsearch.png
+share/icons/hicolor/16x16/actions/vcs-add-cvs-cervisia.png
+share/icons/hicolor/16x16/actions/vcs-add-svn-kiosvn.png
+share/icons/hicolor/16x16/actions/vcs-branch-svn-kiosvn.png
+share/icons/hicolor/16x16/actions/vcs-commit-cvs-cervisia.png
+share/icons/hicolor/16x16/actions/vcs-diff-cvs-cervisia.png
+share/icons/hicolor/16x16/actions/vcs-merge-svn-kiosvn.png
+share/icons/hicolor/16x16/actions/vcs-remove-cvs-cervisia.png
+share/icons/hicolor/16x16/actions/vcs-remove-svn-kiosvn.png
+share/icons/hicolor/16x16/actions/vcs-status-cvs-cervisia.png
+share/icons/hicolor/16x16/actions/vcs-status-svn-kiosvn.png
+share/icons/hicolor/16x16/actions/vcs-switch-svn-kiosvn.png
+share/icons/hicolor/16x16/actions/vcs-update-cvs-cervisia.png
share/icons/hicolor/16x16/apps/cervisia.png
share/icons/hicolor/16x16/apps/kapptemplate.png
-share/icons/hicolor/16x16/apps/kate.png
share/icons/hicolor/16x16/apps/kompare.png
share/icons/hicolor/16x16/apps/kuiviewer.png
share/icons/hicolor/16x16/apps/okteta.png
@@ -1016,9 +929,20 @@ share/icons/hicolor/22x22/actions/prevtemplate.png
share/icons/hicolor/22x22/actions/prevuntranslated.png
share/icons/hicolor/22x22/actions/search2msgstr.png
share/icons/hicolor/22x22/actions/transsearch.png
+share/icons/hicolor/22x22/actions/vcs-add-cvs-cervisia.png
+share/icons/hicolor/22x22/actions/vcs-add-svn-kiosvn.png
+share/icons/hicolor/22x22/actions/vcs-branch-svn-kiosvn.png
+share/icons/hicolor/22x22/actions/vcs-commit-cvs-cervisia.png
+share/icons/hicolor/22x22/actions/vcs-diff-cvs-cervisia.png
+share/icons/hicolor/22x22/actions/vcs-merge-svn-kiosvn.png
+share/icons/hicolor/22x22/actions/vcs-remove-cvs-cervisia.png
+share/icons/hicolor/22x22/actions/vcs-remove-svn-kiosvn.png
+share/icons/hicolor/22x22/actions/vcs-status-cvs-cervisia.png
+share/icons/hicolor/22x22/actions/vcs-status-svn-kiosvn.png
+share/icons/hicolor/22x22/actions/vcs-switch-svn-kiosvn.png
+share/icons/hicolor/22x22/actions/vcs-update-cvs-cervisia.png
share/icons/hicolor/22x22/apps/cervisia.png
share/icons/hicolor/22x22/apps/kapptemplate.png
-share/icons/hicolor/22x22/apps/kate.png
share/icons/hicolor/22x22/apps/kompare.png
share/icons/hicolor/22x22/apps/umbrello.png
share/icons/hicolor/32x32/actions/approved.png
@@ -1041,9 +965,20 @@ share/icons/hicolor/32x32/actions/prevtemplate.png
share/icons/hicolor/32x32/actions/prevuntranslated.png
share/icons/hicolor/32x32/actions/search2msgstr.png
share/icons/hicolor/32x32/actions/transsearch.png
+share/icons/hicolor/32x32/actions/vcs-add-cvs-cervisia.png
+share/icons/hicolor/32x32/actions/vcs-add-svn-kiosvn.png
+share/icons/hicolor/32x32/actions/vcs-branch-svn-kiosvn.png
+share/icons/hicolor/32x32/actions/vcs-commit-cvs-cervisia.png
+share/icons/hicolor/32x32/actions/vcs-diff-cvs-cervisia.png
+share/icons/hicolor/32x32/actions/vcs-merge-svn-kiosvn.png
+share/icons/hicolor/32x32/actions/vcs-remove-cvs-cervisia.png
+share/icons/hicolor/32x32/actions/vcs-remove-svn-kiosvn.png
+share/icons/hicolor/32x32/actions/vcs-status-cvs-cervisia.png
+share/icons/hicolor/32x32/actions/vcs-status-svn-kiosvn.png
+share/icons/hicolor/32x32/actions/vcs-switch-svn-kiosvn.png
+share/icons/hicolor/32x32/actions/vcs-update-cvs-cervisia.png
share/icons/hicolor/32x32/apps/cervisia.png
share/icons/hicolor/32x32/apps/kapptemplate.png
-share/icons/hicolor/32x32/apps/kate.png
share/icons/hicolor/32x32/apps/kcachegrind.png
share/icons/hicolor/32x32/apps/kompare.png
share/icons/hicolor/32x32/apps/kuiviewer.png
@@ -1052,20 +987,47 @@ share/icons/hicolor/32x32/apps/okteta.png
share/icons/hicolor/32x32/apps/umbrello.png
share/icons/hicolor/32x32/mimetypes/application-x-uml.png
share/icons/hicolor/48x48/actions/approved.png
+share/icons/hicolor/48x48/actions/vcs-add-cvs-cervisia.png
+share/icons/hicolor/48x48/actions/vcs-add-svn-kiosvn.png
+share/icons/hicolor/48x48/actions/vcs-branch-svn-kiosvn.png
+share/icons/hicolor/48x48/actions/vcs-commit-cvs-cervisia.png
+share/icons/hicolor/48x48/actions/vcs-diff-cvs-cervisia.png
+share/icons/hicolor/48x48/actions/vcs-merge-svn-kiosvn.png
+share/icons/hicolor/48x48/actions/vcs-remove-cvs-cervisia.png
+share/icons/hicolor/48x48/actions/vcs-remove-svn-kiosvn.png
+share/icons/hicolor/48x48/actions/vcs-status-cvs-cervisia.png
+share/icons/hicolor/48x48/actions/vcs-status-svn-kiosvn.png
+share/icons/hicolor/48x48/actions/vcs-switch-svn-kiosvn.png
+share/icons/hicolor/48x48/actions/vcs-update-cvs-cervisia.png
share/icons/hicolor/48x48/apps/cervisia.png
share/icons/hicolor/48x48/apps/kapptemplate.png
-share/icons/hicolor/48x48/apps/kate.png
share/icons/hicolor/48x48/apps/kcachegrind.png
share/icons/hicolor/48x48/apps/kompare.png
share/icons/hicolor/48x48/apps/kuiviewer.png
share/icons/hicolor/48x48/apps/okteta.png
share/icons/hicolor/48x48/apps/umbrello.png
+share/icons/hicolor/64x64/actions/vcs-add-svn-kiosvn.png
+share/icons/hicolor/64x64/actions/vcs-branch-svn-kiosvn.png
+share/icons/hicolor/64x64/actions/vcs-merge-svn-kiosvn.png
+share/icons/hicolor/64x64/actions/vcs-remove-svn-kiosvn.png
+share/icons/hicolor/64x64/actions/vcs-status-svn-kiosvn.png
+share/icons/hicolor/64x64/actions/vcs-switch-svn-kiosvn.png
share/icons/hicolor/64x64/apps/kapptemplate.png
-share/icons/hicolor/64x64/apps/kate.png
share/icons/hicolor/64x64/apps/lokalize.png
share/icons/hicolor/64x64/apps/umbrello.png
share/icons/hicolor/scalable/actions/approved.svgz
-share/icons/hicolor/scalable/apps/kate.svgz
+share/icons/hicolor/scalable/actions/vcs-add-cvs-cervisia.svgz
+share/icons/hicolor/scalable/actions/vcs-add-svn-kiosvn.svgz
+share/icons/hicolor/scalable/actions/vcs-branch-svn-kiosvn.svgz
+share/icons/hicolor/scalable/actions/vcs-commit-cvs-cervisia.svgz
+share/icons/hicolor/scalable/actions/vcs-diff-cvs-cervisia.svgz
+share/icons/hicolor/scalable/actions/vcs-merge-svn-kiosvn.svgz
+share/icons/hicolor/scalable/actions/vcs-remove-cvs-cervisia.svgz
+share/icons/hicolor/scalable/actions/vcs-remove-svn-kiosvn.svgz
+share/icons/hicolor/scalable/actions/vcs-status-cvs-cervisia.svgz
+share/icons/hicolor/scalable/actions/vcs-status-svn-kiosvn.svgz
+share/icons/hicolor/scalable/actions/vcs-switch-svn-kiosvn.svgz
+share/icons/hicolor/scalable/actions/vcs-update-cvs-cervisia.svgz
share/icons/hicolor/scalable/apps/kompare.svgz
share/icons/hicolor/scalable/apps/lokalize.svgz
share/icons/hicolor/scalable/apps/umbrello.svgz
@@ -1107,102 +1069,6 @@ share/icons/locolor/32x32/actions/prevtemplate.png
share/icons/locolor/32x32/actions/prevuntranslated.png
share/icons/locolor/32x32/actions/search2msgstr.png
share/icons/locolor/32x32/actions/transsearch.png
-share/icons/oxygen/128x128/actions/svn_add.png
-share/icons/oxygen/128x128/actions/svn_branch.png
-share/icons/oxygen/128x128/actions/svn_merge.png
-share/icons/oxygen/128x128/actions/svn_remove.png
-share/icons/oxygen/128x128/actions/svn_status.png
-share/icons/oxygen/128x128/actions/svn_switch.png
-share/icons/oxygen/16x16/actions/debug.png
-share/icons/oxygen/16x16/actions/interrupt.png
-share/icons/oxygen/16x16/actions/kill.png
-share/icons/oxygen/16x16/actions/repoadd.png
-share/icons/oxygen/16x16/actions/repomanage.png
-share/icons/oxygen/16x16/actions/snippetadd.png
-share/icons/oxygen/16x16/actions/snippetedit.png
-share/icons/oxygen/16x16/actions/svn_add.png
-share/icons/oxygen/16x16/actions/svn_branch.png
-share/icons/oxygen/16x16/actions/svn_merge.png
-share/icons/oxygen/16x16/actions/svn_remove.png
-share/icons/oxygen/16x16/actions/svn_status.png
-share/icons/oxygen/16x16/actions/svn_switch.png
-share/icons/oxygen/16x16/actions/umbrello_diagram_activity.png
-share/icons/oxygen/16x16/actions/umbrello_diagram_class.png
-share/icons/oxygen/16x16/actions/umbrello_diagram_collaboration.png
-share/icons/oxygen/16x16/actions/umbrello_diagram_component.png
-share/icons/oxygen/16x16/actions/umbrello_diagram_deployment.png
-share/icons/oxygen/16x16/actions/umbrello_diagram_sequence.png
-share/icons/oxygen/16x16/actions/umbrello_diagram_state.png
-share/icons/oxygen/16x16/actions/umbrello_diagram_usecase.png
-share/icons/oxygen/16x16/actions/vcs_add.png
-share/icons/oxygen/16x16/actions/vcs_commit.png
-share/icons/oxygen/16x16/actions/vcs_diff.png
-share/icons/oxygen/16x16/actions/vcs_remove.png
-share/icons/oxygen/16x16/actions/vcs_status.png
-share/icons/oxygen/16x16/actions/vcs_update.png
-share/icons/oxygen/22x22/actions/svn_add.png
-share/icons/oxygen/22x22/actions/svn_branch.png
-share/icons/oxygen/22x22/actions/svn_merge.png
-share/icons/oxygen/22x22/actions/svn_remove.png
-share/icons/oxygen/22x22/actions/svn_status.png
-share/icons/oxygen/22x22/actions/svn_switch.png
-share/icons/oxygen/22x22/actions/umbrello_diagram_activity.png
-share/icons/oxygen/22x22/actions/umbrello_diagram_class.png
-share/icons/oxygen/22x22/actions/umbrello_diagram_collaboration.png
-share/icons/oxygen/22x22/actions/umbrello_diagram_component.png
-share/icons/oxygen/22x22/actions/umbrello_diagram_deployment.png
-share/icons/oxygen/22x22/actions/umbrello_diagram_entityrelationship.png
-share/icons/oxygen/22x22/actions/umbrello_diagram_sequence.png
-share/icons/oxygen/22x22/actions/umbrello_diagram_state.png
-share/icons/oxygen/22x22/actions/umbrello_diagram_usecase.png
-share/icons/oxygen/22x22/actions/vcs_add.png
-share/icons/oxygen/22x22/actions/vcs_commit.png
-share/icons/oxygen/22x22/actions/vcs_diff.png
-share/icons/oxygen/22x22/actions/vcs_remove.png
-share/icons/oxygen/22x22/actions/vcs_status.png
-share/icons/oxygen/22x22/actions/vcs_update.png
-share/icons/oxygen/32x32/actions/svn_add.png
-share/icons/oxygen/32x32/actions/svn_branch.png
-share/icons/oxygen/32x32/actions/svn_merge.png
-share/icons/oxygen/32x32/actions/svn_remove.png
-share/icons/oxygen/32x32/actions/svn_status.png
-share/icons/oxygen/32x32/actions/svn_switch.png
-share/icons/oxygen/32x32/actions/vcs_add.png
-share/icons/oxygen/32x32/actions/vcs_commit.png
-share/icons/oxygen/32x32/actions/vcs_diff.png
-share/icons/oxygen/32x32/actions/vcs_remove.png
-share/icons/oxygen/32x32/actions/vcs_status.png
-share/icons/oxygen/32x32/actions/vcs_update.png
-share/icons/oxygen/48x48/actions/svn_add.png
-share/icons/oxygen/48x48/actions/svn_branch.png
-share/icons/oxygen/48x48/actions/svn_merge.png
-share/icons/oxygen/48x48/actions/svn_remove.png
-share/icons/oxygen/48x48/actions/svn_status.png
-share/icons/oxygen/48x48/actions/svn_switch.png
-share/icons/oxygen/48x48/actions/vcs_add.png
-share/icons/oxygen/48x48/actions/vcs_commit.png
-share/icons/oxygen/48x48/actions/vcs_diff.png
-share/icons/oxygen/48x48/actions/vcs_remove.png
-share/icons/oxygen/48x48/actions/vcs_status.png
-share/icons/oxygen/48x48/actions/vcs_update.png
-share/icons/oxygen/64x64/actions/svn_add.png
-share/icons/oxygen/64x64/actions/svn_branch.png
-share/icons/oxygen/64x64/actions/svn_merge.png
-share/icons/oxygen/64x64/actions/svn_remove.png
-share/icons/oxygen/64x64/actions/svn_status.png
-share/icons/oxygen/64x64/actions/svn_switch.png
-share/icons/oxygen/scalable/actions/svn_add.svgz
-share/icons/oxygen/scalable/actions/svn_branch.svgz
-share/icons/oxygen/scalable/actions/svn_merge.svgz
-share/icons/oxygen/scalable/actions/svn_remove.svgz
-share/icons/oxygen/scalable/actions/svn_status.svgz
-share/icons/oxygen/scalable/actions/svn_switch.svgz
-share/icons/oxygen/scalable/actions/vcs_add.svgz
-share/icons/oxygen/scalable/actions/vcs_commit.svgz
-share/icons/oxygen/scalable/actions/vcs_diff.svgz
-share/icons/oxygen/scalable/actions/vcs_remove.svgz
-share/icons/oxygen/scalable/actions/vcs_status.svgz
-share/icons/oxygen/scalable/actions/vcs_update.svgz
share/kde4/services/ServiceMenus/subversion.desktop
share/kde4/services/ServiceMenus/subversion_toplevel.desktop
share/kde4/services/cervisiapart.desktop
@@ -1210,28 +1076,6 @@ share/kde4/services/cvsservice.desktop
share/kde4/services/designerthumbnail.desktop
share/kde4/services/fileviewgitplugin.desktop
share/kde4/services/fileviewsvnplugin.desktop
-share/kde4/services/kate_kttsd.desktop
-share/kde4/services/katebacktracebrowserplugin.desktop
-share/kde4/services/katebuildplugin.desktop
-share/kde4/services/katectagsplugin.desktop
-share/kde4/services/kateexternaltoolsplugin.desktop
-share/kde4/services/katefilebrowserplugin.desktop
-share/kde4/services/katefiletemplates.desktop
-share/kde4/services/katefiletreeplugin.desktop
-share/kde4/services/katefindinfilesplugin.desktop
-share/kde4/services/kategdbplugin.desktop
-share/kde4/services/katekonsoleplugin.desktop
-share/kde4/services/katemailfilesplugin.desktop
-share/kde4/services/kateopenheader.desktop
-share/kde4/services/katequickdocumentswitcher.desktop
-share/kde4/services/katesnippets_tngplugin.desktop
-share/kde4/services/katesql.desktop
-share/kde4/services/katesymbolviewer.desktop
-share/kde4/services/katetabbarextension.desktop
-share/kde4/services/katetabifyplugin.desktop
-share/kde4/services/katetextfilter.desktop
-share/kde4/services/katexmlcheck.desktop
-share/kde4/services/katexmltools.desktop
share/kde4/services/kbytearrayedit.desktop
share/kde4/services/kded/ksvnd.desktop
share/kde4/services/komparenavtreepart.desktop
@@ -1239,20 +1083,16 @@ share/kde4/services/komparepart.desktop
share/kde4/services/kuiviewer_part.desktop
share/kde4/services/oktetapart.desktop
share/kde4/services/perldoc.protocol
-share/kde4/services/plasma-applet-katesession.desktop
share/kde4/services/svn+file.protocol
share/kde4/services/svn+http.protocol
share/kde4/services/svn+https.protocol
share/kde4/services/svn+ssh.protocol
share/kde4/services/svn.protocol
-share/kde4/servicetypes/kateplugin.desktop
share/kde4/servicetypes/komparenavigationpart.desktop
share/kde4/servicetypes/kompareviewpart.desktop
share/mime/application/base64.xml
share/mime/application/btoa.xml
-share/mime/application/x-ktesnippets.xml
share/mime/application/x-vnd.kde.okteta.structure.xml
-share/mime/packages/ktesnippets.xml
share/mime/packages/okteta.xml
share/mime/text/x-ascii85.xml
share/mime/text/x-base32.xml
@@ -1272,12 +1112,16 @@ share/strigi/fieldproperties/strigi_translation.fieldproperties
@dirrm share/doc/HTML/en/okteta
@dirrm share/doc/HTML/en/lokalize
@dirrm share/doc/HTML/en/kompare
-@dirrm share/doc/HTML/en/kdesrc-build
@dirrm share/doc/HTML/en/kcachegrind
-@dirrm share/doc/HTML/en/kate
@dirrm share/doc/HTML/en/kapptemplate
@dirrm share/doc/HTML/en/cervisia
@dirrm share/apps/umbrello/pics
+@dirrm share/apps/umbrello/icons/hicolor/22x22/actions
+@dirrm share/apps/umbrello/icons/hicolor/22x22
+@dirrm share/apps/umbrello/icons/hicolor/16x16/actions
+@dirrm share/apps/umbrello/icons/hicolor/16x16
+@dirrm share/apps/umbrello/icons/hicolor
+@dirrm share/apps/umbrello/icons
@dirrm share/apps/umbrello/headings
@dirrm share/apps/umbrello
@dirrm share/apps/oktetapart
@@ -1291,8 +1135,6 @@ share/strigi/fieldproperties/strigi_translation.fieldproperties
@dirrmtry share/apps/lokalize
@dirrm share/apps/kuiviewerpart
@dirrm share/apps/kuiviewer
-@dirrm share/apps/ktexteditor_snippets/data
-@dirrm share/apps/ktexteditor_snippets
@dirrm share/apps/kpartloader
@dirrm share/apps/kompare
@dirrm share/apps/kio_perldoc
@@ -1308,40 +1150,12 @@ share/strigi/fieldproperties/strigi_translation.fieldproperties
@dirrm share/apps/kcachegrind/icons/hicolor
@dirrm share/apps/kcachegrind/icons
@dirrm share/apps/kcachegrind
-@dirrm share/apps/katexmltools
-@dirrm share/apps/kate/plugins/katexmltools
-@dirrm share/apps/kate/plugins/katexmlcheck
-@dirrm share/apps/kate/plugins/katetextfilter
-@dirrm share/apps/kate/plugins/katetabify
-@dirrm share/apps/kate/plugins/katetabbarextension
-@dirrm share/apps/kate/plugins/katesymbolviewer
-@dirrm share/apps/kate/plugins/katesql
-@dirrm share/apps/kate/plugins/katesnippets_tng
-@dirrm share/apps/kate/plugins/katequickdocumentswitcher
-@dirrm share/apps/kate/plugins/kateopenheader
-@dirrm share/apps/kate/plugins/katemailfiles
-@dirrm share/apps/kate/plugins/katekonsole
-@dirrm share/apps/kate/plugins/kategdb
-@dirrm share/apps/kate/plugins/katefiletemplates/templates
-@dirrm share/apps/kate/plugins/katefiletemplates
-@dirrm share/apps/kate/plugins/kateexternaltools
-@dirrm share/apps/kate/plugins/katectags
-@dirrm share/apps/kate/plugins/katebuild
-@dirrm share/apps/kate/plugins/kate_kttsd
-@dirrm share/apps/kate/plugins/findinfiles
-@dirrm share/apps/kate/plugins/filetree
-@dirrmtry share/apps/kate/plugins
-@dirrm share/apps/kate/icons/oxygen/16x16/actions
-@dirrm share/apps/kate/icons/oxygen/16x16
-@dirrm share/apps/kate/icons/oxygen
-@dirrm share/apps/kate/icons
-@dirrmtry share/apps/kate
@dirrm share/apps/cervisiapart
@dirrm share/apps/cervisia
@dirrmtry include/okteta
-@dirrm include/ktexteditor_codesnippets_core
@dirrm include/kompare
-@dirrmtry include/kate
@dirrmtry include/kasten
@dirrmtry include/KDE/Okteta
@dirrmtry include/KDE/Kasten
+@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