head	1.7;
access;
symbols
	pkgsrc-2013Q2:1.7.0.36
	pkgsrc-2013Q2-base:1.7
	pkgsrc-2012Q4:1.7.0.34
	pkgsrc-2012Q4-base:1.7
	pkgsrc-2011Q4:1.7.0.32
	pkgsrc-2011Q4-base:1.7
	pkgsrc-2011Q2:1.7.0.30
	pkgsrc-2011Q2-base:1.7
	pkgsrc-2009Q4:1.7.0.28
	pkgsrc-2009Q4-base:1.7
	pkgsrc-2008Q4:1.7.0.26
	pkgsrc-2008Q4-base:1.7
	pkgsrc-2008Q3:1.7.0.24
	pkgsrc-2008Q3-base:1.7
	cube-native-xorg:1.7.0.22
	cube-native-xorg-base:1.7
	pkgsrc-2008Q2:1.7.0.20
	pkgsrc-2008Q2-base:1.7
	pkgsrc-2008Q1:1.7.0.18
	pkgsrc-2008Q1-base:1.7
	pkgsrc-2007Q4:1.7.0.16
	pkgsrc-2007Q4-base:1.7
	pkgsrc-2007Q3:1.7.0.14
	pkgsrc-2007Q3-base:1.7
	pkgsrc-2007Q2:1.7.0.12
	pkgsrc-2007Q2-base:1.7
	pkgsrc-2007Q1:1.7.0.10
	pkgsrc-2007Q1-base:1.7
	pkgsrc-2006Q4:1.7.0.8
	pkgsrc-2006Q4-base:1.7
	pkgsrc-2006Q3:1.7.0.6
	pkgsrc-2006Q3-base:1.7
	pkgsrc-2006Q2:1.7.0.4
	pkgsrc-2006Q2-base:1.7
	pkgsrc-2006Q1:1.7.0.2
	pkgsrc-2006Q1-base:1.7
	pkgsrc-2005Q4:1.5.0.12
	pkgsrc-2005Q4-base:1.5
	pkgsrc-2005Q3:1.5.0.10
	pkgsrc-2005Q3-base:1.5
	pkgsrc-2005Q2:1.5.0.8
	pkgsrc-2005Q2-base:1.5
	pkgsrc-2005Q1:1.5.0.6
	pkgsrc-2005Q1-base:1.5
	pkgsrc-2004Q4:1.5.0.4
	pkgsrc-2004Q4-base:1.5
	pkgsrc-2004Q3:1.5.0.2
	pkgsrc-2004Q3-base:1.5
	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.7
date	2006.03.14.15.48.01;	author rillig;	state dead;
branches;
next	1.6;

1.6
date	2006.02.18.10.12.24;	author rillig;	state Exp;
branches;
next	1.5;

1.5
date	2004.08.03.07.42.04;	author cube;	state Exp;
branches;
next	1.4;

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.7
log
@Updated xosview to 1.8.3. All our patches have been applied upstream.
@
text
@$NetBSD: patch-am,v 1.6 2006/02/18 10:12:24 rillig Exp $

Status: applied upstream.

--- Xrm.cc.orig	2003-10-09 05:25:25.000000000 +0200
+++ Xrm.cc
@@@@ -98,7 +98,7 @@@@ const char *Xrm::getResource(const char 
     char fcn_lower[1024];
     strncpy(fcn_lower, className(), 1024);
     char* p = fcn_lower;
-    while (p && *p)  *p++ = tolower(*p);
+    while (p && *p)  { *p = tolower(*p); p++; }
     snprintf(fcn, 1024, "%s.%s", fcn_lower, rname);
     XrmGetResource(_db, frn, fcn, &type, &val);
   }
@


1.6
log
@The patches have been applied upstream.
@
text
@d1 1
a1 1
$NetBSD: patch-am,v 1.5 2004/08/03 07:42:04 cube Exp $
@


1.5
log
@Add file forgotten in previous commit.
@
text
@d1 3
a3 1
$NetBSD$
@


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
@d1 1
a1 1
$NetBSD: patch-am,v 1.3 2003/10/01 01:14:35 christos Exp $
d3 11
a13 64
--- Xrm.cc.orig	1999-02-16 09:08:35.000000000 -0500
+++ Xrm.cc	2003-09-30 20:34:27.000000000 -0400
@@@@ -13,3 +13,3 @@@@
 #include <ctype.h>
-#include <iostream.h>
+#include <iostream>
 #include <unistd.h>  //  for access(), etc.  BCG
@@@@ -17,2 +17,5 @@@@
 #include "general.h"
+#ifndef NULL
+#define NULL 0
+#endif
 #include "Xrm.h"
