summaryrefslogtreecommitdiff
path: root/x11/xview-lib
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2001-12-20 09:22:04 +0000
committertron <tron@pkgsrc.org>2001-12-20 09:22:04 +0000
commit223e96ce639d82571a509d217e7612ee64f14c5c (patch)
treec06196226054c260b2d50b19e0b06484dfb734ef /x11/xview-lib
parent71146f333ee2015a1dc555b20853e181378164cc (diff)
downloadpkgsrc-223e96ce639d82571a509d217e7612ee64f14c5c.tar.gz
Fix build problem under NetBSD-current.
Diffstat (limited to 'x11/xview-lib')
-rw-r--r--x11/xview-lib/distinfo4
-rw-r--r--x11/xview-lib/patches/patch-cw9
2 files changed, 6 insertions, 7 deletions
diff --git a/x11/xview-lib/distinfo b/x11/xview-lib/distinfo
index 1323bd2109a..6fbbc878e6a 100644
--- a/x11/xview-lib/distinfo
+++ b/x11/xview-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2001/12/20 09:19:53 tron Exp $
+$NetBSD: distinfo,v 1.6 2001/12/20 09:22:04 tron Exp $
SHA1 (xview3.2p1-X11R6.tar.gz) = 1cd04231b893c3e6c70b56791d527b498e21a27a
Size (xview3.2p1-X11R6.tar.gz) = 3436814 bytes
@@ -76,7 +76,7 @@ SHA1 (patch-cs) = b4b224a0215dc11e20a1e54588d166a29621a997
SHA1 (patch-ct) = 36d8a2eaeeed831e307e74ccba97007e037b61f2
SHA1 (patch-cu) = ce19d2151f259e0cb5358a0c4350b391da94cbd9
SHA1 (patch-cv) = 56fffeff6ca82ca661ee5ef72deb1d328777fb3e
-SHA1 (patch-cw) = 82b15382360cd212c440bc63474bf09c5299c019
+SHA1 (patch-cw) = ec330b271c23788786ce32941f26d40277d09536
SHA1 (patch-cx) = 55fb26597f0b6737e157af19ed3752e84d5f71f3
SHA1 (patch-cy) = a29cbfbe902cf6c0dcb7074a873d54319db7f427
SHA1 (patch-cz) = c54892c234cf60032b236515d0fd20c1a02a99fb
diff --git a/x11/xview-lib/patches/patch-cw b/x11/xview-lib/patches/patch-cw
index 9289a00bb9b..0cf80eb3fcd 100644
--- a/x11/xview-lib/patches/patch-cw
+++ b/x11/xview-lib/patches/patch-cw
@@ -1,7 +1,7 @@
-$NetBSD: patch-cw,v 1.1 2001/12/20 09:20:05 tron Exp $
+$NetBSD: patch-cw,v 1.2 2001/12/20 09:22:04 tron Exp $
--- lib/libxview/textsw/txt_again.c.orig Tue Jun 29 07:17:32 1993
-+++ lib/libxview/textsw/txt_again.c Thu Dec 20 10:09:17 2001
++++ lib/libxview/textsw/txt_again.c Thu Dec 20 10:11:57 2001
@@ -28,6 +28,8 @@
Pkg_private Es_index textsw_do_input();
Pkg_private Es_index textsw_do_pending_delete();
@@ -60,7 +60,7 @@ $NetBSD: patch-cw,v 1.1 2001/12/20 09:20:05 tron Exp $
static int
#ifdef ANSI_FUNC_PROTO
textsw_scanf(register string_t *ptr_to_string, register char *fmt, ...)
-@@ -705,6 +735,39 @@
+@@ -705,6 +735,38 @@
#endif /* OW_I18N */
}
@@ -84,12 +84,11 @@ $NetBSD: patch-cw,v 1.1 2001/12/20 09:20:05 tron Exp $
+ int result;
+ va_list args;
+
++ memset(&_strbuf, '\0', sizeof(_strbuf));
+ _strbuf._flags = __SRD;
+ _strbuf._bf._base = _strbuf._p = (char *) TXTSW_STRING_BASE(ptr_to_string);
+ _strbuf._bf._size = _strbuf._r = TXTSW_STRING_LENGTH(ptr_to_string);
+ _strbuf._read = eofread;
-+ _strbuf._ub._base = NULL;
-+ _strbuf._lb._base = NULL;
+ VA_START(args, fmt);
+ result = __svfscanf(&_strbuf, fmt, args);
+ va_end(args);