CVS commit: pkgsrc/x11/xlax

["Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   vins
Date:           Mon Sep  8 10:19:58 UTC 2025

Modified Files:
        pkgsrc/x11/xlax: Makefile distinfo
        pkgsrc/x11/xlax/patches: patch-xlax.c
Added Files:
        pkgsrc/x11/xlax/patches: patch-lstddef.h
Removed Files:
        pkgsrc/x11/xlax/files: stddef.h

Log Message:
x11/xlax: fix build


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/xlax/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/xlax/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/xlax/files/stddef.h
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xlax/patches/patch-lstddef.h
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/xlax/patches/patch-xlax.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xlax/Makefile
diff -u pkgsrc/x11/xlax/Makefile:1.3 pkgsrc/x11/xlax/Makefile:1.4
--- pkgsrc/x11/xlax/Makefile:1.3        Mon Jul  3 11:29:04 2023
+++ pkgsrc/x11/xlax/Makefile    Mon Sep  8 10:19:58 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2023/07/03 11:29:04 vins Exp $
+# $NetBSD: Makefile,v 1.4 2025/09/08 10:19:58 vins Exp $
 
 DISTNAME=      xlax2.4
 PKGNAME=       xlax-2.4
@@ -22,9 +22,6 @@ INSTALLATION_DIRS+=   lib/X11/app-defaults
 
 REPLACE_PERL+= mkxlax
 
-post-patch:
-       ${RUN} ${CP} ${FILESDIR}/stddef.h ${WRKSRC}
-
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/xlax ${DESTDIR}${PREFIX}/bin
        ${INSTALL_SCRIPT} ${WRKSRC}/mkxlax ${DESTDIR}${PREFIX}/bin

Index: pkgsrc/x11/xlax/distinfo
diff -u pkgsrc/x11/xlax/distinfo:1.1 pkgsrc/x11/xlax/distinfo:1.2
--- pkgsrc/x11/xlax/distinfo:1.1        Tue Dec  6 21:04:13 2022
+++ pkgsrc/x11/xlax/distinfo    Mon Sep  8 10:19:58 2025
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.1 2022/12/06 21:04:13 vins Exp $
+$NetBSD: distinfo,v 1.2 2025/09/08 10:19:58 vins Exp $
 
 BLAKE2s (xlax2.4.tar.gz) = 90e7169a24fd5c1805ff27576b876cfbc4991be4e95e2bc58644a9d0fcffdb68
 SHA512 (xlax2.4.tar.gz) = 294aad75a5ca8dc396c6e07044f66b36e7a99d6cb10a3d89f39660223e0b5063d302b34dd804b272df9d951a7f2bcf1cf1c8a3746d97ae1fb836c9bbcc9e2dd9
 Size (xlax2.4.tar.gz) = 15804 bytes
+SHA1 (patch-lstddef.h) = 7457532f91fa78c1e6bc4e98f1e883bdbe93d3e1
 SHA1 (patch-vroot.h) = 86fd4d6637bf37503c21e1891e19bf0b8a579e5e
-SHA1 (patch-xlax.c) = d09739837c4307579a898a2da7d5031992a0d4ff
+SHA1 (patch-xlax.c) = 9f1cd7b833bf04a8400c323daa065d51c40e24ec
 SHA1 (patch-xlax.h) = e6e146997a48a2ed6f15b56657e6a911fedee9c9

Index: pkgsrc/x11/xlax/patches/patch-xlax.c
diff -u pkgsrc/x11/xlax/patches/patch-xlax.c:1.1 pkgsrc/x11/xlax/patches/patch-xlax.c:1.2
--- pkgsrc/x11/xlax/patches/patch-xlax.c:1.1    Tue Dec  6 21:04:14 2022
+++ pkgsrc/x11/xlax/patches/patch-xlax.c        Mon Sep  8 10:19:58 2025
@@ -1,24 +1,27 @@
-$NetBSD: patch-xlax.c,v 1.1 2022/12/06 21:04:14 vins Exp $
+$NetBSD: patch-xlax.c,v 1.2 2025/09/08 10:19:58 vins Exp $
 
 * Fix warnings about int signedness mismatch.
 * Fix warnings about int to pointer conversion. 
 * Use libbsd on Linux to support strlcpy().
+* Avoid implicit declaration of bcopy().
 
 --- xlax.c.orig        2008-07-31 20:18:25.000000000 +0000
 +++ xlax.c
-@@ -30,6 +30,11 @@
+@@ -30,6 +30,13 @@
   *
   */
  
++#include <strings.h>
++
 +#ifdef __linux__
 +#include <bsd/string.h>
 +#endif
 +
-+#include "stddef.h"
++#include "lstddef.h"
  #include "xlax.h"
  #include "vroot.h"
  
-@@ -50,7 +55,7 @@ XKeyEvent tmpevents[MAXEVENTS];
+@@ -50,7 +57,7 @@ XKeyEvent tmpevents[MAXEVENTS];
  int tmpeventindex;
  int tmpwindex;
    
@@ -27,7 +30,7 @@ $NetBSD: patch-xlax.c,v 1.1 2022/12/06 2
    WindowIndex;
  
  char *prefix="xlax:";
-@@ -70,7 +75,7 @@ XErrorEvent *myerr;
+@@ -70,7 +77,7 @@ XErrorEvent *myerr;
    XGetErrorText(mydisp, myerr->error_code, msg, 80);
    (void) fprintf(stderr, "%s\n", msg);
    if (myerr->error_code == BadWindow) {
@@ -36,7 +39,7 @@ $NetBSD: patch-xlax.c,v 1.1 2022/12/06 2
      Remove_Window(myerr->resourceid);
      return 0;
    } else {
-@@ -411,8 +416,8 @@ Display *dpy;
+@@ -411,8 +418,8 @@ Display *dpy;
  Window top;
  {
    Window *children, dummy;
@@ -47,7 +50,7 @@ $NetBSD: patch-xlax.c,v 1.1 2022/12/06 2
    Window w=0;
    XClassHint class_hint;
  
-@@ -674,7 +679,7 @@ Display *dpy;
+@@ -674,7 +681,7 @@ Display *dpy;
  int wi;
  char *str;
  {
@@ -56,7 +59,7 @@ $NetBSD: patch-xlax.c,v 1.1 2022/12/06 2
    long m;
    Window root = RootWindow(dpy,DefaultScreen(dpy));
  
-@@ -686,7 +691,7 @@ char *str;
+@@ -686,7 +693,7 @@ char *str;
    }
    for (i=0; i<strlen(str)&&i<MAXEVENTS; ++i) {
      /* skip if we don't have a keycode mapping for this character */
@@ -65,7 +68,7 @@ $NetBSD: patch-xlax.c,v 1.1 2022/12/06 2
        fprintf(stderr,"No key mapping for %c!\n", str[i]);
        continue;
      }
-@@ -702,8 +707,8 @@ char *str;
+@@ -702,8 +709,8 @@ char *str;
      Windows[wi].events[i].x_root=0;
      Windows[wi].events[i].y_root=0;
      Windows[wi].events[i].same_screen=1;
@@ -76,7 +79,7 @@ $NetBSD: patch-xlax.c,v 1.1 2022/12/06 2
    }
    Windows[wi].eventindex=i;
    cnt = 0;
-@@ -746,8 +751,8 @@ Display *disp;
+@@ -746,8 +753,8 @@ Display *disp;
        evt.state=states[m];
        len=XLookupString(&evt, out, 32, NULL, NULL);
        if (len == 1) {
@@ -87,7 +90,7 @@ $NetBSD: patch-xlax.c,v 1.1 2022/12/06 2
        }
      }
    }
