[pkgsrc/trunk]: pkgsrc/x11/xview-lib First try on fixing xview. Fix errno. Ad...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/xview-lib First try on fixing xview. Fix errno. Ad...
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 02:50:35 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/308ecc3947d4
branches:  trunk
changeset: 505623:308ecc3947d4
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Jan 05 18:25:56 2006 +0000

description:
First try on fixing xview. Fix errno. Add DragonFly support.
Use NAME_MAX when available. Don't try to fake a FILE on DragonFly.
The implementation of textsw_scanf can be improved, it is very
defensively and slow ATM, the snprintf usage should be portable.
Fix a number of prototype mismatches, e.g. variable argument functions
can conflict with K&R prototypes.

Bump revision since the package "compiled" before, e.g. build
errors where ignored.

diffstat:

 x11/xview-lib/Makefile         |    4 +-
 x11/xview-lib/distinfo         |   58 +++--
 x11/xview-lib/patches/patch-am |    6 +-
 x11/xview-lib/patches/patch-an |    4 +-
 x11/xview-lib/patches/patch-ao |    6 +-
 x11/xview-lib/patches/patch-ar |   13 +-
 x11/xview-lib/patches/patch-at |   22 +-
 x11/xview-lib/patches/patch-ba |   14 +-
 x11/xview-lib/patches/patch-co |    4 +-
 x11/xview-lib/patches/patch-cw |   50 ++++-
 x11/xview-lib/patches/patch-cx |   15 +-
 x11/xview-lib/patches/patch-cy |  390 ++++++++++++++++++++++++++++++++++++++++-
 x11/xview-lib/patches/patch-cz |   13 +-
 x11/xview-lib/patches/patch-dc |   12 +-
 x11/xview-lib/patches/patch-dd |    8 +-
 x11/xview-lib/patches/patch-de |  124 +++++++++++-
 x11/xview-lib/patches/patch-df |   33 +++-
 x11/xview-lib/patches/patch-dj |   12 +-
 x11/xview-lib/patches/patch-dm |   17 +-
 x11/xview-lib/patches/patch-dn |    4 +-
 x11/xview-lib/patches/patch-do |    4 +-
 x11/xview-lib/patches/patch-dp |   15 +-
 x11/xview-lib/patches/patch-dr |   12 +-
 x11/xview-lib/patches/patch-ds |    8 +-
 x11/xview-lib/patches/patch-du |   10 +-
 x11/xview-lib/patches/patch-ec |   25 ++
 x11/xview-lib/patches/patch-ed |   13 +
 x11/xview-lib/patches/patch-ee |   12 +
 x11/xview-lib/patches/patch-ef |   12 +
 x11/xview-lib/patches/patch-eg |   65 ++++++
 x11/xview-lib/patches/patch-eh |   12 +
 x11/xview-lib/patches/patch-ei |   13 +
 x11/xview-lib/patches/patch-ej |   36 +++
 x11/xview-lib/patches/patch-ek |   13 +
 x11/xview-lib/patches/patch-el |   12 +
 35 files changed, 952 insertions(+), 119 deletions(-)

diffs (truncated from 1676 to 300 lines):

diff -r a2e893551e89 -r 308ecc3947d4 x11/xview-lib/Makefile
--- a/x11/xview-lib/Makefile    Thu Jan 05 17:46:49 2006 +0000
+++ b/x11/xview-lib/Makefile    Thu Jan 05 18:25:56 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2005/12/05 20:51:20 rillig Exp $
+# $NetBSD: Makefile,v 1.30 2006/01/05 18:25:56 joerg Exp $
 
 DISTNAME=              xview3.2p1-X11R6
 PKGNAME=               xview-lib-3.2.1
-PKGREVISION=           4
+PKGREVISION=           5
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_LOCAL}
 
