unbreak by upgrading to 0.41

7 files changed, 5 insertions, 68 deletions

diff --git a/cad/qfsm/Makefile b/cad/qfsm/Makefile
index f88ef3fdeeef..f83a0786add8 100644
--- a/cad/qfsm/Makefile
+++ b/cad/qfsm/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	qfsm
-PORTVERSION=	0.40
+PORTVERSION=	0.41
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,22 +15,12 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A graphical tool for designing finite state machines
 
-BROKEN=		"Does not compile"
-
 USE_QT_VER=	3
 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)
diff --git a/cad/qfsm/distinfo b/cad/qfsm/distinfo
index fdbd04e86b33..c4035fc1762a 100644
--- a/cad/qfsm/distinfo
+++ b/cad/qfsm/distinfo
@@ -1 +1 @@
-MD5 (qfsm-0.40.tar.gz) = 5513001b8b6f676ed43ec9996beeb889
+MD5 (qfsm-0.41.tar.gz) = ff2d6ab30a9f2a5ff0328cc1a4836f63
diff --git a/cad/qfsm/files/patch-src::GState.cpp b/cad/qfsm/files/patch-src::GState.cpp
deleted file mode 100644
index 52b6b71c64cb..000000000000
--- a/cad/qfsm/files/patch-src::GState.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index e419a748f953..000000000000
--- a/cad/qfsm/files/patch-src::Machine.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index afc29c655ccb..000000000000
--- a/cad/qfsm/files/patch-src::MainWindow.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index d141994310e8..000000000000
--- a/cad/qfsm/files/patch-src::Project.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/pkg-plist b/cad/qfsm/pkg-plist
index 5a376e2e5c3f..640fa1a0408c 100644
--- a/cad/qfsm/pkg-plist
+++ b/cad/qfsm/pkg-plist
@@ -1,4 +1,4 @@
 bin/qfsm
-%%PORTDOCS%%share/examples/qfsm/ascii_example.fsm
-%%PORTDOCS%%share/examples/qfsm/bin_example.fsm
-%%PORTDOCS%%@dirrm share/examples/qfsm
+%%PORTDOCS%%%%EXAMPLESDIR%%/ascii_example.fsm
+%%PORTDOCS%%%%EXAMPLESDIR%%/bin_example.fsm
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%