Update to 0.14.1.

PR:		ports/119335
Submitted by:	maintainer (yuanjue)

8 files changed, 66 insertions, 20 deletions

diff --git a/devel/kdesvn-kde4/Makefile b/devel/kdesvn-kde4/Makefile
index 1c0feb4e0b9..3c11805774b 100644
--- a/devel/kdesvn-kde4/Makefile
+++ b/devel/kdesvn-kde4/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	kdesvn
-PORTVERSION=	0.13.0
+PORTVERSION=	0.14.1
 CATEGORIES=	devel kde
 MASTER_SITES=	http://www.alwins-world.de/programs/download/${PORTNAME}/${PORTVERSION:R}.x/
 
@@ -29,8 +29,6 @@ LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr-svn \
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
@@ -38,8 +36,8 @@ INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
+EXTRA_PATCHES=	${FILESDIR}/nls-patch-CMakeLists.txt
 .endif
 
 DOCSDIR=	${PREFIX}/share/doc/HTML/en/${PORTNAME}
diff --git a/devel/kdesvn-kde4/distinfo b/devel/kdesvn-kde4/distinfo
index a3ebab1f7b3..545bd61b768 100644
--- a/devel/kdesvn-kde4/distinfo
+++ b/devel/kdesvn-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (kdesvn-0.13.0.tar.bz2) = 8722253b4fe7789e2394d0f9f85dc52f
-SHA256 (kdesvn-0.13.0.tar.bz2) = eac9b85d1f99c3048145bd46c3537870f92fb079e46c14b424ffb6c93642f249
-SIZE (kdesvn-0.13.0.tar.bz2) = 1243539
+MD5 (kdesvn-0.14.1.tar.bz2) = cdd1e2244e1aee3641e76124edd300f4
+SHA256 (kdesvn-0.14.1.tar.bz2) = 6e41794beb23c95542f807cbd93d05a734a0c1eb77544680f2842cc66111e8eb
+SIZE (kdesvn-0.14.1.tar.bz2) = 1267828
diff --git a/devel/kdesvn-kde4/files/nls-patch-CMakeLists.txt b/devel/kdesvn-kde4/files/nls-patch-CMakeLists.txt
new file mode 100644
index 00000000000..8e17a904f72
--- /dev/null
+++ b/devel/kdesvn-kde4/files/nls-patch-CMakeLists.txt
@@ -0,0 +1,23 @@
+--- 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-plist b/devel/kdesvn-kde4/pkg-plist
index 21dd3081fb8..7f416719675 100644
--- a/devel/kdesvn-kde4/pkg-plist
+++ b/devel/kdesvn-kde4/pkg-plist
@@ -24,6 +24,7 @@ include/svnqt/smart_pointer.hpp
 include/svnqt/status.hpp
 include/svnqt/svnfilestream.hpp
 include/svnqt/svnqt_defines.hpp
+include/svnqt/svnqttypes.hpp
 include/svnqt/svnstream.hpp
 include/svnqt/targets.hpp
 include/svnqt/url.hpp
@@ -35,11 +36,12 @@ lib/kde3/kio_ksvn.la
 lib/kde3/kio_ksvn.so
 lib/kde3/libkdesvnpart.la
 lib/kde3/libkdesvnpart.so
-lib/libsvnqt.la
 lib/libsvnqt.so
-lib/libsvnqt.so.3
-lib/libsvnqt.so.3.2.0
+lib/libsvnqt.so.4
+lib/libsvnqt.so.4.0.0
 share/applications/kde/kdesvn.desktop
+share/apps/kconf_update/kdesvnpartrc-use-external.upd
+share/apps/kconf_update/kdesvn-use-external-update.sh
 share/apps/kdesvn/kdesvnui.rc
 share/apps/kdesvnpart/kdesvn_part.rc
 share/apps/konqueror/servicemenus/kdesvn_subversion.desktop
diff --git a/devel/kdesvn/Makefile b/devel/kdesvn/Makefile
index 1c0feb4e0b9..3c11805774b 100644
--- a/devel/kdesvn/Makefile
+++ b/devel/kdesvn/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	kdesvn
-PORTVERSION=	0.13.0
+PORTVERSION=	0.14.1
 CATEGORIES=	devel kde
 MASTER_SITES=	http://www.alwins-world.de/programs/download/${PORTNAME}/${PORTVERSION:R}.x/
 
@@ -29,8 +29,6 @@ LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr-svn \
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
@@ -38,8 +36,8 @@ INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
+EXTRA_PATCHES=	${FILESDIR}/nls-patch-CMakeLists.txt
 .endif
 
 DOCSDIR=	${PREFIX}/share/doc/HTML/en/${PORTNAME}
diff --git a/devel/kdesvn/distinfo b/devel/kdesvn/distinfo
index a3ebab1f7b3..545bd61b768 100644
--- a/devel/kdesvn/distinfo
+++ b/devel/kdesvn/distinfo
@@ -1,3 +1,3 @@
-MD5 (kdesvn-0.13.0.tar.bz2) = 8722253b4fe7789e2394d0f9f85dc52f
-SHA256 (kdesvn-0.13.0.tar.bz2) = eac9b85d1f99c3048145bd46c3537870f92fb079e46c14b424ffb6c93642f249
-SIZE (kdesvn-0.13.0.tar.bz2) = 1243539
+MD5 (kdesvn-0.14.1.tar.bz2) = cdd1e2244e1aee3641e76124edd300f4
+SHA256 (kdesvn-0.14.1.tar.bz2) = 6e41794beb23c95542f807cbd93d05a734a0c1eb77544680f2842cc66111e8eb
+SIZE (kdesvn-0.14.1.tar.bz2) = 1267828
diff --git a/devel/kdesvn/files/nls-patch-CMakeLists.txt b/devel/kdesvn/files/nls-patch-CMakeLists.txt
new file mode 100644
index 00000000000..8e17a904f72
--- /dev/null
+++ b/devel/kdesvn/files/nls-patch-CMakeLists.txt
@@ -0,0 +1,23 @@
+--- 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/pkg-plist b/devel/kdesvn/pkg-plist
index 21dd3081fb8..7f416719675 100644
--- a/devel/kdesvn/pkg-plist
+++ b/devel/kdesvn/pkg-plist
@@ -24,6 +24,7 @@ include/svnqt/smart_pointer.hpp
 include/svnqt/status.hpp
 include/svnqt/svnfilestream.hpp
 include/svnqt/svnqt_defines.hpp
+include/svnqt/svnqttypes.hpp
 include/svnqt/svnstream.hpp
 include/svnqt/targets.hpp
 include/svnqt/url.hpp
@@ -35,11 +36,12 @@ lib/kde3/kio_ksvn.la
 lib/kde3/kio_ksvn.so
 lib/kde3/libkdesvnpart.la
 lib/kde3/libkdesvnpart.so
-lib/libsvnqt.la
 lib/libsvnqt.so
-lib/libsvnqt.so.3
-lib/libsvnqt.so.3.2.0
+lib/libsvnqt.so.4
+lib/libsvnqt.so.4.0.0
 share/applications/kde/kdesvn.desktop
+share/apps/kconf_update/kdesvnpartrc-use-external.upd
+share/apps/kconf_update/kdesvn-use-external-update.sh
 share/apps/kdesvn/kdesvnui.rc
 share/apps/kdesvnpart/kdesvn_part.rc
 share/apps/konqueror/servicemenus/kdesvn_subversion.desktop