diff -r a2e893551e89 -r 308ecc3947d4 x11/xview-lib/distinfo
--- a/x11/xview-lib/distinfo    Thu Jan 05 17:46:49 2006 +0000
+++ b/x11/xview-lib/distinfo    Thu Jan 05 18:25:56 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 17:36:26 wiz Exp $
+$NetBSD: distinfo,v 1.10 2006/01/05 18:25:57 joerg Exp $
 
 SHA1 (xview3.2p1-X11R6.tar.gz) = 1cd04231b893c3e6c70b56791d527b498e21a27a
 RMD160 (xview3.2p1-X11R6.tar.gz) = 2f21b14cb088aec887683bbc6d4ed9a3bc3fe2bb
@@ -15,21 +15,21 @@
 SHA1 (patch-aj) = 9acc575fb736b7c4ec6448cab1f98f1ff00ea34e
 SHA1 (patch-ak) = 5c59e967d89e379108feae01f41c349d13188b11
 SHA1 (patch-al) = b5a795c0eef28302276b112ee34feb5dc3fbf460
-SHA1 (patch-am) = 1b9e3bef2b06633fb3511ff567b51251293f60ab
-SHA1 (patch-an) = d62ec6aaaf1e8924b12b117c12dae8f9f79c15ff
-SHA1 (patch-ao) = 1e2fbe85d98238145fbcf6aec95c449fed66cf7c
+SHA1 (patch-am) = e2c403ec892f9da9da910aab95a66298eb98a409
+SHA1 (patch-an) = b918e9d72ba90b1b9099f6610e021c3e85b1e056
+SHA1 (patch-ao) = 07d5522729a526153b8012899f7df03b7b952fd3
 SHA1 (patch-ap) = 5458cd0e65dcca28da727d17494350369ece59f0
 SHA1 (patch-aq) = 7a13c8cd72b88061308fd85033fe53e1b1b6affe
-SHA1 (patch-ar) = ceaa2183c93e39b65ee48e5d13465c841d80e671
+SHA1 (patch-ar) = ebc5412b91216ca3559db9dbbb9f5fe565cf744f
 SHA1 (patch-as) = 5fefb12b0c5f087d371f8241b028adedd0810435
-SHA1 (patch-at) = af83ab47d41ea040d48bea141a1cf038c500aa94
+SHA1 (patch-at) = 9f0b508e285e80db49b811441264e7042c5f3c51
 SHA1 (patch-au) = 4be6221b6b3660d5c74c043b7edf8aae946b7148
 SHA1 (patch-av) = fea7e5575fe913dfedbdd1e744ac60b75be737d2
 SHA1 (patch-aw) = e848355e0b704bdf6d726dc00cd4a49353e5eddb
 SHA1 (patch-ax) = a286aade16c09dec32698cb175e5cf4634260b25
 SHA1 (patch-ay) = 4ca316c0b53c8624070e9ef106799587cba4dc02
 SHA1 (patch-az) = 45e1f2faa2236ababcdda9543be3eb99ea96a44e
-SHA1 (patch-ba) = 2da120b088d67b0e9ef8da57997839fb9eb8bbc6
+SHA1 (patch-ba) = 146ca5c3717a1000d48042eaf04b3b1e520469cc
 SHA1 (patch-bb) = c1e12875a186a54e3ae1b73937dd5138b1d6e369
 SHA1 (patch-bc) = fe68f9c615e18efbead4845c982fd5b45ae6f459
 SHA1 (patch-bd) = 26bf677853829de6e3890a6878f8eb8c5bdd0acb
@@ -69,7 +69,7 @@
 SHA1 (patch-cl) = 6ada5a7257c2495781c805f55e38d4b2b8bcc323
 SHA1 (patch-cm) = e743e951a0a4b34a60f091df0e37850bc6dde99e
 SHA1 (patch-cn) = 86bede62bc40d3213b5e4801f84707bc2088f747
