The patches have been applied upstream.

9 files changed, 33 insertions, 17 deletions

diff --git a/sysutils/xosview/distinfo b/sysutils/xosview/distinfo
index 4ececf1fa0e..334df1f40e4 100644
--- a/sysutils/xosview/distinfo
+++ b/sysutils/xosview/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.14 2005/11/17 15:53:00 rillig Exp $
+$NetBSD: distinfo,v 1.15 2006/02/18 10:12:24 rillig Exp $
 
 SHA1 (xosview-1.8.2.tar.gz) = 54df604641ebbe6872f631cea34c9d91883bf4da
 RMD160 (xosview-1.8.2.tar.gz) = eb2a513629350795b85c41fc61cbd23da4de140e
 Size (xosview-1.8.2.tar.gz) = 248859 bytes
-SHA1 (patch-aa) = cc3de3bb4130724df543f85705b19946fba2577a
-SHA1 (patch-ab) = 4cb1ed9fad5577a889f22216be2345ace2655307
-SHA1 (patch-am) = 2ff8a500b677f87391d7128c76921f646c91444f
-SHA1 (patch-bc) = 91a2804c51b669fe039bb92df1704262eeff97d2
-SHA1 (patch-bd) = b09e24ca0fdc9abfa541e380da46f5d25218c082
-SHA1 (patch-be) = f4c1c9541e7a65c2e8a910491821007480936368
-SHA1 (patch-bf) = 62974d53607dba489179552247c6c3982e27fdf7
-SHA1 (patch-bg) = 8a21069575bc4a1bb999d8171b4bc1fc9cb02f23
+SHA1 (patch-aa) = d05d32ba8c981d82a0d61efe3e9f7e050dbd7bbc
+SHA1 (patch-ab) = 3ff624013a7780228b68dffe1bdc320d9e75eccd
+SHA1 (patch-am) = 093fb676e2327128c750c253f11a419311c0eef7
+SHA1 (patch-bc) = 7019b4e13fc8884ec71d7e964741c0936cc70745
+SHA1 (patch-bd) = 2e3c185989b5896d2b8a2ee6dbbe9e52c664861a
+SHA1 (patch-be) = 37a04b3c10108e3de07e9236f3e0bc503676d5ac
+SHA1 (patch-bf) = cff3f716b05515a88fc075b040f0e978176d0d00
+SHA1 (patch-bg) = 1143c70bf2472b246c86e868b73912d3ae1236ac
diff --git a/sysutils/xosview/patches/patch-aa b/sysutils/xosview/patches/patch-aa
index cfcf76b5b51..93cba94c406 100644
--- a/sysutils/xosview/patches/patch-aa
+++ b/sysutils/xosview/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.10 2004/04/15 14:37:22 christos Exp $
+$NetBSD: patch-aa,v 1.11 2006/02/18 10:12:24 rillig Exp $
+
+Status: applied upstream.
 
 --- bsd/kernel.cc.orig	2003-10-13 21:53:17.000000000 -0400
 +++ bsd/kernel.cc	2004-04-15 10:16:49.000000000 -0400
diff --git a/sysutils/xosview/patches/patch-ab b/sysutils/xosview/patches/patch-ab
index 602e69b09a6..a4018c97d3f 100644
--- a/sysutils/xosview/patches/patch-ab
+++ b/sysutils/xosview/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.9 2004/04/21 18:45:09 perry Exp $
+$NetBSD: patch-ab,v 1.10 2006/02/18 10:12:24 rillig Exp $
+
+Status: applied upstream.
 
 --- bsd/intratemeter.cc.orig	2003-10-09 00:20:06.000000000 -0400
 +++ bsd/intratemeter.cc		2004-04-21 14:32:07.000000000 -0400
diff --git a/sysutils/xosview/patches/patch-am b/sysutils/xosview/patches/patch-am
index f4e840ea1d0..62a563037fd 100644
--- a/sysutils/xosview/patches/patch-am
+++ b/sysutils/xosview/patches/patch-am
@@ -1,4 +1,6 @@
-$NetBSD: patch-am,v 1.5 2004/08/03 07:42:04 cube Exp $
+$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
diff --git a/sysutils/xosview/patches/patch-bc b/sysutils/xosview/patches/patch-bc
index f475128d6a1..0060c11d9cd 100644
--- a/sysutils/xosview/patches/patch-bc
+++ b/sysutils/xosview/patches/patch-bc
@@ -1,4 +1,6 @@
-$NetBSD: patch-bc,v 1.1 2005/11/17 15:53:01 rillig Exp $
+$NetBSD: patch-bc,v 1.2 2006/02/18 10:12:24 rillig Exp $
+
+Status: applied upstream.
 
 The Solaris SunPro compiler also has a bool type, not only gcc.
 
diff --git a/sysutils/xosview/patches/patch-bd b/sysutils/xosview/patches/patch-bd
index 1bb54845df3..8991f7d83d4 100644
--- a/sysutils/xosview/patches/patch-bd
+++ b/sysutils/xosview/patches/patch-bd
@@ -1,4 +1,6 @@
-$NetBSD: patch-bd,v 1.1 2005/11/17 15:53:01 rillig Exp $
+$NetBSD: patch-bd,v 1.2 2006/02/18 10:12:24 rillig Exp $
+
+Status: applied upstream.
 
 The Solaris SunPro compiler does not know the old <strstream.h> header.
 I fixed it to use the new one. The #define is ugly, but I wanted to keep
diff --git a/sysutils/xosview/patches/patch-be b/sysutils/xosview/patches/patch-be
index cdb4b34b90e..894efd07c07 100644
--- a/sysutils/xosview/patches/patch-be
+++ b/sysutils/xosview/patches/patch-be
@@ -1,4 +1,6 @@
-$NetBSD: patch-be,v 1.1 2005/11/17 15:53:01 rillig Exp $
+$NetBSD: patch-be,v 1.2 2006/02/18 10:12:24 rillig Exp $
+
+Status: applied upstream.
 
 There's some prototype conflict with SunPro, when the constructor is
 called. The "const int" is unnecessary, as ints are always passed by
diff --git a/sysutils/xosview/patches/patch-bf b/sysutils/xosview/patches/patch-bf
index df6cadba1e3..f9799560225 100644
--- a/sysutils/xosview/patches/patch-bf
+++ b/sysutils/xosview/patches/patch-bf
@@ -1,4 +1,6 @@
-$NetBSD: patch-bf,v 1.1 2005/11/17 15:53:01 rillig Exp $
+$NetBSD: patch-bf,v 1.2 2006/02/18 10:12:24 rillig Exp $
+
+Status: applied upstream.
 
 SunPro complains about an unknown variable cerr.
 
diff --git a/sysutils/xosview/patches/patch-bg b/sysutils/xosview/patches/patch-bg
index ed7f74cf72e..568061295b2 100644
--- a/sysutils/xosview/patches/patch-bg
+++ b/sysutils/xosview/patches/patch-bg
@@ -1,4 +1,6 @@
-$NetBSD: patch-bg,v 1.1 2005/11/17 15:53:01 rillig Exp $
+$NetBSD: patch-bg,v 1.2 2006/02/18 10:12:24 rillig Exp $
+
+Status: applied upstream.
 
 This patch fixes the MIN and MAX macros. To my knowledge, only gcc can
 handle ({...}) expressions, so let's express that.