fix build on -current

PR:		46467
Submitted by:	Ports Fury

12 files changed, 161 insertions, 30 deletions

diff --git a/graphics/fractorama/Makefile b/graphics/fractorama/Makefile
index 3a9046d2f18f..a4561f1bc5d8 100644
--- a/graphics/fractorama/Makefile
+++ b/graphics/fractorama/Makefile
@@ -14,25 +14,34 @@ DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_BISON=	yes
-USE_QT_VER=	3
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
+
+USE_QT_VER=	3
+USE_BISON=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
-MAKE_ENV=	QTCPPFLAGS="${QTCPPFLAGS}" QTCFGLIBS="${QTCFGLIBS}" MOC=${MOC}
+MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+		QTCPPFLAGS="${QTCPPFLAGS} ${PTHREAD_CFLAGS}" \
+		QTCFGLIBS="${QTCFGLIBS} ${PTHREAD_LIBS}"
 ALL_TARGET=	release
-USE_REINPLACE=	yes
 
 post-patch:
-	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} \
-		${REINPLACE_CMD} -e "s,OPTIMIZE := -O2,OPTIMIZE := ${CFLAGS},g"
+	@${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|gcc|\$${CC}|g ; \
+		 s|g++|\$${CXX}|g ; \
+		 s|-L[$$][{]QTROOT[}]/lib -lqt|-lqt-mt \$${QTCFGLIBS}|g ; \
+		 s|-I[$$][{]QTROOT[}]/include|\$${QTCPPFLAGS}|g ; \
+		 s|-O2|\$${CFLAGS}|g'
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/../fractorama.exe ${PREFIX}/bin/fractorama
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/../examples/* ${EXAMPLESDIR}
 	${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/../doc/* ${DOCSDIR}
+	cd ${WRKSRC}/../doc && ${FIND} . | \
+		cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+	${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC}/../examples && ${FIND} . | \
+		cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/fractorama/files/patch-src::Makefile b/graphics/fractorama/files/patch-src::Makefile
deleted file mode 100644
index d7197ba6d9f4..000000000000
--- a/graphics/fractorama/files/patch-src::Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.orig	Fri Aug 23 14:07:34 2002
-+++ Makefile	Fri Aug 23 14:11:13 2002
-@@ -92,7 +92,7 @@
-    endif
- 
-    QTROOT        := ${UNIX_QTROOT}
--   PLATFORM_LIBS := -L${QTROOT}/lib -lqt
-+   PLATFORM_LIBS := -L${QTROOT}/lib -lqt-mt -pthread
-    CPP           := g++
-    WARN          := -W -Wall
-    LINK          := ${CPP} -o ${EXE}
-@@ -121,7 +121,8 @@
- 
- OUT     := ${OUT1}${OUT2}
- MOC     := ${QTROOT}/bin/moc
--INCLUDE := -I${QTROOT}/include \
-+INCLUDE := ${QTCPPFLCAGS} \
-+           -I${QTROOT}/include \
-            -Ilib/fractal       \
-            -Ilib/tiff          \
-            -Ilib/persist       \
diff --git a/graphics/fractorama/files/patch-src::lib::fractal::BooleanNode.h b/graphics/fractorama/files/patch-src::lib::fractal::BooleanNode.h
new file mode 100644
index 000000000000..7ae793785aba
--- /dev/null
+++ b/graphics/fractorama/files/patch-src::lib::fractal::BooleanNode.h
@@ -0,0 +1,13 @@
+--- lib/fractal/BooleanNode.h.orig	Sat Dec  1 01:27:59 2001
++++ lib/fractal/BooleanNode.h	Sun Dec 22 06:30:21 2002
+@@ -1,7 +1,9 @@
+ #ifndef _BOOLEAN_NODE_H_
+ #   define _BOOLEAN_NODE_H_
+ 
+-class ostream;
++#include <iostream>
++using namespace std;
++
+ class ComplexVariables;
+ class DoubleVariables;
+ class ColorEnvironment;
diff --git a/graphics/fractorama/files/patch-src::lib::fractal::ColorTable.h b/graphics/fractorama/files/patch-src::lib::fractal::ColorTable.h
new file mode 100644
index 000000000000..365ff3fec8ae
--- /dev/null
+++ b/graphics/fractorama/files/patch-src::lib::fractal::ColorTable.h
@@ -0,0 +1,12 @@
+--- lib/fractal/ColorTable.h.bak	Sat Dec  1 01:27:59 2001
++++ lib/fractal/ColorTable.h	Sun Dec 22 06:07:37 2002
+@@ -1,7 +1,8 @@
+ #ifndef _COLOR_TABLE_H_
+ #   define _COLOR_TABLE_H_
+ 
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ 
+ class ColorTable
+ {
diff --git a/graphics/fractorama/files/patch-src::lib::fractal::ComplexNode.h b/graphics/fractorama/files/patch-src::lib::fractal::ComplexNode.h
new file mode 100644
index 000000000000..de219827b4a8
--- /dev/null
+++ b/graphics/fractorama/files/patch-src::lib::fractal::ComplexNode.h
@@ -0,0 +1,13 @@
+--- lib/fractal/ComplexNode.h.bak	Sat Dec  1 01:27:59 2001
++++ lib/fractal/ComplexNode.h	Sun Dec 22 06:06:53 2002
+@@ -3,7 +3,9 @@
+ 
+ #include "dcomplex.h"
+ 
+-class ostream;
++#include <iostream>
++using namespace std;
++
+ class ComplexVariables;
+ class DoubleVariables;
+ class ColorEnvironment;
diff --git a/graphics/fractorama/files/patch-src::lib::fractal::ComplexVariables.h b/graphics/fractorama/files/patch-src::lib::fractal::ComplexVariables.h
new file mode 100644
index 000000000000..852d2fb14411
--- /dev/null
+++ b/graphics/fractorama/files/patch-src::lib::fractal::ComplexVariables.h
@@ -0,0 +1,13 @@
+--- lib/fractal/ComplexVariables.h.bak	Sat Dec  1 01:27:59 2001
++++ lib/fractal/ComplexVariables.h	Sun Dec 22 06:06:53 2002
+@@ -3,7 +3,9 @@
+ 
+ #include "dcomplex.h"
+ 
+-class ostream;
++#include <iostream>
++using namespace std;
++
+ struct ComplexEntry;
+ 
+ class ComplexVariables
diff --git a/graphics/fractorama/files/patch-src::lib::fractal::DoubleNode.h b/graphics/fractorama/files/patch-src::lib::fractal::DoubleNode.h
new file mode 100644
index 000000000000..ac46e33364fa
--- /dev/null
+++ b/graphics/fractorama/files/patch-src::lib::fractal::DoubleNode.h
@@ -0,0 +1,13 @@
+--- lib/fractal/DoubleNode.h.bak	Sat Dec  1 01:27:59 2001
++++ lib/fractal/DoubleNode.h	Sun Dec 22 06:06:53 2002
+@@ -1,7 +1,9 @@
+ #ifndef _DOUBLE_NODE_H_
+ #   define _DOUBLE_NODE_H_
+ 
+-class ostream;
++#include <iostream>
++using namespace std;
++
+ class ComplexVariables;
+ class DoubleVariables;
+ class ColorEnvironment;
diff --git a/graphics/fractorama/files/patch-src::lib::fractal::DoubleVariables.h b/graphics/fractorama/files/patch-src::lib::fractal::DoubleVariables.h
new file mode 100644
index 000000000000..110d7b83c5a9
--- /dev/null
+++ b/graphics/fractorama/files/patch-src::lib::fractal::DoubleVariables.h
@@ -0,0 +1,13 @@
+--- lib/fractal/DoubleVariables.h.orig	Sat Dec  1 01:27:59 2001
++++ lib/fractal/DoubleVariables.h	Sun Dec 22 06:47:52 2002
+@@ -1,7 +1,9 @@
+ #ifndef _DOUBLE_VARIABLES_H_
+ #   define _DOUBLE_VARIABLES_H_
+ 
+-class ostream;
++#include <iostream>
++using namespace std;
++
+ struct DoubleEntry;
+ 
+ class DoubleVariables
diff --git a/graphics/fractorama/files/patch-src::lib::fractal::Fractal.h b/graphics/fractorama/files/patch-src::lib::fractal::Fractal.h
new file mode 100644
index 000000000000..f092fdcacafd
--- /dev/null
+++ b/graphics/fractorama/files/patch-src::lib::fractal::Fractal.h
@@ -0,0 +1,13 @@
+--- lib/fractal/Fractal.h.bak	Fri Jan 25 01:22:39 2002
++++ lib/fractal/Fractal.h	Sun Dec 22 06:06:53 2002
+@@ -3,7 +3,9 @@
+ 
+ // Forward Declarations
+ 
+-class ostream;
++#include <iostream>
++using namespace std;
++
+ class BooleanNode;
+ class Statement;
+ class InfiniteLoopCallback;
diff --git a/graphics/fractorama/files/patch-src::lib::fractal::PrintArg.h b/graphics/fractorama/files/patch-src::lib::fractal::PrintArg.h
new file mode 100644
index 000000000000..cc6d01ee9a01
--- /dev/null
+++ b/graphics/fractorama/files/patch-src::lib::fractal::PrintArg.h
@@ -0,0 +1,15 @@
+--- lib/fractal/PrintArg.h.orig	Sat Dec  1 01:27:59 2001
++++ lib/fractal/PrintArg.h	Sun Dec 22 07:00:54 2002
+@@ -1,9 +1,11 @@
+ #ifndef _PRINT_ARG_H_
+ #   define _PRINT_ARG_H_
+ 
++#include <iostream>
++using namespace std;
++
+ class ComplexVariables;
+ class DoubleVariables;
+-class ostream;
+ 
+ class PrintArg
+ {
diff --git a/graphics/fractorama/files/patch-src::lib::fractal::RegionNode.h b/graphics/fractorama/files/patch-src::lib::fractal::RegionNode.h
new file mode 100644
index 000000000000..1b0740edcfa5
--- /dev/null
+++ b/graphics/fractorama/files/patch-src::lib::fractal::RegionNode.h
@@ -0,0 +1,17 @@
+--- lib/fractal/RegionNode.h.orig	Sat Dec  1 01:27:59 2001
++++ lib/fractal/RegionNode.h	Sun Dec 22 07:02:08 2002
+@@ -1,11 +1,13 @@
+ #ifndef _REGION_NODE_H_
+ #   define _REGION_NODE_H_
+ 
++#include <iostream>
++using namespace std;
++
+ class ComplexNode;
+ class ComplexVariables;
+ class DoubleVariables;
+ class ColorEnvironment;
+-class ostream;
+ 
+ class RegionNode
+ {
diff --git a/graphics/fractorama/files/patch-src::lib::fractal::Statement.h b/graphics/fractorama/files/patch-src::lib::fractal::Statement.h
new file mode 100644
index 000000000000..efebdf813eb1
--- /dev/null
+++ b/graphics/fractorama/files/patch-src::lib::fractal::Statement.h
@@ -0,0 +1,21 @@
+--- lib/fractal/Statement.h.orig	Sat Dec  1 01:27:59 2001
++++ lib/fractal/Statement.h	Sun Dec 22 07:03:48 2002
+@@ -1,13 +1,16 @@
+ #ifndef _STATEMENT_H_
+ #   define _STATEMENT_H_
+ 
++#include "tf.h"
++
++#include <iostream>
++using namespace std;
++
+ class ComplexVariables;
+ class DoubleVariables;
+ class ColorEnvironment;
+ class InfiniteLoopCallback;
+-class ostream;
+ 
+-#include "tf.h"
+ 
+ struct LoopControl
+ {