-SHA1 (patch-co) = cd71d4c794a489129c985877ab45753ae139e7ce
+SHA1 (patch-co) = 8983ff1dbd11907d9399b2cf497d74378291a4df
 SHA1 (patch-cp) = d989a4a195622b2aba899d70f1700b602eeb771f
 SHA1 (patch-cq) = 3d9022971b371500bdf14f800a7e392beefefee0
 SHA1 (patch-cr) = 025e5607cd3ecbc0c261f473bf0ddb31e9f70265
@@ -77,31 +77,31 @@
 SHA1 (patch-ct) = 36d8a2eaeeed831e307e74ccba97007e037b61f2
 SHA1 (patch-cu) = ce19d2151f259e0cb5358a0c4350b391da94cbd9
 SHA1 (patch-cv) = 56fffeff6ca82ca661ee5ef72deb1d328777fb3e
-SHA1 (patch-cw) = ec330b271c23788786ce32941f26d40277d09536
-SHA1 (patch-cx) = 55fb26597f0b6737e157af19ed3752e84d5f71f3
-SHA1 (patch-cy) = 2700e41897de42850073f235040088305e065a07
-SHA1 (patch-cz) = c54892c234cf60032b236515d0fd20c1a02a99fb
+SHA1 (patch-cw) = ab33630d7854e7d93190a37d232ea481fc49159c
+SHA1 (patch-cx) = 3df44c86e60ed0e542a6746d04695b7e65adca73
+SHA1 (patch-cy) = 5d511a7d6cd4a0aefd0b05e0e1e26b3b8567ec08
+SHA1 (patch-cz) = d772125c6aeebec919bccd083f997cdd425c5a1d
 SHA1 (patch-da) = 58f289767fd9a6f6a334e0e5a770564b780a1212
 SHA1 (patch-db) = 94c13bd10197c4b209a46da3e8008685db22adb6
-SHA1 (patch-dc) = 40274cd5581f626914bef70df477469773557e3d
-SHA1 (patch-dd) = baf2201c61088de823bb42f49427b3f53c3c4123
-SHA1 (patch-de) = a06bd0224b4c0de068486851753646e268c27673
-SHA1 (patch-df) = c2af3e6d2f74942ad1dd3d97c0462f7f3ffff793
+SHA1 (patch-dc) = d0240a7a6e330af56167b5707cd91fcade334d5f
+SHA1 (patch-dd) = 935f97cffd10b44c5bd7d80e599b3f897d56b049
+SHA1 (patch-de) = 7896d70ab94054d8a77049df47eceb2505c60ed1
+SHA1 (patch-df) = 1140349bd309cfdc43c586e39914b607f2cb8e7a
 SHA1 (patch-dg) = 1c757673e8d21f90363997f853492c7d98192098
 SHA1 (patch-dh) = b0b7c1d3b99991c64e4d70a27f601993baa1f91b
 SHA1 (patch-di) = da64503892d0e421bce6f8f07da879884a757bcb
-SHA1 (patch-dj) = 685901dcf270f9028a67f0a414b5bfb83644657c
+SHA1 (patch-dj) = 7b13ec762f5dc0f21a1416c311e20c4ed2b62afc
 SHA1 (patch-dk) = ed02c7f7aa8ee25c4227843e115689952f765caf
 SHA1 (patch-dl) = 0aef1fe619dc5ff228d813d816f5e974d49bf829
-SHA1 (patch-dm) = 6d3dfb8ab718bdfacaa59785304d5ae7978d4f9c
-SHA1 (patch-dn) = 68b66abb8c0b1c6aebbc8df06c193b2e7f377dcf
-SHA1 (patch-do) = 6631be46113498b433b10f8067b0ba8ed0239c5e
-SHA1 (patch-dp) = 65d121b240b0454ff40a2b27c8ed95f5527b139a
+SHA1 (patch-dm) = 205ac73da2105f82d497279507f93a6ec703a5d0
+SHA1 (patch-dn) = b0ccb6467097b3b1937810d9f1fc6a2b21fbabc2
+SHA1 (patch-do) = 14d0e4cb02758b457b2c78ae1ee5d0899b0faa65
+SHA1 (patch-dp) = 94c78bf81c6125d14df071eb0d2738eef95b5f17
 SHA1 (patch-dq) = 951faffa9e5b377f8709c3e155b9bbf36b76e19c
