Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Oct 2002 16:26:06 +0200 (CEST)
From:      Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        anteater@tracker.drzoom.ch
Subject:   ports/44463: [patch] Update port: sysutils/anteater; fix compilation with GCC3
Message-ID:  <200210251426.g9PEQ6S3095101@bsd.localdomain>

next in thread | raw e-mail | index | archive | help

>Number:         44463
>Category:       ports
>Synopsis:       [patch] Update port: sysutils/anteater; fix compilation with GCC3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Oct 25 07:30:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Volker Stolz
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
Lehrstuhl für Informatik II
>Environment:
System: FreeBSD bsd.localdomain 4.6-STABLE FreeBSD 4.6-STABLE #3: Mon Oct 7 16:20:29 CEST 2002 root@bsd.localdomain:/opt/src/sys/compile/BSD i386


	
>Description:
Some generic patches to get anteater to compile with g++31:

- C++ target practice
- Only pass --enable-strstream to configure when building
   on -STABLE
- cc: author, maybe he wants to include these patches
>How-To-Repeat:
>Fix:
--- Makefile.orig	Fri Oct 25 16:06:09 2002
+++ Makefile	Fri Oct 25 16:12:24 2002
@@ -14,6 +14,13 @@
 MAINTAINER=	ports@FreeBSD.org
 
 GNU_CONFIGURE=	yes
+
+.include <bsd.port.pre.mk>
+
+# You will still get configure errors on -STABLE
+#  if you set CXX to a GCC3 incarnation!
+.if ${OSVERSION} < 500035
 CONFIGURE_ARGS=	--enable-strstream
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	files
#	files/patch-anteater-htmlreport.cpp
#	files/patch-anteater-clp.cpp
#	files/patch-anteater-report.cpp
#	files/patch-anteater-asciireport.cpp
#
echo c - files
mkdir -p files > /dev/null 2>&1
echo x - files/patch-anteater-htmlreport.cpp
sed 's/^X//' >files/patch-anteater-htmlreport.cpp << 'END-of-files/patch-anteater-htmlreport.cpp'
X--- anteater/htmlreport.cpp.orig	Fri Oct 25 15:53:43 2002
X+++ anteater/htmlreport.cpp	Fri Oct 25 15:53:54 2002
X@@ -244,7 +244,7 @@
X 	nextField();	
X }
X 
X-void htmlReport::skipField( const bool realline = true )
X+void htmlReport::skipField( const bool realline)
X {
X   if( col_list.size() == 0 ) return; // Fehler.
X   if( realline ) checkAutoField();
END-of-files/patch-anteater-htmlreport.cpp
echo x - files/patch-anteater-clp.cpp
sed 's/^X//' >files/patch-anteater-clp.cpp << 'END-of-files/patch-anteater-clp.cpp'
X--- anteater/clp.cpp.orig	Fri Oct 25 15:55:23 2002
X+++ anteater/clp.cpp	Fri Oct 25 15:59:35 2002
X@@ -502,7 +502,7 @@
X   return true;
X };
X 
X-bool clp::parseError( const std::string &wrong, const long line = 0 )
X+bool clp::parseError( const std::string &wrong, const long line)
X {
X   std::cerr << "Ooops! I don't understand your parameter \"" << wrong << "\"..." << std::endl;
X   std::cerr << "Please check the syntax or read the manual." << std::endl << std::endl;
END-of-files/patch-anteater-clp.cpp
echo x - files/patch-anteater-report.cpp
sed 's/^X//' >files/patch-anteater-report.cpp << 'END-of-files/patch-anteater-report.cpp'
X--- anteater/report.cpp.orig	Fri Oct 25 16:01:31 2002
X+++ anteater/report.cpp	Fri Oct 25 16:01:40 2002
X@@ -132,7 +132,7 @@
X }
X 
X void Report::addCol( const int colSize, const colTyp_e colTyp, const colAlign_e colAlign,
X- const std::string &colTitle, const colStyle_e colStyle, const unsigned long colFlags = 0 )
X+ const std::string &colTitle, const colStyle_e colStyle, const unsigned long colFlags)
X {
X 	if( Type == TABLE )
X 	{
END-of-files/patch-anteater-report.cpp
echo x - files/patch-anteater-asciireport.cpp
sed 's/^X//' >files/patch-anteater-asciireport.cpp << 'END-of-files/patch-anteater-asciireport.cpp'
X--- anteater/asciireport.cpp.orig	Fri Oct 25 16:02:58 2002
X+++ anteater/asciireport.cpp	Fri Oct 25 16:03:44 2002
X@@ -297,7 +297,7 @@
X 	if( !nextField() ) printSpace();	
X }
X 
X-void asciiReport::skipField( const bool realline = true )
X+void asciiReport::skipField( const bool realline)
X {
X   if( col_list.size() == 0 ) return; // Fehler.
X   if( realline ) checkAutoField();
X@@ -366,14 +366,14 @@
X }
X 
X /** Gibt width anzahl spaces aus. */
X-void asciiReport::printSpace( const int width = 1 )
X+void asciiReport::printSpace( const int width)
X {
X   int i;
X   for( i = 0; i < width; i++ ) (*os).put( ' ' );
X }
X 
X /** Zeichnet eine Linie über die gesammte Breite mit zeichen ch. */
X-void asciiReport::printLine( const char ch = '-', const int size = -1 )
X+void asciiReport::printLine( const char ch, const int size)
X {
X   int i;
X   for( i = 0; i < ( size == -1 ? ScreenWidth : size ) ; i++ ) (*os).put( ch );
END-of-files/patch-anteater-asciireport.cpp
exit



>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210251426.g9PEQ6S3095101>