Update to 1.7.0, the first release developed and hosted within KDE's infrastructure.

While here, switch to an out-of-source CMake build.

Approved by:	dbn (maintainer)
Differential Revision:	https://reviews.freebsd.org/D5026

7 files changed, 52 insertions, 96 deletions

diff --git a/devel/kdesvn-kde4/Makefile b/devel/kdesvn-kde4/Makefile
index 3805f3fd219f..e7be4533ef88 100644
--- a/devel/kdesvn-kde4/Makefile
+++ b/devel/kdesvn-kde4/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	kdesvn
-DISTVERSION=	1.6.0
-PORTREVISION=	4
+DISTVERSION=	1.7.0
 CATEGORIES=	devel kde
-MASTER_SITES=	http://box.alwins-world.de/owncloud/index.php/s/3e6f4c2273b329c185ff25824277bf42/download?path=%2F1.6.0&files=kdesvn-1.6.0.tar.bz2&dummy=
+MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	dbn@FreeBSD.org
 COMMENT=	KDE frontend for Subversion
@@ -16,13 +15,12 @@ LICENSE=	GPLv2
 
 CONFLICTS=	qsvn-[0-9]*
 
-FETCH_ARGS=	-Fpr -o ${DISTFILES}
-
-USES=		cmake tar:bzip2
-CMAKE_ARGS+=	-DSUBVERSION_INCLUDE_DIR=${LOCALBASE}/include/subversion-1
+USES=		cmake:outsource tar:xz
+CMAKE_ARGS+=	-DSUBVERSION_INCLUDE_DIR=${LOCALBASE}/include/subversion-1 \
+		-DMAN_INSTALL_DIR=${MANPREFIX}/man
 USE_KDE4=	kdelibs kdeprefix automoc4
 USE_LDCONFIG=	yes
-USE_QT4=	corelib gui xml network dbus svg qt3support sql \
+USE_QT4=	corelib gui xml network dbus svg sql \
 		qmake_build moc_build rcc_build uic_build linguist_build
 
 OPTIONS_DEFINE=	DOCS NLS
diff --git a/devel/kdesvn-kde4/distinfo b/devel/kdesvn-kde4/distinfo
index b874a078417a..2fab2a8ec48c 100644
--- a/devel/kdesvn-kde4/distinfo
+++ b/devel/kdesvn-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kdesvn-1.6.0.tar.bz2) = 05686f246b76810f90a9f80f1d45cdccf812b42e18fa10a16b14e7d27d370f96
-SIZE (kdesvn-1.6.0.tar.bz2) = 1863823
+SHA256 (kdesvn-1.7.0.tar.xz) = b3a9dc01e1730c880478aecd5c8d832a4b218468f791083985d325c0ef8a6ece
+SIZE (kdesvn-1.7.0.tar.xz) = 1965064
diff --git a/devel/kdesvn-kde4/files/patch-doc-man-CMakeLists.txt b/devel/kdesvn-kde4/files/patch-doc-man-CMakeLists.txt
deleted file mode 100644
index 86ebe7091b2f..000000000000
--- a/devel/kdesvn-kde4/files/patch-doc-man-CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- doc/man/CMakeLists.txt.orig	Fri Aug 25 05:29:36 2006
-+++ doc/man/CMakeLists.txt	Sun Oct 22 10:25:58 2006
-@@ -4,5 +4,5 @@
- 
- INSTALL(FILES 
-     ${MANFILES}
--    DESTINATION share/man/man1)
-+    DESTINATION man/man1)
- 
diff --git a/devel/kdesvn-kde4/files/patch-src__kdesvn_part.cpp b/devel/kdesvn-kde4/files/patch-src__kdesvn_part.cpp
deleted file mode 100644
index 819187634c4f..000000000000
--- a/devel/kdesvn-kde4/files/patch-src__kdesvn_part.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/kdesvn_part.cpp.old	2013-07-07 17:37:41.415664472 +0200
-+++ src/kdesvn_part.cpp	2013-07-07 17:37:53.484512746 +0200
-@@ -174,7 +174,6 @@
-     about.addAuthor(ki18n("Rajko Albrecht"), ki18n("Original author and maintainer"), "ral@alwins-world.de" );
-     about.setOtherText(m_Extratext);
-     about.setHomepage("http://kdesvn.alwins-world.de/");
--    about.setBugAddress("kdesvn-bugs@alwins-world.de");
-     about.setProgramIconName("kdesvn");
-     about.setTranslator(ki18n("kdesvn: NAME OF TRANSLATORS\\nYour names"),
-         ki18n("kdesvn: EMAIL OF TRANSLATORS\\nYour emails"));
diff --git a/devel/kdesvn-kde4/files/patch-src__main.cpp b/devel/kdesvn-kde4/files/patch-src__main.cpp
deleted file mode 100644
index a48180abfd13..000000000000
--- a/devel/kdesvn-kde4/files/patch-src__main.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/main.cpp.old	2013-07-07 17:37:05.617114521 +0200
-+++ src/main.cpp	2013-07-07 17:37:20.322929644 +0200
-@@ -40,7 +40,6 @@
-                      KAboutData::License_GPL,ki18n("(C) 2005-2009 Rajko Albrecht"));
-     about.addAuthor( ki18n("Rajko Albrecht"),ki18n("Developer"),QByteArray("ral@alwins-world.de"),QByteArray());
-     about.setHomepage("http://kdesvn.alwins-world.de/");
--    about.setBugAddress("kdesvn-bugs@alwins-world.de");
- 
-     KCmdLineArgs::init(argc, argv, &about);
-     KCmdLineOptions options;
diff --git a/devel/kdesvn-kde4/pkg-descr b/devel/kdesvn-kde4/pkg-descr
index 477d5c474458..88fbf8176866 100644
--- a/devel/kdesvn-kde4/pkg-descr
+++ b/devel/kdesvn-kde4/pkg-descr
@@ -3,4 +3,4 @@ tools it uses the subversion C-Api direct via a c++ wrapper made by
 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/