-@@ -759,7 +764,7 @@ unsigned char c;
+@@ -759,7 +766,7 @@ unsigned char c;
  long *m;
  {
    KeySym ks, ksr;
@@ -96,7 +99,7 @@ $NetBSD: patch-xlax.c,v 1.1 2022/12/06 2
    XKeyEvent evt;
    long mr, len;
    char str[2], out[32];
-@@ -802,11 +807,11 @@ long *m;
+@@ -802,11 +809,11 @@ long *m;
        *m = ShiftMask | ControlMask;
        return(kc);
      }
@@ -110,7 +113,7 @@ $NetBSD: patch-xlax.c,v 1.1 2022/12/06 2
      *m = 0;
      return(0);
    } else {
-@@ -826,7 +831,7 @@ long *m;
+@@ -826,7 +833,7 @@ long *m;
        *m = ShiftMask;
        return(kc);
      }
@@ -119,7 +122,7 @@ $NetBSD: patch-xlax.c,v 1.1 2022/12/06 2
      *m = 0;
      return(0);
    }
-@@ -882,7 +887,7 @@ long *m;
+@@ -882,7 +889,7 @@ long *m;
        *m = ShiftMask | ControlMask;
        return(kc);
      }
@@ -128,7 +131,7 @@ $NetBSD: patch-xlax.c,v 1.1 2022/12/06 2
      *m = ControlMask;
      return(0);
    } else {
-@@ -902,7 +907,7 @@ long *m;
+@@ -902,7 +909,7 @@ long *m;
        *m = ShiftMask;
        return(kc);
      }
