Date: Tue, 18 Jan 2000 16:43:01 +0100 (CET) From: Alexander Langer <alex@cichlids.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/16174: fix x11-toolkits/xview Message-ID: <200001181543.QAA59225@cichlids.cichlids.com>
next in thread | raw e-mail | index | archive | help
>Number: 16174
>Category: ports
>Synopsis: fix x11-toolkits/xview
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 18 07:50:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: Alexander Langer
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
none
>Environment:
doesnt matter
>Description:
fix x11-toolkits/xview, found by me and also by bento.
>How-To-Repeat:
build old xview
>Fix:
diff -rNu xview.old/patches/patch-li xview/patches/patch-li
--- xview.old/patches/patch-li Wed May 5 00:58:01 1999
+++ xview/patches/patch-li Mon Jan 10 15:50:16 2000
@@ -1168,39 +1168,6 @@
{
int ndelay;
Notify_error return_code;
-diff -rc ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfy.h ./lib/libxview/notify/ntfy.h
-*** ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfy.h Tue Jun 29 01:18:14 1993
---- ./lib/libxview/notify/ntfy.h Sun Nov 20 13:39:05 1994
-***************
-*** 22,27 ****
---- 22,31 ----
- #include <sys/rusage.h>
- #endif
- #include <sys/resource.h>
-+ #if (defined(BSD) && (BSD >= 199103))
-+ #include <sys/wait.h>
-+ #include <sys/signal.h>
-+ #endif
- #include <xview/notify.h>
-
- /*
-***************
-*** 149,155 ****
- */
- typedef struct ntfy_wait3_data {
- int pid; /* Process waiting for */
-! #ifndef SVR4
- union wait status; /* Return value from wait3 */
- #else SVR4
- int status; /* Return value from wait3 */
---- 153,159 ----
- */
- typedef struct ntfy_wait3_data {
- int pid; /* Process waiting for */
-! #if !defined(SVR4) && !(defined(BSD) && (BSD >= 199103))
- union wait status; /* Return value from wait3 */
- #else SVR4
- int status; /* Return value from wait3 */
diff -rc ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfy_test.c ./lib/libxview/notify/ntfy_test.c
*** ../old/xview3.2p1-X11R6/lib/libxview/notify/ntfy_test.c Tue Jun 29 01:18:12 1993
--- ./lib/libxview/notify/ntfy_test.c Sun Nov 20 13:39:05 1994
diff -rNu xview.old/patches/patch-lo xview/patches/patch-lo
--- xview.old/patches/patch-lo Thu Jan 1 01:00:00 1970
+++ xview/patches/patch-lo Tue Jan 18 16:22:04 2000
@@ -0,0 +1,36 @@
+--- lib/libxview/notify/ntfy.h.orig Tue Jun 29 07:18:14 1993
++++ lib/libxview/notify/ntfy.h Mon Jan 10 15:50:53 2000
+@@ -22,6 +22,10 @@
+ #include <sys/rusage.h>
+ #endif
+ #include <sys/resource.h>
++#if (defined(BSD) && (BSD >= 199103))
++#include <sys/wait.h>
++#include <sys/signal.h>
++#endif
+ #include <xview/notify.h>
+
+ /*
+@@ -149,7 +153,7 @@
+ */
+ typedef struct ntfy_wait3_data {
+ int pid; /* Process waiting for */
+-#ifndef SVR4
++#if !defined(SVR4) && !(defined(BSD) && (BSD >= 199103))
+ union wait status; /* Return value from wait3 */
+ #else SVR4
+ int status; /* Return value from wait3 */
+@@ -188,7 +197,12 @@
+ #define sigisempty(s) (!(((s)->__sigbits[0]) | ((s)->__sigbits[1]) \
+ | ((s)->__sigbits[2]) | ((s)->__sigbits[3])))
+ #else
+-#define sigisempty(s) (!(*(s)))
++static int
++sigisempty (sigset_t *s) {
++ sigset_t n;
++ bzero(&n, sizeof(sigset_t));
++ return (! memcmp(&n, s, sizeof(sigset_t)));
++}
+ #endif
+
+ /*
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200001181543.QAA59225>