[pkgsrc/trunk]: pkgsrc/x11/xview-lib Unbreak package by culling extern declar...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/xview-lib Unbreak package by culling extern declar...
From: hauke <hauke%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 08:25:08 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/efc6f00f7c2a
branches:  trunk
changeset: 372632:efc6f00f7c2a
user:      hauke <hauke%pkgsrc.org@localhost>
date:      Tue Dec 12 20:42:41 2017 +0000

description:
Unbreak package by culling extern declarations doubling as function
prototypes. Since NetBSD headers have moved to #including what they
reference, <string.h> is everywhere, which turns the externs from
annoying into harmful.

diffstat:

 x11/xview-lib/distinfo                                 |  19 ++--
 x11/xview-lib/patches/patch-ak                         |  16 +++-
 x11/xview-lib/patches/patch-cg                         |   9 ++-
 x11/xview-lib/patches/patch-cj                         |  24 +++---
 x11/xview-lib/patches/patch-cm                         |   7 +-
 x11/xview-lib/patches/patch-co                         |  13 +++-
 x11/xview-lib/patches/patch-cw                         |  18 +++--
 x11/xview-lib/patches/patch-cy                         |  63 +++++++++--------
 x11/xview-lib/patches/patch-fh                         |  13 +++-
 x11/xview-lib/patches/patch-lib_libxview_ttysw_ttytl.c |  15 ++++
 10 files changed, 126 insertions(+), 71 deletions(-)

diffs (truncated from 630 to 300 lines):

diff -r 5f0ae10e98fb -r efc6f00f7c2a x11/xview-lib/distinfo
--- a/x11/xview-lib/distinfo    Tue Dec 12 10:40:27 2017 +0000
+++ b/x11/xview-lib/distinfo    Tue Dec 12 20:42:41 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2017/03/23 17:07:02 joerg Exp $
+$NetBSD: distinfo,v 1.22 2017/12/12 20:42:41 hauke Exp $
 
 SHA1 (xview3.2p1-X11R6.tar.gz) = 1cd04231b893c3e6c70b56791d527b498e21a27a
 RMD160 (xview3.2p1-X11R6.tar.gz) = 2f21b14cb088aec887683bbc6d4ed9a3bc3fe2bb
@@ -14,7 +14,7 @@
 SHA1 (patch-ah) = b873b369ea8b6bf5672efb36b0633f1db78f06fa
 SHA1 (patch-ai) = bfa9b69f5597624ec1f00e05b5c96b653f6504ab
 SHA1 (patch-aj) = a26a6b141a4252bbe6e305a58768ba33a5ba4461
-SHA1 (patch-ak) = a3298d27c26a1070eb0c2b92c9ab97d769e1f4a8
+SHA1 (patch-ak) = 760d95299ee335b11d50f380066b628123ad7661
 SHA1 (patch-al) = 3242c906bdd3f6951b891e17b8f3d02893afbe5a
 SHA1 (patch-am) = f578d0e77d11a14e58d560011b84fccd3d9bd51e
 SHA1 (patch-an) = b4243008a3158d787ec7263291f3b59d43b18f36
@@ -62,15 +62,15 @@
 SHA1 (patch-cd) = 9e93666c7388a7de7015f0e809325223c0523214
 SHA1 (patch-ce) = c7afce4243e2f6322d4a5450d0c88d83b6b194f2
 SHA1 (patch-cf) = 051ac2e4f9882b1a799de25e37ea8ae950028ef1
-SHA1 (patch-cg) = 11b99148834d032a50e85ad8ed703516321d580a
+SHA1 (patch-cg) = 020bbe752a51daf082aac7a3732a72e929dfbab0
 SHA1 (patch-ch) = 0cf7084abf39f4beed8236eb1bb32f57facec6d2
 SHA1 (patch-ci) = 665e59cc11e47565968387e2ad91a6918965a7db
-SHA1 (patch-cj) = 5a0cbf2029492e68899cbe74ce32892ae497a343
+SHA1 (patch-cj) = b6547ef9a91ceed457223887f4ba459472055118
 SHA1 (patch-ck) = f470d31bad573e1041fa55e004276738a0ca83ca
 SHA1 (patch-cl) = 129838e7ab4786794bfb88f43a5a13b1c47bf5a6
