6 files changed, 212 insertions, 152 deletions

diff --git a/devel/kdesvn-kde4/Makefile b/devel/kdesvn-kde4/Makefile
index d672ef1fcfe9..4fd7fbe10d1c 100644
--- a/devel/kdesvn-kde4/Makefile
+++ b/devel/kdesvn-kde4/Makefile
@@ -5,42 +5,36 @@
 # $FreeBSD$
 
 PORTNAME=	kdesvn
-PORTVERSION=	0.14.4
+DISTVERSION=	1.2.2
 CATEGORIES=	devel kde
-MASTER_SITES=	http://kdesvn.alwins-world.de/trac.fcgi/downloads/
+MASTER_SITES=	http://kdesvn.alwins-world.de/downloads/
+PKGNAMESUFFIX=	-kde4
 
-MAINTAINER=	yuanjue@FreeBSD.org
+MAINTAINER=	dragonsa@highveldmail.co.za
 COMMENT=	KDE frontend for Subversion
 
-LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr-svn \
-		svn_client-1:${PORTSDIR}/devel/subversion \
-		neon:${PORTSDIR}/www/neon28
+LIB_DEPENDS=	svn_client-1:${PORTSDIR}/devel/subversion
 
-USE_CMAKE=	yes
-USE_BZIP2=	yes
-USE_KDELIBS_VER=3
-USE_LDCONFIG=	yes
-INSTALLS_ICONS=	yes
+CONFLICTS=	qsvn-[0-9]*
 
-CMAKE_ARGS=	-DLIB_SUFFIX=
-
-.if !defined(WITHOUT_NLS)
+USE_BZIP2=	yes
+USE_CMAKE=	yes
 USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
-EXTRA_PATCHES=	${FILESDIR}/nls-patch-CMakeLists.txt
-.endif
-
-DOCSDIR=	${PREFIX}/share/doc/HTML/en/${PORTNAME}
+USE_KDE4=	kdelibs kdeprefix automoc4
+USE_LDCONFIG=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib gui xml network dbus svg qt3support sql \
+		qmake_build moc_build rcc_build uic_build
 
-MAN1=	kdesvn.1 kdesvnaskpass.1
+MAN1=		kdesvn.1 kdesvnaskpass.1
 
-post-extract:
-	${MKDIR} ${WRKSRC}
+post-patch:
+	${RM} ${WRKSRC}/src/kiosvn/svn*.protocol
 .if defined(NOPORTDOCS)
