3 files changed, 49 insertions, 38 deletions

diff --git a/devel/kdesvn-kde4/Makefile b/devel/kdesvn-kde4/Makefile
index 54611f8eeeaf..35abd2281529 100644
--- a/devel/kdesvn-kde4/Makefile
+++ b/devel/kdesvn-kde4/Makefile
@@ -5,13 +5,12 @@
 # $FreeBSD$
 
 PORTNAME=	kdesvn
-PORTVERSION=	0.11.2
-PORTREVISION=	1
+PORTVERSION=	0.12.1
 CATEGORIES=	devel kde
-MASTER_SITES=	http://www.alwins-world.de/programs/download/${PORTNAME}/ \
+MASTER_SITES=	http://www.alwins-world.de/programs/download/${PORTNAME}/${PORTVERSION:R}.x/ \
 		http://www.yuanjue.net/download/
 
-MAINTAINER=	yuanjue@yuanjue.net
+MAINTAINER=	yuanjue@freebsd.org
 COMMENT=	KDE frontend for Subversion
 
 BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
@@ -32,22 +31,32 @@ LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr-svn \
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_GETTEXT=	yes
-
-MAN1=	kdesvn.1 kdesvnaskpass.1
 
-.include <bsd.port.pre.mk>
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
 
-.if ${OSVERSION} < 500000
-BROKEN=		Does not compile on 4.x
+.if !defined(NOPORTDOCS)
+DOCSDIR=	${PREFIX}/share/doc/HTML/en/kdesvn
 .endif
 
+MAN1=	kdesvn.1 kdesvnaskpass.1
+
 post-extract:
 	${MKDIR} ${WRKSRC}
+.if defined(NOPORTDOCS)
+	${RM} -f ${PATCH_WRKSRC}/doc/CMakeLists.txt
+	${ECHO} "ADD_SUBDIRECTORY(man)" > ${PATCH_WRKSRC}/doc/CMakeLists.txt
+.endif
 
 do-configure:
 	@(cd ${WRKSRC}; \
 	${LOCALBASE}/bin/cmake ${CMAKE_ARGS} ${PATCH_WRKSRC})
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/kdesvn-kde4/distinfo b/devel/kdesvn-kde4/distinfo
index 7a045f360efb..9a9a6cdec7a1 100644
--- a/devel/kdesvn-kde4/distinfo
+++ b/devel/kdesvn-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (kdesvn-0.11.2.tar.bz2) = fdc498c9424f4a6a68013790b54491dd
-SHA256 (kdesvn-0.11.2.tar.bz2) = ff2d25ed5ffec374d7ec26895dc0339e23c15f19e0ca4e216d0982061efd6c83
-SIZE (kdesvn-0.11.2.tar.bz2) = 1204456
+MD5 (kdesvn-0.12.1.tar.bz2) = 160bdbbfb47b7c0ee1ce8ccacd18cedc
+SHA256 (kdesvn-0.12.1.tar.bz2) = a20932070625c7af1786b5a3ab44d1a4d51802d05ade2e13cc2e680aefdca1c1
+SIZE (kdesvn-0.12.1.tar.bz2) = 1237520
diff --git a/devel/kdesvn-kde4/pkg-plist b/devel/kdesvn-kde4/pkg-plist
index 756db1107939..f46589fd9ad6 100644
--- a/devel/kdesvn-kde4/pkg-plist
+++ b/devel/kdesvn-kde4/pkg-plist
@@ -38,22 +38,22 @@ lib/kde3/libkdesvnpart.so
 lib/libsvnqt.la
 lib/libsvnqt.so
 lib/libsvnqt.so.3
-lib/libsvnqt.so.3.1.1
+lib/libsvnqt.so.3.1.2
 share/applications/kde/kdesvn.desktop
 share/apps/kdesvn/kdesvnui.rc
 share/apps/kdesvnpart/kdesvn_part.rc
 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
-share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnneedlock.png
-share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnupdates.png
-share/doc/HTML/en/kdesvn/index.cache.bz2
-share/doc/HTML/en/kdesvn/index.docbook
+%%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/icons/hicolor/128x128/actions/kdesvnadd.png
 share/icons/hicolor/128x128/actions/kdesvnaddrecursive.png
 share/icons/hicolor/128x128/actions/kdesvnblame.png
@@ -250,18 +250,18 @@ 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
-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/gl/LC_MESSAGES/kdesvn.mo
-share/locale/it/LC_MESSAGES/kdesvn.mo
-share/locale/lt/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
+%%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
@@ -273,9 +273,11 @@ share/services/svn+http.protocol
 share/services/svn+https.protocol
 share/services/svn+ssh.protocol
 share/services/svn.protocol
+@dirrmtry share/locale/es/LC_MESSAGES
+@dirrmtry share/locale/es
 @dirrmtry share/services/kded
-@dirrm share/doc/HTML/en/kdesvn
 @dirrm share/apps/kdesvnpart
 @dirrm share/apps/kdesvn
 @dirrmtry share/applications/kde
 @dirrm include/svnqt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%