- Update 0.45

PR:		116922
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

5 files changed, 15 insertions, 39 deletions

diff --git a/cad/qfsm/Makefile b/cad/qfsm/Makefile
index 002a7857b62d..82a5b0d002c4 100644
--- a/cad/qfsm/Makefile
+++ b/cad/qfsm/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	qfsm
-PORTVERSION=	0.44
+PORTVERSION=	0.45
 CATEGORIES=	cad
 MASTER_SITES=	SF
 
diff --git a/cad/qfsm/distinfo b/cad/qfsm/distinfo
index 88d96751f49e..7742bfc4af3a 100644
--- a/cad/qfsm/distinfo
+++ b/cad/qfsm/distinfo
@@ -1,3 +1,3 @@
-MD5 (qfsm-0.44.tar.gz) = f955963bd41be19689c5e948ed124551
-SHA256 (qfsm-0.44.tar.gz) = c73a1f617e80130bba16b27ae7f4da178cba5e24cc53b1c04f9cfb119a685198
-SIZE (qfsm-0.44.tar.gz) = 814943
+MD5 (qfsm-0.45.tar.gz) = 235a0fdb7b8c98985a0db0acd0bf4762
+SHA256 (qfsm-0.45.tar.gz) = b06357eb35c924f2d63fa6f053206c9cd32d1f76682ad12082bd4f7eff91b222
+SIZE (qfsm-0.45.tar.gz) = 820425
diff --git a/cad/qfsm/files/patch-src::Draw.cpp b/cad/qfsm/files/patch-src::Draw.cpp
index 89e8fa7e6b45..060131ab44ff 100644
--- a/cad/qfsm/files/patch-src::Draw.cpp
+++ b/cad/qfsm/files/patch-src::Draw.cpp
@@ -1,11 +1,13 @@
---- 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 @@
+--- src/Draw.cpp.orig	Fri Aug 17 05:07:21 2007
++++ src/Draw.cpp	Wed Oct  3 14:30:19 2007
+@@ -16,8 +16,8 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
  
 -#include <math.h>
+-#include <float.h>
 +#include <cmath>
++#include <cfloat>
  #include <qnamespace.h>
- #include <qlist.h>
+ #include <qptrlist.h>
  #include <qpainter.h>
diff --git a/cad/qfsm/files/patch-src::GState.cpp b/cad/qfsm/files/patch-src::GState.cpp
index 6b8e2531609e..8d03cd8fc724 100644
--- a/cad/qfsm/files/patch-src::GState.cpp
+++ b/cad/qfsm/files/patch-src::GState.cpp
@@ -1,5 +1,5 @@
---- src/GState.cpp.orig	2004-11-21 14:48:41.000000000 +0100
-+++ src/GState.cpp	2007-08-02 14:07:00.000000000 +0200
+--- src/GState.cpp.orig	Fri Aug 17 05:05:36 2007
++++ src/GState.cpp	Wed Oct  3 14:33:54 2007
 @@ -16,7 +16,7 @@
  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
@@ -9,29 +9,3 @@
  
  #include <qpen.h>
  #include <qbrush.h>
-@@ -196,9 +196,9 @@
-     t->getCPoint2(c2x, c2y);
-     info = t->getInfo();
- 
--    qDebug("Adresse:     %d", (int)t);
--    qDebug("Start:       %d", (int)t->getStart());
--    qDebug("Ende:        %d", (int)t->getEnd());
-+    qDebug("Adresse:     %d", (intptr_t)t);
-+    qDebug("Start:       %d", (intptr_t)t->getStart());
-+    qDebug("Ende:        %d", (intptr_t)t->getEnd());
-     qDebug("Inputs:      %s", info->getInputsStrBin(/*numin*/).latin1());
-     qDebug("Outputs:     %s", info->getOutputsStrBin(/*numout*/).latin1());
-     qDebug(" ");
-@@ -215,9 +215,9 @@
-     t->getCPoint2(c2x, c2y);
-     info = t->getInfo();
- 
--    qDebug("Adresse:     %d", (int)t);
--    qDebug("Start:       %d", (int)t->getStart());
--    qDebug("Ende:        %d", (int)t->getEnd());
-+    qDebug("Adresse:     %d", (intptr_t)t);
-+    qDebug("Start:       %d", (intptr_t)t->getStart());
-+    qDebug("Ende:        %d", (intptr_t)t->getEnd());
-     qDebug("Inputs:      %s", info->getInputsStrBin(/*numin*/).latin1());
-     qDebug("Outputs:     %s", info->getOutputsStrBin(/*numout*/).latin1());
-     qDebug(" ");
diff --git a/cad/qfsm/files/patch-src::Machine.h b/cad/qfsm/files/patch-src::Machine.h
index 8448be91d79c..335dce6b793c 100644
--- a/cad/qfsm/files/patch-src::Machine.h
+++ b/cad/qfsm/files/patch-src::Machine.h
@@ -1,11 +1,11 @@
---- src/Machine.h.orig	Sat Mar  6 22:27:09 2004
-+++ src/Machine.h	Wed Mar 17 00:11:08 2004
+--- src/Machine.h.orig	Fri Aug 17 05:06:26 2007
++++ src/Machine.h	Wed Oct  3 14:34:14 2007
 @@ -19,7 +19,7 @@
  #ifndef MACHINE_H
  #define MACHINE_H
  
 -#include <math.h>
 +#include <cmath>
- #include <qlist.h>
+ #include <qptrlist.h>
  #include <qobject.h>
  #include <qstringlist.h>