3 files changed, 34 insertions, 16 deletions

diff --git a/devel/kdesvn/Makefile b/devel/kdesvn/Makefile
index 25dbd917fb25..cde1f902f7be 100644
--- a/devel/kdesvn/Makefile
+++ b/devel/kdesvn/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	kdesvn
-PORTVERSION=	0.9.1
+PORTVERSION=	0.10.0
 CATEGORIES=	devel kde
 MASTER_SITES=	http://www.alwins-world.de/programs/download/${PORTNAME}/ \
 		http://www.yuanjue.net/download/
@@ -13,19 +13,28 @@ MASTER_SITES=	http://www.alwins-world.de/programs/download/${PORTNAME}/ \
 MAINTAINER=	yuanjue@yuanjue.net
 COMMENT=	KDE frontend for Subversion
 
-EXTRA_PATCHES=	${PORTSDIR}/x11/kde3/files/extrapatch-old_configure
+BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
+
+WRKSRC=		${WRKDIR}/${DISTNAME}-build
+PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
+
+CMAKE_ARGS=	-DCMAKE_BUILD_TYPE:STRING=Release \
+		-DCMAKE_C_COMPILER:STRING='${CC}' \
+		-DCMAKE_CXX_COMPILER:STRING=${CXX} \
+		-DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}"
 
 LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr-svn \
 		svn_client-1:${PORTSDIR}/devel/subversion \
 		neon:${PORTSDIR}/www/neon
 
+USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
+
+CXXFLAGS+=	-lc
 
-CONFIGURE_ARGS+=--with-apr-config=apr-1-config \
-		--with-apu-config=apu-1-config
+MAN1=	kdesvn.1 kdesvnaskpass.1
 
 .include <bsd.port.pre.mk>
 
@@ -33,7 +42,15 @@ CONFIGURE_ARGS+=--with-apr-config=apr-1-config \
 BROKEN=		Does not compile on 4.x
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||g'	${WRKSRC}/${CONFIGURE_SCRIPT}
+post-extract:
+	${MKDIR} ${WRKSRC}
+
+do-configure:
+	@(cd ${WRKSRC}; \
+	${LOCALBASE}/bin/cmake ${CMAKE_ARGS} ${PATCH_WRKSRC})
+
+post-install:
+	@${MV} ${PREFIX}/share/man/man1/kdesvn.1 ${PREFIX}/man/man1/kdesvn.1
+	@${MV} ${PREFIX}/share/man/man1/kdesvnaskpass.1 ${PREFIX}/man/man1/kdesvnaskpass.1
 
 .include <bsd.port.post.mk>
diff --git a/devel/kdesvn/distinfo b/devel/kdesvn/distinfo
index 0493f06ff3fb..bf2bfb4b5911 100644
--- a/devel/kdesvn/distinfo
+++ b/devel/kdesvn/distinfo
@@ -1,3 +1,3 @@
-MD5 (kdesvn-0.9.1.tar.gz) = 5ae31df56b853976db56400b1fd1b4fa
-SHA256 (kdesvn-0.9.1.tar.gz) = 79c4d369ebdc52924f641a14ca58a2dabc50804677e10d6132b218b9e0f99018
-SIZE (kdesvn-0.9.1.tar.gz) = 2027518
+MD5 (kdesvn-0.10.0.tar.bz2) = 896d62ac8687236f05e984ba6cd69e6b
+SHA256 (kdesvn-0.10.0.tar.bz2) = af453638b263bcfaf8060f9270a5ddddcc76f7beae7958908499f6e9cfa3129c
+SIZE (kdesvn-0.10.0.tar.bz2) = 1179156
diff --git a/devel/kdesvn/pkg-plist b/devel/kdesvn/pkg-plist
index d6ff1c05849e..5a2f16d44c1e 100644
--- a/devel/kdesvn/pkg-plist
+++ b/devel/kdesvn/pkg-plist
@@ -19,6 +19,7 @@ include/svnqt/pool.hpp
 include/svnqt/repository.hpp
 include/svnqt/repositorylistener.hpp
 include/svnqt/revision.hpp
+include/svnqt/smart_pointer.hpp
 include/svnqt/status.hpp
 include/svnqt/svnfilestream.hpp
 include/svnqt/svnqt_defines.hpp
@@ -27,19 +28,16 @@ include/svnqt/targets.hpp
 include/svnqt/url.hpp
 include/svnqt/version_check.hpp
 include/svnqt/wc.hpp
-lib/kde3/kded_kdesvnd.a
 lib/kde3/kded_kdesvnd.la
 lib/kde3/kded_kdesvnd.so
-lib/kde3/kio_ksvn.a
 lib/kde3/kio_ksvn.la
 lib/kde3/kio_ksvn.so
-lib/kde3/libkdesvnpart.a
 lib/kde3/libkdesvnpart.la
 lib/kde3/libkdesvnpart.so
-lib/libsvnqt.a
 lib/libsvnqt.la
 lib/libsvnqt.so
-lib/libsvnqt.so.4
+lib/libsvnqt.so.3
+lib/libsvnqt.so.3.0.0
 share/applications/kde/kdesvn.desktop
 share/apps/kdesvn/kdesvnui.rc
 share/apps/kdesvnpart/kdesvn_part.rc
@@ -47,6 +45,7 @@ share/apps/konqueror/servicemenus/kdesvn_subversion.desktop
 share/config.kcfg/kdesvn_part.kcfg
 share/doc/HTML/en/kdesvn/common
 share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnadded.png
+share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnconflicted.png
 share/doc/HTML/en/kdesvn/hi128-filesys-kdesvndeleted.png
 share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnlocked.png
 share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnmodified.png
@@ -251,12 +250,14 @@ share/icons/hicolor/scalable/filesystems/kdesvnmodified.svgz
 share/icons/hicolor/scalable/filesystems/kdesvnneedlock.svgz
 share/icons/hicolor/scalable/filesystems/kdesvnupdates.svgz
 share/locale/ca/LC_MESSAGES/kdesvn.mo
+share/locale/cs/LC_MESSAGES/kdesvn.mo
 share/locale/de/LC_MESSAGES/kdesvn.mo
 share/locale/es/LC_MESSAGES/kdesvn.mo
 share/locale/fr/LC_MESSAGES/kdesvn.mo
 share/locale/it/LC_MESSAGES/kdesvn.mo
 share/locale/nl/LC_MESSAGES/kdesvn.mo
 share/locale/pa/LC_MESSAGES/kdesvn.mo
+share/locale/ru/LC_MESSAGES/kdesvn.mo
 share/locale/sv/LC_MESSAGES/kdesvn.mo
 share/services/kded/kdesvnd.desktop
 share/services/ksvn+file.protocol