- Update to 1.6.0

- Convert to the new options framework.

PR:		ports/170828
Submitted by:	David Naylor <naylor.b.david@gmail.com> (maintainer)

4 files changed, 33 insertions, 31 deletions

diff --git a/devel/kdesvn-kde4/Makefile b/devel/kdesvn-kde4/Makefile
index 8b1079dde176..ac6f28b97905 100644
--- a/devel/kdesvn-kde4/Makefile
+++ b/devel/kdesvn-kde4/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	kdesvn
-DISTVERSION=	1.5.5
-PORTREVISION=	2
+DISTVERSION=	1.6.0
 CATEGORIES=	devel kde
 MASTER_SITES=	http://kdesvn.alwins-world.de/downloads/
 
@@ -22,7 +21,6 @@ CONFLICTS=	qsvn-[0-9]*
 USE_BZIP2=	yes
 USE_CMAKE=	yes
 CMAKE_ARGS+=	-DSUBVERSION_INCLUDE_DIR=${LOCALBASE}/include/subversion-1
-USE_GETTEXT=	yes
 USE_KDE4=	kdelibs kdeprefix automoc4
 USE_LDCONFIG=	yes
 USE_QT4=	corelib gui xml network dbus svg qt3support sql \
@@ -31,17 +29,26 @@ MAKE_JOBS_SAFE=	yes
 
 MAN1=		kdesvn.1 kdesvnaskpass.1
 
+.include <bsd.port.pre.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 post-patch:
 	${RM} ${WRKSRC}/src/kiosvn/svn*.protocol
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${ECHO} "ADD_SUBDIRECTORY(man)" > ${WRKSRC}/doc/CMakeLists.txt
-.else
-#Fix build with kdelibs>=4.5.0
-	${REINPLACE_CMD} -e 's,V4.1.2-Based,V4.2-Based,g' \
-		${WRKSRC}/doc/nl/index.docbook
+.endif
+.if empty(PORT_OPTIONS:MNLS)
+	${REINPLACE_CMD} -e 's,ADD_SUBDIRECTORY(po), ,g' \
+		${WRKSRC}/CMakeLists.txt
 .endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/kdesvn-kde4/distinfo b/devel/kdesvn-kde4/distinfo
index 1771f28f3e46..b874a078417a 100644
--- a/devel/kdesvn-kde4/distinfo
+++ b/devel/kdesvn-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kdesvn-1.5.5.tar.bz2) = 67fee0374c9e3ac0514d2ef2b0fdd0b072dca173f1eeae2742cd37022e194b0b
-SIZE (kdesvn-1.5.5.tar.bz2) = 1746344
+SHA256 (kdesvn-1.6.0.tar.bz2) = 05686f246b76810f90a9f80f1d45cdccf812b42e18fa10a16b14e7d27d370f96
+SIZE (kdesvn-1.6.0.tar.bz2) = 1863823
diff --git a/devel/kdesvn-kde4/files/patch-src__svnfrontend__graphtree__revgraphview.h b/devel/kdesvn-kde4/files/patch-src__svnfrontend__graphtree__revgraphview.h
deleted file mode 100644
index 2ec3459673d6..000000000000
--- a/devel/kdesvn-kde4/files/patch-src__svnfrontend__graphtree__revgraphview.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/svnfrontend/graphtree/revgraphview.h~	2012-05-21 15:28:34.000000000 -0300
-+++ src/svnfrontend/graphtree/revgraphview.h	2012-05-21 15:28:40.000000000 -0300
-@@ -49,7 +49,7 @@
- /**
- 	@author Rajko Albrecht <ral@alwins-world.de>
- */
--class RevGraphView : virtual public QGraphicsView
-+class RevGraphView : public QGraphicsView
- {
-     Q_OBJECT
- public:
diff --git a/devel/kdesvn-kde4/pkg-plist b/devel/kdesvn-kde4/pkg-plist
index dbcffafd30b0..9106295053cf 100644
--- a/devel/kdesvn-kde4/pkg-plist
+++ b/devel/kdesvn-kde4/pkg-plist
@@ -11,6 +11,7 @@ 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
@@ -31,6 +32,7 @@ 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
@@ -48,8 +50,8 @@ lib/kde4/kded_kdesvnd.so
 lib/kde4/kdesvnpart.so
 lib/kde4/kio_ksvn.so
 lib/libsvnqt.so
-lib/libsvnqt.so.6
-lib/libsvnqt.so.6.0.3
+lib/libsvnqt.so.7
+lib/libsvnqt.so.7.0.1
 share/applications/kde4/kdesvn.desktop
 share/apps/kconf_update/kdesvn-use-external-update.sh
 share/apps/kconf_update/kdesvnpartrc-use-external.upd
@@ -372,13 +374,17 @@ 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/pt_BR/LC_MESSAGES/kdesvn.mo
-share/locale/ro/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/es/LC_MESSAGES/kdesvn.mo
+%%NLS%%share/locale/fr/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/pt_BR/LC_MESSAGES/kdesvn.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/kdesvn.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kdesvn.mo
 share/svnqt/i18n/svnqt_de.qm
 share/svnqt/i18n/svnqt_en_GB.qm
 @dirrm share/svnqt/i18n