diff -urN /usr/ports/deskutils/qtm/Makefile deskutils/qtm/Makefile
--- /usr/ports/deskutils/qtm/Makefile	2008-03-03 01:19:12.000000000 +0900
+++ deskutils/qtm/Makefile	2008-03-12 23:53:45.000000000 +0900
@@ -6,36 +6,40 @@
 #
 
 PORTNAME=	qtm
-PORTVERSION=	0.5.5
+PORTVERSION=	0.5.8.2
 CATEGORIES=	deskutils
-MASTER_SITES=	SF
-MASTER_SITE_SUBDIR=catkin
+MASTER_SITES=	SF/catkin
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Blog management application based on Qt 4
 
-USE_QT_VER=	4
-QT_COMPONENTS=	gui network corelib xml qmake_build uic_build moc_build
-PLIST_FILES=	bin/QTM
+BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
 
-PORTDOCS=	COPYING Changelog INSTALL README
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib gui network xml moc_build qmake4_build uic_build
 
-DESKTOP_ENTRIES=	"QTM" \
-			"Weblog management application" \
-			"" \
-			"QTM" \
-			"Application;Network;" \
-			"false"
+MAN=		qtm.1
+PORTDOCS=	Changelog INSTALL README
+PLIST_FILES=	bin/qtm \
+		share/applications/qtm.desktop \
+		share/icons/qtm-logo1.png
 
 pre-build:
-	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE} -unix QTM.pro
+	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} cmake . \
+		-DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
+		-DCMAKE_C_FLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}" \
+		-DCMAKE_C_LINK_FLAGS="${PTHREAD_LIBS}" \
+		-DCMAKE_CXX_LINK_FLAGS="${PTHREAD_LIBS}" \
+		-DMANPAGE_DIRECTORY="${MANPREFIX}/man/man1"
 
 post-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/QTM ${PREFIX}/bin
+	@${ECHO_CMD} "@unexec rmdir %D/share/applications 2>/dev/null || true" \
+		>> ${TMPPLIST}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for doc in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
 .endfor
 .endif
 
diff -urN /usr/ports/deskutils/qtm/distinfo deskutils/qtm/distinfo
--- /usr/ports/deskutils/qtm/distinfo	2007-10-24 15:37:32.000000000 +0900
+++ deskutils/qtm/distinfo	2008-03-12 23:53:45.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (qtm-0.5.5.tar.gz) = 2d5f433b5cfcb080dc026849b3085ab6
-SHA256 (qtm-0.5.5.tar.gz) = 3dd55ea938c116e8e8d9a40a27e93e9af6742cdebc28d47f16f81159b5dce7ee
-SIZE (qtm-0.5.5.tar.gz) = 124404
+MD5 (qtm-0.5.8.2.tar.gz) = 1fd4ab24b1b18202326bae47132c45bd
+SHA256 (qtm-0.5.8.2.tar.gz) = 7de2b4ef9643082a9b104ef4298ba440dba66b958b37d684a9356e406ad049b4
+SIZE (qtm-0.5.8.2.tar.gz) = 138081