@@@@ -31,3 +34,3 @@@@
 Xrm::Xrm(const char *instanceName, int argc, char **argv){
-  cerr << " Error:  This constructor is not supported yet.\n";
+  std::cerr << " Error:  This constructor is not supported yet." << std::endl;
   exit (-1);
@@@@ -116,3 +119,3 @@@@
   {
-    cerr << "Error:  Xrm:loadAndMergeResources() called twice!\n";
+    std::cerr << "Error:  Xrm:loadAndMergeResources() called twice!" << std::endl;
     exit (-1);
@@@@ -220,3 +223,3 @@@@
 //------------  Some debugging functions follow.  -----------------------
-inline ostream &operator<<(ostream &os, const XrmBinding &b){
+inline std::ostream &operator<<(std::ostream &os, const XrmBinding &b){
   switch (b){
@@@@ -227,3 +230,3 @@@@
   default:
-    cerr <<"ostream operator<<(ostream &, const XrmBinding &) : "
+    std::cerr <<"std::ostream operator<<(std::ostream &, const XrmBinding &) : "
       <<"Unknown XrmBinding!";
@@@@ -235,3 +238,3 @@@@
 
-ostream &Xrm::dump(ostream &os) const {
+std::ostream &Xrm::dump(std::ostream &os) const {
   os <<"--- Xrm --- class: " <<XrmQuarkToString(_class)
@@@@ -252,6 +255,6 @@@@
   
-  ostream *os = (ostream *)closure;
+  std::ostream *os = (std::ostream *)closure;
   (void) type;  //  Avoid gcc warnings.
 
-  //cerr <<"type = " <<XrmQuarkToString(*type) <<endl;
+  //std::cerr <<"type = " <<XrmQuarkToString(*type) <<std::endl;
 
--- Xrm.h.orig	1999-02-16 09:08:34.000000000 -0500
+++ Xrm.h	2003-09-30 20:34:27.000000000 -0400
@@@@ -18,4 +18,2 @@@@
 
-class ostream;
-
 class Xrm {
@@@@ -33,3 +31,3 @@@@
 
-  ostream &dump(ostream &os) const;
+  std::ostream &dump(std::ostream &os) const;
 
@@@@ -49,3 +47,3 @@@@
 
-inline ostream &operator<<(ostream &os, const Xrm &xrm){
+inline std::ostream &operator<<(std::ostream &os, const Xrm &xrm){
   return xrm.dump(os);
@


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-am,v 1.1 2003/09/30 23:03:59 christos Exp $
d4 2
a5 4
+++ Xrm.cc	2003-09-30 18:44:38.000000000 -0400
@@@@ -11,10 +11,13 @@@@
 #include <stdlib.h>
 #include <stdio.h>	//  For snprintf().
d10 1
a10 1
 #include "snprintf.h"
d16 1
a16 5
 #include "Xrmcommandline.h"
 
@@@@ -29,7 +32,7 @@@@
 bool Xrm::_initialized = false;
 
d21 1
a21 5
   _db = NULL;
   _class = _instance = NULLQUARK;
@@@@ -114,7 +117,7 @@@@
   }
   else
d26 1
a26 5
   }
   //  This is ugly code.  According to X and Xt rules, many files need
@@@@ -218,14 +221,14 @@@@
 
 
d31 1
a31 4
   case XrmBindTightly:
     return os << ".";
   case XrmBindLoosely:
     return os << "*";
d36 1
a36 5
     return os;
   }
@@@@ -233,7 +236,7 @@@@
   return os;
 }
d41 1
a41 5
      <<", instance: " <<XrmQuarkToString(_instance) <<"\n";
 
@@@@ -250,10 +253,10 @@@@
                  XrmQuarkList quarks, XrmRepresentation *type,
                  XrmValue *value, XPointer closure) {
a49 2
   int i = 0;
   while (quarks[i] != NULLQUARK){
d51 1
a51 1
+++ Xrm.h	2003-09-30 20:29:33.000000000 -0400
@


1.1
log
@g++-3.x compliance. std namespaces, etc.
@
text
@d1 1
a1 1
$NetBSD$
d78 2
a79 11
+++ Xrm.h	2003-09-30 19:01:04.000000000 -0400
@@@@ -10,14 +10,13 @@@@
 #define _Xrm_h
 
 #include "bool.h"
+#include <iostream>
 
 #define XRM_H_CVSID "$Id: Xrm.h,v 1.5 1999/01/23 22:20:39 mromberg Exp $"
 
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
d84 1
a84 5
 public:
   Xrm(const char *className, const char *instanceName);
@@@@ -31,7 +30,7 @@@@
   const char* getDisplayName (int argc, char** argv);
   void loadAndMergeResources(int& argc, char** argv, Display* display);
d89 1
a89 5
 private:
   XrmDatabase _db;
@@@@ -47,7 +46,7 @@@@
   static bool _initialized;
 };
a93 2
 }
 
@