3 files changed, 38 insertions, 52 deletions

diff --git a/cad/qfsm/Makefile b/cad/qfsm/Makefile
index 811637a50a8a..d00fad95f71d 100644
--- a/cad/qfsm/Makefile
+++ b/cad/qfsm/Makefile
@@ -7,29 +7,52 @@
 #
 
 PORTNAME=	qfsm
-PORTVERSION=	0.50
-PORTREVISION=	1
+PORTVERSION=	0.51.0
 CATEGORIES=	cad
 MASTER_SITES=	SF
+DISTNAME=	${PORTNAME}-${PORTVERSION}-Source
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A graphical tool for designing finite state machines
 
+USE_XORG=	xi
 USE_QT_VER=	4
 QT_COMPONENTS=	corelib gui qt3support svg xml \
-		moc_build porting_build qmake_build uic_build uic3_build
+		moc_build porting_build qmake_build \
+		uic_build uic3_build rcc_build
+USE_GNOME=	desktopfileutils
+USE_CMAKE=	yes
+CMAKE_USE_PTHREAD=	yes
 INSTALLS_ICONS=	yes
-USE_XORG=	xi
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/qfsm.pro
+.if !defined(WITH_DEBUG)
+CMAKE_ARGS+=	-DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG"
+.endif
 
-do-configure:
-	@cd ${WRKSRC} \
-		&& ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKE_ARGS} qfsm.pro
+post-patch:
+	@${REINPLACE_CMD} -e 's|(/usr/include/.*$$|(|g ; \
+		 /^\/usr\/include/d ; \
+		 /SET.*CMAKE_BUILD_TYPE/d ; \
+		 /SET.*CMAKE_INSTALL_PREFIX/d' ${WRKSRC}/CMakeLists.txt
 
-post-install:
-	@${STRIP_CMD} ${PREFIX}/bin/qfsm
+do-install:
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} qfsm ${PREFIX}/bin)
+	@${MKDIR} ${PREFIX}/share/applications
+	(cd ${WRKSRC}/desktop && ${INSTALL_DATA} qfsm.desktop \
+		${PREFIX}/share/applications)
+.for i in 32x32 48x48 64x64
+	@${MKDIR} ${PREFIX}/share/icons/hicolor/${i}/apps
+	(cd ${WRKSRC}/desktop/${i}/apps && ${INSTALL_DATA} qfsm.png \
+		${PREFIX}/share/icons/hicolor/${i}/apps)
+	@${MKDIR} ${PREFIX}/share/icons/hicolor/${i}/mimetypes
+	(cd ${WRKSRC}/desktop/${i}/mimetypes && ${INSTALL_DATA} x-qfsm.png \
+		${PREFIX}/share/icons/hicolor/${i}/mimetypes)
+.endfor
+	@${MKDIR} ${PREFIX}/share/mimelnk/application
+	(cd ${WRKSRC}/desktop && ${INSTALL_DATA} x-qfsm.desktop \
+		${PREFIX}/share/mimelnk/application)
+	@${MKDIR} ${DATADIR}
+	(cd ${WRKSRC}/po && ${INSTALL_DATA} *.qm ${DATADIR})
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@(cd ${WRKSRC}/doc/user && ${COPYTREE_SHARE} . ${DOCSDIR})
@@ -38,5 +61,6 @@ post-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
 .endif
+	@-update-desktop-database
 
 .include <bsd.port.mk>
diff --git a/cad/qfsm/distinfo b/cad/qfsm/distinfo
index b0d566c491b7..2e57d28c08e5 100644
--- a/cad/qfsm/distinfo
+++ b/cad/qfsm/distinfo
@@ -1,3 +1,3 @@
-MD5 (qfsm-0.50.tar.gz) = 5172f474b8e018ff86fdbb65bf6c7c53
-SHA256 (qfsm-0.50.tar.gz) = 033933d31d237ec0ccbb48fca4022b2f2a1e6c0c9302d7f954cd1bc66c8708ee
-SIZE (qfsm-0.50.tar.gz) = 1644095
+MD5 (qfsm-0.51.0-Source.tar.gz) = 7f057779d6455831d747eca37a113528
+SHA256 (qfsm-0.51.0-Source.tar.gz) = 8512b84b70f82fcdc6394d3c84cde545e80f17075faefdafa36b06b0e38397a8
+SIZE (qfsm-0.51.0-Source.tar.gz) = 1680312
diff --git a/cad/qfsm/files/patch-qfsm.pro b/cad/qfsm/files/patch-qfsm.pro
deleted file mode 100644
index 0c644b3e545e..000000000000
--- a/cad/qfsm/files/patch-qfsm.pro
+++ /dev/null
@@ -1,38 +0,0 @@
---- qfsm.pro.bak	2008-04-04 16:40:05.000000000 +0900
-+++ qfsm.pro	2008-04-05 14:03:47.000000000 +0900
-@@ -3,7 +3,7 @@
- 
- VERSION = 0.50
- 
--CONFIG	+= debug
-+#CONFIG	+= debug
- 
- INCLUDEPATH	+= . src
- 
-@@ -200,7 +200,7 @@
- #  INSTDIR = $${PROGRAMFILES}
-   INSTDIR = "C:\Qfsm"
- } else {
--  INSTDIR = /usr
-+  INSTDIR = %%PREFIX%%
- }
- DEPENDPATH += po src 
- TARGET = qfsm
-@@ -212,7 +212,7 @@
-   DEFINES += QFSM_HELP_DIR=\\\"doc\\user\\\"
- } else {
-   DEFINES += QFSM_LANGUAGE_DIR=\\\"$${INSTDIR}/share/qfsm\\\"
--  DEFINES += QFSM_HELP_DIR=\\\"${INSTDIR}/share/doc/qfsm\\\")
-+  DEFINES += QFSM_HELP_DIR=\\\"$${INSTDIR}/share/doc/qfsm\\\"
- }
- 
- # XPMS = $$system( find pics -type f -name "*.xpm" | grep -v CVS )
-@@ -359,7 +359,7 @@
-   trans.path = $${INSTDIR}/share/qfsm
-   trans.files = $$QMS
- 
--  INSTALLS += target doc trans desktop mime icons 
-+  INSTALLS += target trans desktop mime icons 
- }
- 
-