3 files changed, 18 insertions, 31 deletions

diff --git a/deskutils/kdissert/Makefile b/deskutils/kdissert/Makefile
index 02b8d3351320..f458f64198ca 100644
--- a/deskutils/kdissert/Makefile
+++ b/deskutils/kdissert/Makefile
@@ -6,18 +6,17 @@
 #
 
 PORTNAME=	kdissert
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	deskutils kde
-MASTER_SITES=	http://www.kde-apps.org/content/files/
-DISTNAME=	12725-${PORTNAME}-${PORTVERSION}-waf-b
+MASTER_SITES=	http://freehackers.org/~tnagy/kdissert/ \
+		http://bsdguru.org/distfiles/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	alex@BSDGuru.org
 COMMENT=	KDE mindmapping tool
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/^12725-//}
-
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
+USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 USE_KDELIBS_VER=	3
 USE_PYTHON_BUILD=	yes
@@ -29,8 +28,9 @@ MAKE_ENV=	QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
 CXXFLAGS+=	-fpermissive
 .endif
 
-post-extract:
-	@cd ${WRKSRC} && ${TAR} yxf miniwaf.tar.bz2
+.if ${OSVERSION} < 500000
+BROKEN=		Does not compile on 4.x
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
@@ -39,13 +39,13 @@ post-patch:
 			${WRKSRC}/src/kdissert/wscript_build
 
 do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf.py configure
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf configure
 
 do-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf.py
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf
 
 do-install:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf.py install
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./waf install
 	@${STRIP_CMD} ${PREFIX}/bin/kdissert
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/kdissert/distinfo b/deskutils/kdissert/distinfo
index 18b631c5ece8..16d320dc3a9a 100644
--- a/deskutils/kdissert/distinfo
+++ b/deskutils/kdissert/distinfo
@@ -1,3 +1,3 @@
-MD5 (12725-kdissert-1.0.6-waf-b.tar.bz2) = abeb507a79aed0cc4ef6d1a4ee58ea94
-SHA256 (12725-kdissert-1.0.6-waf-b.tar.bz2) = 91e4aba8cf10c1a5eb7ce1776afca65aed0611c1ca95e199a7dd3b3edd4450d9
-SIZE (12725-kdissert-1.0.6-waf-b.tar.bz2) = 501346
+MD5 (kdissert-1.0.7.tar.bz2) = 88ad0d4f67bded1aac307434564215fc
+SHA256 (kdissert-1.0.7.tar.bz2) = 199d35df4ef5f6e3b006710c4504fe859a390caeb3e08f5c5fc8f2dcef079c60
+SIZE (kdissert-1.0.7.tar.bz2) = 501108
diff --git a/deskutils/kdissert/pkg-plist b/deskutils/kdissert/pkg-plist
index a5619180b863..865f88061cbf 100644
--- a/deskutils/kdissert/pkg-plist
+++ b/deskutils/kdissert/pkg-plist
@@ -9,6 +9,8 @@ lib/kde3/libkdissasciidoc.la
 lib/kde3/libkdissasciidoc.so
 lib/kde3/libkdissbeamerslides.la
 lib/kde3/libkdissbeamerslides.so
+lib/kde3/libkdissdocbook.la
+lib/kde3/libkdissdocbook.so
 lib/kde3/libkdisshtmldoc.la
 lib/kde3/libkdisshtmldoc.so
 lib/kde3/libkdisspdflatexarticle.la
@@ -28,6 +30,7 @@ share/apps/kdissert/templatedata/kdissOOOimpress.tar.gz
 share/apps/kdissert/templatedata/kdissapplet.tar.gz
 share/apps/kdissert/templatedata/kdissasciidoc.tar.gz
 share/apps/kdissert/templatedata/kdissbeamerslides.tar.gz
+share/apps/kdissert/templatedata/kdissdocbook.tar.gz
 share/apps/kdissert/templatedata/kdisshtmldoc.tar.gz
 share/apps/kdissert/templatedata/kdisspdflatexarticle.tar.gz
 share/apps/kdissert/templatedata/kdisspdflatexbook.tar.gz
@@ -36,11 +39,6 @@ share/apps/kdissert/templatedata/kdissstx.tar.gz
 share/apps/kdissert/tips
 share/apps/kdissertpart/kdissertpart.rc
 share/config.kcfg/kdissert.kcfg
-share/doc/HTML/en/kdissert/index.cache.bz2
-share/doc/HTML/en/kdissert/index.docbook
-share/doc/HTML/en/kdissert/screenshot.jpg
-share/doc/HTML/fr/kdissert/index.cache.bz2
-share/doc/HTML/fr/kdissert/index.docbook
 share/icons/hicolor/128x128/actions/kdissert_sort.png
 share/icons/hicolor/128x128/apps/kdissert.png
 share/icons/hicolor/16x16/actions/kdissert_link.png
@@ -74,23 +72,12 @@ share/locale/pl/LC_MESSAGES/kdissert.mo
 share/locale/pt/LC_MESSAGES/kdissert.mo
 share/locale/pt_BR/LC_MESSAGES/kdissert.mo
 share/locale/ru/LC_MESSAGES/kdissert.mo
+share/locale/sk/LC_MESSAGES/kdissert.mo
 share/locale/sv/LC_MESSAGES/kdissert.mo
 share/locale/tr/LC_MESSAGES/kdissert.mo
 share/mimelnk/application/x-kdissert.desktop
 share/services/kdissertpart.desktop
-@dirrm share/doc/HTML/fr/kdissert
-@dirrm share/doc/HTML/en/kdissert
 @dirrm share/apps/kdissertpart
 @dirrm share/apps/kdissert/templatedata
 @dirrm share/apps/kdissert/pics
 @dirrm share/apps/kdissert
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt