diff options
author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-12-22 13:26:02 +0000 |
---|---|---|
committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-12-22 13:26:02 +0000 |
commit | ef59d5df915b5c6ece8c8d08ca0d60ea780d0f78 (patch) | |
tree | 2639d0b1ba9712b2e3dd643155f54e32e0b0c620 /cad | |
parent | fix build on -current (diff) |
fix build on -current
PR: 46466
Submitted by: Ports Fury
Notes
Notes:
svn path=/head/; revision=71781
Diffstat (limited to 'cad')
-rw-r--r-- | cad/qfsm/Makefile | 17 | ||||
-rw-r--r-- | cad/qfsm/files/patch-Makefile.in | 11 | ||||
-rw-r--r-- | cad/qfsm/files/patch-src::GState.cpp | 11 | ||||
-rw-r--r-- | cad/qfsm/files/patch-src::Machine.cpp | 11 | ||||
-rw-r--r-- | cad/qfsm/files/patch-src::MainWindow.cpp | 20 | ||||
-rw-r--r-- | cad/qfsm/files/patch-src::Project.cpp | 11 | ||||
-rw-r--r-- | cad/qfsm/files/patch-src:Makefile.in | 20 |
7 files changed, 67 insertions, 34 deletions
diff --git a/cad/qfsm/Makefile b/cad/qfsm/Makefile index ed6cf353c426..4fce24b07247 100644 --- a/cad/qfsm/Makefile +++ b/cad/qfsm/Makefile @@ -15,13 +15,24 @@ MASTER_SITE_SUBDIR= ${PORTNAME} 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 --git a/cad/qfsm/files/patch-Makefile.in b/cad/qfsm/files/patch-Makefile.in deleted file mode 100644 index 44ed5ebae79c..000000000000 --- a/cad/qfsm/files/patch-Makefile.in +++ /dev/null @@ -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 --git a/cad/qfsm/files/patch-src::GState.cpp b/cad/qfsm/files/patch-src::GState.cpp new file mode 100644 index 000000000000..52b6b71c64cb --- /dev/null +++ b/cad/qfsm/files/patch-src::GState.cpp @@ -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 --git a/cad/qfsm/files/patch-src::Machine.cpp b/cad/qfsm/files/patch-src::Machine.cpp new file mode 100644 index 000000000000..e419a748f953 --- /dev/null +++ b/cad/qfsm/files/patch-src::Machine.cpp @@ -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 --git a/cad/qfsm/files/patch-src::MainWindow.cpp b/cad/qfsm/files/patch-src::MainWindow.cpp new file mode 100644 index 000000000000..afc29c655ccb --- /dev/null +++ b/cad/qfsm/files/patch-src::MainWindow.cpp @@ -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 --git a/cad/qfsm/files/patch-src::Project.cpp b/cad/qfsm/files/patch-src::Project.cpp new file mode 100644 index 000000000000..d141994310e8 --- /dev/null +++ b/cad/qfsm/files/patch-src::Project.cpp @@ -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 --git a/cad/qfsm/files/patch-src:Makefile.in b/cad/qfsm/files/patch-src:Makefile.in deleted file mode 100644 index df5115f553ea..000000000000 --- a/cad/qfsm/files/patch-src:Makefile.in +++ /dev/null @@ -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 - |