-SHA1 (patch-cm) = c83fab28009da4a7db750dbf9ca28f1e737797a8
+SHA1 (patch-cm) = e48e542c1bff4ebc3eeb15c184eb9acf00509d3e
 SHA1 (patch-cn) = c569c5ea7fdc13e90e320eaa99d935a8272cafe4
-SHA1 (patch-co) = 46a1845f95e8b30c982e165a5d9c8a803ff996cc
+SHA1 (patch-co) = 8296f3f9de6ef2dbe8ff7394cf8fbbec3340caff
 SHA1 (patch-cp) = 093e6381788c44c09d9eaa7077747918b79a5da8
 SHA1 (patch-cq) = 58b7904d1a4d98e77a9af609873c987ed4345b89
 SHA1 (patch-cr) = 4077f858fcad7c4949455a4c38588a8435f802c7
@@ -78,9 +78,9 @@
 SHA1 (patch-ct) = 8ceafeae951776b3dca9fb95a430972f0d76989d
 SHA1 (patch-cu) = 6f5a5cef1af7618d819ad5a0e35c5b003ac4ddcf
 SHA1 (patch-cv) = 2c35f611141747144b84e83636c32eaf428d0770
-SHA1 (patch-cw) = fe33ed25d5c106610cce53b956c4c2ca2e5ba9f9
+SHA1 (patch-cw) = 1701e0f0034c8cad61815a4af21396c5061cb756
 SHA1 (patch-cx) = c075412084b243f884a1039e90c55825b81d676c
-SHA1 (patch-cy) = 6eec35d5b9db6bfeeb60c16db242b1b3e18916ff
+SHA1 (patch-cy) = ef34a84b81f597f917e9cf2ec50917d8b26d54f6
 SHA1 (patch-cz) = 9120a99da1f6fd8cf18e4da4f012824b31644637
 SHA1 (patch-da) = 5bd56d13c9519aaf953bfe1dcfb1ddd4d77cd157
 SHA1 (patch-db) = 42b80dd6e320205e6216f9b6a59bb510845e9c97
@@ -131,7 +131,7 @@
 SHA1 (patch-fe) = ec183923b68cf934e7edcadd1f1f85fd65669244
 SHA1 (patch-ff) = b0ac27bb261fb06bf88b4d970c18466149809816
 SHA1 (patch-fg) = 05c3b924b18df5a36596a242f54cd2b7fea4ec66
-SHA1 (patch-fh) = 6a933d844818a57b448ef9fdd373d03a14ba961a
+SHA1 (patch-fh) = 14d8ab23ec1b123642c54ee66919a5dca4a131eb
 SHA1 (patch-fi) = 64d0d60dc3fbccb735c60183303bfb4e2f3e744a
 SHA1 (patch-fj) = e97c787c1ae6bf32a4f97124852c454fab431378
 SHA1 (patch-fk) = 48df22f42bc1f642f4e1b6731ea2645495109bba
@@ -155,6 +155,7 @@
 SHA1 (patch-lib_libxview_textsw_txt__find.c) = 37e82f38b51c5c202bb71fadd2155eb752e90791
 SHA1 (patch-lib_libxview_textsw_txt__sel.c) = c2bd1479518a32a3b09fefb33ae08c571f47404d
 SHA1 (patch-lib_libxview_ttysw_tty__menu.c) = 4c42ff022329bc4e640b2b0cb193ec85afc0ae1c
+SHA1 (patch-lib_libxview_ttysw_ttytl.c) = d0167b406d817116e97262cfc78f696864bc435b
 SHA1 (patch-lib_libxview_win_win__global.c) = f806ec4200f627d26f559d26caaed34961fedc79
 SHA1 (patch-lib_libxview_window_window__cms.c) = 255186370b317bbcb6efc5ef7ed23f570b114912
 SHA1 (patch-lib_libxview_window_windowutil.c) = 64a2c5fbf04af54d0689b15af40473b093072afa
