3 files changed, 64 insertions, 19 deletions

diff --git a/deskutils/kdissert/Makefile b/deskutils/kdissert/Makefile
index c7ef238f9971..22a4d1eabcc6 100644
--- a/deskutils/kdissert/Makefile
+++ b/deskutils/kdissert/Makefile
@@ -6,26 +6,36 @@
 #
 
 PORTNAME=	kdissert
-PORTVERSION=	0.2.5
+PORTVERSION=	0.2.9
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://freehackers.org/~tnagy/kdissert/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	KDE mindmapping tool
 
+BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
+
 USE_BZIP2=	yes
 USE_KDELIBS_VER=	3
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+WANT_LIBTOOL_VER=	15
+MAKE_ARGS=	QTDIR="${QT_PREFIX}" LIBTOOL="${LIBTOOL} --tag=CXX"
 INSTALLS_SHLIB=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,-O2,,g ; \
-		 s,-pedantic,,g ; \
-		 s,-lpthread,${PTHREAD_LIBS},g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e \
-		's,$$(LIB_KDEPRINT) \\,$$(LIB_KDEPRINT) $$(LIBPTHREAD) \\,g' \
-		${WRKSRC}/src/Makefile.in
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} qmake \
+		-spec ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ main.pro
+
+pre-install:
+	@${MKDIR} ${PREFIX}/share/apps/kdissert/pics
+	@${MKDIR} ${PREFIX}/share/apps/kdissert/templatedata
+	@${MKDIR} ${PREFIX}/share/doc/HTML/en/kdissert
+.for size in 16 32 64 128
+	@${MKDIR} ${PREFIX}/share/icons/hicolor/${size}x${size}/apps
+.endfor
+
+post-install:
+	@${STRIP_CMD} ${PREFIX}/bin/kdissert
 
 .include <bsd.port.mk>
diff --git a/deskutils/kdissert/distinfo b/deskutils/kdissert/distinfo
index 546472e818c5..4ae957f94c67 100644
--- a/deskutils/kdissert/distinfo
+++ b/deskutils/kdissert/distinfo
@@ -1,2 +1,2 @@
-MD5 (kdissert-0.2.5.tar.bz2) = 0f62d11ea0910f49b28d2639e09e7918
-SIZE (kdissert-0.2.5.tar.bz2) = 859012
+MD5 (kdissert-0.2.9.tar.bz2) = 2424d518dd458dc5621e29f42fe72bf8
+SIZE (kdissert-0.2.9.tar.bz2) = 435806
diff --git a/deskutils/kdissert/pkg-plist b/deskutils/kdissert/pkg-plist
index 5abed1fd1375..b09ec06cfdad 100644
--- a/deskutils/kdissert/pkg-plist
+++ b/deskutils/kdissert/pkg-plist
@@ -1,20 +1,29 @@
 bin/kdissert
-lib/libkdissasciidoc.la
-lib/libkdissasciidoc.so
-lib/libkdisshtmldoc.la
-lib/libkdisshtmldoc.so
-lib/libkdisspdflatexarticle.la
-lib/libkdisspdflatexarticle.so
-lib/libkdisspdflatexbook.la
-lib/libkdisspdflatexbook.so
+lib/kde3/libkdissOOOdoc.so
+lib/kde3/libkdissOOOdoc.so.10
+lib/kde3/libkdissasciidoc.so
+lib/kde3/libkdissasciidoc.so.10
+lib/kde3/libkdissbeamerslides.so
+lib/kde3/libkdissbeamerslides.so.10
+lib/kde3/libkdisshtmldoc.so
+lib/kde3/libkdisshtmldoc.so.10
+lib/kde3/libkdisspdflatexarticle.so
+lib/kde3/libkdisspdflatexarticle.so.10
+lib/kde3/libkdisspdflatexbook.so
+lib/kde3/libkdisspdflatexbook.so.10
+lib/kde3/libkdissprosperslides.so
+lib/kde3/libkdissprosperslides.so.10
 share/applications/kde/kdissert.desktop
 share/applnk/Utilities/kdissert.desktop
 share/apps/kdissert/kdissertui.rc
 share/apps/kdissert/pics/nopix.png
+share/apps/kdissert/templatedata/kdissOOOdoc.tar.gz
 share/apps/kdissert/templatedata/kdissasciidoc.tar.gz
+share/apps/kdissert/templatedata/kdissbeamerslides.tar.gz
 share/apps/kdissert/templatedata/kdisshtmldoc.tar.gz
 share/apps/kdissert/templatedata/kdisspdflatexarticle.tar.gz
 share/apps/kdissert/templatedata/kdisspdflatexbook.tar.gz
+share/apps/kdissert/templatedata/kdissprosperslides.tar.gz
 share/apps/kdissert/tips
 share/config.kcfg/kdissert.kcfg
 share/doc/HTML/en/kdissert/common
@@ -40,6 +49,32 @@ share/locale/de/LC_MESSAGES/kdissert.mo
 share/locale/fr/LC_MESSAGES/kdissert.mo
 share/locale/nl/LC_MESSAGES/kdissert.mo
 share/mimelnk/application/x-kdissert.desktop
+@unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/128x128/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/128x128 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/64x64/actions 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/64x64 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/32x32/actions 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/22x22/actions 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/22x22 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/128x128/actions 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg/128x128 2>/dev/null || true
+@unexec rmdir %D/share/icons/crystalsvg 2>/dev/null || true
+@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrm share/doc/HTML/en/kdissert
+@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
 @dirrm share/apps/kdissert/templatedata
 @dirrm share/apps/kdissert/pics
 @dirrm share/apps/kdissert
+@unexec rmdir %D/share/apps 2>/dev/null || true
+@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
+@unexec rmdir %D/share/applnk 2>/dev/null || true
+@unexec rmdir %D/share/applications/kde 2>/dev/null || true
+@unexec rmdir %D/share/applications 2>/dev/null || true