-SHA1 (patch-dr) = ec77026b2c8c5339f5121070f03f96d9a7a9c6fd
-SHA1 (patch-ds) = 25d7937970d520ddd8ebf3c5260b048769694e1b
+SHA1 (patch-dr) = e7c97b18c3b6db18411f86af87f4987f186eb755
+SHA1 (patch-ds) = 9e94de59e2979bd51cab164a4464ae0bdfb4eaa2
 SHA1 (patch-dt) = 38168d6d296814f166a528e35cd92c2686e8a98e
-SHA1 (patch-du) = 53a9627038f24c135d6808e737bb018a202a7bad
+SHA1 (patch-du) = f1ffe17e2aae3199885bb4f2889c6935089f4926
 SHA1 (patch-dv) = 7326dba16b9043ede173a9aeaa6eabce4a83c730
 SHA1 (patch-dw) = 9002f1f1477d4d8d1e587c19749b01fc46211615
 SHA1 (patch-dx) = 3e437213954b74af62045bc0b650ded6be73ed46
@@ -109,4 +109,14 @@
 SHA1 (patch-dz) = b8304af8ac019af3224f0df0212e5d4da4226eac
 SHA1 (patch-ea) = ac9158bfc79aba18b318f1e2e7ac0fa2427cfbec
 SHA1 (patch-eb) = 05fcefb5b5f0799b92828b72938a57854707a69b
+SHA1 (patch-ec) = 76f2a9d23643b4603fffc933c2fd0860fa4c3052
+SHA1 (patch-ed) = 6a377819f933cea63580b82be6328d47376d7b7d
+SHA1 (patch-ee) = 1bd444f2e77d0637c86a054e94229cd714ad0875
+SHA1 (patch-ef) = f16205feb29f7ea282e098ad9434f56900d12e02
+SHA1 (patch-eg) = e746accd7d17649d6f7cd7f8195ef2357d231c98
+SHA1 (patch-eh) = 73cc36fe2cba94e9c1fbab06628dfefb90d96994
+SHA1 (patch-ei) = 65e504ea6b78958b5ff3a805559d4429f4f6e798
+SHA1 (patch-ej) = 8eb2a61821f1ebf778ae1fa7a828de3a0b8e2ae6
+SHA1 (patch-ek) = 49c51048cb416e53279d9f319466f5eaf5c28ae0
+SHA1 (patch-el) = 51e1d47e1f42e1cc62d53b1e4c3426b9dbf4a798
 SHA1 (patch-fa) = b17b18509017d19e52c1c54416bec24d67ce2b4d
diff -r a2e893551e89 -r 308ecc3947d4 x11/xview-lib/patches/patch-am
--- a/x11/xview-lib/patches/patch-am    Thu Jan 05 17:46:49 2006 +0000
+++ b/x11/xview-lib/patches/patch-am    Thu Jan 05 18:25:56 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.3 2001/12/20 09:19:55 tron Exp $
+$NetBSD: patch-am,v 1.4 2006/01/05 18:25:57 joerg Exp $
 
 --- lib/libxview/io_stream/file_strms.c.orig   Tue Jun 29 07:15:07 1993
 +++ lib/libxview/io_stream/file_strms.c        Thu Dec 20 10:09:16 2001
