ports/106199: [PATCH] misc/xdf: Fix BROKENness

[Peter Johnson]

>Number:         106199
>Category:       ports
>Synopsis:       [PATCH] misc/xdf: Fix BROKENness
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 02 06:10:11 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Peter Johnson
>Release:        FreeBSD 6.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD 6.1-RELEASE
>Description:
Fix bad C++, which currently has the port marked as BROKEN on >= 5.x.
>How-To-Repeat:
Marked BROKEN on >= 5.x (due to bad C++).
>Fix:
Patch attached.

--- unbreak-xdf.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/xdf/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile	8 Feb 2004 02:49:47 -0000	1.6
+++ Makefile	2 Dec 2006 06:02:17 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdf
 PORTVERSION=    1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=     misc
 MASTER_SITES=   http://home.in.tum.de/~vidalrod/ports/
 
@@ -23,10 +23,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 502000
-BROKEN=		"Does not compile"
-.endif
-
 post-install:
 	${STRIP_CMD} ${PREFIX}/bin/xdf
 
Index: files/patch-xdf.cc
===================================================================
RCS file: /home/ncvs/ports/misc/xdf/files/patch-xdf.cc,v
retrieving revision 1.2
diff -u -r1.2 patch-xdf.cc
--- files/patch-xdf.cc	16 Jan 2003 22:57:11 -0000	1.2
+++ files/patch-xdf.cc	2 Dec 2006 06:02:17 -0000
@@ -1,10 +1,12 @@
---- xdf.cc.orig	Thu Nov 14 00:06:28 2002
-+++ xdf.cc	Fri Jan 17 00:56:31 2003
-@@ -18,18 +18,18 @@
+--- xdf.cc.orig	Wed Nov 13 05:06:28 2002
++++ xdf.cc	Fri Dec  1 21:58:22 2006
+@@ -17,19 +17,19 @@
+ /* Standard C++ includes */
  #include <stdio.h>
  #include <iostream.h>
- #include <strstream.h>
+-#include <strstream.h>
 -#include <syscall.h>
++#include <backward/strstream>
 +#include <sys/syscall.h>
  #include <sys/param.h>
  #include <sys/types.h>
@@ -83,3 +85,12 @@
    
    for ( int i = 0 ; i < mountpoints ; ++i ){
      if ( par_table[i]->status == FALSE && par_table[i]->last_status == TRUE) {
+@@ -322,7 +328,7 @@
+ /*}}}*/
+ /*{{{  Create String Subroutine  */
+ void create_size_string(char* string, double value, double maximum, int target){
+-  ostrstream OSS(string, STRLENGTH, ios::out);
++  std::ostrstream OSS(string, STRLENGTH, ios::out);
+   OSS.seekp(ios::beg);
+   char* unit="K";
+   int precision = kprec;
--- unbreak-xdf.patch ends here ---


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