+WWW: https://projects.kde.org/projects/extragear/sdk/kdesvn
diff --git a/devel/kdesvn-kde4/pkg-plist b/devel/kdesvn-kde4/pkg-plist
index bef71c635696..063570d0a1d6 100644
--- a/devel/kdesvn-kde4/pkg-plist
+++ b/devel/kdesvn-kde4/pkg-plist
@@ -1,59 +1,19 @@
 bin/kdesvn
 bin/kdesvnaskpass
-include/svnqt/annotate_line.h
-include/svnqt/apr.h
-include/svnqt/cache/DatabaseException.h
-include/svnqt/cache/LogCache.h
-include/svnqt/cache/ReposConfig.h
-include/svnqt/cache/ReposLog.h
-include/svnqt/cache/conversion_check.h
-include/svnqt/check.h
-include/svnqt/client.h
-include/svnqt/client_annotate_parameter.h
-include/svnqt/client_commit_parameter.h
-include/svnqt/client_update_parameter.h
-include/svnqt/client_parameter.h
-include/svnqt/commititem.h
-include/svnqt/conflictdescription.h
-include/svnqt/conflictresult.h
-include/svnqt/context.h
-include/svnqt/context_listener.h
-include/svnqt/datetime.h
-include/svnqt/diffoptions.h
-include/svnqt/dirent.h
-include/svnqt/entry.h
-include/svnqt/exception.h
-include/svnqt/info_entry.h
-include/svnqt/lock_entry.h
-include/svnqt/log_entry.h
-include/svnqt/path.h
-include/svnqt/pool.h
-include/svnqt/repoparameter.cpp
-include/svnqt/repoparameter.h
-include/svnqt/repository.h
-include/svnqt/repositorylistener.h
-include/svnqt/reposnotify.h
-include/svnqt/revision.h
-include/svnqt/shared_pointer.h
-include/svnqt/smart_pointer.h
-include/svnqt/status.h
-include/svnqt/stringarray.h
-include/svnqt/svnfilestream.h
-include/svnqt/svnqt_defines.h
-include/svnqt/svnqttypes.h
-include/svnqt/svnstream.h
-include/svnqt/targets.h
-include/svnqt/url.h
-include/svnqt/version_check.h
-include/svnqt/wc.h
 lib/kde4/kded_kdesvnd.so
 lib/kde4/kdesvnpart.so
 lib/kde4/kio_ksvn.so
