21 files changed, 237 insertions, 5 deletions

diff --git a/cad/qfsm/Makefile b/cad/qfsm/Makefile
index 0cc34ee7783a..b5e43f361751 100644
--- a/cad/qfsm/Makefile
+++ b/cad/qfsm/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	qfsm
-PORTVERSION=	0.41
-PORTREVISION=	2
+PORTVERSION=	0.42b
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,18 +15,33 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A graphical tool for designing finite state machines
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/b//}
+
 USE_QT_VER=	3
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
+post-extract:
+	@${ECHO_CMD} '#!/bin/sh' > ${WRKSRC}/qfsm.sh
+	@${ECHO_CMD} 'QFSMDIR=${DATADIR}' >> ${WRKSRC}/qfsm.sh
+	@${ECHO_CMD} 'export QFSMDIR' >> ${WRKSRC}/qfsm.sh
+	@${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_PROGRAM} ${WRKSRC}/src/qfsm ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/qfsm.sh ${PREFIX}/bin/qfsm
+	${INSTALL_PROGRAM} ${WRKSRC}/src/qfsm ${PREFIX}/bin/qfsm.exec
+	@${MKDIR} ${DATADIR}/po
+	${INSTALL_DATA} ${WRKSRC}/po/*.qm ${DATADIR}/po
+	${INSTALL_DATA} ${WRKSRC}/po/*.ts ${DATADIR}/po
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.fsm ${EXAMPLESDIR}
diff --git a/cad/qfsm/distinfo b/cad/qfsm/distinfo
index 8a242a8d10ea..b14c129846cb 100644
--- a/cad/qfsm/distinfo
+++ b/cad/qfsm/distinfo
@@ -1,2 +1,2 @@
-MD5 (qfsm-0.41.tar.gz) = ff2d6ab30a9f2a5ff0328cc1a4836f63
-SIZE (qfsm-0.41.tar.gz) = 779196
+MD5 (qfsm-0.42b.tar.gz) = 8b8da6257eb3bbe9861a8cfb41dbeac5
+SIZE (qfsm-0.42b.tar.gz) = 787723
diff --git a/cad/qfsm/files/patch-src::Convert.cpp b/cad/qfsm/files/patch-src::Convert.cpp
new file mode 100644
index 000000000000..1b660004d949
--- /dev/null
+++ b/cad/qfsm/files/patch-src::Convert.cpp
@@ -0,0 +1,11 @@
+--- src/Convert.cpp.orig	Mon Dec 29 05:35:44 2003
++++ src/Convert.cpp	Wed Mar 17 00:06:42 2004
+@@ -16,7 +16,7 @@
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+ 
+-#include <math.h>
++#include <cmath>
+ #include <qstring.h>
+ #include <qregexp.h>
+ #include "Convert.h"
diff --git a/cad/qfsm/files/patch-src::Draw.cpp b/cad/qfsm/files/patch-src::Draw.cpp
new file mode 100644
index 000000000000..89e8fa7e6b45
--- /dev/null
+++ b/cad/qfsm/files/patch-src::Draw.cpp
@@ -0,0 +1,11 @@
+--- src/Draw.cpp.orig	Sun Feb 29 21:38:23 2004
++++ src/Draw.cpp	Tue Mar 16 23:46:29 2004
+@@ -16,7 +16,7 @@
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+ 
+-#include <math.h>
++#include <cmath>
+ #include <qnamespace.h>
+ #include <qlist.h>
+ #include <qpainter.h>
diff --git a/cad/qfsm/files/patch-src::Export.cpp b/cad/qfsm/files/patch-src::Export.cpp
new file mode 100644
index 000000000000..da61a24eb588
--- /dev/null
+++ b/cad/qfsm/files/patch-src::Export.cpp
@@ -0,0 +1,12 @@
+--- src/Export.cpp.orig	Mon Dec 29 05:35:44 2003
++++ src/Export.cpp	Tue Mar 16 23:40:15 2004
+@@ -17,7 +17,8 @@
+ */
+ 
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std; 
+ #include <qapplication.h>
+ #include "Export.h"
+ #include "Machine.h"
diff --git a/cad/qfsm/files/patch-src::Export.h b/cad/qfsm/files/patch-src::Export.h
new file mode 100644
index 000000000000..bf40b8337a93
--- /dev/null
+++ b/cad/qfsm/files/patch-src::Export.h
@@ -0,0 +1,12 @@
+--- src/Export.h.orig	Sat Feb 14 21:06:52 2004
++++ src/Export.h	Tue Mar 16 23:45:39 2004
+@@ -19,7 +19,8 @@
+ #ifndef EXPORT_H
+ #define EXPORT_H
+ 
+-#include <fstream.h>
++#include <fstream>
++using namespace std;
+ #include <qstring.h>
+  
+ class Machine;
diff --git a/cad/qfsm/files/patch-src::ExportAHDL.cpp b/cad/qfsm/files/patch-src::ExportAHDL.cpp
new file mode 100644
index 000000000000..449cadd306a5
--- /dev/null
+++ b/cad/qfsm/files/patch-src::ExportAHDL.cpp
@@ -0,0 +1,12 @@
+--- src/ExportAHDL.cpp.orig	Sat Mar  6 22:28:50 2004
++++ src/ExportAHDL.cpp	Tue Mar 16 23:43:50 2004
+@@ -16,7 +16,8 @@
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <qregexp.h>
+ 
+ #include "ExportAHDL.h"
diff --git a/cad/qfsm/files/patch-src::ExportKISS.cpp b/cad/qfsm/files/patch-src::ExportKISS.cpp
new file mode 100644
index 000000000000..f43047db5d86
--- /dev/null
+++ b/cad/qfsm/files/patch-src::ExportKISS.cpp
@@ -0,0 +1,12 @@
+--- src/ExportKISS.cpp.orig	Tue Feb  3 02:44:02 2004
++++ src/ExportKISS.cpp	Tue Mar 16 23:44:37 2004
+@@ -16,7 +16,8 @@
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <qregexp.h>
+ 
+ #include "ExportKISS.h"
diff --git a/cad/qfsm/files/patch-src::ExportVHDL.cpp b/cad/qfsm/files/patch-src::ExportVHDL.cpp
new file mode 100644
index 000000000000..43137507c961
--- /dev/null
+++ b/cad/qfsm/files/patch-src::ExportVHDL.cpp
@@ -0,0 +1,12 @@
+--- src/ExportVHDL.cpp.orig	Sat Mar  6 22:32:02 2004
++++ src/ExportVHDL.cpp	Tue Mar 16 23:53:08 2004
+@@ -16,7 +16,8 @@
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <qregexp.h>
+ 
+ #include "ExportVHDL.h"
diff --git a/cad/qfsm/files/patch-src::ExportVerilog.cpp b/cad/qfsm/files/patch-src::ExportVerilog.cpp
new file mode 100644
index 000000000000..3ce814f508db
--- /dev/null
+++ b/cad/qfsm/files/patch-src::ExportVerilog.cpp
@@ -0,0 +1,12 @@
+--- src/ExportVerilog.cpp.orig	Sat Mar  6 22:33:16 2004
++++ src/ExportVerilog.cpp	Tue Mar 16 23:43:03 2004
+@@ -16,7 +16,8 @@
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ #include <qregexp.h>
+ 
+ #include "ExportVerilog.h"
diff --git a/cad/qfsm/files/patch-src::GState.cpp b/cad/qfsm/files/patch-src::GState.cpp
new file mode 100644
index 000000000000..99ec380f5f5a
--- /dev/null
+++ b/cad/qfsm/files/patch-src::GState.cpp
@@ -0,0 +1,11 @@
+--- src/GState.cpp.orig	Sat Mar  6 22:41:05 2004
++++ src/GState.cpp	Wed Mar 17 00:07:34 2004
+@@ -16,7 +16,7 @@
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+ 
+-#include <math.h>
++#include <cmath>
+ 
+ #include <qpen.h>
+ #include <qbrush.h>
diff --git a/cad/qfsm/files/patch-src::GTransition.cpp b/cad/qfsm/files/patch-src::GTransition.cpp
new file mode 100644
index 000000000000..4fb695429b34
--- /dev/null
+++ b/cad/qfsm/files/patch-src::GTransition.cpp
@@ -0,0 +1,11 @@
+--- src/GTransition.cpp.orig	Mon Dec 29 05:35:44 2003
++++ src/GTransition.cpp	Wed Mar 17 00:08:16 2004
+@@ -16,7 +16,7 @@
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+ 
+-#include <math.h>
++#include <cmath>
+ 
+ #include "GTransition.h"
+ #include "GState.h"
diff --git a/cad/qfsm/files/patch-src::ICheck.cpp b/cad/qfsm/files/patch-src::ICheck.cpp
new file mode 100644
index 000000000000..01cd34097c54
--- /dev/null
+++ b/cad/qfsm/files/patch-src::ICheck.cpp
@@ -0,0 +1,11 @@
+--- src/ICheck.cpp.orig	Tue Feb  3 02:50:35 2004
++++ src/ICheck.cpp	Wed Mar 17 00:08:59 2004
+@@ -16,7 +16,7 @@
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+ 
+-#include <math.h>
++#include <cmath>
+ #include <qcursor.h>
+ #include "ICheck.h"
+ #include "Machine.h"
diff --git a/cad/qfsm/files/patch-src::ListBoxItems.cpp b/cad/qfsm/files/patch-src::ListBoxItems.cpp
new file mode 100644
index 000000000000..9521b98fa7ee
--- /dev/null
+++ b/cad/qfsm/files/patch-src::ListBoxItems.cpp
@@ -0,0 +1,11 @@
+--- src/ListBoxItems.cpp.orig	Mon Dec 29 05:35:44 2003
++++ src/ListBoxItems.cpp	Wed Mar 17 00:09:39 2004
+@@ -16,7 +16,7 @@
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+ 
+-#include <math.h>
++#include <cmath>
+ #include <qlistbox.h>
+ #include <qpen.h>
+ #include <qpainter.h>
diff --git a/cad/qfsm/files/patch-src::Machine.h b/cad/qfsm/files/patch-src::Machine.h
new file mode 100644
index 000000000000..8448be91d79c
--- /dev/null
+++ b/cad/qfsm/files/patch-src::Machine.h
@@ -0,0 +1,11 @@
+--- src/Machine.h.orig	Sat Mar  6 22:27:09 2004
++++ src/Machine.h	Wed Mar 17 00:11:08 2004
+@@ -19,7 +19,7 @@
+ #ifndef MACHINE_H
+ #define MACHINE_H
+ 
+-#include <math.h>
++#include <cmath>
+ #include <qlist.h>
+ #include <qobject.h>
+ #include <qstringlist.h>
diff --git a/cad/qfsm/files/patch-src::OptGeneralDlgImpl.cpp b/cad/qfsm/files/patch-src::OptGeneralDlgImpl.cpp
new file mode 100644
index 000000000000..3a8750aaed17
--- /dev/null
+++ b/cad/qfsm/files/patch-src::OptGeneralDlgImpl.cpp
@@ -0,0 +1,11 @@
+--- src/OptGeneralDlgImpl.cpp.orig	Mon Dec 29 05:35:44 2003
++++ src/OptGeneralDlgImpl.cpp	Tue Mar 16 23:47:47 2004
+@@ -16,7 +16,7 @@
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+ 
+-#include <stdlib.h>
++#include <cstdlib>
+ #include <qdir.h>
+ #include <qstringlist.h>
+ 
diff --git a/cad/qfsm/files/patch-src::State.cpp b/cad/qfsm/files/patch-src::State.cpp
new file mode 100644
index 000000000000..4d51477fe5c6
--- /dev/null
+++ b/cad/qfsm/files/patch-src::State.cpp
@@ -0,0 +1,13 @@
+--- src/State.cpp.orig	Sat Mar  6 22:22:17 2004
++++ src/State.cpp	Wed Mar 17 00:10:25 2004
+@@ -16,8 +16,8 @@
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+ 
+-#include <math.h>
+-#include <string.h>
++#include <cmath>
++#include <cstring>
+ 
+ #include "State.h"
+ #include "Transition.h"
diff --git a/cad/qfsm/files/patch-src::Transition.cpp b/cad/qfsm/files/patch-src::Transition.cpp
new file mode 100644
index 000000000000..bcf8e247febd
--- /dev/null
+++ b/cad/qfsm/files/patch-src::Transition.cpp
@@ -0,0 +1,11 @@
+--- src/Transition.cpp.orig	Tue Feb  3 01:36:43 2004
++++ src/Transition.cpp	Tue Mar 16 23:48:26 2004
+@@ -16,7 +16,7 @@
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+ 
+-#include <stdlib.h>
++#include <cstdlib>
+ //#include <typeinfo>
+ 
+ #include "Transition.h"
diff --git a/cad/qfsm/files/patch-src::TransitionInfoBin.cpp b/cad/qfsm/files/patch-src::TransitionInfoBin.cpp
new file mode 100644
index 000000000000..1c6ebdf5e725
--- /dev/null
+++ b/cad/qfsm/files/patch-src::TransitionInfoBin.cpp
@@ -0,0 +1,11 @@
+--- src/TransitionInfoBin.cpp.orig	Mon Dec 29 05:35:44 2003
++++ src/TransitionInfoBin.cpp	Tue Mar 16 23:49:09 2004
+@@ -16,7 +16,7 @@
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+ 
+-#include <stdlib.h>
++#include <cstdlib>
+ #include <typeinfo>
+ #include "IOInfoBin.h"
+ #include "IOInfoASCII.h"
diff --git a/cad/qfsm/files/patch-src::main.cpp b/cad/qfsm/files/patch-src::main.cpp
new file mode 100644
index 000000000000..1893b25dd3e2
--- /dev/null
+++ b/cad/qfsm/files/patch-src::main.cpp
@@ -0,0 +1,14 @@
+--- src/main.cpp.orig	Sun Mar  7 01:12:13 2004
++++ src/main.cpp	Wed Mar 17 00:12:23 2004
+@@ -16,8 +16,9 @@
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+ 
+-#include <stdlib.h>
+-#include <iostream.h>
++#include <cstdlib>
++#include <iostream>
++using namespace std;
+ #include <qtranslator.h>
+ #include <qapplication.h>
+ #include <qstring.h>
diff --git a/cad/qfsm/pkg-plist b/cad/qfsm/pkg-plist
index 640fa1a0408c..b88ba4062748 100644
--- a/cad/qfsm/pkg-plist
+++ b/cad/qfsm/pkg-plist
@@ -1,4 +1,13 @@
 bin/qfsm
+bin/qfsm.exec
 %%PORTDOCS%%%%EXAMPLESDIR%%/ascii_example.fsm
 %%PORTDOCS%%%%EXAMPLESDIR%%/bin_example.fsm
+%%DATADIR%%/po/English.qm
+%%DATADIR%%/po/English.ts
+%%DATADIR%%/po/French.qm
+%%DATADIR%%/po/French.ts
+%%DATADIR%%/po/German.qm
+%%DATADIR%%/po/German.ts
+@dirrm %%DATADIR%%/po
+@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%