Since rmind cleaned up sys/fd_set.h last winter, sys/types.h no longer

exposes howmany(). This is generally a good thing, but as a result
libxview fails to find it, so it turns up as a missing external
function instead. Due to the wonders of ELF libs, combined with help
from imake, this results in a broken libxview that nothing else can
successfully link with. So, patch it up. PKGREVISION -> 9.

4 files changed, 38 insertions, 8 deletions

diff --git a/x11/xview-lib/Makefile b/x11/xview-lib/Makefile
index 5856180cf42..1115a874c86 100644
--- a/x11/xview-lib/Makefile
+++ b/x11/xview-lib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2009/12/10 20:35:56 abs Exp $
+# $NetBSD: Makefile,v 1.38 2011/09/29 07:47:56 dholland Exp $
 
 DISTNAME=		xview3.2p1-X11R6
 PKGNAME=		xview-lib-3.2.1
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
diff --git a/x11/xview-lib/distinfo b/x11/xview-lib/distinfo
index 91d4447c9a3..342d41ef9ba 100644
--- a/x11/xview-lib/distinfo
+++ b/x11/xview-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2011/09/19 03:45:28 dholland Exp $
+$NetBSD: distinfo,v 1.17 2011/09/29 07:47:56 dholland Exp $
 
 SHA1 (xview3.2p1-X11R6.tar.gz) = 1cd04231b893c3e6c70b56791d527b498e21a27a
 RMD160 (xview3.2p1-X11R6.tar.gz) = 2f21b14cb088aec887683bbc6d4ed9a3bc3fe2bb
@@ -99,7 +99,7 @@ SHA1 (patch-do) = e85f7868de4046b596f70233c052362165b816a3
 SHA1 (patch-dp) = 18de16f7167b4fcfcd8cd812237b4ecdde1cde8c
 SHA1 (patch-dq) = c12fdd5e06bd4bc04e79bf031c7e5d1086052bb3
 SHA1 (patch-dr) = 1b8db234d329c62200080d760655c7a2e18f38a1
-SHA1 (patch-ds) = 38b749b6abc13cb6a9d924f47b768155217cd140
+SHA1 (patch-ds) = f3ed69b2393e11aaf96e7877fcdff73841435cbb
 SHA1 (patch-dt) = 9ed5f117c0ad131814ac58e966bf7d479f89397d
 SHA1 (patch-du) = c53fb2d1554cdfdedcdf285db0803a1a3555920d
 SHA1 (patch-dv) = a3ac43dcb4d24579c91c14b1970adb97972bd804
@@ -135,3 +135,4 @@ SHA1 (patch-fi) = 540358d6753f70bd72e5371cbff240427a4a19fb
 SHA1 (patch-fj) = ef898c17bd36de97fdf1331d4f63b0738840cf20
 SHA1 (patch-fk) = 98c7ef077aad9f8eef298e0d398e25bc20b04ea6
 SHA1 (patch-fl) = f1cd513c6b2a9dbe694ed221998d645a6815183f
+SHA1 (patch-fm) = d05fc6cd8453bf066ee135d66f2be5895e56b45e
diff --git a/x11/xview-lib/patches/patch-ds b/x11/xview-lib/patches/patch-ds
index b507a2aca24..8206c83d81d 100644
--- a/x11/xview-lib/patches/patch-ds
+++ b/x11/xview-lib/patches/patch-ds
@@ -1,8 +1,23 @@
-$NetBSD: patch-ds,v 1.3 2009/12/10 20:35:58 abs Exp $
+$NetBSD: patch-ds,v 1.4 2011/09/29 07:47:56 dholland Exp $
+
+- Needs sys/param.h to define BSD if it's going to test it. I'm not
+sure if this is actually failing at the moment but it could start
+without notice.
+
+- remove union wait.
+
+- hack sigisempty().
 
 --- lib/libxview/notify/ntfy.h.orig	1993-06-29 05:18:14.000000000 +0000
 +++ lib/libxview/notify/ntfy.h
-@@ -22,6 +22,10 @@
+@@ -16,12 +16,17 @@
+ #define	NTFY_DEFINED
+ 
+ #include <sys/types.h>
++#include <sys/param.h>
+ #include <xview_private/ultrix_cpt.h>
+ #include <sys/time.h>
+ #ifdef SVR4
  #include <sys/rusage.h>
  #endif
  #include <sys/resource.h>
@@ -13,7 +28,7 @@ $NetBSD: patch-ds,v 1.3 2009/12/10 20:35:58 abs Exp $
  #include <xview/notify.h>
  
  /*
-@@ -149,7 +153,7 @@ typedef struct ntfy_condition {
+@@ -149,7 +154,7 @@ typedef struct ntfy_condition {
   */
  typedef	struct ntfy_wait3_data {
  	int	pid;			/* Process waiting for */
@@ -22,7 +37,7 @@ $NetBSD: patch-ds,v 1.3 2009/12/10 20:35:58 abs Exp $
  	union	wait status;		/* Return value from wait3 */
  #else SVR4
  	int 	status;		/* Return value from wait3 */
-@@ -184,9 +188,12 @@ extern	int ntfy_nodes_avail;	/* count of
+@@ -184,9 +189,12 @@ extern	int ntfy_nodes_avail;	/* count of
  extern	sigset_t ntfy_sigs_delayed;/* Bit mask of signals received while in
  				      critical section */
  
diff --git a/x11/xview-lib/patches/patch-fm b/x11/xview-lib/patches/patch-fm
new file mode 100644
index 00000000000..6fcccca6f50
--- /dev/null
+++ b/x11/xview-lib/patches/patch-fm
@@ -0,0 +1,14 @@
+$NetBSD: patch-fm,v 1.1 2011/09/29 07:47:56 dholland Exp $
+
+- needs sys/param.h for howmany().
+
+--- lib/libxview/notify/ntfy_fd_op.c~	1993-06-29 05:18:03.000000000 +0000
++++ lib/libxview/notify/ntfy_fd_op.c
+@@ -11,6 +11,7 @@ static char     sccsid[] = "@(#)ntfy_fd_
+  */
+ 
+ #include <sys/types.h>
++#include <sys/param.h>
+ #include <xview_private/ultrix_cpt.h>
+ 
+ /* AND op on two fds */