-lib/libsvnqt.so
-lib/libsvnqt.so.7
-lib/libsvnqt.so.7.0.1
+lib/libsvnqt.a
 man/man1/kdesvn.1.gz
 man/man1/kdesvnaskpass.1.gz
+man/nl/man1/kdesvn.1.gz
+man/nl/man1/kdesvnaskpass.1.gz
+man/pt_BR/man1/kdesvn.1.gz
+man/pt_BR/man1/kdesvnaskpass.1.gz
+man/sv/man1/kdesvn.1.gz
+man/sv/man1/kdesvnaskpass.1.gz
+man/uk/man1/kdesvn.1.gz
+man/uk/man1/kdesvnaskpass.1.gz
 share/applications/kde4/kdesvn.desktop
 share/apps/kconf_update/kdesvn-use-external-update.sh
 share/apps/kconf_update/kdesvnpartrc-use-external.upd
@@ -72,16 +32,28 @@ share/dbus-1/interfaces/org.kde.kdesvnd.xml
 %%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/en/kdesvn/man-kdesvn.1.docbook
+%%PORTDOCS%%share/doc/HTML/en/kdesvn/man-kdesvnaskpass.1.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
+%%PORTDOCS%%share/doc/HTML/nl/kdesvn/man-kdesvn.1.docbook
+%%PORTDOCS%%share/doc/HTML/nl/kdesvn/man-kdesvnaskpass.1.docbook
+%%PORTDOCS%%share/doc/HTML/pt_BR/kdesvn/common
+%%PORTDOCS%%share/doc/HTML/pt_BR/kdesvn/index.cache.bz2
+%%PORTDOCS%%share/doc/HTML/pt_BR/kdesvn/index.docbook
+%%PORTDOCS%%share/doc/HTML/pt_BR/kdesvn/man-kdesvn.1.docbook
+%%PORTDOCS%%share/doc/HTML/pt_BR/kdesvn/man-kdesvnaskpass.1.docbook
+%%PORTDOCS%%share/doc/HTML/sv/kdesvn/common
+%%PORTDOCS%%share/doc/HTML/sv/kdesvn/index.cache.bz2
+%%PORTDOCS%%share/doc/HTML/sv/kdesvn/index.docbook
+%%PORTDOCS%%share/doc/HTML/sv/kdesvn/man-kdesvn.1.docbook
+%%PORTDOCS%%share/doc/HTML/sv/kdesvn/man-kdesvnaskpass.1.docbook
+%%PORTDOCS%%share/doc/HTML/uk/kdesvn/common
+%%PORTDOCS%%share/doc/HTML/uk/kdesvn/index.cache.bz2
+%%PORTDOCS%%share/doc/HTML/uk/kdesvn/index.docbook
+%%PORTDOCS%%share/doc/HTML/uk/kdesvn/man-kdesvn.1.docbook
+%%PORTDOCS%%share/doc/HTML/uk/kdesvn/man-kdesvnaskpass.1.docbook
 share/icons/hicolor/128x128/actions/kdesvnadd.png
 share/icons/hicolor/128x128/actions/kdesvnaddrecursive.png
 share/icons/hicolor/128x128/actions/kdesvnblame.png
@@ -376,16 +348,31 @@ share/kde4/services/ksvn+http.protocol
 share/kde4/services/ksvn+https.protocol
 share/kde4/services/ksvn+ssh.protocol
 share/kde4/services/ksvn.protocol
+%%NLS%%share/locale/ast/LC_MESSAGES/kdesvn.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/kdesvn.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/kdesvn.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdesvn.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/kdesvn.mo
 %%NLS%%share/locale/de/LC_MESSAGES/kdesvn.mo
 %%NLS%%share/locale/el/LC_MESSAGES/kdesvn.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/kdesvn.mo
 %%NLS%%share/locale/es/LC_MESSAGES/kdesvn.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kdesvn.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/kdesvn.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/kdesvn.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/kdesvn.mo
 %%NLS%%share/locale/it/LC_MESSAGES/kdesvn.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/kdesvn.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/kdesvn.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/kdesvn.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/kdesvn.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/kdesvn.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/kdesvn.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/kdesvn.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/kdesvn.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kdesvn.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/kdesvn.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/kdesvn.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/kdesvn.mo
 share/svnqt/i18n/svnqt_de.qm
 share/svnqt/i18n/svnqt_en_GB.qm