diff -r 5f0ae10e98fb -r efc6f00f7c2a x11/xview-lib/patches/patch-ak
--- a/x11/xview-lib/patches/patch-ak    Tue Dec 12 10:40:27 2017 +0000
+++ b/x11/xview-lib/patches/patch-ak    Tue Dec 12 20:42:41 2017 +0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-ak,v 1.4 2012/11/16 00:29:39 joerg Exp $
+$NetBSD: patch-ak,v 1.5 2017/12/12 20:42:41 hauke Exp $
 
 --- lib/libxview/font/font.c.orig      1993-06-29 05:15:01.000000000 +0000
 +++ lib/libxview/font/font.c
-@@ -67,6 +67,10 @@ Xv_private char *xv_font_regular_cmdline
+@@ -33,7 +33,6 @@ static char     sccsid[] = "@(#)font.c 2
+ 
+ extern Pixfont *xv_pf_sys;
+ extern char    *defaults_get_string();
+-extern char    *strcpy();
+ extern Xv_opaque xv_default_server;
+ extern Display *xv_default_display;
+ 
+@@ -67,6 +66,10 @@ Xv_private char *xv_font_regular_cmdline
  Xv_private char *xv_font_scale_cmdline();
  Xv_private char *xv_font_scale();
  
@@ -13,7 +21,7 @@
  /*
   * delimiters
   */
-@@ -144,7 +148,7 @@ static char        *font_strip_name();
+@@ -144,7 +147,7 @@ static char        *font_strip_name();
  static int    font_delim_count();
  static XID font_try_misc_name();
  static Font_locale_info *find_font_locale_info();
@@ -22,7 +30,7 @@
  static int    font_setup_known_styles();
  static void   font_init_known_families();
  static void   font_init_known_styles();
-@@ -3315,7 +3319,7 @@ Font_locale_info *linfo;
+@@ -3315,7 +3318,7 @@ Font_locale_info *linfo;
  
  }
  
diff -r 5f0ae10e98fb -r efc6f00f7c2a x11/xview-lib/patches/patch-cg
--- a/x11/xview-lib/patches/patch-cg    Tue Dec 12 10:40:27 2017 +0000
+++ b/x11/xview-lib/patches/patch-cg    Tue Dec 12 20:42:41 2017 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-cg,v 1.2 2009/12/10 20:35:57 abs Exp $
+$NetBSD: patch-cg,v 1.3 2017/12/12 20:42:41 hauke Exp $
 
 --- lib/libxview/ttysw/cim_change.c.orig       1993-06-29 05:17:12.000000000 +0000
 +++ lib/libxview/ttysw/cim_change.c
-@@ -17,10 +17,10 @@ static char     sccsid[] = "@(#)cim_chan
+@@ -17,15 +17,13 @@ static char     sccsid[] = "@(#)cim_chan
  #include <xview_private/i18n_impl.h>
  #include <sys/types.h>
  #include <pixrect/pixrect.h>
@@ -14,3 +14,8 @@
  
  char            boldify;
  
+-extern char    *strcpy();
+-
+ /* static */ void ttysw_roll();
+ static void reverse();
+ /* static */ void ttysw_swap();
diff -r 5f0ae10e98fb -r efc6f00f7c2a x11/xview-lib/patches/patch-cj
--- a/x11/xview-lib/patches/patch-cj    Tue Dec 12 10:40:27 2017 +0000
+++ b/x11/xview-lib/patches/patch-cj    Tue Dec 12 20:42:41 2017 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-cj,v 1.3 2009/12/10 20:35:57 abs Exp $
+$NetBSD: patch-cj,v 1.4 2017/12/12 20:42:41 hauke Exp $
 
 --- lib/libxview/ttysw/tty_init.c.orig 1993-06-29 05:17:19.000000000 +0000
 +++ lib/libxview/ttysw/tty_init.c
@@ -10,10 +10,12 @@
  #include <sys/time.h>
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -82,7 +83,11 @@ static char     sccsid[] = "@(#)tty_init
+@@ -80,9 +81,11 @@ static char     sccsid[] = "@(#)tty_init
+ #endif
  