-	${RM} -f ${PATCH_WRKSRC}/doc/CMakeLists.txt
-	${ECHO} "ADD_SUBDIRECTORY(man)" > ${PATCH_WRKSRC}/doc/CMakeLists.txt
+	${ECHO} "ADD_SUBDIRECTORY(man)" > ${WRKSRC}/doc/CMakeLists.txt
 .endif
 
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.mk>
diff --git a/devel/kdesvn-kde4/distinfo b/devel/kdesvn-kde4/distinfo
index 161c7bdfb46e..f38cdc5f2f4c 100644
--- a/devel/kdesvn-kde4/distinfo
+++ b/devel/kdesvn-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (kdesvn-0.14.4.tar.bz2) = 70901a2450f74702dff99f7c0fe00a8c
-SHA256 (kdesvn-0.14.4.tar.bz2) = e4f5359cd088c960d0522e06a76165aafd002d3cd041b58a2c65c2786442f319
-SIZE (kdesvn-0.14.4.tar.bz2) = 1277228
+MD5 (kdesvn-1.2.2.tar.bz2) = 81ead830747be9c679a03ecd50ce0a44
+SHA256 (kdesvn-1.2.2.tar.bz2) = 60473d08198c7242346edfd878bb4408c3505a5dd62841cf6eb600604edb6f2e
+SIZE (kdesvn-1.2.2.tar.bz2) = 1628411
diff --git a/devel/kdesvn-kde4/files/nls-patch-CMakeLists.txt b/devel/kdesvn-kde4/files/nls-patch-CMakeLists.txt
deleted file mode 100644
index 8e17a904f722..000000000000
--- a/devel/kdesvn-kde4/files/nls-patch-CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
---- CMakeLists.txt.orig	Tue Oct 30 21:23:29 2007
-+++ CMakeLists.txt	Fri Jan  4 20:09:17 2008
-@@ -90,20 +90,4 @@
- 
- 
- ADD_SUBDIRECTORY(src)
--ADD_SUBDIRECTORY(po)
- ADD_SUBDIRECTORY(doc)
--
--FILE(GLOB _POFILES po/*.po)
--FOREACH(_p ${_POFILES})
--  SET(POFILES "${_p} ${POFILES}")
--ENDFOREACH(_p)
--
--SET(MESSAGES_DIR ${CMAKE_SOURCE_DIR}/src)
--CONFIGURE_FILE(
--    "${CMAKE_CURRENT_SOURCE_DIR}/cmakemodules/package_messages.sh.in"
--    "${CMAKE_CURRENT_BINARY_DIR}/package_messages.sh"
--    IMMEDIATE
--    @ONLY)
--ADD_CUSTOM_TARGET(package-messages
--    "${CMAKE_CURRENT_BINARY_DIR}/package_messages.sh")
--
diff --git a/devel/kdesvn-kde4/pkg-descr b/devel/kdesvn-kde4/pkg-descr
index 7f07a3c2fe91..477d5c474458 100644
--- a/devel/kdesvn-kde4/pkg-descr
+++ b/devel/kdesvn-kde4/pkg-descr
@@ -4,6 +4,3 @@ Rapid SVN and doesn't parse the output of the subversion client. So it is
 a real client itself instead of a frontend to the command line tool.
 
 WWW: http://www.alwins-world.de/programs/kdesvn/
-
-- Yuan Jue
-yuanjue@FreeBSD.org
diff --git a/devel/kdesvn-kde4/pkg-message b/devel/kdesvn-kde4/pkg-message
new file mode 100644
index 000000000000..efc506fba234
--- /dev/null
+++ b/devel/kdesvn-kde4/pkg-message
@@ -0,0 +1,5 @@
+kdesvn installs alternative svn protocols to that of kdesdk4. To use the
+kdesvn protocols append a 'k' to the beginning of the protocol, i.e.
+"svn+https://www.example.com/" becomes "ksvn+https://www.example.com/".
+kdesvn provides the following svn protocols:
+  ksvn, ksvn+file, ksvn+ssh, ksvn+http, ksvn+https
diff --git a/devel/kdesvn-kde4/pkg-plist b/devel/kdesvn-kde4/pkg-plist
index eb1d1f72a8ed..81c2410e77af 100644
--- a/devel/kdesvn-kde4/pkg-plist
+++ b/devel/kdesvn-kde4/pkg-plist
@@ -2,12 +2,18 @@ bin/kdesvn
 bin/kdesvnaskpass
 include/svnqt/annotate_line.hpp
 include/svnqt/apr.hpp
+include/svnqt/cache/DatabaseException.hpp
+include/svnqt/cache/LogCache.hpp
+include/svnqt/cache/ReposLog.hpp
 include/svnqt/check.hpp
 include/svnqt/client.hpp
 include/svnqt/commititem.hpp
+include/svnqt/conflictdescription.hpp
+include/svnqt/conflictresult.hpp
 include/svnqt/context.hpp
 include/svnqt/context_listener.hpp
 include/svnqt/datetime.hpp
+include/svnqt/diffoptions.hpp
 include/svnqt/dirent.hpp
 include/svnqt/entry.hpp
 include/svnqt/exception.hpp
@@ -22,6 +28,7 @@ include/svnqt/revision.hpp
 include/svnqt/shared_pointer.hpp
 include/svnqt/smart_pointer.hpp
 include/svnqt/status.hpp
+include/svnqt/stringarray.hpp
 include/svnqt/svnfilestream.hpp
 include/svnqt/svnqt_defines.hpp
 include/svnqt/svnqttypes.hpp
@@ -30,32 +37,39 @@ include/svnqt/targets.hpp
 include/svnqt/url.hpp
 include/svnqt/version_check.hpp
 include/svnqt/wc.hpp
-lib/kde3/kded_kdesvnd.la
-lib/kde3/kded_kdesvnd.so
-lib/kde3/kio_ksvn.la
-lib/kde3/kio_ksvn.so
-lib/kde3/libkdesvnpart.la
-lib/kde3/libkdesvnpart.so
-lib/libsvnqt.so
-lib/libsvnqt.so.4
-lib/libsvnqt.so.4.1.1
-share/applications/kde/kdesvn.desktop
-share/apps/kconf_update/kdesvnpartrc-use-external.upd
+lib/kde4/kded_kdesvnd.so
+lib/kde4/kdesvnpart.so
+lib/kde4/kio_ksvn.so
+lib/libsvnqt4.so
+lib/libsvnqt4.so.5
+lib/libsvnqt4.so.5.0.1
+share/applications/kde4/kdesvn.desktop
 share/apps/kconf_update/kdesvn-use-external-update.sh
+share/apps/kconf_update/kdesvnpartrc-use-external.upd
 share/apps/kdesvn/kdesvnui.rc
 share/apps/kdesvnpart/kdesvn_part.rc
-share/apps/konqueror/servicemenus/kdesvn_subversion.desktop
 share/config.kcfg/kdesvn_part.kcfg
-%%PORTDOCS%%%%DOCSDIR%%/common
-%%PORTDOCS%%%%DOCSDIR%%/hi128-filesys-kdesvnadded.png
-%%PORTDOCS%%%%DOCSDIR%%/hi128-filesys-kdesvnconflicted.png
-%%PORTDOCS%%%%DOCSDIR%%/hi128-filesys-kdesvndeleted.png
-%%PORTDOCS%%%%DOCSDIR%%/hi128-filesys-kdesvnlocked.png
-%%PORTDOCS%%%%DOCSDIR%%/hi128-filesys-kdesvnmodified.png
-%%PORTDOCS%%%%DOCSDIR%%/hi128-filesys-kdesvnneedlock.png
-%%PORTDOCS%%%%DOCSDIR%%/hi128-filesys-kdesvnupdates.png
-%%PORTDOCS%%%%DOCSDIR%%/index.cache.bz2
-%%PORTDOCS%%%%DOCSDIR%%/index.docbook
+share/dbus-1/interfaces/org.kde.kdesvnd.xml
+%%PORTDOCS%%share/doc/HTML/en/kdesvn/common
+%%PORTDOCS%%share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnadded.png
+%%PORTDOCS%%share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnconflicted.png
+%%PORTDOCS%%share/doc/HTML/en/kdesvn/hi128-filesys-kdesvndeleted.png
+%%PORTDOCS%%share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnlocked.png
+%%PORTDOCS%%share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnmodified.png
+%%PORTDOCS%%share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnneedlock.png
+%%PORTDOCS%%share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnupdates.png
+%%PORTDOCS%%share/doc/HTML/en/kdesvn/index.cache.bz2
+%%PORTDOCS%%share/doc/HTML/en/kdesvn/index.docbook
+%%PORTDOCS%%share/doc/HTML/nl/kdesvn/common
+%%PORTDOCS%%share/doc/HTML/nl/kdesvn/hi128-filesys-kdesvnadded.png
+%%PORTDOCS%%share/doc/HTML/nl/kdesvn/hi128-filesys-kdesvnconflicted.png
+%%PORTDOCS%%share/doc/HTML/nl/kdesvn/hi128-filesys-kdesvndeleted.png
+%%PORTDOCS%%share/doc/HTML/nl/kdesvn/hi128-filesys-kdesvnlocked.png
+%%PORTDOCS%%share/doc/HTML/nl/kdesvn/hi128-filesys-kdesvnmodified.png
+%%PORTDOCS%%share/doc/HTML/nl/kdesvn/hi128-filesys-kdesvnneedlock.png
+%%PORTDOCS%%share/doc/HTML/nl/kdesvn/hi128-filesys-kdesvnupdates.png
+%%PORTDOCS%%share/doc/HTML/nl/kdesvn/index.cache.bz2
+%%PORTDOCS%%share/doc/HTML/nl/kdesvn/index.docbook
 share/icons/hicolor/128x128/actions/kdesvnadd.png
 share/icons/hicolor/128x128/actions/kdesvnaddrecursive.png
 share/icons/hicolor/128x128/actions/kdesvnblame.png
@@ -69,21 +83,27 @@ share/icons/hicolor/128x128/actions/kdesvndelete.png
 share/icons/hicolor/128x128/actions/kdesvndiff.png
 share/icons/hicolor/128x128/actions/kdesvnexport.png
 share/icons/hicolor/128x128/actions/kdesvninfo.png
+share/icons/hicolor/128x128/actions/kdesvnleft.png
 share/icons/hicolor/128x128/actions/kdesvnlock.png
 share/icons/hicolor/128x128/actions/kdesvnlog.png
 share/icons/hicolor/128x128/actions/kdesvnmerge.png
 share/icons/hicolor/128x128/actions/kdesvnrelocate.png
+share/icons/hicolor/128x128/actions/kdesvnresolved.png
+share/icons/hicolor/128x128/actions/kdesvnreverse.png
+share/icons/hicolor/128x128/actions/kdesvnright.png
+share/icons/hicolor/128x128/actions/kdesvnrightreload.png
 share/icons/hicolor/128x128/actions/kdesvnswitch.png
+share/icons/hicolor/128x128/actions/kdesvntree.png
 share/icons/hicolor/128x128/actions/kdesvnunlock.png
 share/icons/hicolor/128x128/actions/kdesvnupdate.png
 share/icons/hicolor/128x128/apps/kdesvn.png
-share/icons/hicolor/128x128/filesystems/kdesvnadded.png
-share/icons/hicolor/128x128/filesystems/kdesvnconflicted.png
-share/icons/hicolor/128x128/filesystems/kdesvndeleted.png
-share/icons/hicolor/128x128/filesystems/kdesvnlocked.png
-share/icons/hicolor/128x128/filesystems/kdesvnmodified.png
-share/icons/hicolor/128x128/filesystems/kdesvnneedlock.png
-share/icons/hicolor/128x128/filesystems/kdesvnupdates.png
+share/icons/hicolor/128x128/places/kdesvnadded.png
+share/icons/hicolor/128x128/places/kdesvnconflicted.png
+share/icons/hicolor/128x128/places/kdesvndeleted.png
+share/icons/hicolor/128x128/places/kdesvnlocked.png
+share/icons/hicolor/128x128/places/kdesvnmodified.png
+share/icons/hicolor/128x128/places/kdesvnneedlock.png
+share/icons/hicolor/128x128/places/kdesvnupdates.png
 share/icons/hicolor/16x16/actions/kdesvnadd.png
 share/icons/hicolor/16x16/actions/kdesvnaddrecursive.png
 share/icons/hicolor/16x16/actions/kdesvnblame.png
@@ -97,21 +117,27 @@ share/icons/hicolor/16x16/actions/kdesvndelete.png
 share/icons/hicolor/16x16/actions/kdesvndiff.png
 share/icons/hicolor/16x16/actions/kdesvnexport.png
 share/icons/hicolor/16x16/actions/kdesvninfo.png
+share/icons/hicolor/16x16/actions/kdesvnleft.png
 share/icons/hicolor/16x16/actions/kdesvnlock.png
 share/icons/hicolor/16x16/actions/kdesvnlog.png
 share/icons/hicolor/16x16/actions/kdesvnmerge.png
 share/icons/hicolor/16x16/actions/kdesvnrelocate.png
+share/icons/hicolor/16x16/actions/kdesvnresolved.png
+share/icons/hicolor/16x16/actions/kdesvnreverse.png
+share/icons/hicolor/16x16/actions/kdesvnright.png
+share/icons/hicolor/16x16/actions/kdesvnrightreload.png
 share/icons/hicolor/16x16/actions/kdesvnswitch.png
+share/icons/hicolor/16x16/actions/kdesvntree.png
 share/icons/hicolor/16x16/actions/kdesvnunlock.png
 share/icons/hicolor/16x16/actions/kdesvnupdate.png
 share/icons/hicolor/16x16/apps/kdesvn.png
-share/icons/hicolor/16x16/filesystems/kdesvnadded.png
-share/icons/hicolor/16x16/filesystems/kdesvnconflicted.png
-share/icons/hicolor/16x16/filesystems/kdesvndeleted.png
-share/icons/hicolor/16x16/filesystems/kdesvnlocked.png
-share/icons/hicolor/16x16/filesystems/kdesvnmodified.png
-share/icons/hicolor/16x16/filesystems/kdesvnneedlock.png
-share/icons/hicolor/16x16/filesystems/kdesvnupdates.png
+share/icons/hicolor/16x16/places/kdesvnadded.png
+share/icons/hicolor/16x16/places/kdesvnconflicted.png
+share/icons/hicolor/16x16/places/kdesvndeleted.png
+share/icons/hicolor/16x16/places/kdesvnlocked.png
+share/icons/hicolor/16x16/places/kdesvnmodified.png
+share/icons/hicolor/16x16/places/kdesvnneedlock.png
+share/icons/hicolor/16x16/places/kdesvnupdates.png
 share/icons/hicolor/22x22/actions/kdesvnadd.png
 share/icons/hicolor/22x22/actions/kdesvnaddrecursive.png
 share/icons/hicolor/22x22/actions/kdesvnblame.png
@@ -125,21 +151,27 @@ share/icons/hicolor/22x22/actions/kdesvndelete.png
 share/icons/hicolor/22x22/actions/kdesvndiff.png
 share/icons/hicolor/22x22/actions/kdesvnexport.png
 share/icons/hicolor/22x22/actions/kdesvninfo.png
+share/icons/hicolor/22x22/actions/kdesvnleft.png
 share/icons/hicolor/22x22/actions/kdesvnlock.png
 share/icons/hicolor/22x22/actions/kdesvnlog.png
 share/icons/hicolor/22x22/actions/kdesvnmerge.png
 share/icons/hicolor/22x22/actions/kdesvnrelocate.png
+share/icons/hicolor/22x22/actions/kdesvnresolved.png
+share/icons/hicolor/22x22/actions/kdesvnreverse.png
+share/icons/hicolor/22x22/actions/kdesvnright.png
+share/icons/hicolor/22x22/actions/kdesvnrightreload.png
 share/icons/hicolor/22x22/actions/kdesvnswitch.png
+share/icons/hicolor/22x22/actions/kdesvntree.png
 share/icons/hicolor/22x22/actions/kdesvnunlock.png
 share/icons/hicolor/22x22/actions/kdesvnupdate.png
 share/icons/hicolor/22x22/apps/kdesvn.png
-share/icons/hicolor/22x22/filesystems/kdesvnadded.png
-share/icons/hicolor/22x22/filesystems/kdesvnconflicted.png
-share/icons/hicolor/22x22/filesystems/kdesvndeleted.png
-share/icons/hicolor/22x22/filesystems/kdesvnlocked.png
-share/icons/hicolor/22x22/filesystems/kdesvnmodified.png
-share/icons/hicolor/22x22/filesystems/kdesvnneedlock.png
-share/icons/hicolor/22x22/filesystems/kdesvnupdates.png
+share/icons/hicolor/22x22/places/kdesvnadded.png
+share/icons/hicolor/22x22/places/kdesvnconflicted.png
+share/icons/hicolor/22x22/places/kdesvndeleted.png
+share/icons/hicolor/22x22/places/kdesvnlocked.png
+share/icons/hicolor/22x22/places/kdesvnmodified.png
+share/icons/hicolor/22x22/places/kdesvnneedlock.png
+share/icons/hicolor/22x22/places/kdesvnupdates.png
 share/icons/hicolor/32x32/actions/kdesvnadd.png
 share/icons/hicolor/32x32/actions/kdesvnaddrecursive.png
 share/icons/hicolor/32x32/actions/kdesvnblame.png
@@ -153,21 +185,27 @@ share/icons/hicolor/32x32/actions/kdesvndelete.png
 share/icons/hicolor/32x32/actions/kdesvndiff.png
 share/icons/hicolor/32x32/actions/kdesvnexport.png
 share/icons/hicolor/32x32/actions/kdesvninfo.png
+share/icons/hicolor/32x32/actions/kdesvnleft.png
 share/icons/hicolor/32x32/actions/kdesvnlock.png
 share/icons/hicolor/32x32/actions/kdesvnlog.png
 share/icons/hicolor/32x32/actions/kdesvnmerge.png
 share/icons/hicolor/32x32/actions/kdesvnrelocate.png
+share/icons/hicolor/32x32/actions/kdesvnresolved.png
+share/icons/hicolor/32x32/actions/kdesvnreverse.png
+share/icons/hicolor/32x32/actions/kdesvnright.png
+share/icons/hicolor/32x32/actions/kdesvnrightreload.png
 share/icons/hicolor/32x32/actions/kdesvnswitch.png
+share/icons/hicolor/32x32/actions/kdesvntree.png
 share/icons/hicolor/32x32/actions/kdesvnunlock.png
 share/icons/hicolor/32x32/actions/kdesvnupdate.png
 share/icons/hicolor/32x32/apps/kdesvn.png
-share/icons/hicolor/32x32/filesystems/kdesvnadded.png
-share/icons/hicolor/32x32/filesystems/kdesvnconflicted.png
-share/icons/hicolor/32x32/filesystems/kdesvndeleted.png
-share/icons/hicolor/32x32/filesystems/kdesvnlocked.png
-share/icons/hicolor/32x32/filesystems/kdesvnmodified.png
-share/icons/hicolor/32x32/filesystems/kdesvnneedlock.png
-share/icons/hicolor/32x32/filesystems/kdesvnupdates.png
+share/icons/hicolor/32x32/places/kdesvnadded.png
+share/icons/hicolor/32x32/places/kdesvnconflicted.png
+share/icons/hicolor/32x32/places/kdesvndeleted.png
+share/icons/hicolor/32x32/places/kdesvnlocked.png
+share/icons/hicolor/32x32/places/kdesvnmodified.png
+share/icons/hicolor/32x32/places/kdesvnneedlock.png
+share/icons/hicolor/32x32/places/kdesvnupdates.png
 share/icons/hicolor/48x48/actions/kdesvnadd.png
 share/icons/hicolor/48x48/actions/kdesvnaddrecursive.png
 share/icons/hicolor/48x48/actions/kdesvnblame.png
@@ -181,21 +219,27 @@ share/icons/hicolor/48x48/actions/kdesvndelete.png
 share/icons/hicolor/48x48/actions/kdesvndiff.png
 share/icons/hicolor/48x48/actions/kdesvnexport.png
 share/icons/hicolor/48x48/actions/kdesvninfo.png
+share/icons/hicolor/48x48/actions/kdesvnleft.png
 share/icons/hicolor/48x48/actions/kdesvnlock.png
 share/icons/hicolor/48x48/actions/kdesvnlog.png
 share/icons/hicolor/48x48/actions/kdesvnmerge.png
 share/icons/hicolor/48x48/actions/kdesvnrelocate.png
+share/icons/hicolor/48x48/actions/kdesvnresolved.png
+share/icons/hicolor/48x48/actions/kdesvnreverse.png
+share/icons/hicolor/48x48/actions/kdesvnright.png
+share/icons/hicolor/48x48/actions/kdesvnrightreload.png
 share/icons/hicolor/48x48/actions/kdesvnswitch.png
+share/icons/hicolor/48x48/actions/kdesvntree.png
 share/icons/hicolor/48x48/actions/kdesvnunlock.png
 share/icons/hicolor/48x48/actions/kdesvnupdate.png
 share/icons/hicolor/48x48/apps/kdesvn.png
-share/icons/hicolor/48x48/filesystems/kdesvnadded.png
-share/icons/hicolor/48x48/filesystems/kdesvnconflicted.png
-share/icons/hicolor/48x48/filesystems/kdesvndeleted.png
-share/icons/hicolor/48x48/filesystems/kdesvnlocked.png
-share/icons/hicolor/48x48/filesystems/kdesvnmodified.png
-share/icons/hicolor/48x48/filesystems/kdesvnneedlock.png
-share/icons/hicolor/48x48/filesystems/kdesvnupdates.png
+share/icons/hicolor/48x48/places/kdesvnadded.png
+share/icons/hicolor/48x48/places/kdesvnconflicted.png
+share/icons/hicolor/48x48/places/kdesvndeleted.png
+share/icons/hicolor/48x48/places/kdesvnlocked.png
+share/icons/hicolor/48x48/places/kdesvnmodified.png
+share/icons/hicolor/48x48/places/kdesvnneedlock.png
+share/icons/hicolor/48x48/places/kdesvnupdates.png
 share/icons/hicolor/64x64/actions/kdesvnadd.png
 share/icons/hicolor/64x64/actions/kdesvnaddrecursive.png
 share/icons/hicolor/64x64/actions/kdesvnblame.png
@@ -209,21 +253,60 @@ share/icons/hicolor/64x64/actions/kdesvndelete.png
 share/icons/hicolor/64x64/actions/kdesvndiff.png
 share/icons/hicolor/64x64/actions/kdesvnexport.png
 share/icons/hicolor/64x64/actions/kdesvninfo.png
+share/icons/hicolor/64x64/actions/kdesvnleft.png
 share/icons/hicolor/64x64/actions/kdesvnlock.png
 share/icons/hicolor/64x64/actions/kdesvnlog.png
 share/icons/hicolor/64x64/actions/kdesvnmerge.png
 share/icons/hicolor/64x64/actions/kdesvnrelocate.png
+share/icons/hicolor/64x64/actions/kdesvnresolved.png
+share/icons/hicolor/64x64/actions/kdesvnreverse.png
+share/icons/hicolor/64x64/actions/kdesvnright.png
+share/icons/hicolor/64x64/actions/kdesvnrightreload.png
 share/icons/hicolor/64x64/actions/kdesvnswitch.png
+share/icons/hicolor/64x64/actions/kdesvntree.png
 share/icons/hicolor/64x64/actions/kdesvnunlock.png
 share/icons/hicolor/64x64/actions/kdesvnupdate.png
 share/icons/hicolor/64x64/apps/kdesvn.png
-share/icons/hicolor/64x64/filesystems/kdesvnadded.png
-share/icons/hicolor/64x64/filesystems/kdesvnconflicted.png
-share/icons/hicolor/64x64/filesystems/kdesvndeleted.png
-share/icons/hicolor/64x64/filesystems/kdesvnlocked.png
-share/icons/hicolor/64x64/filesystems/kdesvnmodified.png
-share/icons/hicolor/64x64/filesystems/kdesvnneedlock.png
-share/icons/hicolor/64x64/filesystems/kdesvnupdates.png
+share/icons/hicolor/64x64/places/kdesvnadded.png
+share/icons/hicolor/64x64/places/kdesvnconflicted.png
+share/icons/hicolor/64x64/places/kdesvndeleted.png
+share/icons/hicolor/64x64/places/kdesvnlocked.png
+share/icons/hicolor/64x64/places/kdesvnmodified.png
+share/icons/hicolor/64x64/places/kdesvnneedlock.png
+share/icons/hicolor/64x64/places/kdesvnupdates.png
+share/icons/hicolor/96x96/actions/kdesvnadd.png
+share/icons/hicolor/96x96/actions/kdesvnaddrecursive.png
+share/icons/hicolor/96x96/actions/kdesvnblame.png
+share/icons/hicolor/96x96/actions/kdesvncat.png
+share/icons/hicolor/96x96/actions/kdesvncheckout.png
+share/icons/hicolor/96x96/actions/kdesvncheckupdates.png
+share/icons/hicolor/96x96/actions/kdesvncleanup.png
+share/icons/hicolor/96x96/actions/kdesvncommit.png
+share/icons/hicolor/96x96/actions/kdesvncopy.png
+share/icons/hicolor/96x96/actions/kdesvndelete.png
+share/icons/hicolor/96x96/actions/kdesvndiff.png
+share/icons/hicolor/96x96/actions/kdesvnexport.png
+share/icons/hicolor/96x96/actions/kdesvninfo.png
+share/icons/hicolor/96x96/actions/kdesvnleft.png
+share/icons/hicolor/96x96/actions/kdesvnlock.png
+share/icons/hicolor/96x96/actions/kdesvnlog.png
+share/icons/hicolor/96x96/actions/kdesvnmerge.png
+share/icons/hicolor/96x96/actions/kdesvnrelocate.png
+share/icons/hicolor/96x96/actions/kdesvnresolved.png
+share/icons/hicolor/96x96/actions/kdesvnreverse.png
+share/icons/hicolor/96x96/actions/kdesvnright.png
+share/icons/hicolor/96x96/actions/kdesvnrightreload.png
+share/icons/hicolor/96x96/actions/kdesvnswitch.png
+share/icons/hicolor/96x96/actions/kdesvntree.png
+share/icons/hicolor/96x96/actions/kdesvnunlock.png
+share/icons/hicolor/96x96/actions/kdesvnupdate.png
+share/icons/hicolor/96x96/places/kdesvnadded.png
+share/icons/hicolor/96x96/places/kdesvnconflicted.png
+share/icons/hicolor/96x96/places/kdesvndeleted.png
+share/icons/hicolor/96x96/places/kdesvnlocked.png
+share/icons/hicolor/96x96/places/kdesvnmodified.png
+share/icons/hicolor/96x96/places/kdesvnneedlock.png
+share/icons/hicolor/96x96/places/kdesvnupdates.png
 share/icons/hicolor/scalable/actions/kdesvnadd.svgz
 share/icons/hicolor/scalable/actions/kdesvnaddrecursive.svgz
 share/icons/hicolor/scalable/actions/kdesvnblame.svgz
@@ -231,53 +314,57 @@ share/icons/hicolor/scalable/actions/kdesvncat.svgz
 share/icons/hicolor/scalable/actions/kdesvncheckout.svgz
 share/icons/hicolor/scalable/actions/kdesvncheckupdates.svgz
 share/icons/hicolor/scalable/actions/kdesvncleanup.svgz
+share/icons/hicolor/scalable/actions/kdesvncolors.svgz
 share/icons/hicolor/scalable/actions/kdesvncommit.svgz
 share/icons/hicolor/scalable/actions/kdesvncopy.svgz
 share/icons/hicolor/scalable/actions/kdesvndelete.svgz
 share/icons/hicolor/scalable/actions/kdesvndiff.svgz
 share/icons/hicolor/scalable/actions/kdesvnexport.svgz
+share/icons/hicolor/scalable/actions/kdesvnimportfolder.svgz
 share/icons/hicolor/scalable/actions/kdesvninfo.svgz
+share/icons/hicolor/scalable/actions/kdesvnleft.svgz
 share/icons/hicolor/scalable/actions/kdesvnlock.svgz
 share/icons/hicolor/scalable/actions/kdesvnlog.svgz
 share/icons/hicolor/scalable/actions/kdesvnmerge.svgz
+share/icons/hicolor/scalable/actions/kdesvnmove.svgz
+share/icons/hicolor/scalable/actions/kdesvnnewfolder.svgz
 share/icons/hicolor/scalable/actions/kdesvnrelocate.svgz
+share/icons/hicolor/scalable/actions/kdesvnrepository.svgz
+share/icons/hicolor/scalable/actions/kdesvnresolved.svgz
+share/icons/hicolor/scalable/actions/kdesvnreverse.svgz
+share/icons/hicolor/scalable/actions/kdesvnright.svgz
+share/icons/hicolor/scalable/actions/kdesvnrightreload.svgz
 share/icons/hicolor/scalable/actions/kdesvnswitch.svgz
+share/icons/hicolor/scalable/actions/kdesvnterminal.svgz
+share/icons/hicolor/scalable/actions/kdesvntree.svgz
 share/icons/hicolor/scalable/actions/kdesvnunlock.svgz
 share/icons/hicolor/scalable/actions/kdesvnupdate.svgz
 share/icons/hicolor/scalable/apps/kdesvn.svgz
-share/icons/hicolor/scalable/filesystems/kdesvnadded.svgz
-share/icons/hicolor/scalable/filesystems/kdesvnconflicted.svgz
-share/icons/hicolor/scalable/filesystems/kdesvndeleted.svgz
-share/icons/hicolor/scalable/filesystems/kdesvnlocked.svgz
-share/icons/hicolor/scalable/filesystems/kdesvnmodified.svgz
-share/icons/hicolor/scalable/filesystems/kdesvnneedlock.svgz
-share/icons/hicolor/scalable/filesystems/kdesvnupdates.svgz
-%%NLS%%share/locale/ca/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/de/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/es/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/it/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/pa/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/kdesvn.mo
-share/services/kded/kdesvnd.desktop
-share/services/ksvn+file.protocol
-share/services/ksvn+http.protocol
-share/services/ksvn+https.protocol
-share/services/ksvn+ssh.protocol
-share/services/ksvn.protocol
-share/services/svn+file.protocol
-share/services/svn+http.protocol
-share/services/svn+https.protocol
-share/services/svn+ssh.protocol
-share/services/svn.protocol
-@dirrmtry share/services/kded
+share/icons/hicolor/scalable/places/kdesvnadded.svgz
+share/icons/hicolor/scalable/places/kdesvnconflicted.svgz
+share/icons/hicolor/scalable/places/kdesvndeleted.svgz
+share/icons/hicolor/scalable/places/kdesvnlocked.svgz
+share/icons/hicolor/scalable/places/kdesvnmodified.svgz
+share/icons/hicolor/scalable/places/kdesvnneedlock.svgz
+share/icons/hicolor/scalable/places/kdesvnupdates.svgz
+share/kde4/services/ServiceMenus/kdesvn_subversion.desktop
+share/kde4/services/kded/kdesvnd.desktop
+share/kde4/services/kdesvnpart.desktop
+share/kde4/services/ksvn+file.protocol
+share/kde4/services/ksvn+http.protocol
+share/kde4/services/ksvn+https.protocol
+share/kde4/services/ksvn+ssh.protocol
+share/kde4/services/ksvn.protocol
+share/locale/de/LC_MESSAGES/kdesvn.mo
+share/locale/es/LC_MESSAGES/kdesvn.mo
+share/locale/fr/LC_MESSAGES/kdesvn.mo
+share/locale/ja/LC_MESSAGES/kdesvn.mo
+share/locale/lt/LC_MESSAGES/kdesvn.mo
+share/locale/nl/LC_MESSAGES/kdesvn.mo
+share/locale/ru/LC_MESSAGES/kdesvn.mo
+%%PORTDOCS%%@dirrm share/doc/HTML/en/kdesvn
+%%PORTDOCS%%@dirrm share/doc/HTML/nl/kdesvn
 @dirrm share/apps/kdesvnpart
 @dirrm share/apps/kdesvn
-@dirrmtry share/applications/kde
+@dirrm include/svnqt/cache
 @dirrm include/svnqt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%