4 files changed, 46 insertions, 27 deletions

diff --git a/cad/qfsm/Makefile b/cad/qfsm/Makefile
index 0a65b80b98d9..002a7857b62d 100644
--- a/cad/qfsm/Makefile
+++ b/cad/qfsm/Makefile
@@ -7,11 +7,9 @@
 #
 
 PORTNAME=	qfsm
-PORTVERSION=	0.43
-PORTREVISION=	1
+PORTVERSION=	0.44
 CATEGORIES=	cad
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A graphical tool for designing finite state machines
@@ -21,7 +19,8 @@ USE_PERL5_BUILD=yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=	--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
+CONFIGURE_ARGS=	--with-qtdir=${QT_PREFIX}
+MAKE_ARGS=	LDADD="-lqt-mt ${PTHREAD_LIBS}"
 
 post-extract:
 	@${ECHO_CMD} '#!/bin/sh' > ${WRKSRC}/qfsm.sh
@@ -30,12 +29,6 @@ post-extract:
 	@${ECHO_CMD} '' >> ${WRKSRC}/qfsm.sh
 	@${ECHO_CMD} 'exec ${PREFIX}/bin/qfsm.exec "$$@"' >> ${WRKSRC}/qfsm.sh
 
-post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|^AM_CXXFLAGS =.*$$|AM_CXXFLAGS =|g'
-	@${REINPLACE_CMD} -e 's|-pedantic||g ; \
-		 s|-pthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/qfsm.sh ${PREFIX}/bin/qfsm
 	${INSTALL_PROGRAM} ${WRKSRC}/src/qfsm ${PREFIX}/bin/qfsm.exec
@@ -43,6 +36,13 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/po/*.qm ${DATADIR}/po
 	${INSTALL_DATA} ${WRKSRC}/po/*.ts ${DATADIR}/po
 .if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/user/*.docbook ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/user/*.html ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/user/*.pdf ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/user/*.png ${DOCSDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.fsm ${EXAMPLESDIR}
 .endif
diff --git a/cad/qfsm/distinfo b/cad/qfsm/distinfo
index e61f22128d35..88d96751f49e 100644
--- a/cad/qfsm/distinfo
+++ b/cad/qfsm/distinfo
@@ -1,3 +1,3 @@
-MD5 (qfsm-0.43.tar.gz) = baa0994025dc140d90c29b205e7db6db
-SHA256 (qfsm-0.43.tar.gz) = f19c8bea0d078e4bdf7d9bd3373f6978b2d64416cf231035ed1fe92f3e987763
-SIZE (qfsm-0.43.tar.gz) = 747533
+MD5 (qfsm-0.44.tar.gz) = f955963bd41be19689c5e948ed124551
+SHA256 (qfsm-0.44.tar.gz) = c73a1f617e80130bba16b27ae7f4da178cba5e24cc53b1c04f9cfb119a685198
+SIZE (qfsm-0.44.tar.gz) = 814943
diff --git a/cad/qfsm/files/patch-src_SimulatorDlg.ui b/cad/qfsm/files/patch-src_SimulatorDlg.ui
deleted file mode 100644
index 783332e19ef1..000000000000
--- a/cad/qfsm/files/patch-src_SimulatorDlg.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/SimulatorDlg.ui.orig	Tue Sep 27 16:35:51 2005
-+++ src/SimulatorDlg.ui	Tue Sep 27 16:36:06 2005
-@@ -1164,7 +1164,4 @@
-     <slot>returnPressedInputs()</slot>
- </slots>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>wspinbox.h</includehint>
--</includehints>
- </UI>
diff --git a/cad/qfsm/pkg-plist b/cad/qfsm/pkg-plist
index b88ba4062748..6f2d897a0482 100644
--- a/cad/qfsm/pkg-plist
+++ b/cad/qfsm/pkg-plist
@@ -1,7 +1,35 @@
 bin/qfsm
 bin/qfsm.exec
-%%PORTDOCS%%%%EXAMPLESDIR%%/ascii_example.fsm
-%%PORTDOCS%%%%EXAMPLESDIR%%/bin_example.fsm
+%%PORTDOCS%%%%DOCSDIR%%/addstate.png
+%%PORTDOCS%%%%DOCSDIR%%/addtrans.png
+%%PORTDOCS%%%%DOCSDIR%%/copy.png
+%%PORTDOCS%%%%DOCSDIR%%/cut.png
+%%PORTDOCS%%%%DOCSDIR%%/integrity_check.png
+%%PORTDOCS%%%%DOCSDIR%%/machine_properties.png
+%%PORTDOCS%%%%DOCSDIR%%/new.png
+%%PORTDOCS%%%%DOCSDIR%%/open.png
+%%PORTDOCS%%%%DOCSDIR%%/pan.png
+%%PORTDOCS%%%%DOCSDIR%%/paste.png
+%%PORTDOCS%%%%DOCSDIR%%/print.png
+%%PORTDOCS%%%%DOCSDIR%%/qfsm.docbook
+%%PORTDOCS%%%%DOCSDIR%%/qfsm.html
+%%PORTDOCS%%%%DOCSDIR%%/qfsm.pdf
+%%PORTDOCS%%%%DOCSDIR%%/save.png
+%%PORTDOCS%%%%DOCSDIR%%/select.png
+%%PORTDOCS%%%%DOCSDIR%%/simulate.png
+%%PORTDOCS%%%%DOCSDIR%%/simulation.png
+%%PORTDOCS%%%%DOCSDIR%%/state_properties.png
+%%PORTDOCS%%%%DOCSDIR%%/straighten.png
+%%PORTDOCS%%%%DOCSDIR%%/toolbar.png
+%%PORTDOCS%%%%DOCSDIR%%/transition_properties.png
+%%PORTDOCS%%%%DOCSDIR%%/undo.png
+%%PORTDOCS%%%%DOCSDIR%%/working_area2.png
+%%PORTDOCS%%%%DOCSDIR%%/zoom.png
+%%PORTDOCS%%%%DOCSDIR%%/zoomin.png
+%%PORTDOCS%%%%DOCSDIR%%/zoomout.png
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ascii_example.fsm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ascii_example2.fsm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bin_example.fsm
 %%DATADIR%%/po/English.qm
 %%DATADIR%%/po/English.ts
 %%DATADIR%%/po/French.qm
@@ -10,4 +38,5 @@ bin/qfsm.exec
 %%DATADIR%%/po/German.ts
 @dirrm %%DATADIR%%/po
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%