- extern char    *strncpy();
- extern char    *strcpy();
+ 
+-extern char    *strncpy();
+-extern char    *strcpy();
 +#if (defined(BSD) && (BSD >= 199306))
 +extern off_t  lseek();
 +#else
@@ -22,7 +24,7 @@
  char           *textsw_checkpoint_undo();
  
  /* static */ void ttysw_parseargs();
-@@ -106,6 +111,7 @@ Xv_private char *xv_font_monospace();
+@@ -106,6 +109,7 @@ Xv_private char *xv_font_monospace();
  
  extern int      ttysel_use_seln_service;
  
@@ -30,7 +32,7 @@
  
  struct ttysw_createoptions {
      int             becomeconsole;    /* be the console */
-@@ -432,10 +438,8 @@ ttysw_fork_it(ttysw0, argv, wfd)
+@@ -432,10 +436,8 @@ ttysw_fork_it(ttysw0, argv, wfd)
      char          appname[20];
      char          *p;
      unsigned        ttysw_error_sleep = 1;
@@ -42,7 +44,7 @@
      extern char *ptsname();
  
  #define BSD_TTY_COMPAT /* yank this if csh ever gets ported properly */
-@@ -461,27 +465,6 @@ ttysw_fork_it(ttysw0, argv, wfd)
+@@ -461,27 +463,6 @@ ttysw_fork_it(ttysw0, argv, wfd)
      }
  
      /* Set up the child characteristics */
@@ -70,7 +72,7 @@
      vec.sa_handler = SIG_DFL;
      sigemptyset(&vec.sa_mask);
      vec.sa_flags = SA_RESTART;
-@@ -497,13 +480,19 @@ ttysw_fork_it(ttysw0, argv, wfd)
+@@ -497,13 +478,19 @@ ttysw_fork_it(ttysw0, argv, wfd)
      vec.sa_flags = SA_RESTART;
      sigaction(SIGTTOU, &vec, &ovec);
  
@@ -91,7 +93,7 @@
  
      /*
       * Initialize file descriptors. Connections to servers are marked as
-@@ -518,6 +507,9 @@ ttysw_fork_it(ttysw0, argv, wfd)
+@@ -518,6 +505,9 @@ ttysw_fork_it(ttysw0, argv, wfd)
      (void) dup2(ttysw->ttysw_tty, 2);
      (void) close(ttysw->ttysw_tty);
  
@@ -101,7 +103,7 @@
      if (*argv == (char *) NULL || strcmp("-c", *argv) == 0) {
        /* Process arg list */
        int             argc;
-@@ -955,7 +947,11 @@ updateutmp(username, ttyslotuse, ttyfd)
+@@ -955,7 +945,11 @@ updateutmp(username, ttyslotuse, ttyfd)
      struct utmpx     utmp;
  #endif
      struct passwd  *passwdent;
@@ -113,7 +115,7 @@
      int             f;
      char           *ttyn;
      extern char    *ttyname();
-@@ -1007,13 +1003,22 @@ updateutmp(username, ttyslotuse, ttyfd)
+@@ -1007,13 +1001,22 @@ updateutmp(username, ttyslotuse, ttyfd)
                XV_MSG("Add tty[qrs][0-f] to /etc/ttys file.\n"));
        return (0);
      }
diff -r 5f0ae10e98fb -r efc6f00f7c2a x11/xview-lib/patches/patch-cm
--- a/x11/xview-lib/patches/patch-cm    Tue Dec 12 10:40:27 2017 +0000
+++ b/x11/xview-lib/patches/patch-cm    Tue Dec 12 20:42:41 2017 +0000
@@ -1,15 +1,16 @@
-$NetBSD: patch-cm,v 1.2 2009/12/10 20:35:57 abs Exp $
+$NetBSD: patch-cm,v 1.3 2017/12/12 20:42:41 hauke Exp $
 
 --- lib/libxview/ttysw/ttyansi.c.orig  1993-06-29 05:17:21.000000000 +0000
 +++ lib/libxview/ttysw/ttyansi.c
