CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src Committed By: christos Date: Tue Nov 12 21:02:46 UTC 2019 Modified Files: src/external/bsd/tmux/usr.bin/tmux: Makefile Log Message: new files and bump version To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/external/bsd/tmux/usr.bin/tmux/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src Committed By: christos Date: Tue Nov 12 21:02:46 UTC 2019 Modified Files: src/external/bsd/tmux/usr.bin/tmux: Makefile Log Message: new files and bump version To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/external/bsd/tmux/usr.bin/tmux/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/tmux/usr.bin/tmux/Makefile diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.22 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.23 --- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.22 Sun Oct 13 03:28:07 2019 +++ src/external/bsd/tmux/usr.bin/tmux/Makefile Tue Nov 12 16:02:46 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2019/10/13 07:28:07 mrg Exp $ +# $NetBSD: Makefile,v 1.23 2019/11/12 21:02:46 christos Exp $ .include @@ -56,6 +56,7 @@ cmd-refresh-client.c \ cmd-rename-session.c \ cmd-rename-window.c \ cmd-resize-pane.c \ +cmd-resize-window.c \ cmd-respawn-pane.c \ cmd-respawn-window.c \ cmd-rotate-window.c \ @@ -86,6 +87,7 @@ control-notify.c \ control.c \ environ.c \ format.c \ +format-draw.c \ grid-view.c \ grid.c \ hooks.c \ @@ -206,13 +208,13 @@ CPPFLAGS+= \ -DPACKAGE=\"tmux\" \ -DPACKAGE_BUGREPORT=\"\" \ -DPACKAGE_NAME=\"tmux\" \ --DPACKAGE_STRING=\"tmux\ 2.8\" \ +-DPACKAGE_STRING=\"tmux\ 2.9a\" \ -DPACKAGE_TARNAME=\"tmux\" \ -DPACKAGE_URL=\"\" \ --DPACKAGE_VERSION=\"2.8\" \ +-DPACKAGE_VERSION=\"2.9a\" \ -DSTDC_HEADERS=1 \ -DTMUX_CONF="\"/etc/tmux.conf\"" \ --DVERSION=\"2.8\" \ +-DVERSION=\"2.9a\" \ -D_ALL_SOURCE=1 \ -D_GNU_SOURCE=1 \ -D_OPENBSD_SOURCE \
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src
Committed By: uwe
Date: Thu Jan 4 13:20:22 UTC 2024
Modified Files:
src/external/bsd/tmux/usr.bin/tmux: Makefile
Log Message:
tmux: perform substitution(s) in the man page
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/external/bsd/tmux/usr.bin/tmux/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tmux/usr.bin/tmux/Makefile
diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.31 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.32
--- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.31 Wed Jun 28 22:47:39 2023
+++ src/external/bsd/tmux/usr.bin/tmux/Makefile Thu Jan 4 13:20:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2023/06/28 22:47:39 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2024/01/04 13:20:22 uwe Exp $
.include
@@ -247,4 +247,10 @@ COPTS.tty.c += -Wno-pointer-sign
COPTS.utempter.c+= ${CC_WNO_STRINGOP_TRUNCATION}
COPTS.window-copy.c+= ${CC_WNO_MAYBE_UNINITIALIZED} -Wno-pointer-sign
+# The man page needs substitutions, but the dist file usurps the
+# output file suffix.
+.NOPATH: tmux.1
+tmux.1: $(SRCDIR)/tmux.1
+ sed -e 's|@SYSCONFDIR@|/etc|g' $> > $@
+
.include
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src Committed By: uwe Date: Thu Jan 4 13:20:22 UTC 2024 Modified Files: src/external/bsd/tmux/usr.bin/tmux: Makefile Log Message: tmux: perform substitution(s) in the man page To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/external/bsd/tmux/usr.bin/tmux/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src Committed By: wiz Date: Wed Jun 28 22:21:48 UTC 2023 Modified Files: src/external/bsd/tmux/usr.bin/tmux: Makefile Log Message: update build system for tmux 3.3a To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/external/bsd/tmux/usr.bin/tmux/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src
Committed By: wiz
Date: Wed Jun 28 22:21:48 UTC 2023
Modified Files:
src/external/bsd/tmux/usr.bin/tmux: Makefile
Log Message:
update build system for tmux 3.3a
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/external/bsd/tmux/usr.bin/tmux/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tmux/usr.bin/tmux/Makefile
diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.29 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.30
--- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.29 Sat Jun 3 09:09:05 2023
+++ src/external/bsd/tmux/usr.bin/tmux/Makefile Wed Jun 28 22:21:48 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2023/06/03 09:09:05 lukem Exp $
+# $NetBSD: Makefile,v 1.30 2023/06/28 22:21:48 wiz Exp $
.include
@@ -67,12 +67,14 @@ cmd-select-layout.c \
cmd-select-pane.c \
cmd-select-window.c \
cmd-send-keys.c \
+cmd-server-access.c \
cmd-set-buffer.c \
cmd-set-environment.c \
cmd-set-option.c \
cmd-show-environment.c \
cmd-show-messages.c \
cmd-show-options.c \
+cmd-show-prompt-history.c \
cmd-source-file.c \
cmd-split-window.c \
cmd-swap-pane.c \
@@ -115,6 +117,7 @@ resize.c \
screen-redraw.c \
screen-write.c \
screen.c \
+server-acl.c \
server-client.c \
server-fn.c \
server.c \
@@ -160,13 +163,13 @@ CPPFLAGS+= -I${SRCDIR} -I${.CURDIR}
# Would be nicer to stick this in a config.h file, but the upstream code
# does not use one at this moment.
+# HAVE_VIS and HAVE_TREE_H added manually; HAVE_BSD_GETOPT_H necessary due to local patches
CPPFLAGS+= \
-DHAVE_ASPRINTF=1 \
-DHAVE_B64_NTOP=1 \
-DHAVE_BITSTRING_H=1 \
-DHAVE_BSD_GETOPT=1 \
-DHAVE_CFMAKERAW=1 \
--DHAVE_CFMAKERAWEP=1 \
-DHAVE_CLOCK_GETTIME=1 \
-DHAVE_CLOSEFROM=1 \
-DHAVE_CURSES_H=1 \
@@ -178,10 +181,9 @@ CPPFLAGS+= \
-DHAVE_FGETLN=1 \
-DHAVE_FLOCK=1 \
-DHAVE_FORKPTY=1 \
--DHAVE_FPARSELN=1 \
-DHAVE_GETDTABLESIZE=1 \
-DHAVE_GETLINE=1 \
--DHAVE_GETOPT=1 \
+-DHAVE_GETPEEREID=1 \
-DHAVE_GETPROGNAME=1 \
-DHAVE_INTTYPES_H=1 \
-DHAVE_LIBM=1 \
@@ -191,7 +193,6 @@ CPPFLAGS+= \
-DHAVE_PATHS_H=1 \
-DHAVE_PROC_PID=1 \
-DHAVE_QUEUE_H=1 \
--DHAVE_REALLOCARRAY=1 \
-DHAVE_SETENV=1 \
-DHAVE_SETPROCTITLE=1 \
-DHAVE_STDINT_H=1 \
@@ -212,35 +213,37 @@ CPPFLAGS+= \
-DHAVE_SYS_TYPES_H=1 \
-DHAVE_TREE_H=1 \
-DHAVE_UNISTD_H=1 \
--DHAVE_UTEMPTER=1 \
-DHAVE_UTIL_H=1 \
-DHAVE_VIS=1 \
-DHAVE___PROGNAME=1 \
-DPACKAGE=\"tmux\" \
-DPACKAGE_BUGREPORT=\"\" \
-DPACKAGE_NAME=\"tmux\" \
--DPACKAGE_STRING=\"tmux\ 3.2a\" \
+-DPACKAGE_STRING=\"tmux\ 3.3a\" \
-DPACKAGE_TARNAME=\"tmux\" \
-DPACKAGE_URL=\"\" \
--DPACKAGE_VERSION=\"3.2a\" \
+-DPACKAGE_VERSION=\"3.3a\" \
-DSTDC_HEADERS=1 \
--DTMUX_CONF="\"/etc/tmux.conf:~/.tmux.conf:~/.config/tmux/tmux.conf\"" \
--DTMUX_VERSION='"3.2a"' \
--DVERSION=\"3.2a\" \
+-DTMUX_CONF='"/etc/tmux.conf:~/.tmux.conf:$XDG_CONFIG_HOME/tmux/tmux.conf:~/.config/tmux/tmux.conf"' \
+-DTMUX_TERM='"tmux-256color"' \
+-DTMUX_VERSION='"3.3a"' \
+-DVERSION=\"3.3a\" \
-D_ALL_SOURCE=1 \
+-D_FORTIFY_SOURCE=2 \
-D_GNU_SOURCE=1 \
--D_NETBSD_SOURCE \
-D_OPENBSD_SOURCE \
-D_POSIX_PTHREAD_SEMANTICS=1 \
-D_TANDEM_SOURCE=1 \
--D_XOPEN_SOURCE=500 \
-D__EXTENSIONS__=1
LDADD+= -levent -lterminfo -lutil -lm
DPADD+= ${LIBEVENT} ${LIBTERMINFO} ${LIBUTIL}
COPTS.format.c += -Wno-format-nonliteral
+COPTS.input.c += -Wno-sign-compare -Wno-pointer-sign
+COPTS.notify.c += -Wno-sign-compare
+COPTS.tty.c += -Wno-pointer-sign
COPTS.utempter.c+= ${CC_WNO_STRINGOP_TRUNCATION}
-COPTS.window-copy.c+= ${CC_WNO_MAYBE_UNINITIALIZED}
+COPTS.window-copy.c+= ${CC_WNO_MAYBE_UNINITIALIZED} -Wno-pointer-sign
.include
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src Committed By: wiz Date: Wed Jun 28 22:47:39 UTC 2023 Modified Files: src/external/bsd/tmux/usr.bin/tmux: Makefile Log Message: tmux: also set HAVE_REALLOCARRAY To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/external/bsd/tmux/usr.bin/tmux/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src
Committed By: wiz
Date: Wed Jun 28 22:47:39 UTC 2023
Modified Files:
src/external/bsd/tmux/usr.bin/tmux: Makefile
Log Message:
tmux: also set HAVE_REALLOCARRAY
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/external/bsd/tmux/usr.bin/tmux/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tmux/usr.bin/tmux/Makefile
diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.30 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.31
--- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.30 Wed Jun 28 22:21:48 2023
+++ src/external/bsd/tmux/usr.bin/tmux/Makefile Wed Jun 28 22:47:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2023/06/28 22:21:48 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2023/06/28 22:47:39 wiz Exp $
.include
@@ -163,7 +163,7 @@ CPPFLAGS+= -I${SRCDIR} -I${.CURDIR}
# Would be nicer to stick this in a config.h file, but the upstream code
# does not use one at this moment.
-# HAVE_VIS and HAVE_TREE_H added manually; HAVE_BSD_GETOPT_H necessary due to local patches
+# HAVE_REALLOCARRAY, HAVE_TREE_H, HAVE_VIS added manually; HAVE_BSD_GETOPT_H necessary due to local patches
CPPFLAGS+= \
-DHAVE_ASPRINTF=1 \
-DHAVE_B64_NTOP=1 \
@@ -193,6 +193,7 @@ CPPFLAGS+= \
-DHAVE_PATHS_H=1 \
-DHAVE_PROC_PID=1 \
-DHAVE_QUEUE_H=1 \
+-DHAVE_REALLOCARRAY=1 \
-DHAVE_SETENV=1 \
-DHAVE_SETPROCTITLE=1 \
-DHAVE_STDINT_H=1 \
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src Committed By: wiz Date: Sat Jun 22 20:08:16 UTC 2024 Modified Files: src/external/bsd/tmux/usr.bin/tmux: Makefile Log Message: Adapt build for tmux 3.4. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/external/bsd/tmux/usr.bin/tmux/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src
Committed By: wiz
Date: Sat Jun 22 20:08:16 UTC 2024
Modified Files:
src/external/bsd/tmux/usr.bin/tmux: Makefile
Log Message:
Adapt build for tmux 3.4.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/external/bsd/tmux/usr.bin/tmux/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tmux/usr.bin/tmux/Makefile
diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.32 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.33
--- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.32 Thu Jan 4 13:20:22 2024
+++ src/external/bsd/tmux/usr.bin/tmux/Makefile Sat Jun 22 20:08:16 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2024/01/04 13:20:22 uwe Exp $
+# $NetBSD: Makefile,v 1.33 2024/06/22 20:08:16 wiz Exp $
.include
@@ -93,6 +93,9 @@ format.c \
grid-reader.c \
grid-view.c \
grid.c \
+hyperlinks.c \
+image.c \
+image-sixel.c \
input-keys.c \
input.c \
job.c \
@@ -132,6 +135,7 @@ tty-keys.c \
tty-term.c \
tty.c \
utf8.c \
+utf8-combined.c \
window-buffer.c \
window-client.c \
window-clock.c \
@@ -150,6 +154,8 @@ SRCS+= imsg.c
SRCS+= fdforkpty.c
SRCS+= freezero.c
SRCS+= explicit_bzero.c
+SRCS+= htonll.c
+SRCS+= ntohll.c
SRCS+= recallocarray.c
SRCS+= getdtablecount.c
#SRCS+= strtonum.c
@@ -163,7 +169,7 @@ CPPFLAGS+= -I${SRCDIR} -I${.CURDIR}
# Would be nicer to stick this in a config.h file, but the upstream code
# does not use one at this moment.
-# HAVE_REALLOCARRAY, HAVE_TREE_H, HAVE_VIS added manually; HAVE_BSD_GETOPT_H necessary due to local patches
+# HAVE_REALLOCARRAY, HAVE_TREE_H, HAVE_VIS added manually; HAVE_BSD_GETOPT necessary due to local patches
CPPFLAGS+= \
-DHAVE_ASPRINTF=1 \
-DHAVE_B64_NTOP=1 \
@@ -175,6 +181,7 @@ CPPFLAGS+= \
-DHAVE_CURSES_H=1 \
-DHAVE_DAEMON=1 \
-DHAVE_DIRENT_H=1 \
+-DENABLE_SIXEL=1 \
-DHAVE_EVENT2_EVENT_H=1 \
-DHAVE_FCNTL_CLOSEM=1 \
-DHAVE_FCNTL_H=1 \
@@ -212,6 +219,7 @@ CPPFLAGS+= \
-DHAVE_SYS_STAT_H=1 \
-DHAVE_SYS_TREE_H=1 \
-DHAVE_SYS_TYPES_H=1 \
+-DHAVE_TIPARM=1 \
-DHAVE_TREE_H=1 \
-DHAVE_UNISTD_H=1 \
-DHAVE_UTIL_H=1 \
@@ -220,17 +228,17 @@ CPPFLAGS+= \
-DPACKAGE=\"tmux\" \
-DPACKAGE_BUGREPORT=\"\" \
-DPACKAGE_NAME=\"tmux\" \
--DPACKAGE_STRING=\"tmux\ 3.3a\" \
+-DPACKAGE_STRING=\"tmux\ 3.4\" \
-DPACKAGE_TARNAME=\"tmux\" \
-DPACKAGE_URL=\"\" \
--DPACKAGE_VERSION=\"3.3a\" \
+-DPACKAGE_VERSION=\"3.4\" \
-DSTDC_HEADERS=1 \
-DTMUX_CONF='"/etc/tmux.conf:~/.tmux.conf:$XDG_CONFIG_HOME/tmux/tmux.conf:~/.config/tmux/tmux.conf"' \
+-DTMUX_LOCK_CMD='"lock -np"' \
-DTMUX_TERM='"tmux-256color"' \
--DTMUX_VERSION='"3.3a"' \
--DVERSION=\"3.3a\" \
+-DTMUX_VERSION='"3.4"' \
+-DVERSION=\"3.4\" \
-D_ALL_SOURCE=1 \
--D_FORTIFY_SOURCE=2 \
-D_GNU_SOURCE=1 \
-D_OPENBSD_SOURCE \
-D_POSIX_PTHREAD_SEMANTICS=1 \
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src
Committed By: wiz
Date: Sat Jun 22 23:49:17 UTC 2024
Modified Files:
src/external/bsd/tmux/usr.bin/tmux: Makefile
Log Message:
notify.c is now sign-compare-safe
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/external/bsd/tmux/usr.bin/tmux/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tmux/usr.bin/tmux/Makefile
diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.33 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.34
--- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.33 Sat Jun 22 20:08:16 2024
+++ src/external/bsd/tmux/usr.bin/tmux/Makefile Sat Jun 22 23:49:17 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2024/06/22 20:08:16 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2024/06/22 23:49:17 wiz Exp $
.include
@@ -250,7 +250,6 @@ DPADD+= ${LIBEVENT} ${LIBTERMINFO} ${LI
COPTS.format.c += -Wno-format-nonliteral
COPTS.input.c += -Wno-sign-compare -Wno-pointer-sign
-COPTS.notify.c += -Wno-sign-compare
COPTS.tty.c += -Wno-pointer-sign
COPTS.utempter.c+= ${CC_WNO_STRINGOP_TRUNCATION}
COPTS.window-copy.c+= ${CC_WNO_MAYBE_UNINITIALIZED} -Wno-pointer-sign
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src Committed By: wiz Date: Sat Jun 22 23:49:17 UTC 2024 Modified Files: src/external/bsd/tmux/usr.bin/tmux: Makefile Log Message: notify.c is now sign-compare-safe To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/external/bsd/tmux/usr.bin/tmux/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src
Committed By: wiz
Date: Sat Jun 22 23:51:26 UTC 2024
Modified Files:
src/external/bsd/tmux/usr.bin/tmux: Makefile
Log Message:
add generated tmux.1 to CLEANDIRFILES so it gets removed too
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/external/bsd/tmux/usr.bin/tmux/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tmux/usr.bin/tmux/Makefile
diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.34 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.35
--- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.34 Sat Jun 22 23:49:17 2024
+++ src/external/bsd/tmux/usr.bin/tmux/Makefile Sat Jun 22 23:51:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2024/06/22 23:49:17 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2024/06/22 23:51:26 wiz Exp $
.include
@@ -260,4 +260,6 @@ COPTS.window-copy.c+= ${CC_WNO_MAYBE_UNI
tmux.1: $(SRCDIR)/tmux.1
sed -e 's|@SYSCONFDIR@|/etc|g' $> > $@
+CLEANDIRFILES+= tmux.1
+
.include
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src Committed By: wiz Date: Sat Jun 22 23:51:26 UTC 2024 Modified Files: src/external/bsd/tmux/usr.bin/tmux: Makefile Log Message: add generated tmux.1 to CLEANDIRFILES so it gets removed too To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/external/bsd/tmux/usr.bin/tmux/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src Committed By: wiz Date: Sun Jun 23 06:27:38 UTC 2024 Modified Files: src/external/bsd/tmux/usr.bin/tmux: Makefile Log Message: Explain HAVE_VIS situation in a comment To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/external/bsd/tmux/usr.bin/tmux/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/tmux/usr.bin/tmux
Module Name:src
Committed By: wiz
Date: Sun Jun 23 06:27:38 UTC 2024
Modified Files:
src/external/bsd/tmux/usr.bin/tmux: Makefile
Log Message:
Explain HAVE_VIS situation in a comment
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/external/bsd/tmux/usr.bin/tmux/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/tmux/usr.bin/tmux/Makefile
diff -u src/external/bsd/tmux/usr.bin/tmux/Makefile:1.35 src/external/bsd/tmux/usr.bin/tmux/Makefile:1.36
--- src/external/bsd/tmux/usr.bin/tmux/Makefile:1.35 Sat Jun 22 23:51:26 2024
+++ src/external/bsd/tmux/usr.bin/tmux/Makefile Sun Jun 23 06:27:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2024/06/22 23:51:26 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2024/06/23 06:27:38 wiz Exp $
.include
@@ -169,7 +169,18 @@ CPPFLAGS+= -I${SRCDIR} -I${.CURDIR}
# Would be nicer to stick this in a config.h file, but the upstream code
# does not use one at this moment.
-# HAVE_REALLOCARRAY, HAVE_TREE_H, HAVE_VIS added manually; HAVE_BSD_GETOPT necessary due to local patches
+# HAVE_REALLOCARRAY, HAVE_TREE_H, HAVE_VIS added manually
+#
+# HAVE_BSD_GETOPT:
+# Use the NetBSD libc getopt functions instead of the compat functions
+# provided by tmux (done using a local patch).
+#
+# HAVE_VIS:
+# tmux assumes the OpenBSD variant of strnvis which has arguments
+# swapped compared to FreeBSD & NetBSD, see
+# https://github.com/tmux/tmux/pull/4015
+# We have a local patch that adapts the call to the NetBSD version,
+# so we don't need to use the compat code provided by tmux.
CPPFLAGS+= \
-DHAVE_ASPRINTF=1 \
-DHAVE_B64_NTOP=1 \
Re: CVS commit: src/external/bsd/tmux/usr.bin/tmux
In article <20230628222148.710dbf...@cvs.netbsd.org>, Thomas Klausner wrote: >-=-=-=-=-=- > [...] >+-DTMUX_CONF='"/etc/tmux.conf:~/.tmux.conf:$XDG_CONFIG_HOME/tmux/tmux.conf:~/.config/tmux/tmux.conf"' > \ What is XDG_CONFIG_HOME? christos
Re: CVS commit: src/external/bsd/tmux/usr.bin/tmux
> Date: Thu, 29 Jun 2023 16:51:05 - (UTC) > From: chris...@astron.com (Christos Zoulas) > > In article <20230628222148.710dbf...@cvs.netbsd.org>, > Thomas Klausner wrote: > >-=-=-=-=-=- > > > [...] > >+-DTMUX_CONF='"/etc/tmux.conf:~/.tmux.conf:$XDG_CONFIG_HOME/tmux/tmux.conf:~/.config/tmux/tmux.conf"' > > \ > > What is XDG_CONFIG_HOME? Typically ~/.config. Described here: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html Many modern desktop applications dribble goo into this directory; you probably already have one! A large fraction of those applications can be redirected to leak the goo elsewhere by changing XDG_CONFIG_HOME without changing HOME. See also XDG_DATA_HOME, XDG_CACHE_HOME, &c.
