pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
xlax: remove, imported in the main tree.
Module Name: pkgsrc-wip
Committed By: Paolo Vincenzo Olivo <vins%NetBSD.org@localhost>
Pushed By: vms
Date: Tue Dec 6 23:32:43 2022 +0100
Changeset: eb9a4783a4ca6da5ec7f254b3004e6ff84af0b04
Removed Files:
xlax/DESCR
xlax/Makefile
xlax/PLIST
xlax/distinfo
xlax/files/stddef.h
xlax/files/xlax.ad
xlax/patches/patch-vroot.h
xlax/patches/patch-xlax.c
xlax/patches/patch-xlax.h
Log Message:
xlax: remove, imported in the main tree.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=eb9a4783a4ca6da5ec7f254b3004e6ff84af0b04
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
xlax/DESCR | 10 ---
xlax/Makefile | 49 -------------
xlax/PLIST | 6 --
xlax/distinfo | 8 ---
xlax/files/stddef.h | 30 --------
xlax/files/xlax.ad | 10 ---
xlax/patches/patch-vroot.h | 15 ----
xlax/patches/patch-xlax.c | 169 ---------------------------------------------
xlax/patches/patch-xlax.h | 19 -----
9 files changed, 316 deletions(-)
diffs:
diff --git a/xlax/DESCR b/xlax/DESCR
deleted file mode 100644
index 5c454f1da1..0000000000
--- a/xlax/DESCR
+++ /dev/null
@@ -1,10 +0,0 @@
-xlax is an X11 input multiplexer: keyboard input can be set from a xlax
-instance to a group of windows simultaneously. The tool is designed for
-system administrators who typically have to do the same thing on several
-machines (or in several different directories).
-Windows can be added or deleted interactively, or temporarily
-disconnected and reconnected.
-xlax allows the user to assign a custom string to each window (e.g. a
-hostname) that can be sent with a button click.
-An included script handles starting up and arranging windows, and
-permits to define commonly used window groupings in a config file.
diff --git a/xlax/Makefile b/xlax/Makefile
deleted file mode 100644
index 15041276a3..0000000000
--- a/xlax/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD$
-
-DISTNAME= xlax2.4
-PKGNAME= xlax-2.4
-CATEGORIES= x11
-MASTER_SITES= http://hea-www.harvard.edu/~fine/Tech/
-
-MAINTAINER= vms%retrobsd.ddns.net@localhost
-HOMEPAGE= https://hea-www.harvard.edu/~fine/Tech/xlax.html
-COMMENT= Multi-window input software
-LICENSE= mit
-
-USE_IMAKE= yes
-
-MAKE_FLAGS+= CCOPTIONS=${CFLAGS:Q}
-MAKE_FLAGS+= LOCAL_LDFLAGS=${LDFLAGS:Q}
-
-INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
-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
-
-.for m in xlax mkxlax
- ${INSTALL_MAN} ${WRKSRC}/${m}.man \
- ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${m}.1
-.endfor
-
-post-install:
- ${INSTALL_DATA} ${FILESDIR}/xlax.ad \
- ${DESTDIR}${PREFIX}/lib/X11/app-defaults/Xlax
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Linux" # strlcpy()
-.include "../../devel/libbsd/buildlink3.mk"
-.endif
-
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXmu/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/xlax/PLIST b/xlax/PLIST
deleted file mode 100644
index ea0a28d3e2..0000000000
--- a/xlax/PLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-@comment $NetBSD$
-bin/mkxlax
-bin/xlax
-lib/X11/app-defaults/Xlax
-man/man1/mkxlax.1
-man/man1/xlax.1
diff --git a/xlax/distinfo b/xlax/distinfo
deleted file mode 100644
index 317f2d02a7..0000000000
--- a/xlax/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD$
-
-BLAKE2s (xlax2.4.tar.gz) = 90e7169a24fd5c1805ff27576b876cfbc4991be4e95e2bc58644a9d0fcffdb68
-SHA512 (xlax2.4.tar.gz) = 294aad75a5ca8dc396c6e07044f66b36e7a99d6cb10a3d89f39660223e0b5063d302b34dd804b272df9d951a7f2bcf1cf1c8a3746d97ae1fb836c9bbcc9e2dd9
-Size (xlax2.4.tar.gz) = 15804 bytes
-SHA1 (patch-vroot.h) = 86fd4d6637bf37503c21e1891e19bf0b8a579e5e
-SHA1 (patch-xlax.c) = d09739837c4307579a898a2da7d5031992a0d4ff
-SHA1 (patch-xlax.h) = e6e146997a48a2ed6f15b56657e6a911fedee9c9
diff --git a/xlax/files/stddef.h b/xlax/files/stddef.h
deleted file mode 100644
index e01be3a3c1..0000000000
--- a/xlax/files/stddef.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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;
diff --git a/xlax/files/xlax.ad b/xlax/files/xlax.ad
deleted file mode 100644
index b78d445406..0000000000
--- a/xlax/files/xlax.ad
+++ /dev/null
@@ -1,10 +0,0 @@
-! X11 Resources for xlax multi window input utility
-!Default Green on Black, Black on Grey is commented out if you prefer
-
-xlax*foreground: green
-xlax*borderPixmap: gradient:horizontal?dimension=1&start=green&end=green
-xlax*background: black
-
-!xlax*foreground: black
-!xlax*borderPixmap: gradient:horizontal?dimension=512&start=gray40&end=gray20
-!xlax*background: gray
diff --git a/xlax/patches/patch-vroot.h b/xlax/patches/patch-vroot.h
deleted file mode 100644
index 605e49b56b..0000000000
--- a/xlax/patches/patch-vroot.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Fix compile-time warnings.
-
---- vroot.h.orig 2008-07-31 20:18:25.000000000 +0000
-+++ vroot.h
-@@ -75,7 +75,7 @@ VirtualRootWindowOfScreen(screen)
- if (screen != save_screen) {
- Display *dpy = DisplayOfScreen(screen);
- Atom __SWM_VROOT = None;
-- int i;
-+ unsigned int i;
- Window rootReturn, parentReturn, *children;
- unsigned int numChildren;
-
diff --git a/xlax/patches/patch-xlax.c b/xlax/patches/patch-xlax.c
deleted file mode 100644
index f0b9ca42f4..0000000000
--- a/xlax/patches/patch-xlax.c
+++ /dev/null
@@ -1,169 +0,0 @@
-$NetBSD$
-
-* Fix warnings about int signedness mismatch.
-* Fix warnings about int to pointer conversion.
-* Use libbsd on Linux to support strlcpy().
-
---- xlax.c.orig 2008-07-31 20:18:25.000000000 +0000
-+++ xlax.c
-@@ -30,6 +30,11 @@
- *
- */
-
-+#ifdef __linux__
-+#include <bsd/string.h>
-+#endif
-+
-+#include "stddef.h"
- #include "xlax.h"
- #include "vroot.h"
-
-@@ -50,7 +55,7 @@ XKeyEvent tmpevents[MAXEVENTS];
- int tmpeventindex;
- int tmpwindex;
-
--int
-+uintptr_t
- WindowIndex;
-
- char *prefix="xlax:";
-@@ -70,7 +75,7 @@ XErrorEvent *myerr;
- XGetErrorText(mydisp, myerr->error_code, msg, 80);
- (void) fprintf(stderr, "%s\n", msg);
- if (myerr->error_code == BadWindow) {
-- fprintf(stderr, "Removing window %d\n", myerr->resourceid);
-+ fprintf(stderr, "Removing window %lu\n", (unsigned long)myerr->resourceid);
- Remove_Window(myerr->resourceid);
- return 0;
- } else {
-@@ -411,8 +416,8 @@ Display *dpy;
- Window top;
- {
- Window *children, dummy;
-- unsigned int nchildren;
-- int i, x;
-+ unsigned int i, nchildren;
-+ int x;
- Window w=0;
- XClassHint class_hint;
-
-@@ -674,7 +679,7 @@ Display *dpy;
- int wi;
- char *str;
- {
-- int i;
-+ size_t i;
- long m;
- Window root = RootWindow(dpy,DefaultScreen(dpy));
-
-@@ -686,7 +691,7 @@ char *str;
- }
- for (i=0; i<strlen(str)&&i<MAXEVENTS; ++i) {
- /* skip if we don't have a keycode mapping for this character */
-- if (kcmap[str[i]] < 0) {
-+ if (kcmap[(unsigned char)str[i]] < 0) {
- fprintf(stderr,"No key mapping for %c!\n", str[i]);
- continue;
- }
-@@ -702,8 +707,8 @@ char *str;
- Windows[wi].events[i].x_root=0;
- Windows[wi].events[i].y_root=0;
- Windows[wi].events[i].same_screen=1;
-- Windows[wi].events[i].keycode=kcmap[str[i]];
-- Windows[wi].events[i].state=modmap[str[i]];
-+ Windows[wi].events[i].keycode=kcmap[(unsigned char)str[i]];
-+ Windows[wi].events[i].state=modmap[(unsigned char)str[i]];
- }
- Windows[wi].eventindex=i;
- cnt = 0;
-@@ -746,8 +751,8 @@ Display *disp;
- evt.state=states[m];
- len=XLookupString(&evt, out, 32, NULL, NULL);
- if (len == 1) {
-- kcmap[out[0]] = i;
-- modmap[out[0]] = states[m];
-+ kcmap[(unsigned char)out[0]] = i;
-+ modmap[(unsigned char)out[0]] = states[m];
- }
- }
- }
-@@ -759,7 +764,7 @@ unsigned char c;
- long *m;
- {
- KeySym ks, ksr;
-- KeyCode kc;
-+ KeyCode kc = -1;
- XKeyEvent evt;
- long mr, len;
- char str[2], out[32];
-@@ -802,11 +807,11 @@ long *m;
- *m = ShiftMask | ControlMask;
- return(kc);
- }
-- fprintf(stderr, "Didn't resolve keycode! (c=%d, ks=%d,kc=%d\n",c,ks,kc);
-+ fprintf(stderr, "Didn't resolve keycode! (c=%d, ks=%lu,kc=%d\n",c,(unsigned long)ks,kc);
- *m = ControlMask;
- return(0);
- } else if (c>127) {
-- fprintf(stderr, "Didn't resolve keycode! (c=%d, ks=%d,kc=%d\n",c,ks,kc);
-+ fprintf(stderr, "Didn't resolve keycode! (c=%d, ks=%lu,kc=%d\n",c,(unsigned long)ks,kc);
- *m = 0;
- return(0);
- } else {
-@@ -826,7 +831,7 @@ long *m;
- *m = ShiftMask;
- return(kc);
- }
-- fprintf(stderr, "Didn't resolve keycode! (c=%d, ks=%d,kc=%d\n",c,ks,kc);
-+ fprintf(stderr, "Didn't resolve keycode! (c=%d, ks=%lu,kc=%d\n",c,(unsigned long)ks,kc);
- *m = 0;
- return(0);
- }
-@@ -882,7 +887,7 @@ long *m;
- *m = ShiftMask | ControlMask;
- return(kc);
- }
-- fprintf(stderr, "Didn't resolve keycode! (c=%d, ks=%d,kc=%d\n",c,ks,kc);
-+ fprintf(stderr, "Didn't resolve keycode! (c=%d, ks=%lu,kc=%d\n",c,(unsigned long)ks,kc);
- *m = ControlMask;
- return(0);
- } else {
-@@ -902,7 +907,7 @@ long *m;
- *m = ShiftMask;
- return(kc);
- }
-- fprintf(stderr, "Didn't resolve keycode! (c=%d, ks=%d,kc=%d\n",c,ks,kc);
-+ fprintf(stderr, "Didn't resolve keycode! (c=%d, ks=%lu,kc=%d\n",c,(unsigned long)ks,kc);
- *m = 0;
- return(0);
- }
-@@ -1040,7 +1045,8 @@ caddr_t client_data; /* unused */
- caddr_t call_data; /* unused */
-
- {
-- int x, y, n;
-+ int x, n;
-+ size_t y;
- char *sel;
- XKeyEvent evt;
- long m;
-@@ -1052,7 +1058,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 */
-- if (kcmap[sel[y]] < 0) {
-+ if (kcmap[(unsigned char)sel[y]] < 0) {
- fprintf(stderr,"No key mapping for %c!\n", sel[y]);
- continue;
- }
-@@ -1068,8 +1074,8 @@ caddr_t call_data; /* unused */
- evt.x_root=0;
- evt.y_root=0;
- evt.same_screen=1;
-- evt.keycode=kcmap[sel[y]];
-- evt.state=modmap[sel[y]];
-+ evt.keycode=kcmap[(unsigned char)sel[y]];
-+ evt.state=modmap[(unsigned char)sel[y]];
-
- XSendEvent(dpy, Windows[x].wind, True,
- KeyPressMask, (XEvent *) &evt);
diff --git a/xlax/patches/patch-xlax.h b/xlax/patches/patch-xlax.h
deleted file mode 100644
index 1ae5aac369..0000000000
--- a/xlax/patches/patch-xlax.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD$
-
-Avoid redefinitions.
-
---- xlax.h.orig 2008-07-31 20:18:25.000000000 +0000
-+++ xlax.h
-@@ -39,8 +39,12 @@
- #include <X11/Xmu/WinUtil.h>
-
- #include <X11/cursorfont.h>
-+#ifndef XK_MISCELLANY
- #define XK_MISCELLANY 1
-+#endif
-+#ifndef XK_LATIN1
- #define XK_LATIN1 1
-+#endif
- #include <X11/keysymdef.h>
-
- #include <stdlib.h>
Home |
Main Index |
Thread Index |
Old Index