Date: Sun, 22 Dec 2002 17:21:14 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46466: Update port: cad/qfsm Message-ID: <20021222172114.4d57565c.tkato@prontomail.com>
next in thread | raw e-mail | index | archive | help
>Number: 46466
>Category: ports
>Synopsis: Update port: cad/qfsm
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 22 01:10:02 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.7-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Fix build on 5-current
New file:
files/patch-src::GState.cpp
files/patch-src::Machine.cpp
files/patch-src::MainWindow.cpp
files/patch-src::Project.cpp
Remove file
files/patch-Makefile.in
files/patch-src::Makefile.in
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/cad/qfsm/Makefile cad/qfsm/Makefile
--- /usr/ports/cad/qfsm/Makefile Mon Nov 11 18:58:57 2002
+++ cad/qfsm/Makefile Sun Dec 22 07:38:55 2002
@@ -15,13 +15,24 @@
MAINTAINER= ports@FreeBSD.org
USE_QT_VER= 3
-GNU_CONFIGURE= yes
+USE_REINPLACE= yes
USE_GMAKE= yes
+GNU_CONFIGURE= yes
+CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+post-extract:
+ @${SED} -e 's:select\[:select1\[:g' ${WRKSRC}/pics/select.xpm \
+ > ${WRKSRC}/pics/select1.xpm
+
+post-patch:
+ @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|^CXXFLAGS =.*$$|CXXFLAGS = @CXXFLAGS@|g'
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/src/qfsm ${PREFIX}/bin
.if !defined(NOPORTDOCS)
-post-install:
@${MKDIR} ${EXAMPLESDIR}
- ${CP} ${WRKSRC}/examples/*.fsm ${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/examples/*.fsm ${EXAMPLESDIR}
.endif
.include <bsd.port.mk>
diff -urN /usr/ports/cad/qfsm/files/patch-Makefile.in cad/qfsm/files/patch-Makefile.in
--- /usr/ports/cad/qfsm/files/patch-Makefile.in Tue Sep 10 20:06:19 2002
+++ cad/qfsm/files/patch-Makefile.in Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- Makefile.in.orig Tue Jun 11 21:44:52 2002
-+++ Makefile.in Tue Jun 11 21:45:10 2002
-@@ -226,7 +226,7 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
-
--SUBDIRS = src po
-+SUBDIRS = src
- DIST_SUBDIRS = src po
-
- #qfsmdir = $(prefix)/qfsm
diff -urN /usr/ports/cad/qfsm/files/patch-src::GState.cpp cad/qfsm/files/patch-src::GState.cpp
--- /usr/ports/cad/qfsm/files/patch-src::GState.cpp Thu Jan 1 09:00:00 1970
+++ cad/qfsm/files/patch-src::GState.cpp Sun Dec 22 03:04:03 2002
@@ -0,0 +1,11 @@
+--- src/GState.cpp.orig Sat Jan 5 23:15:26 2002
++++ src/GState.cpp Sat Dec 21 16:41:56 2002
+@@ -312,7 +312,7 @@
+ s->reflist.append(t);
+ }
+
+-void GState::addTransition(Project* p, GTransition* t, bool withundo=TRUE)
++void GState::addTransition(Project* p, GTransition* t, bool withundo)
+ {
+ tlist.append(t);
+ if (withundo)
diff -urN /usr/ports/cad/qfsm/files/patch-src::Machine.cpp cad/qfsm/files/patch-src::Machine.cpp
--- /usr/ports/cad/qfsm/files/patch-src::Machine.cpp Thu Jan 1 09:00:00 1970
+++ cad/qfsm/files/patch-src::Machine.cpp Sun Dec 22 03:24:09 2002
@@ -0,0 +1,11 @@
+--- src/Machine.cpp.orig Thu May 2 05:14:47 2002
++++ src/Machine.cpp Sun Dec 22 03:23:36 2002
+@@ -31,7 +31,7 @@
+
+
+ /// Constructor.
+-Machine::Machine(QObject* parent=NULL, const char* n=0)
++Machine::Machine(QObject* parent, const char* n)
+ : QObject(parent, n)
+ {
+ name = "";
diff -urN /usr/ports/cad/qfsm/files/patch-src::MainWindow.cpp cad/qfsm/files/patch-src::MainWindow.cpp
--- /usr/ports/cad/qfsm/files/patch-src::MainWindow.cpp Thu Jan 1 09:00:00 1970
+++ cad/qfsm/files/patch-src::MainWindow.cpp Sun Dec 22 07:47:09 2002
@@ -0,0 +1,20 @@
+--- src/MainWindow.cpp.orig Fri May 3 22:26:38 2002
++++ src/MainWindow.cpp Sun Dec 22 07:46:43 2002
+@@ -60,7 +60,7 @@
+ #include "pics/editcopyoff.xpm"
+ #include "pics/editpaste.xpm"
+ #include "pics/editpasteoff.xpm"
+-#include "pics/select.xpm"
++#include "pics/select1.xpm"
+ #include "pics/selectoff.xpm"
+ #include "pics/statenew.xpm"
+ #include "pics/statenewoff.xpm"
+@@ -418,7 +418,7 @@
+
+ toolbar->addSeparator();
+
+- QPixmap pselect((const char**)select);
++ QPixmap pselect((const char**)select1);
+ QPixmap pselectoff((const char**)selectoff);
+ selset = new QIconSet(pselect);
+ selset->setPixmap(pselectoff, QIconSet::Automatic, QIconSet::Disabled);
diff -urN /usr/ports/cad/qfsm/files/patch-src::Project.cpp cad/qfsm/files/patch-src::Project.cpp
--- /usr/ports/cad/qfsm/files/patch-src::Project.cpp Thu Jan 1 09:00:00 1970
+++ cad/qfsm/files/patch-src::Project.cpp Sun Dec 22 03:36:42 2002
@@ -0,0 +1,11 @@
+--- src/Project.cpp.orig Sat Jan 5 23:15:27 2002
++++ src/Project.cpp Sun Dec 22 03:36:25 2002
+@@ -25,7 +25,7 @@
+ #include "GObject.h"
+ #include "AppInfo.h"
+
+-Project::Project(QObject* parent=NULL, const char* name=0)
++Project::Project(QObject* parent, const char* name)
+ : QObject(parent, name)
+ {
+ main = (MainWindow*)parent;
diff -urN /usr/ports/cad/qfsm/files/patch-src:Makefile.in cad/qfsm/files/patch-src:Makefile.in
--- /usr/ports/cad/qfsm/files/patch-src:Makefile.in Fri Apr 12 03:27:36 2002
+++ cad/qfsm/files/patch-src:Makefile.in Thu Jan 1 09:00:00 1970
@@ -1,20 +0,0 @@
---- src/Makefile.in.orig Sun Feb 3 18:50:29 2002
-+++ src/Makefile.in Fri Apr 12 00:50:19 2002
-@@ -54,7 +54,7 @@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
-+transform =
-
- NORMAL_INSTALL = :
- PRE_INSTALL = :
-@@ -210,7 +210,7 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
-
--qfsmdir = $(prefix)/qfsm
-+qfsmdir = $(prefix)
- qfsmbindir = $(qfsmdir)/bin
- qfsmbin_PROGRAMS = qfsm
-
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021222172114.4d57565c.tkato>