hi,
i know everyone uses tmux, but we still have screen in ports, and
upstream released 5.0 a while ago, see https://lwn.net/Articles/987700/
thanks miod for the texinfo course to fix errors in the info page..
feedback from screen users welcome.
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/misc/screen/Makefile,v
diff -u -r1.79 Makefile
--- Makefile 27 Sep 2023 09:52:12 -0000 1.79
+++ Makefile 2 Nov 2024 10:11:21 -0000
@@ -1,6 +1,6 @@
COMMENT= multi-screen window manager
-DISTNAME= screen-4.9.1
+DISTNAME= screen-5.0.0
CATEGORIES= misc
SITES= ${SITE_GNU:=screen/}
@@ -9,9 +9,8 @@
# GPLv3+
PERMIT_PACKAGE= Yes
-AUTOCONF_VERSION=2.71
-CONFIGURE_STYLE=autoconf
-CONFIGURE_ARGS= --with-sys-screenrc="${SYSCONFDIR}/screenrc"
+CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS= --with-sys-screenrc="${SYSCONFDIR}/screenrc"
--disable-pam
USE_GMAKE= Yes
USE_GROFF= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/misc/screen/distinfo,v
diff -u -r1.15 distinfo
--- distinfo 25 Aug 2023 17:41:06 -0000 1.15
+++ distinfo 2 Nov 2024 10:11:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (screen-4.9.1.tar.gz) = Js7z48QlccDUhK1vrxEMXBUJH7+HKwb6eqR2bHQFrGk=
-SIZE (screen-4.9.1.tar.gz) = 1040785
+SHA256 (screen-5.0.0.tar.gz) = 8Eo50AoOXHyGpVM4gIkDCCrV301z3xov00JZdq7ZSXE=
+SIZE (screen-5.0.0.tar.gz) = 895882
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac 25 Aug 2023 17:41:06 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,51 +0,0 @@
-Do not rm -f /tmp/conftest*. This kills configure tests of other builds
-that happen to run at the same time.
-
-Index: configure.ac
---- configure.ac.orig
-+++ configure.ac
-@@ -22,7 +22,7 @@ _CUT_HERE_
- EOF
- eval "$ac_cpp conftest.c 2>&5 | sed -e '1,/_CUT_HERE_/d' -e 's/ //g' >
conftest.out"
- . ./conftest.out
--rm -f conftest*
-+rm -f conftest.out
- ])dnl
- dnl
- define(AC_NOTE,
-@@ -385,7 +385,7 @@ int main()
- ], AC_NOTE(- your fifos are usable) fifo=1,
- AC_NOTE(- your fifos are not usable),
- AC_NOTE(- skipping check because we are cross compiling; assuming fifos are
usable) fifo=1)
--rm -f /tmp/conftest*
-+rm -f /tmp/conftest$$
-
- if test -n "$fifo"; then
- AC_CHECKING(for broken fifo implementation)
-@@ -436,7 +436,7 @@ main()
- ], AC_NOTE(- your implementation is ok),
- AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1,
- AC_NOTE(- skipping check because we are cross compiling; assuming fifo
implementation is ok))
--rm -f /tmp/conftest*
-+rm -f /tmp/conftest$$
- fi
-
- dnl
-@@ -503,7 +503,7 @@ main()
- ], AC_NOTE(- your sockets are usable) sock=1,
- AC_NOTE(- your sockets are not usable),
- AC_NOTE(- skipping check because we are cross compiling; assuming sockets are
usable) sock=1)
--rm -f /tmp/conftest*
-+rm -f /tmp/conftest$$
-
- if test -n "$sock"; then
- AC_CHECKING(socket implementation)
-@@ -546,7 +546,7 @@ main()
- AC_NOTE(- unix domain sockets are not kept in the filesystem)
- AC_DEFINE(SOCK_NOT_IN_FS) socknofs=1,
- AC_NOTE(- skipping check because we are cross compiling; assuming sockets are
normal))
--rm -f /tmp/conftest*
-+rm -f /tmp/conftest$$
- fi
-
-
Index: patches/patch-doc_screen_1
===================================================================
RCS file: /cvs/ports/misc/screen/patches/patch-doc_screen_1,v
diff -u -r1.10 patch-doc_screen_1
--- patches/patch-doc_screen_1 25 Aug 2023 17:41:06 -0000 1.10
+++ patches/patch-doc_screen_1 2 Nov 2024 10:11:21 -0000
@@ -28,7 +28,7 @@
\*Q.screenrc\*U in the user's home directory. These are the \*Qprogrammer's
defaults\*U that can be overridden in the following ways: for the
global screenrc file
-@@ -2050,7 +2050,7 @@ when seeing proper escape sequence. See also "TITLES (
+@@ -2047,7 +2047,7 @@ when seeing proper escape sequence. See also "TITLES (
The echo command may be used to annoy
.I screen
users with a 'message of the
@@ -37,10 +37,10 @@
The option \*Q\-n\*U may be used to suppress the line feed.
See also \*Qsleep\*U.
Echo is also useful for online checking of environment variables.
-@@ -5212,12 +5212,12 @@ Examples in the
+@@ -5194,12 +5194,12 @@ Examples in the
.I screen
distribution package for private and global initialization files.
- .IP $SYSSCREENRC
+ .IP $SYSSCREENRC
-.IP /usr/local/etc/screenrc
+.IP ${SYSCONFDIR}/screenrc
.I screen
@@ -50,9 +50,9 @@
-Read in after /usr/local/etc/screenrc
+Read in after ${SYSCONFDIR}/screenrc
.IP $SCREENDIR/S\-<login>
- .IP /local/screens/S\-<login>
+ .IP $HOME/.screen
Socket directories (default)
-@@ -5238,7 +5238,7 @@ Output log files created by the log function
+@@ -5220,7 +5220,7 @@ Output log files created by the log function
or
.IP /etc/termcap
Terminal capability databases
@@ -61,7 +61,7 @@
Login records
.IP $LOCKPRG
Program that locks a terminal.
-@@ -5365,9 +5365,9 @@ does not make use of hardware tabs.
+@@ -5333,9 +5333,9 @@ does not make use of hardware tabs.
must be installed as set-uid with owner root on most systems in order
to be able to correctly change the owner of the tty device file for
each window.
Index: patches/patch-doc_screen_texinfo
===================================================================
RCS file: /cvs/ports/misc/screen/patches/patch-doc_screen_texinfo,v
diff -u -r1.1 patch-doc_screen_texinfo
--- patches/patch-doc_screen_texinfo 25 Aug 2023 17:41:06 -0000 1.1
+++ patches/patch-doc_screen_texinfo 2 Nov 2024 10:11:21 -0000
@@ -1,9 +1,22 @@
./screen.texinfo:2403: Node `Window Settings' lacks menu item for `Mousetrack'
despite being its Up target.
+4 next chunks fails with our old makeinfo ?
+cf 12aed9c4 upstream commit
Index: doc/screen.texinfo
--- doc/screen.texinfo.orig
+++ doc/screen.texinfo
-@@ -2416,6 +2416,7 @@ terminal emulation itself.
+@@ -2130,8 +2130,8 @@ However, if that next region contains one or more laye
+ region in the highest layer is selected first. If you are at the
+ last region of the current layer, @code{next} will move the focus
+ to the next region in the lower layer (if there is a lower layer).
+-@code{Prev} cycles in the opposite order. @xref{Split} for more
+-information about layers.
++@code{Prev} cycles in the opposite order. For more information
++about layers, see @xref{Split}.
+
+ The rest of the options (@code{up}, @code{down}, @code{left},
+ @code{right}, @code{top}, and @code{bottom}) are more indifferent
+@@ -2419,6 +2419,7 @@ terminal emulation itself.
* Monitor:: Watch for activity or inactivity in a window
* Windows:: List the active windows
* Hardstatus:: Set a window's hardstatus line
@@ -11,7 +24,7 @@
@end menu
@node Naming Windows, Console, , Window Settings
-@@ -5147,7 +5148,6 @@ categories.
+@@ -5146,7 +5147,6 @@ categories.
* Backtick:: Program a command for a backtick string escape.
* Screen Saver:: Define a screen safer.
* Zmodem:: Define how screen treats zmodem requests.
@@ -19,3 +32,56 @@
@end menu
@node At, Break, , Miscellaneous
+@@ -5248,7 +5248,7 @@ Exchanges windows positions on window list, with windo
+ Changes windows numbers, so there is no gaps between them.
+ @end deffn
+
+-@node License, Collapse, Miscellaneous
++@node License, Nonblock, Collapse, Miscellaneous
+ @section License
+ @kindex ,
+ @deffn Command license
+@@ -5257,7 +5257,7 @@ Display the disclaimer page. This is done whenever @co
+ started without options, which should be often enough.
+ @end deffn
+
+-@node Nonblock, Number, Miscellaneous
++@node Nonblock, Number, License, Miscellaneous
+ @section Nonblock
+ @deffn Command nonblock [@var{state}|@var{numsecs}]
+ Tell screen how to deal with user interfaces (displays) that cease to
+@@ -5277,7 +5277,7 @@ Same as the @code{nonblock} command except that the de
+ displays is changed. Initial setting is @code{off}.
+ @end deffn
+
+-@node Number, Nonblock, Miscellaneous
++@node Number, Verbose, Nonblock, Miscellaneous
+ @section Number
+ @kindex N
+ @deffn Command number [[+|-]@var{n}]
+@@ -5289,7 +5289,7 @@ plus (`+') or minus (`-') will change the window's num
+ amount specified.
+ @end deffn
+
+-@node Verbose, Version, Miscellaneous
++@node Verbose, Version, Number, Miscellaneous
+ @section Verbose
+ @deffn Command verbose [on|off]
+ If verbose is switched on, the command name is echoed, whenever a window
+@@ -5412,14 +5412,14 @@ The default is @code{on}, of course. This command is p
+ only in rare circumstances.
+ @end deffn
+
+-@node Eval, , Setsid, Miscellaneous
++@node Eval, Backtick, Setsid, Miscellaneous
+ @section Eval
+ @deffn Command eval @var{command1} [@var{command2} ...]
+ (none)@*
+ Parses and executes each argument as separate command.
+ @end deffn
+
+-@node Backtick, Screen Saver, , Miscellaneous
++@node Backtick, Screen Saver, Eval, Miscellaneous
+ @section Backtick
+ @deffn Command backtick @var{id} @var{lifespan} @var{autorefresh}
@var{command} [@var{args}]
+ @deffnx Command backtick @var{id}
Index: patches/patch-pty_c
===================================================================
RCS file: patches/patch-pty_c
diff -N patches/patch-pty_c
--- patches/patch-pty_c 11 Mar 2022 19:38:20 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: pty.c
---- pty.c.orig
-+++ pty.c
-@@ -32,7 +32,7 @@
- #include <signal.h>
-
- #if defined(__OpenBSD__)
--#include <utils.h> /* for openpty() */
-+#include <util.h> /* for openpty() */
- #endif
-
- #include "config.h"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/misc/screen/pkg/PLIST,v
diff -u -r1.25 PLIST
--- pkg/PLIST 11 Mar 2022 19:38:20 -0000 1.25
+++ pkg/PLIST 2 Nov 2024 10:11:21 -0000
@@ -13,6 +13,7 @@
share/screen/utf8encodings/18
share/screen/utf8encodings/19
share/screen/utf8encodings/a1
+share/screen/utf8encodings/a3
share/screen/utf8encodings/bf
share/screen/utf8encodings/c2
share/screen/utf8encodings/c3