@@ -6,7 +6,7 @@
  
  #define GetFISData struct xv_file_input_stream_data *data = (struct xv_file_input_stream_data*) in->client_data
  
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
  static struct xv_file_input_stream_data {
 +#else
 +struct xv_file_input_stream_data {
@@ -18,7 +18,7 @@
  
  #define GetFOSData struct xv_file_output_stream_data *data = (struct xv_file_output_stream_data*) out->client_data
  
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
  static struct xv_file_output_stream_data {
 +#else
 +struct xv_file_output_stream_data {
diff -r a2e893551e89 -r 308ecc3947d4 x11/xview-lib/patches/patch-an
--- a/x11/xview-lib/patches/patch-an    Thu Jan 05 17:46:49 2006 +0000
+++ b/x11/xview-lib/patches/patch-an    Thu Jan 05 18:25:56 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.3 2001/12/20 09:19:55 tron Exp $
+$NetBSD: patch-an,v 1.4 2006/01/05 18:25:57 joerg Exp $
 
 --- lib/libxview/io_stream/othr_strms.c.orig   Tue Jun 29 07:15:05 1993
 +++ lib/libxview/io_stream/othr_strms.c        Thu Dec 20 10:09:16 2001
@@ -6,7 +6,7 @@
  
  #define GetFCSData struct xv_filter_comments_stream_data *data = (struct xv_filter_comments_stream_data*) in->client_data
  
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
  static struct xv_filter_comments_stream_data {
 +#else
 +struct xv_filter_comments_stream_data {
diff -r a2e893551e89 -r 308ecc3947d4 x11/xview-lib/patches/patch-ao
--- a/x11/xview-lib/patches/patch-ao    Thu Jan 05 17:46:49 2006 +0000
+++ b/x11/xview-lib/patches/patch-ao    Thu Jan 05 18:25:56 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.2 2001/12/20 09:19:55 tron Exp $
+$NetBSD: patch-ao,v 1.3 2006/01/05 18:25:57 joerg Exp $
 
 --- lib/libxview/io_stream/str_strms.c.orig    Tue Jun 29 07:15:06 1993
 +++ lib/libxview/io_stream/str_strms.c Thu Dec 20 10:09:16 2001
@@ -6,7 +6,7 @@
  
  #define GetSISData struct string_input_stream_data    *data = (struct string_input_stream_data*) in->client_data
  
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
  static struct string_input_stream_data {
 +#else
 +struct string_input_stream_data {
@@ -18,7 +18,7 @@
  
  #define GetSOSData struct string_output_stream_data *data = (struct string_output_stream_data*) out->client_data
  
-+#if !defined(__FreeBSD__) && !defined(__NetBSD__)
++#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
  static struct string_output_stream_data {
 +#else
 +struct string_output_stream_data {
diff -r a2e893551e89 -r 308ecc3947d4 x11/xview-lib/patches/patch-ar
--- a/x11/xview-lib/patches/patch-ar    Thu Jan 05 17:46:49 2006 +0000
+++ b/x11/xview-lib/patches/patch-ar    Thu Jan 05 18:25:56 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ar,v 1.2 2001/12/20 09:19:56 tron Exp $
+$NetBSD: patch-ar,v 1.3 2006/01/05 18:25:57 joerg Exp $
 
 --- lib/libxview/sel/seln_impl.h.orig  Tue Jun 29 07:15:25 1993
 +++ lib/libxview/sel/seln_impl.h       Thu Dec 20 10:09:17 2001
@@ -21,3 +21,14 @@
  #endif FILE
  #include <sys/time.h>
  #include <sys/types.h>
+@@ -27,10 +32,6 @@
+ #include <xview/sel_attrs.h>
+ #include <X11/Xlib.h>
+ 
+-extern int          errno;
+-
+-
+-
+ /*
+  * Procedure IDs for client-module procedures 
+  */
diff -r a2e893551e89 -r 308ecc3947d4 x11/xview-lib/patches/patch-at
--- a/x11/xview-lib/patches/patch-at    Thu Jan 05 17:46:49 2006 +0000
+++ b/x11/xview-lib/patches/patch-at    Thu Jan 05 18:25:56 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-at,v 1.2 2001/12/20 09:19:56 tron Exp $
+$NetBSD: patch-at,v 1.3 2006/01/05 18:25:57 joerg Exp $
 
 --- lib/libxview/win/win_input.c.orig  Mon Jun 27 00:27:53 1994
 +++ lib/libxview/win/win_input.c       Thu Dec 20 10:09:19 2001
-@@ -56,6 +56,7 @@
+@@ -56,6 +56,7 @@ static int      BlockForEvent();
  static int      GetButtonEvent();
  static int      win_translate_KP_keysym();
  static int    translate_key();
@@ -10,7 +10,7 @@
  
  extern struct rectlist *win_get_damage();
  extern void     server_set_timestamp();
-@@ -853,7 +854,9 @@
+@@ -853,7 +854,9 @@ ContProcess:
  #ifdef X11R6
        /* lumpi%dobag.in-berlin.de@localhost */
                int ksym_pcc;
@@ -21,7 +21,7 @@
                for (index = 0; index < ksym_pcc; index++) {
  #else
                for (index = 0; index < display->keysyms_per_keycode; index++) {
-@@ -861,7 +864,7 @@
+@@ -861,7 +864,7 @@ ContProcess:
                    if ((ksym = XLookupKeysym(ek, index)) != NoSymbol)
                        if (IsKeypadKey(ksym)) {
                            /* See if key has been rebound. */
@@ -30,7 +30,15 @@
                                               buffer, BUFFERSIZE)) {
                                (void)win_translate_KP_keysym(ksym, buffer);
                            }
-@@ -2720,8 +2723,10 @@
+@@ -2341,7 +2344,6 @@ BlockForEvent(display, xevent, usec, pre
+     int             result;
+     struct timeval  timeout;
+     struct timeval  starttime, curtime, diff1, diff2;
+-    extern int      errno;
+ 
+     timeout.tv_sec = 0;
+     timeout.tv_usec = usec;
+@@ -2720,8 +2722,10 @@ win_translate_KP_keysym(keysym, buffer)
   * Xlib's.
   */
  
@@ -43,7 +51,7 @@
  static int
  translate_key(dpy, symbol, modifiers, buffer, nbytes)
      Display           *dpy;
-@@ -2731,11 +2736,18 @@
+@@ -2731,11 +2735,18 @@ translate_key(dpy, symbol, modifiers, bu
      int                nbytes;
  {
        /* This is _very_ rude ! */
@@ -64,7 +72,7 @@
  static int
  translate_key(dpy, symbol, modifiers, buffer, nbytes)
      Display           *dpy;
-@@ -2761,4 +2773,4 @@
+@@ -2761,4 +2772,4 @@ translate_key(dpy, symbol, modifiers, bu
      }
      return 0;
  }
diff -r a2e893551e89 -r 308ecc3947d4 x11/xview-lib/patches/patch-ba
--- a/x11/xview-lib/patches/patch-ba    Thu Jan 05 17:46:49 2006 +0000
+++ b/x11/xview-lib/patches/patch-ba    Thu Jan 05 18:25:56 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.1 2001/12/20 09:19:56 tron Exp $
+$NetBSD: patch-ba,v 1.2 2006/01/05 18:25:57 joerg Exp $
 
 --- lib/libxview/selection/sel_util.c.orig     Tue Jun 29 07:16:03 1993
 +++ lib/libxview/selection/sel_util.c  Thu Dec 20 10:09:17 2001
-@@ -23,6 +23,7 @@
+@@ -23,6 +23,7 @@ static void tvdiff();
  static void FreeMultiProp();
  static int    SelMatchReply();
  static Sel_req_tbl *SelMatchReqTbl();
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc x11/xview-lib hopefully works now, before it was i...
Next by Date: [pkgsrc/trunk]: pkgsrc/mail These packages generate catted manpages. Add USE_...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc x11/xview-lib hopefully works now, before it was i...
Next by Thread: [pkgsrc/trunk]: pkgsrc/mail These packages generate catted manpages. Add USE_...
Indexes:
Home | Main Index | Thread Index | Old Index