Attachment #27389 for bug #46466

View | Details | Raw Unified | Return to bug 46466
Collapse All | Expand All

Lines 15-27 Link Here

(-)cad/qfsm/Makefile (-3 / +14 lines)
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
16		16
17	USE_QT_VER= 3	17	USE_QT_VER= 3
18	GNU_CONFIGURE= yes	18	USE_REINPLACE= yes
19	USE_GMAKE= yes	19	USE_GMAKE= yes
		20	GNU_CONFIGURE= yes
		21	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
		22
		23	post-extract:
		24	@${SED} -e 's:select\[:select1\[:g' ${WRKSRC}/pics/select.xpm \
		25	> ${WRKSRC}/pics/select1.xpm
		26
		27	post-patch:
		28	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \
		29	's\|^CXXFLAGS =.*$$\|CXXFLAGS = @CXXFLAGS@\|g'
20		30
		31	do-install:
		32	${INSTALL_PROGRAM} ${WRKSRC}/src/qfsm ${PREFIX}/bin
21	.if !defined(NOPORTDOCS)	33	.if !defined(NOPORTDOCS)
22	post-install:
23	@${MKDIR} ${EXAMPLESDIR}	34	@${MKDIR} ${EXAMPLESDIR}
24	${CP} ${WRKSRC}/examples/*.fsm ${EXAMPLESDIR}	35	${INSTALL_DATA} ${WRKSRC}/examples/*.fsm ${EXAMPLESDIR}
25	.endif	36	.endif
26		37
27	.include <bsd.port.mk>	38	.include <bsd.port.mk>

Lines 1-11 Link Here

(-)cad/qfsm/files/patch-Makefile.in (-11 lines)
1	--- Makefile.in.orig Tue Jun 11 21:44:52 2002
2	+++ Makefile.in Tue Jun 11 21:45:10 2002
3	@@ -226,7 +226,7 @@
4	x_includes = @x_includes@
5	x_libraries = @x_libraries@
6
7	-SUBDIRS = src po
8	+SUBDIRS = src
9	DIST_SUBDIRS = src po
10
11	#qfsmdir = $(prefix)/qfsm

Line 0 Link Here

(-)cad/qfsm/files/patch-src::GState.cpp (+11 lines)
	1	--- src/GState.cpp.orig Sat Jan 5 23:15:26 2002
	2	+++ src/GState.cpp Sat Dec 21 16:41:56 2002
	3	@@ -312,7 +312,7 @@
	4	s->reflist.append(t);
	5	}
	6
	7	-void GState::addTransition(Project* p, GTransition* t, bool withundo=TRUE)
	8	+void GState::addTransition(Project* p, GTransition* t, bool withundo)
	9	{
	10	tlist.append(t);
	11	if (withundo)

Line 0 Link Here

(-)cad/qfsm/files/patch-src::Machine.cpp (+11 lines)
	1	--- src/Machine.cpp.orig Thu May 2 05:14:47 2002
	2	+++ src/Machine.cpp Sun Dec 22 03:23:36 2002
	3	@@ -31,7 +31,7 @@
	4
	5
	6	/// Constructor.
	7	-Machine::Machine(QObject* parent=NULL, const char* n=0)
	8	+Machine::Machine(QObject* parent, const char* n)
	9	: QObject(parent, n)
	10	{
	11	name = "";




--- 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);

Line 0 Link Here

(-)cad/qfsm/files/patch-src::Project.cpp (+11 lines)
	1	--- src/Project.cpp.orig Sat Jan 5 23:15:27 2002
	2	+++ src/Project.cpp Sun Dec 22 03:36:25 2002
	3	@@ -25,7 +25,7 @@
	4	#include "GObject.h"
	5	#include "AppInfo.h"
	6
	7	-Project::Project(QObject* parent=NULL, const char* name=0)
	8	+Project::Project(QObject* parent, const char* name)
	9	: QObject(parent, name)
	10	{
	11	main = (MainWindow*)parent;




--- 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


Return to bug 46466

Line 0 Link Here

(-)cad/qfsm/files/patch-src::MainWindow.cpp (+20 lines)
	1	--- src/MainWindow.cpp.orig Fri May 3 22:26:38 2002
	2	+++ src/MainWindow.cpp Sun Dec 22 07:46:43 2002
	3	@@ -60,7 +60,7 @@
	4	#include "pics/editcopyoff.xpm"
	5	#include "pics/editpaste.xpm"
	6	#include "pics/editpasteoff.xpm"
	7	-#include "pics/select.xpm"
	8	+#include "pics/select1.xpm"
	9	#include "pics/selectoff.xpm"
	10	#include "pics/statenew.xpm"
	11	#include "pics/statenewoff.xpm"
	12	@@ -418,7 +418,7 @@
	13
	14	toolbar->addSeparator();
	15
	16	- QPixmap pselect((const char**)select);
	17	+ QPixmap pselect((const char**)select1);
	18	QPixmap pselectoff((const char**)selectoff);
	19	selset = new QIconSet(pselect);
	20	selset->setPixmap(pselectoff, QIconSet::Automatic, QIconSet::Disabled);

Lines 1-20 Link Here

(-)cad/qfsm/files/patch-src:Makefile.in (-20 lines)
1	--- src/Makefile.in.orig Sun Feb 3 18:50:29 2002
2	+++ src/Makefile.in Fri Apr 12 00:50:19 2002
3	@@ -54,7 +54,7 @@
4	INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
5	INSTALL_DATA = @INSTALL_DATA@
6	INSTALL_SCRIPT = @INSTALL_SCRIPT@
7	-transform = @program_transform_name@
8	+transform =
9
10	NORMAL_INSTALL = :
11	PRE_INSTALL = :
12	@@ -210,7 +210,7 @@
13	x_includes = @x_includes@
14	x_libraries = @x_libraries@
15
16	-qfsmdir = $(prefix)/qfsm
17	+qfsmdir = $(prefix)
18	qfsmbindir = $(qfsmdir)/bin
19	qfsmbin_PROGRAMS = qfsm
20