From owner-freebsd-ports Sun Dec 22 1:10:46 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 23C0837B40C for ; Sun, 22 Dec 2002 01:10:11 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C3C1743EF1 for ; Sun, 22 Dec 2002 01:10:03 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id gBM9A3NS045283 for ; Sun, 22 Dec 2002 01:10:03 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gBM9A3RI045282; Sun, 22 Dec 2002 01:10:03 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0A1AA37B401 for ; Sun, 22 Dec 2002 01:00:46 -0800 (PST) Received: from socigeog.hmt.toyama-u.ac.jp (socigeog.hmt.toyama-u.ac.jp [160.26.63.48]) by mx1.FreeBSD.org (Postfix) with ESMTP id EAADB43EDA for ; Sun, 22 Dec 2002 01:00:43 -0800 (PST) (envelope-from tkato@prontomail.com) Received: from localhost (localhost [127.0.0.1]) by socigeog.hmt.toyama-u.ac.jp (Postfix) with SMTP id 10F799CE for ; Sun, 22 Dec 2002 18:00:36 +0900 (JST) Message-Id: <20021222172134.61eae075.tkato@prontomail.com> Date: Sun, 22 Dec 2002 17:21:34 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46467: Update port: graphics/fractrama Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 46467 >Category: ports >Synopsis: Update port: graphics/fractrama >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:03 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::lib::fractal::BooleanNode.h files/patch-src::lib::fractal::ColorTable.h files/patch-src::lib::fractal::ComplexNode.h files/patch-src::lib::fractal::ComplexVariables.h files/patch-src::lib::fractal::DoubleNode.h files/patch-src::lib::fractal::DoubleVariables.h files/patch-src::lib::fractal::Fractal.h files/patch-src::lib::fractal::PrintArg.h files/patch-src::lib::fractal::RegionNode.h files/patch-src::lib::fractal::Statement.h Remove file: files/patch-src::Makefile >How-To-Repeat: >Fix: diff -urN /usr/ports/graphics/fractorama/Makefile graphics/fractorama/Makefile --- /usr/ports/graphics/fractorama/Makefile Mon Nov 11 18:59:47 2002 +++ graphics/fractorama/Makefile Sun Dec 22 07:35:16 2002 @@ -14,25 +14,34 @@ 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 diff -urN /usr/ports/graphics/fractorama/files/patch-src::Makefile graphics/fractorama/files/patch-src::Makefile --- /usr/ports/graphics/fractorama/files/patch-src::Makefile Tue Sep 10 20:12:02 2002 +++ graphics/fractorama/files/patch-src::Makefile Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/graphics/fractorama/files/patch-src::lib::fractal::BooleanNode.h graphics/fractorama/files/patch-src::lib::fractal::BooleanNode.h --- /usr/ports/graphics/fractorama/files/patch-src::lib::fractal::BooleanNode.h Thu Jan 1 09:00:00 1970 +++ graphics/fractorama/files/patch-src::lib::fractal::BooleanNode.h Sun Dec 22 06:40:45 2002 @@ -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 ++using namespace std; ++ + class ComplexVariables; + class DoubleVariables; + class ColorEnvironment; diff -urN /usr/ports/graphics/fractorama/files/patch-src::lib::fractal::ColorTable.h graphics/fractorama/files/patch-src::lib::fractal::ColorTable.h --- /usr/ports/graphics/fractorama/files/patch-src::lib::fractal::ColorTable.h Thu Jan 1 09:00:00 1970 +++ graphics/fractorama/files/patch-src::lib::fractal::ColorTable.h Sun Dec 22 06:40:57 2002 @@ -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 ++#include ++using namespace std; + + class ColorTable + { diff -urN /usr/ports/graphics/fractorama/files/patch-src::lib::fractal::ComplexNode.h graphics/fractorama/files/patch-src::lib::fractal::ComplexNode.h --- /usr/ports/graphics/fractorama/files/patch-src::lib::fractal::ComplexNode.h Thu Jan 1 09:00:00 1970 +++ graphics/fractorama/files/patch-src::lib::fractal::ComplexNode.h Sun Dec 22 06:41:09 2002 @@ -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 ++using namespace std; ++ + class ComplexVariables; + class DoubleVariables; + class ColorEnvironment; diff -urN /usr/ports/graphics/fractorama/files/patch-src::lib::fractal::ComplexVariables.h graphics/fractorama/files/patch-src::lib::fractal::ComplexVariables.h --- /usr/ports/graphics/fractorama/files/patch-src::lib::fractal::ComplexVariables.h Thu Jan 1 09:00:00 1970 +++ graphics/fractorama/files/patch-src::lib::fractal::ComplexVariables.h Sun Dec 22 06:41:16 2002 @@ -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 ++using namespace std; ++ + struct ComplexEntry; + + class ComplexVariables diff -urN /usr/ports/graphics/fractorama/files/patch-src::lib::fractal::DoubleNode.h graphics/fractorama/files/patch-src::lib::fractal::DoubleNode.h --- /usr/ports/graphics/fractorama/files/patch-src::lib::fractal::DoubleNode.h Thu Jan 1 09:00:00 1970 +++ graphics/fractorama/files/patch-src::lib::fractal::DoubleNode.h Sun Dec 22 06:41:39 2002 @@ -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 ++using namespace std; ++ + class ComplexVariables; + class DoubleVariables; + class ColorEnvironment; diff -urN /usr/ports/graphics/fractorama/files/patch-src::lib::fractal::DoubleVariables.h graphics/fractorama/files/patch-src::lib::fractal::DoubleVariables.h --- /usr/ports/graphics/fractorama/files/patch-src::lib::fractal::DoubleVariables.h Thu Jan 1 09:00:00 1970 +++ graphics/fractorama/files/patch-src::lib::fractal::DoubleVariables.h Sun Dec 22 06:48:53 2002 @@ -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 ++using namespace std; ++ + struct DoubleEntry; + + class DoubleVariables diff -urN /usr/ports/graphics/fractorama/files/patch-src::lib::fractal::Fractal.h graphics/fractorama/files/patch-src::lib::fractal::Fractal.h --- /usr/ports/graphics/fractorama/files/patch-src::lib::fractal::Fractal.h Thu Jan 1 09:00:00 1970 +++ graphics/fractorama/files/patch-src::lib::fractal::Fractal.h Sun Dec 22 06:41:49 2002 @@ -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 ++using namespace std; ++ + class BooleanNode; + class Statement; + class InfiniteLoopCallback; diff -urN /usr/ports/graphics/fractorama/files/patch-src::lib::fractal::PrintArg.h graphics/fractorama/files/patch-src::lib::fractal::PrintArg.h --- /usr/ports/graphics/fractorama/files/patch-src::lib::fractal::PrintArg.h Thu Jan 1 09:00:00 1970 +++ graphics/fractorama/files/patch-src::lib::fractal::PrintArg.h Sun Dec 22 07:01:29 2002 @@ -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 ++using namespace std; ++ + class ComplexVariables; + class DoubleVariables; +-class ostream; + + class PrintArg + { diff -urN /usr/ports/graphics/fractorama/files/patch-src::lib::fractal::RegionNode.h graphics/fractorama/files/patch-src::lib::fractal::RegionNode.h --- /usr/ports/graphics/fractorama/files/patch-src::lib::fractal::RegionNode.h Thu Jan 1 09:00:00 1970 +++ graphics/fractorama/files/patch-src::lib::fractal::RegionNode.h Sun Dec 22 07:02:17 2002 @@ -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 ++using namespace std; ++ + class ComplexNode; + class ComplexVariables; + class DoubleVariables; + class ColorEnvironment; +-class ostream; + + class RegionNode + { diff -urN /usr/ports/graphics/fractorama/files/patch-src::lib::fractal::Statement.h graphics/fractorama/files/patch-src::lib::fractal::Statement.h --- /usr/ports/graphics/fractorama/files/patch-src::lib::fractal::Statement.h Thu Jan 1 09:00:00 1970 +++ graphics/fractorama/files/patch-src::lib::fractal::Statement.h Sun Dec 22 07:04:31 2002 @@ -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 ++using namespace std; ++ + class ComplexVariables; + class DoubleVariables; + class ColorEnvironment; + class InfiniteLoopCallback; +-class ostream; + +-#include "tf.h" + + struct LoopControl + { >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message