diff options
| author | tron <tron> | 1998-11-01 23:07:30 +0000 |
|---|---|---|
| committer | tron <tron> | 1998-11-01 23:07:30 +0000 |
| commit | 05fc4f8d23366cc5adcbbee29d8dc4b8ecd40536 (patch) | |
| tree | 1cc890176fc42e5918b812e95d331b23f998a475 /devel/libgtop/patches | |
| parent | 82bbe56b9a54b3656fa4c993d7cca6885e0563e2 (diff) | |
| download | pkgsrc-05fc4f8d23366cc5adcbbee29d8dc4b8ecd40536.tar.gz | |
Make this package build under 1.3.2, fixes PR pkg/6388 by Clifford Wright.
Diffstat (limited to 'devel/libgtop/patches')
| -rw-r--r-- | devel/libgtop/patches/patch-ab | 14 | ||||
| -rw-r--r-- | devel/libgtop/patches/patch-am | 29 |
2 files changed, 30 insertions, 13 deletions
diff --git a/devel/libgtop/patches/patch-ab b/devel/libgtop/patches/patch-ab index c8decea3ff6..a10c4ef5cec 100644 --- a/devel/libgtop/patches/patch-ab +++ b/devel/libgtop/patches/patch-ab @@ -1,16 +1,18 @@ -$NetBSD: patch-ab,v 1.1.1.1 1998/10/07 13:11:35 agc Exp $ +$NetBSD: patch-ab,v 1.2 1998/11/01 23:07:30 tron Exp $ -Make this compile under NetBSD as well. - ---- sysdeps/bsd/open.c 1998/10/06 16:01:28 1.1 -+++ sysdeps/bsd/open.c 1998/10/06 16:02:06 -@@ -61,7 +61,11 @@ +--- sysdeps/bsd/open.c.orig Mon Aug 24 20:14:49 1998 ++++ sysdeps/bsd/open.c Sun Nov 1 23:40:07 1998 +@@ -61,7 +61,15 @@ server->machine.gid = getgid (); server->machine.egid = getegid (); +#ifdef __NetBSD__ ++#ifdef __NetBSD_Version__ + server->os_version_code = __NetBSD_Version__; +#else ++ server->os_version_code = 103000000; ++#endif ++#else server->os_version_code = __FreeBSD_version; +#endif diff --git a/devel/libgtop/patches/patch-am b/devel/libgtop/patches/patch-am index a2eaca6c9ae..eb61d5bff02 100644 --- a/devel/libgtop/patches/patch-am +++ b/devel/libgtop/patches/patch-am @@ -1,31 +1,46 @@ -$NetBSD: patch-am,v 1.1 1998/10/18 22:11:41 tron Exp $ +$NetBSD: patch-am,v 1.2 1998/11/01 23:07:31 tron Exp $ --- sysdeps/bsd/procsignal.c.orig Wed Sep 9 01:54:54 1998 -+++ sysdeps/bsd/procsignal.c Sun Oct 18 23:59:26 1998 -@@ -63,22 +63,22 @@ ++++ sysdeps/bsd/procsignal.c Sun Nov 1 23:20:05 1998 +@@ -63,22 +63,38 @@ /* signal: mask of pending signals. * pinfo [0].kp_proc.p_siglist */ -- buf->signal = pinfo [0].kp_proc.p_siglist; ++#if defined(__NetBSD__) && (NSIG > 32) + buf->signal = pinfo [0].kp_proc.p_siglist.__bits[0]; ++#else + buf->signal = pinfo [0].kp_proc.p_siglist; ++#endif /* blocked: mask of blocked signals. * pinfo [0].kp_proc.p_sigmask */ - buf->blocked = pinfo [0].kp_proc.p_sigmask; -+ buf->blocked = pinfo [0].kp_proc.p_sigmask.__bits[0]; ++#if defined(__NetBSD__) && (NSIG > 32) ++ buf->signal = pinfo [0].kp_proc.p_sigmask.__bits[0]; ++#else ++ buf->signal = pinfo [0].kp_proc.p_sigmask; ++#endif /* sigignore: mask of ignored signals. * pinfo [0].kp_proc.p_sigignore */ - buf->sigignore = pinfo [0].kp_proc.p_sigignore; -+ buf->sigignore = pinfo [0].kp_proc.p_sigignore.__bits[0]; ++#if defined(__NetBSD__) && (NSIG > 32) ++ buf->signal = pinfo [0].kp_proc.p_sigignore.__bits[0]; ++#else ++ buf->signal = pinfo [0].kp_proc.p_sigignore; ++#endif /* sigcatch: mask of caught signals. * pinfo [0].kp_proc.p_sigcatch */ - buf->sigcatch = pinfo [0].kp_proc.p_sigcatch; -+ buf->sigcatch = pinfo [0].kp_proc.p_sigcatch.__bits[0]; ++#if defined(__NetBSD__) && (NSIG > 32) ++ buf->signal = pinfo [0].kp_proc.p_sigcatch.__bits[0]; ++#else ++ buf->signal = pinfo [0].kp_proc.p_sigcatch; ++#endif buf->flags = _glibtop_sysdeps_proc_signal; } |