-@@ -31,6 +31,10 @@ static char     sccsid[] = "@(#)ttyansi.
+@@ -31,7 +31,10 @@ static char     sccsid[] = "@(#)ttyansi.
  
  #include <xview/sel_attrs.h>
  
+-char           *strncpy();
 +static int    send_input_to_textsw();
 +static int    ansi_lf();
 +static int    ansi_char();
 +
- char           *strncpy();
  char           *textsw_checkpoint_undo();
  Textsw_index    textsw_replace_i18n(), textsw_erase_i18n();
+ 
diff -r 5f0ae10e98fb -r efc6f00f7c2a x11/xview-lib/patches/patch-co
--- a/x11/xview-lib/patches/patch-co    Tue Dec 12 10:40:27 2017 +0000
+++ b/x11/xview-lib/patches/patch-co    Tue Dec 12 20:42:41 2017 +0000
@@ -1,8 +1,17 @@
-$NetBSD: patch-co,v 1.3 2009/12/10 20:35:57 abs Exp $
+$NetBSD: patch-co,v 1.4 2017/12/12 20:42:41 hauke Exp $
 
 --- lib/libxview/ttysw/tty_mapkey.c.orig       1993-06-29 05:17:20.000000000 +0000
 +++ lib/libxview/ttysw/tty_mapkey.c
-@@ -500,7 +500,7 @@ ttysw_remove_caps(label, label_ptr)
+@@ -34,8 +34,6 @@ static char     sccsid[] = "@(#)tty_mapk
+ 
+ extern Notify_error win_post_event();
+ extern char    *getenv();
+-extern char    *strcpy();
+-extern char    *strcat();
+ 
+ /* static routines     */
+ 
+@@ -500,7 +498,7 @@ ttysw_remove_caps(label, label_ptr)
   * have more time.
   */
  
diff -r 5f0ae10e98fb -r efc6f00f7c2a x11/xview-lib/patches/patch-cw
--- a/x11/xview-lib/patches/patch-cw    Tue Dec 12 10:40:27 2017 +0000
+++ b/x11/xview-lib/patches/patch-cw    Tue Dec 12 20:42:41 2017 +0000
@@ -1,8 +1,12 @@
-$NetBSD: patch-cw,v 1.5 2012/11/16 00:29:40 joerg Exp $
+$NetBSD: patch-cw,v 1.6 2017/12/12 20:42:41 hauke Exp $
 
 --- lib/libxview/textsw/txt_again.c.orig       1993-06-29 05:17:32.000000000 +0000
 +++ lib/libxview/textsw/txt_again.c
-@@ -28,6 +28,8 @@ Pkg_private CHAR    *STRNCPY();
+@@ -24,10 +24,11 @@ static char     sccsid[] = "@(#)txt_agai
+ #include <string.h>
+ #endif /* SVR4 */
+ 
+-Pkg_private CHAR    *STRNCPY();
  Pkg_private Es_index textsw_do_input();
  Pkg_private Es_index textsw_do_pending_delete();
  
@@ -11,7 +15,7 @@
  string_t        null_string = {0, 0, 0};
  
  #define       TEXT_DELIMITER  "\\"
-@@ -182,6 +184,7 @@ textsw_string_min_free(ptr_to_string, mi
+@@ -182,6 +183,7 @@ textsw_string_min_free(ptr_to_string, mi
   * Following is stolen from 3.2ALPHA sprintf(str, fmt, va_alist) SIDE_EFFECT:
   * TXTSW_STRING_FREE(ptr_to_string) is modified by this routine.
   */
@@ -19,7 +23,7 @@
  #ifndef SVR4
  
  /* VARARGS2 */
-@@ -325,6 +328,46 @@ va_dcl
+@@ -325,6 +327,46 @@ va_dcl
  
  #endif /* SVR4 */
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/libuuid libuuid: disable NLS for everyone for PL...
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/libuuid libuuid: on further thought, move nls di...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/libuuid libuuid: disable NLS for everyone for PL...
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/libuuid libuuid: on further thought, move nls di...
Indexes:
Home | Main Index | Thread Index | Old Index