From 8f9145b9cb907180237f20eaa5092bf0100d41b4 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Tue, 2 Jan 2001 23:45:32 +0000
Subject: Fix build on NetBSD-1.5P or newer.

---
 devel/libgtop/files/patch-sum  |  3 ++-
 devel/libgtop/patches/patch-ab | 48 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 devel/libgtop/patches/patch-ab

(limited to 'devel')

diff --git a/devel/libgtop/files/patch-sum b/devel/libgtop/files/patch-sum
index d2cacef043e..ff2b772d383 100644
--- a/devel/libgtop/files/patch-sum
+++ b/devel/libgtop/files/patch-sum
@@ -1,6 +1,7 @@
-$NetBSD: patch-sum,v 1.20 2000/11/29 21:02:04 tron Exp $
+$NetBSD: patch-sum,v 1.21 2001/01/02 23:45:32 tron Exp $
 
 MD5 (patch-aa) = c20fbf8c437f72a35bd5dada09aca1a4
+MD5 (patch-ab) = 15fd201ea0c1e8ea8a98e53da528a744
 MD5 (patch-ac) = f84a83914548206edccb11e1f84bf1bf
 MD5 (patch-ad) = 617e9e681d3576d14d2b9dd4185dfd68
 MD5 (patch-ae) = 500e5a7bf247842cef93af16027a7cbf
diff --git a/devel/libgtop/patches/patch-ab b/devel/libgtop/patches/patch-ab
new file mode 100644
index 00000000000..65832588857
--- /dev/null
+++ b/devel/libgtop/patches/patch-ab
@@ -0,0 +1,48 @@
+$NetBSD: patch-ab,v 1.8 2001/01/02 23:45:33 tron Exp $
+
+--- sysdeps/freebsd/procsignal.c.orig	Sun Feb 13 22:31:39 2000
++++ sysdeps/freebsd/procsignal.c	Wed Jan  3 00:42:45 2001
+@@ -70,7 +70,9 @@
+ 	/* signal: mask of pending signals.
+ 	 *         pinfo [0].kp_proc.p_siglist
+ 	 */
+-#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
++#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000)
++	buf->signal [0] = pinfo [0].kp_proc.p_sigctx.ps_siglist.__bits[0];
++#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
+ 	buf->signal [0] = pinfo [0].kp_proc.p_siglist.__bits[0];
+ #else
+ 	buf->signal [0] = pinfo [0].kp_proc.p_siglist;
+@@ -79,7 +81,9 @@
+ 	/* blocked: mask of blocked signals.
+ 	 *          pinfo [0].kp_proc.p_sigmask
+ 	 */
+-#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
++#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000)
++	buf->blocked [0] = pinfo [0].kp_proc.p_sigctx.ps_sigmask.__bits[0];
++#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
+ 	buf->blocked [0] = pinfo [0].kp_proc.p_sigmask.__bits[0];
+ #else
+ 	buf->blocked [0] = pinfo [0].kp_proc.p_sigmask;
+@@ -88,7 +92,9 @@
+ 	/* sigignore: mask of ignored signals.
+ 	 *            pinfo [0].kp_proc.p_sigignore
+ 	*/
+-#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
++#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000)
++	buf->sigignore [0] = pinfo [0].kp_proc.p_sigctx.ps_sigignore.__bits[0];
++#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
+ 	buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore.__bits[0];
+ #else
+ 	buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore;
+@@ -97,7 +103,9 @@
+ 	/* sigcatch: mask of caught signals.
+ 	 *           pinfo [0].kp_proc.p_sigcatch
+ 	*/
+-#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
++#if defined(__NetBSD__) && (__NetBSD_Version__ > 105150000)
++	buf->sigcatch [0] = pinfo [0].kp_proc.p_sigctx.ps_sigcatch.__bits[0];
++#elif (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
+ 	buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch.__bits[0];
+ #else
+ 	buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch;
-- 
cgit v1.2.3