head	1.4;
access;
symbols
	pkgsrc-2013Q2:1.4.0.54
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2012Q4:1.4.0.52
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2011Q4:1.4.0.50
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q2:1.4.0.48
	pkgsrc-2011Q2-base:1.4
	pkgsrc-2009Q4:1.4.0.46
	pkgsrc-2009Q4-base:1.4
	pkgsrc-2008Q4:1.4.0.44
	pkgsrc-2008Q4-base:1.4
	pkgsrc-2008Q3:1.4.0.42
	pkgsrc-2008Q3-base:1.4
	cube-native-xorg:1.4.0.40
	cube-native-xorg-base:1.4
	pkgsrc-2008Q2:1.4.0.38
	pkgsrc-2008Q2-base:1.4
	pkgsrc-2008Q1:1.4.0.36
	pkgsrc-2008Q1-base:1.4
	pkgsrc-2007Q4:1.4.0.34
	pkgsrc-2007Q4-base:1.4
	pkgsrc-2007Q3:1.4.0.32
	pkgsrc-2007Q3-base:1.4
	pkgsrc-2007Q2:1.4.0.30
	pkgsrc-2007Q2-base:1.4
	pkgsrc-2007Q1:1.4.0.28
	pkgsrc-2007Q1-base:1.4
	pkgsrc-2006Q4:1.4.0.26
	pkgsrc-2006Q4-base:1.4
	pkgsrc-2006Q3:1.4.0.24
	pkgsrc-2006Q3-base:1.4
	pkgsrc-2006Q2:1.4.0.22
	pkgsrc-2006Q2-base:1.4
	pkgsrc-2006Q1:1.4.0.20
	pkgsrc-2006Q1-base:1.4
	pkgsrc-2005Q4:1.4.0.18
	pkgsrc-2005Q4-base:1.4
	pkgsrc-2005Q3:1.4.0.16
	pkgsrc-2005Q3-base:1.4
	pkgsrc-2005Q2:1.4.0.14
	pkgsrc-2005Q2-base:1.4
	pkgsrc-2005Q1:1.4.0.12
	pkgsrc-2005Q1-base:1.4
	pkgsrc-2004Q4:1.4.0.10
	pkgsrc-2004Q4-base:1.4
	pkgsrc-2004Q3:1.4.0.8
	pkgsrc-2004Q3-base:1.4
	pkgsrc-2004Q2:1.4.0.6
	pkgsrc-2004Q2-base:1.4
	pkgsrc-2004Q1:1.4.0.4
	pkgsrc-2004Q1-base:1.4
	pkgsrc-2003Q4:1.4.0.2
	pkgsrc-2003Q4-base:1.4;
locks; strict;
comment	@# @;


1.4
date	2003.11.10.17.18.28;	author agc;	state dead;
branches;
next	1.3;

1.3
date	2003.10.01.01.14.35;	author christos;	state Exp;
branches;
next	1.2;

1.2
date	2003.10.01.00.33.54;	author christos;	state Exp;
branches;
next	1.1;

1.1
date	2003.09.30.23.03.59;	author christos;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Update xosview to version 1.8.1alpha, from a nudge by Brian Grayson.

Fixes build on NetBSD-1.6.2 and NetBSD-1.6ZE. Existing patches have
either been incorporated or are unnecessary.
@
text
@$NetBSD: patch-al,v 1.3 2003/10/01 01:14:35 christos Exp $

--- fieldmeter.cc.orig	1999-02-16 09:08:35.000000000 -0500
+++ fieldmeter.cc	2003-09-30 20:48:22.000000000 -0400
@@@@ -8,3 +8,4 @@@@
 //
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <stdlib.h>
@@@@ -296,10 +297,10 @@@@
       || (x > x_ + width_) || (x + width > x_ + width_)){
-    cerr << "FieldMeter::checkX() : bad horiz values for meter : "
-         << name() << endl;
+    std::cerr << "FieldMeter::checkX() : bad horiz values for meter : "
+         << name() << std::endl;
 
-    cerr <<"value "<<x<<", width "<<width<<", total_ = "<<total_<<endl;
+    std::cerr <<"value "<<x<<", width "<<width<<", total_ = "<<total_<<std::endl;
 
     for (int i = 0 ; i < numfields_ ; i++)
-      cerr <<"fields_[" <<i <<"] = " <<fields_[i] <<",";
-    cerr <<endl;
+      std::cerr <<"fields_[" <<i <<"] = " <<fields_[i] <<",";
+    std::cerr <<std::endl;
 
@


1.3
log
@more g++-3 header issues. don't use the compat headers.
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
log
@regenerate patches with -u1 to avoid $Id getting in the patch
@
text
@d1 1
a1 1
$NetBSD: patch-al,v 1.1 2003/09/30 23:03:59 christos Exp $
d4 2
a5 2
+++ fieldmeter.cc	2003-09-30 20:28:39.000000000 -0400
@@@@ -8,2 +8,3 @@@@
d7 1
d9 2
a10 1
 #include <fstream.h>
@


1.1
log
@g++-3.x compliance. std namespaces, etc.
@
text
@d1 1
a1 1
$NetBSD$
d4 2
a5 4
+++ fieldmeter.cc	2003-09-30 18:42:06.000000000 -0400
@@@@ -6,6 +6,7 @@@@
 //
 // $Id: fieldmeter.cc,v 1.22 1999/01/25 21:22:10 mromberg Exp $
d9 1
a9 5
 #include <stdlib.h>
 #include "snprintf.h"
@@@@ -294,14 +295,14 @@@@
 bool FieldMeter::checkX(int x, int width) const {
   if ((x < x_) || (x + width < x_)
a24 2
     return false;
   }
@