ports/118009: [patch] net-mgmt/arts++ unbreak fix build with GCC 4.2

["Pietro Cerutti" <Pietro Cerutti]

>Number:         118009
>Category:       ports
>Synopsis:       [patch] net-mgmt/arts++ unbreak fix build with GCC 4.2
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 12 15:50:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Pietro Cerutti
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
Bern University of Applied Sciences 
>Environment:


System: FreeBSD 8.0-CURRENT #9: Fri Nov  9 14:50:37 CET 2007
    root at gahrtop.localhost:/usr/obj/usr/src/sys/MSI1034



>Description:


- fixed a few "extra qualification" errors


>How-To-Repeat:


cd /usr/ports/net-mgmt/arts++ && make


>Fix:


--- _arts++.diff begins here ---
--- Makefile.orig	2007-11-12 16:11:09.000000000 +0100
+++ Makefile	2007-11-12 16:11:21.000000000 +0100
@@ -24,12 +24,6 @@
 		artsasagg.l artsportms.l artsportmagg.l artsintfms.l \
 		artsintfmagg.l artsnexthops.l artsnexthopagg.l artstos.l
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Broken with gcc 4.2
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/ltconfig
 
@@ -47,4 +41,4 @@
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- /dev/null	2007-11-12 16:28:04.000000000 +0100
+++ files/patch-classes-include_ArtsHeader.hh	2007-11-12 16:20:00.000000000 +0100
@@ -0,0 +1,19 @@
+--- classes/include/ArtsHeader.hh.orig	2007-11-12 16:12:56.000000000 +0100
++++ classes/include/ArtsHeader.hh	2007-11-12 16:14:55.000000000 +0100
+@@ -421,14 +421,14 @@
+   //.........................................................................
+   //!  Reads the ARTS header from an istream.
+   //-------------------------------------------------------------------------
+-  std::istream& ArtsHeader::read(std::istream& is);
++  std::istream& read(std::istream& is);
+   
+   //-------------------------------------------------------------------------
+   //                      int ArtsHeader::read(int fd)
+   //.........................................................................
+   //!  Reads the ARTS header from a file descriptor.
+   //-------------------------------------------------------------------------
+-  int ArtsHeader::read(int fd);
++  int read(int fd);
+   
+ 
+   //-------------------------------------------------------------------------
--- /dev/null	2007-11-12 16:28:15.000000000 +0100
+++ files/patch-classes-include_ArtsPortMatrixAggregator.hh	2007-11-12 16:20:58.000000000 +0100
@@ -0,0 +1,10 @@
+--- classes/include/ArtsPortMatrixAggregator.hh.orig	2007-11-12 16:17:18.000000000 +0100
++++ classes/include/ArtsPortMatrixAggregator.hh	2007-11-12 16:17:28.000000000 +0100
+@@ -166,7 +166,6 @@
+   //  
+   //--------------------------------------------------------------------------
+   ArtsSelectedPortTable *
+-  ArtsPortMatrixAggregator::
+   ConvertToArtsSelectedPortTable(int numTopPorts,
+                                  bool byPkts = false) const;
+   
--- /dev/null	2007-11-12 16:28:21.000000000 +0100
+++ files/patch-classes-include_ArtsSelectedPortTable.hh	2007-11-12 16:20:30.000000000 +0100
@@ -0,0 +1,11 @@
+--- classes/include/ArtsSelectedPortTable.hh.orig	2007-11-12 16:16:29.000000000 +0100
++++ classes/include/ArtsSelectedPortTable.hh	2007-11-12 16:16:57.000000000 +0100
+@@ -131,7 +131,7 @@
+   //.........................................................................
+   //!  Returns a reference to the ArtsPortChooser in the object.
+   //-------------------------------------------------------------------------
+-  ArtsPortChooser & ArtsSelectedPortTable::PortChooser() const;
++  ArtsPortChooser & PortChooser() const;
+   
+   //-------------------------------------------------------------------------
+   //            std::vector<ArtsPortTableEntry> & PortEntries() const
--- _arts++.diff ends here ---



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