@@ -137,7 +140,7 @@ $NetBSD: patch-xlax.c,v 1.1 2022/12/06 2
      *m = 0;
      return(0);
    }
-@@ -1040,7 +1045,8 @@ caddr_t  client_data;    /* unused */
+@@ -1040,7 +1047,8 @@ caddr_t  client_data;    /* unused */
  caddr_t  call_data;   /* unused */
  
  {
@@ -147,7 +150,7 @@ $NetBSD: patch-xlax.c,v 1.1 2022/12/06 2
    char *sel;
    XKeyEvent evt;
    long m;
-@@ -1052,7 +1058,7 @@ caddr_t  call_data;      /* unused */
+@@ -1052,7 +1060,7 @@ caddr_t  call_data;      /* unused */
      if (Windows[x].active == 1) {
        for (y = 0; y < strlen(sel); y++) {
        /* skip if we don't have a keycode mapping for this character */
@@ -156,7 +159,7 @@ $NetBSD: patch-xlax.c,v 1.1 2022/12/06 2
          fprintf(stderr,"No key mapping for %c!\n", sel[y]);
          continue;
        }
-@@ -1068,8 +1074,8 @@ caddr_t  call_data;      /* unused */
+@@ -1068,8 +1076,8 @@ caddr_t  call_data;      /* unused */
        evt.x_root=0;
        evt.y_root=0;
        evt.same_screen=1;

Added files:

Index: pkgsrc/x11/xlax/patches/patch-lstddef.h
diff -u /dev/null pkgsrc/x11/xlax/patches/patch-lstddef.h:1.1
--- /dev/null   Mon Sep  8 10:19:58 2025
+++ pkgsrc/x11/xlax/patches/patch-lstddef.h     Mon Sep  8 10:19:58 2025
@@ -0,0 +1,37 @@
+$NetBSD: patch-lstddef.h,v 1.1 2025/09/08 10:19:58 vins Exp $
+
+Silence makedepend warnings.
+
+--- lstddef.h.orig     2025-09-08 10:09:03.437374637 +0000
++++ lstddef.h
+@@ -0,0 +1,30 @@
++/*
++ * stddef.h
++ *
++ * Prepocessor defined type definitions.
++ *
++ */
++
++#ifndef __PTRDIFF_TYPE__
++#define __PTRDIFF_TYPE__ long int
++#endif
++typedef __PTRDIFF_TYPE__ ptrdiff_t;
++
++#ifndef __SIZE_TYPE__
++#define __SIZE_TYPE__ long unsigned int
++#endif
++#if !(defined (__GNUG__) && defined (size_t))
++typedef __SIZE_TYPE__ size_t;
++#endif
++
++#ifndef __WCHAR_TYPE__
++#define __WCHAR_TYPE__ int
++#endif
++#ifndef __cplusplus
++typedef __WCHAR_TYPE__ wchar_t;
++#endif
++
++#ifndef __WINT_TYPE__
++#define __WINT_TYPE__ unsigned int
++#endif
++typedef __WINT_TYPE__ wint_t;