diff options
Diffstat (limited to 'sysutils/screen49')
-rw-r--r-- | sysutils/screen49/Makefile | 123 | ||||
-rw-r--r-- | sysutils/screen49/distinfo | 3 | ||||
-rw-r--r-- | sysutils/screen49/files/patch-attacher.c | 24 | ||||
-rw-r--r-- | sysutils/screen49/files/patch-configure.ac | 75 | ||||
-rw-r--r-- | sysutils/screen49/files/patch-doc__Makefile.in | 34 | ||||
-rw-r--r-- | sysutils/screen49/files/patch-doc_screen.1 | 11 | ||||
-rw-r--r-- | sysutils/screen49/files/patch-extern.h | 8 | ||||
-rw-r--r-- | sysutils/screen49/files/patch-misc.c | 31 | ||||
-rw-r--r-- | sysutils/screen49/files/patch-os.h | 33 | ||||
-rw-r--r-- | sysutils/screen49/files/patch-osdef.h.in | 19 | ||||
-rw-r--r-- | sysutils/screen49/files/patch-resize.c | 20 | ||||
-rw-r--r-- | sysutils/screen49/files/patch-screen.c | 11 | ||||
-rw-r--r-- | sysutils/screen49/files/patch-socket.c | 84 | ||||
-rw-r--r-- | sysutils/screen49/files/patch-termcap.c | 15 | ||||
-rw-r--r-- | sysutils/screen49/files/patch-terminfo__checktc.c | 18 | ||||
-rw-r--r-- | sysutils/screen49/files/patch-utmp.c | 156 | ||||
-rw-r--r-- | sysutils/screen49/files/screenrc.sample | 10 | ||||
-rw-r--r-- | sysutils/screen49/pkg-descr | 7 | ||||
-rw-r--r-- | sysutils/screen49/pkg-message | 11 | ||||
-rw-r--r-- | sysutils/screen49/pkg-plist | 26 |
20 files changed, 0 insertions, 719 deletions
diff --git a/sysutils/screen49/Makefile b/sysutils/screen49/Makefile deleted file mode 100644 index a7173267826b..000000000000 --- a/sysutils/screen49/Makefile +++ /dev/null @@ -1,123 +0,0 @@ -PORTNAME= screen -PORTVERSION= 4.9.1 -PORTREVISION= 5 -CATEGORIES= sysutils -MASTER_SITES= GNU \ - ftp://ftp.gnu.org/gnu/screen/ \ - ftp://gnu.mirror.iweb.com/screen/ \ - http://gnu.mirror.iweb.com/screen/ \ - http://mirror.sdunix.com/gnu/ \ - ftp://mirrors.kernel.org/gnu/screen/ \ - http://cschubert.com/distfiles/ \ - LOCAL/cy -.if !defined(MASTERDIR) -PKGNAMESUFFIX= 49 -CONFLICTS= screen-* -.endif - -MAINTAINER= cy@FreeBSD.org -COMMENT= Multi-screen window manager -WWW= https://www.gnu.org/software/screen/ - -CONFLICTS+= screen-devel* - -LICENSE= GPLv3 - -OPTIONS_DEFINE= INFO NETHACK XTERM_256 SYSTEM_SCREENRC MULTIUSER \ - NOSOCKETDIR -OPTIONS_DEFAULT= INFO NETHACK XTERM_256 SOCKETS SYSTEM_SCREENRC \ - NCURSES_DEFAULT MULTIUSER -OPTIONS_SINGLE= IPC NCURSES -OPTIONS_SINGLE_IPC= SOCKETS NAMED_PIPES -OPTIONS_SINGLE_NCURSES= NCURSES_DEFAULT NCURSES_BASE NCURSES_PORT -NETHACK_DESC= Enable nethack-style messages -XTERM_256_DESC= Enable support for 256 colour xterm -SOCKETS_DESC= Use new (4.2.1+) sockets for IPC (default) -NAMED_PIPES_DESC= Use legacy (4.0.3) named pipes for IPC (override) -SYSTEM_SCREENRC_DESC= Install system screenrc with helpful status line -MULTIUSER_DESC= Install setuid-root screen to support multiuser -MULTIUSER_PLIST_SUB= MULTISUID="@(,,4555) " -MULTIUSER_PLIST_SUB_OFF=MULTISUID="@(,,0555) " -NCURSES_DEFAULT_DESC= Depend on ncurses (ports if installed, otherwise base) -NCURSES_BASE_DESC= Depend on ncurses in base -NCURSES_PORT_DESC= Depend on devel/ncurses in ports -NOSOCKETDIR_DESC= Use ~/.screen instead of socketdir - -NCURSES_DEFAULT_USES= ncurses -NCURSES_BASE_USES= ncurses:base -NCURSES_PORT_USES= ncurses:port - -OPTIONS_SUB= - -USES= autoreconf:build gmake cpe -MAKE_ARGS+= WITH_MAN=1 - -CPE_VENDOR= gnu - -.include <bsd.port.options.mk> - -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -CFLAGS+= -I${NCURSESINC} -LDFLAGS+= -L${NCURSESLIB} - -.if ${PORT_OPTIONS:MINFO} -INFO= screen -MAKE_ARGS+= WITH_INFO=1 -USES+= makeinfo -.endif - -# Enables support for 256 colour xterm. Note that you may need to -# set up a custom termcap entry or .screenrc which modifies termcap -# to contain the following: Co#256:AB=\E[48;5;%dm:AF=\E[38;5;%dm -# -.if ${PORT_OPTIONS:MXTERM_256} -CFLAGS+= -DCOLORS256 -.endif - -.if ! ${PORT_OPTIONS:MNETHACK} -CFLAGS+= -DNONETHACK -.endif - -.if ${PORT_OPTIONS:MNOSOCKETDIR} -CONFIGURE_ARGS+= --disable-socket-dir -.endif - -.if defined(SCREEN_SOCKET_DIR) -CONFIGURE_ARGS+= --with-socket-dir=${SCREEN_SOCKET_DIR} -.endif - -post-patch: - @${RM} ${WRKSRC}/doc/screen.info* - -# Bug 191029: Users can choose whether to use sockets or named pipes. -# Choose sockets if you don't know what the difference is. -# Choose named pipes if your environment is heterogeneous, -# using both screen 4.0.3 and 4.2.1. -# Bug 191017 - -pre-configure: - cd ${WRKSRC} && ./autogen.sh - -post-configure-NAMED_PIPES-on: - @${ECHO_CMD} '#define NAMEDPIPE 1' >> ${WRKSRC}/config.h - @${ECHO_CMD} User selected named pipes override set. - -ETCDIR?= ${PREFIX}/etc - -post-install: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \ - ${STAGEDIR}${EXAMPLESDIR}/screenrc.sample-1 - ${INSTALL_DATA} ${FILESDIR}/screenrc.sample \ - ${STAGEDIR}${EXAMPLESDIR}/screenrc.sample-2 - @${MKDIR} ${STAGEDIR}${ETCDIR} -.if ${PORT_OPTIONS:MSYSTEM_SCREENRC} - ${INSTALL_DATA} ${FILESDIR}/screenrc.sample \ - ${STAGEDIR}${ETCDIR}/screenrc.sample -.else - ${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \ - ${STAGEDIR}${ETCDIR}/screenrc.sample -.endif - -.include <bsd.port.mk> diff --git a/sysutils/screen49/distinfo b/sysutils/screen49/distinfo deleted file mode 100644 index 21d74bb6e156..000000000000 --- a/sysutils/screen49/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1692454303 -SHA256 (screen-4.9.1.tar.gz) = 26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69 -SIZE (screen-4.9.1.tar.gz) = 1040785 diff --git a/sysutils/screen49/files/patch-attacher.c b/sysutils/screen49/files/patch-attacher.c deleted file mode 100644 index 0f89189898e3..000000000000 --- a/sysutils/screen49/files/patch-attacher.c +++ /dev/null @@ -1,24 +0,0 @@ ---- attacher.c.orig 2003-09-08 07:24:48.000000000 -0700 -+++ attacher.c 2011-01-02 21:42:39.547897531 -0800 -@@ -662,7 +662,7 @@ - printf("\n"); - - prg = getenv("LOCKPRG"); -- if (prg && strcmp(prg, "builtin") && !access(prg, X_OK)) -+ if (prg && (strcmp(prg, "builtin") || strcmp(prg,"builtin-passwd")) && !access(prg, X_OK)) - { - signal(SIGCHLD, SIG_DFL); - debug1("lockterminal: '%s' seems executable, execl it!\n", prg); -@@ -676,7 +676,11 @@ - setuid(real_uid); /* this should be done already */ - #endif - closeallfiles(0); /* important: /etc/shadow may be open */ -- execl(prg, "SCREEN-LOCK", NULL); -+ if (strcmp(prg,"builtin-passwd")) -+ /* use system passsword for lock */ -+ execl(prg, "SCREEN-LOCK", "-p", "-n", NULL); -+ else -+ execl(prg, "SCREEN-LOCK", NULL); - exit(errno); - } - if (pid == -1) diff --git a/sysutils/screen49/files/patch-configure.ac b/sysutils/screen49/files/patch-configure.ac deleted file mode 100644 index 1f32616b3797..000000000000 --- a/sysutils/screen49/files/patch-configure.ac +++ /dev/null @@ -1,75 +0,0 @@ ---- configure.ac.orig 2023-08-15 17:29:26.000000000 -0700 -+++ configure.ac 2024-01-02 18:30:11.205776000 -0800 -@@ -669,7 +669,7 @@ - tgetent((char *)0, (char *)0); - ],, - olibs="$LIBS" --LIBS="-lcurses $olibs" -+LIBS="-lcurses $olibs"; CC="$CC -I/usr/local/include" - AC_CHECKING(libcurses) - AC_TRY_LINK([ - #include <curses.h> -@@ -756,19 +756,6 @@ - fi - fi - --if test "$cross_compiling" = no ; then --AC_CHECKING(for SVR4 ptys) --sysvr4ptys= --if test -c /dev/ptmx ; then --AC_TRY_LINK([ -- #include <stdlib.h> --], [ -- ptsname(0);grantpt(0);unlockpt(0); --],[AC_DEFINE(HAVE_SVR4_PTYS) --sysvr4ptys=1]) --fi --fi -- - AC_CHECK_FUNCS(getpt) - - dnl check for openpty() -@@ -900,11 +887,11 @@ - dnl - dnl **** utmp handling **** - dnl --AC_CHECKING(getutent) -+AC_CHECKING(getutxent) - AC_TRY_LINK([ - #include <time.h> /* to get time_t on SCO */ - #include <sys/types.h> --#if defined(SVR4) && !defined(DGUX) -+#if defined(SVR4) && !defined(DGUX) || defined(__FreeBSD__) - #include <utmpx.h> - #define utmp utmpx - #else -@@ -917,11 +904,11 @@ - [int x = DEAD_PROCESS; pututline((struct utmp *)0); getutent();], AC_DEFINE(GETUTENT), - olibs="$LIBS" - LIBS="$LIBS -lgen" --AC_CHECKING(getutent with -lgen) -+AC_CHECKING(getutxent with -lgen) - AC_TRY_LINK([ - #include <time.h> - #include <sys/types.h> --#if defined(SVR4) && !defined(DGUX) -+#if defined(SVR4) && !defined(DGUX) || defined(__FreeBSD__) - #include <utmpx.h> - #define utmp utmpx - #else -@@ -931,13 +918,13 @@ - #define pututline _pututline - #endif - ], --[int x = DEAD_PROCESS; pututline((struct utmp *)0); getutent();], AC_DEFINE(GETUTENT), LIBS="$olibs") -+[int x = DEAD_PROCESS; pututxline((struct utmp *)0); getutxent();], AC_DEFINE(GETUTENT), LIBS="$olibs") - ) - AC_CHECKING(ut_host) - AC_TRY_COMPILE([ - #include <time.h> - #include <sys/types.h> --#if defined(SVR4) && !defined(DGUX) -+#if defined(SVR4) && !defined(DGUX) || defined(__FreeBSD__) - #include <utmpx.h> - #define utmp utmpx - #else diff --git a/sysutils/screen49/files/patch-doc__Makefile.in b/sysutils/screen49/files/patch-doc__Makefile.in deleted file mode 100644 index 8666be063fe5..000000000000 --- a/sysutils/screen49/files/patch-doc__Makefile.in +++ /dev/null @@ -1,34 +0,0 @@ ---- doc/Makefile.in.orig 2014-04-29 20:26:42.618832001 -0700 -+++ doc/Makefile.in 2014-04-29 20:29:26.379384101 -0700 -@@ -31,7 +31,10 @@ - $(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info - - install: installdirs -+ifeq (${WITH_MAN},1) - $(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1 -+endif -+ifeq (${WITH_INFO},1) - -$(MAKE) screen.info - -if test -f screen.info; then d=.; else d=$(srcdir); fi; \ - if test -f $$d/screen.info; then \ -@@ -40,13 +43,19 @@ - install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/screen.info; \ - else true; fi; \ - fi -+endif - - uninstall: - rm -f $(DESTDIR)$(mandir)/man1/screen.1 - rm -f $(DESTDIR)$(infodir)/screen.info* - - installdirs: -- $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(infodir) -+ifeq (${WITH_MAN},1) -+ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 -+endif -+ifeq (${WITH_INFO},1) -+ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(infodir) -+endif - - mostlyclean: - -rm -f *.cp *.cps *.fn *.fns *.ky *.kys *.pg *.tp *.vr diff --git a/sysutils/screen49/files/patch-doc_screen.1 b/sysutils/screen49/files/patch-doc_screen.1 deleted file mode 100644 index 59077d7be443..000000000000 --- a/sysutils/screen49/files/patch-doc_screen.1 +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/screen.1.orig 2023-08-15 11:01:59 UTC -+++ doc/screen.1 -@@ -241,7 +241,7 @@ - .IR screen , - but prints a list of - .I pid.tty.host --strings identifying your -+strings and creation timestamps identifying your - .I screen - sessions. - Sessions marked `detached' can be resumed with \*Qscreen \-r\*U. Those marked diff --git a/sysutils/screen49/files/patch-extern.h b/sysutils/screen49/files/patch-extern.h deleted file mode 100644 index 99e9063cdd0f..000000000000 --- a/sysutils/screen49/files/patch-extern.h +++ /dev/null @@ -1,8 +0,0 @@ ---- extern.h.orig 2023-08-15 08:44:47 UTC -+++ extern.h -@@ -512,3 +512,5 @@ - /* layout.c */ - extern void RemoveLayout __P((struct layout *)); - extern int LayoutDumpCanvas __P((struct canvas *, char *)); -+ -+extern time_t SessionCreationTime __P((const char *)); diff --git a/sysutils/screen49/files/patch-misc.c b/sysutils/screen49/files/patch-misc.c deleted file mode 100644 index 1364b230d55a..000000000000 --- a/sysutils/screen49/files/patch-misc.c +++ /dev/null @@ -1,31 +0,0 @@ ---- misc.c.orig 2022-01-28 14:06:02 UTC -+++ misc.c -@@ -28,8 +28,10 @@ - - #include <poll.h> - #include <sys/types.h> -+#include <sys/user.h> - #include <sys/stat.h> /* mkdir() declaration */ - #include <signal.h> -+#include <libutil.h> - - #include "config.h" - #include "screen.h" -@@ -796,3 +798,17 @@ - } - - #endif -+ -+time_t -+SessionCreationTime(fifo) -+const char *fifo; -+{ -+ int pid = atoi(fifo); -+ if (pid <= 0) return 0; -+ -+ struct kinfo_proc * kip = kinfo_getproc(pid); -+ if (kip == 0) return 0; -+ time_t start = kip->ki_start.tv_sec; -+ free (kip); -+ return start; -+} diff --git a/sysutils/screen49/files/patch-os.h b/sysutils/screen49/files/patch-os.h deleted file mode 100644 index 80e7ec3c0bcb..000000000000 --- a/sysutils/screen49/files/patch-os.h +++ /dev/null @@ -1,33 +0,0 @@ ---- os.h.orig 2019-10-01 15:08:00.000000000 -0700 -+++ os.h 2019-10-28 19:37:41.585526000 -0700 -@@ -250,9 +250,11 @@ - #endif - - #if defined(UTMPOK) || defined(BUGGYGETLOGIN) --# if defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux) -+# if (defined(SVR4) && !defined(DGUX) && !defined(__hpux) && !defined(linux)) || defined(__FreeBSD_version) - # include <utmpx.h> --# define UTMPFILE UTMPX_FILE -+# ifdef UTMPX_FILE /* GNU extension */ -+# define UTMPFILE UTMPX_FILE -+# endif - # define utmp utmpx - # define getutent getutxent - # define getutid getutxid -@@ -507,7 +509,7 @@ typedef struct fd_set { int fds_bits[1]; } fd_set; - */ - - #ifndef TERMCAP_BUFSIZE --# define TERMCAP_BUFSIZE 1023 -+# define TERMCAP_BUFSIZE 1024 - #endif - - #ifndef MAXPATHLEN -@@ -524,6 +526,6 @@ - /* Changing those you won't be able to attach to your old sessions - * when changing those values in official tree don't forget to bump - * MSG_VERSION */ --#define MAXTERMLEN 32 -+#define MAXTERMLEN 63 - #define MAXLOGINLEN 256 - diff --git a/sysutils/screen49/files/patch-osdef.h.in b/sysutils/screen49/files/patch-osdef.h.in deleted file mode 100644 index 3b32fe80ed81..000000000000 --- a/sysutils/screen49/files/patch-osdef.h.in +++ /dev/null @@ -1,19 +0,0 @@ ---- osdef.h.in.orig 2023-08-15 17:29:26.000000000 -0700 -+++ osdef.h.in 2024-07-17 20:59:56.936179000 -0700 -@@ -28,6 +28,8 @@ - **************************************************************** - */ - -+#include <sys/param.h> -+#if defined(__FreeBSD_version) && __FreeBSD_version < 1500020 - extern int printf __P((char *, ...)); - extern int fprintf __P((FILE *, char *, ...)); - extern int sprintf __P((char *, char *, ...)); -@@ -71,6 +73,7 @@ - #else - extern void bcopy __P((char *, char *, int)); - #endif -+#endif /* __FreeBSD_version */ - - #ifdef BSDWAIT - struct rusage; /* for wait3 __P */ diff --git a/sysutils/screen49/files/patch-resize.c b/sysutils/screen49/files/patch-resize.c deleted file mode 100644 index a2af125f12ff..000000000000 --- a/sysutils/screen49/files/patch-resize.c +++ /dev/null @@ -1,20 +0,0 @@ ---- resize.c.orig Mon Sep 8 07:26:31 2003 -+++ resize.c Mon Dec 1 17:16:29 2003 -@@ -682,6 +682,17 @@ - if (wi == 0) - he = hi = 0; - -+ if (wi > 1000) -+ { -+ Msg(0, "Window width too large, truncated"); -+ wi = 1000; -+ } -+ if (he > 1000) -+ { -+ Msg(0, "Window height too large, truncated"); -+ he = 1000; -+ } -+ - if (p->w_width == wi && p->w_height == he && p->w_histheight == hi) - { - debug("ChangeWindowSize: No change.\n"); diff --git a/sysutils/screen49/files/patch-screen.c b/sysutils/screen49/files/patch-screen.c deleted file mode 100644 index 50b28c02a955..000000000000 --- a/sysutils/screen49/files/patch-screen.c +++ /dev/null @@ -1,11 +0,0 @@ ---- screen.c.orig 2017-07-10 12:26:25.000000000 -0700 -+++ screen.c 2017-08-25 20:20:20.471073000 -0700 -@@ -2214,7 +2214,7 @@ - pn2 = pn = p + padlen; - r = winmsg_numrend; - while (p >= buf) { -- if (r && *p != 127 && p - buf == winmsg_rendpos[r - 1]) { -+ if (r && p - buf == winmsg_rendpos[r - 1]) { - winmsg_rendpos[--r] = pn - buf; - continue; - } diff --git a/sysutils/screen49/files/patch-socket.c b/sysutils/screen49/files/patch-socket.c deleted file mode 100644 index cfa52856c2e7..000000000000 --- a/sysutils/screen49/files/patch-socket.c +++ /dev/null @@ -1,84 +0,0 @@ ---- socket.c.orig 2022-01-28 14:06:02 UTC -+++ socket.c -@@ -141,12 +141,14 @@ - char *firstn = NULL; - int nfound = 0, ngood = 0, ndead = 0, nwipe = 0, npriv = 0; - int nperfect = 0; -+ char timestr[64]; - struct sent - { - struct sent *next; - int mode; - char *name; -- } *slist, **slisttail, *sent, *nsent; -+ time_t time_created; -+ } *slist, **slisttail, *sent, *nsent, *schosen; - - if (match) - { -@@ -258,8 +260,13 @@ - sent->next = 0; - sent->name = SaveStr(name); - sent->mode = mode; -+ sent->time_created = SessionCreationTime(name); -+ for (slisttail = &slist; *slisttail; slisttail = &((*slisttail)->next)) -+ { -+ if ((*slisttail)->time_created < sent->time_created) break; -+ } -+ sent->next = *slisttail; - *slisttail = sent; -- slisttail = &sent->next; - nfound++; - sockfd = MakeClientSocket(0, *is_sock); - #ifdef USE_SETEUID -@@ -359,34 +366,42 @@ - } - for (sent = slist; sent; sent = sent->next) - { -+ if (sent->time_created == 0) -+ { -+ sprintf(timestr, "??" "?"); -+ } -+ else -+ { -+ strftime(timestr, 64, "%x %X", localtime(&sent->time_created)); -+ } - switch (sent->mode) - { - case 0700: -- printf("\t%s\t(Attached)\n", sent->name); -+ printf("\t%s\t(%s)\t(Attached)\n", sent->name, timestr); - break; - case 0600: -- printf("\t%s\t(Detached)\n", sent->name); -+ printf("\t%s\t(%s)\t(Detached)\n", sent->name, timestr); - break; - #ifdef MULTIUSER - case 0701: -- printf("\t%s\t(Multi, attached)\n", sent->name); -+ printf("\t%s\t(%s)\t(Multi, attached)\n", sent->name, timestr); - break; - case 0601: -- printf("\t%s\t(Multi, detached)\n", sent->name); -+ printf("\t%s\t(%s)\t(Multi, detached)\n", sent->name, timestr); - break; - #endif - case -1: - /* No trigraphs here! */ -- printf("\t%s\t(Dead ?%c?)\n", sent->name, '?'); -+ printf("\t%s\t(%s)\t(Dead ?%c?)\n", sent->name, timestr, '?'); - break; - case -2: -- printf("\t%s\t(Removed)\n", sent->name); -+ printf("\t%s\t(%s)\t(Removed)\n", sent->name, timestr); - break; - case -3: -- printf("\t%s\t(Remote or dead)\n", sent->name); -+ printf("\t%s\t(%s)\t(Remote or dead)\n", sent->name, timestr); - break; - case -4: -- printf("\t%s\t(Private)\n", sent->name); -+ printf("\t%s\t(%s)\t(Private)\n", sent->name, timestr); - break; - } - } diff --git a/sysutils/screen49/files/patch-termcap.c b/sysutils/screen49/files/patch-termcap.c deleted file mode 100644 index cbe7a90f11a2..000000000000 --- a/sysutils/screen49/files/patch-termcap.c +++ /dev/null @@ -1,15 +0,0 @@ ---- termcap.c.orig 2020-02-05 12:09:38.000000000 -0800 -+++ termcap.c 2020-02-11 20:10:12.747990000 -0800 -@@ -361,11 +361,7 @@ - if (D_CG0) - { - if (D_CS0 == 0) --#ifdef TERMINFO -- D_CS0 = "\033(%p1%c"; --#else -- D_CS0 = "\033(%."; --#endif -+ D_CS0 = "\033(%p1%c"; /* Old ncurses can't handle %. */ - if (D_CE0 == 0) - D_CE0 = "\033(B"; - D_AC = 0; diff --git a/sysutils/screen49/files/patch-terminfo__checktc.c b/sysutils/screen49/files/patch-terminfo__checktc.c deleted file mode 100644 index d4ffb75cc0c1..000000000000 --- a/sysutils/screen49/files/patch-terminfo__checktc.c +++ /dev/null @@ -1,18 +0,0 @@ ---- terminfo/checktc.c.orig Fri Sep 29 09:13:22 1995 -+++ terminfo/checktc.c Tue Apr 22 20:37:18 2003 -@@ -171,6 +171,7 @@ - fflush(stdout); - } - -+#ifndef __FreeBSD__ - void CPutStr(s, c) - char *s; - int c; -@@ -178,6 +179,7 @@ - tputs(tgoto(s, 0, c), 1, putcha); - fflush(stdout); - } -+#endif /* __FreeBSD__ */ - - void CCPutStr(s, x, y) - char *s; diff --git a/sysutils/screen49/files/patch-utmp.c b/sysutils/screen49/files/patch-utmp.c deleted file mode 100644 index 0573d96ceab5..000000000000 --- a/sysutils/screen49/files/patch-utmp.c +++ /dev/null @@ -1,156 +0,0 @@ ---- utmp.c.orig 2023-08-15 17:29:26.000000000 -0700 -+++ utmp.c 2023-08-19 08:57:48.376313000 -0700 -@@ -26,6 +26,7 @@ - **************************************************************** - */ - -+#include <sys/param.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> -@@ -89,11 +90,13 @@ - static int pututslot __P((slot_t, struct utmp *, char *, struct win *)); - static struct utmp *getutslot __P((slot_t)); - #ifndef GETUTENT -+#if 0 - static struct utmp *getutent __P((void)); - static void endutent __P((void)); - static int initutmp __P((void)); - static void setutent __P((void)); - #endif -+#endif - #if defined(linux) && defined(GETUTENT) - static struct utmp *xpututline __P((struct utmp *utmp)); - # define pututline xpututline -@@ -102,9 +105,7 @@ - - static int utmpok; - static char UtmpName[] = UTMPFILE; --#ifndef UTMP_HELPER - static int utmpfd = -1; --#endif - - - # if defined(GETUTENT) && (!defined(SVR4) || defined(__hpux)) && ! defined(__CYGWIN__) -@@ -409,12 +410,6 @@ - register slot_t slot; - struct utmp u; - int saved_ut; --#ifdef UTHOST -- char *p; -- char host[sizeof(D_loginhost) + 15]; --#else -- char *host = 0; --#endif /* UTHOST */ - - wi->w_slot = (slot_t)0; - if (!utmpok || wi->w_type != W_TYPE_PTY) -@@ -435,51 +430,13 @@ - makeuser(&u, stripdev(wi->w_tty), LoginName, wi->w_pid); - - #ifdef UTHOST -- host[sizeof(host) - 15] = '\0'; -- if (display) -- { -- strncpy(host, D_loginhost, sizeof(host) - 15); -- if (D_loginslot != (slot_t)0 && D_loginslot != (slot_t)-1 && host[0] != '\0') -- { -- /* -- * we want to set our ut_host field to something like -- * ":ttyhf:s.0" or -- * "faui45:s.0" or -- * "132.199.81.4:s.0" (even this may hurt..), but not -- * "faui45.informati"......:s.0 -- * HPUX uses host:0.0, so chop at "." and ":" (Eric Backus) -- */ -- for (p = host; *p; p++) -- if ((*p < '0' || *p > '9') && (*p != '.')) -- break; -- if (*p) -- { -- for (p = host; *p; p++) -- if (*p == '.' || (*p == ':' && p != host)) -- { -- *p = '\0'; -- break; -- } -- } -- } -- else -- { -- strncpy(host + 1, stripdev(D_usertty), sizeof(host) - 15 - 1); -- host[0] = ':'; -- } -- } -- else -- strncpy(host, "local", sizeof(host) - 15); -- -- sprintf(host + strlen(host), ":S.%d", wi->w_number); -- debug1("rlogin hostname: '%s'\n", host); -- - # if !defined(_SEQUENT_) && !defined(sequent) -- strncpy(u.ut_host, host, sizeof(u.ut_host)); -+ if (display) -+ strncpy(u.ut_host, D_loginhost, sizeof(u.ut_host)); - # endif - #endif /* UTHOST */ - -- if (pututslot(slot, &u, host, wi) == 0) -+ if (pututslot(slot, &u, D_loginhost, wi) == 0) - { - Msg(errno,"Could not write %s", UtmpName); - UT_CLOSE; -@@ -607,7 +564,7 @@ - struct utmp *u; - { - u->ut_type = DEAD_PROCESS; --#if (!defined(linux) || defined(EMPTY)) && !defined(__CYGWIN__) -+#if (!defined(linux) || defined(EMPTY)) && !defined(__CYGWIN__) && !defined(__FreeBSD__) - u->ut_exit.e_termination = 0; - u->ut_exit.e_exit = 0; - #endif -@@ -640,7 +597,11 @@ - /* must use temp variable because of NetBSD/sparc64, where - * ut_xtime is long(64) but time_t is int(32) */ - (void)time(&now); -- u->ut_time = now; -+#if defined(__FreeBSD_version) && __FreeBSD_version < 900000 -+ u->ut_time = now; -+#else -+ u->ut_tv.tv_sec = now; -+#endif - } - - static slot_t -@@ -670,6 +631,7 @@ - return (utmpfd = open(UtmpName, O_RDWR)) >= 0; - } - -+#if 0 - static void - setutent() - { -@@ -694,6 +656,7 @@ - return 0; - return &uent; - } -+#endif - - static struct utmp * - getutslot(slot) -@@ -750,9 +713,13 @@ - { - time_t now; - strncpy(u->ut_line, line, sizeof(u->ut_line)); -- strncpy(u->ut_name, user, sizeof(u->ut_name)); -+ strncpy(u->ut_user, user, sizeof(u->ut_user)); - (void)time(&now); -- u->ut_time = now; -+#if defined(__FreeBSD_version) && __FreeBSD_version < 900000 -+ u->ut_time = now; -+#else -+ u->ut_tv.tv_sec = now; -+#endif - } - - static slot_t diff --git a/sysutils/screen49/files/screenrc.sample b/sysutils/screen49/files/screenrc.sample deleted file mode 100644 index 1ce5561ebf31..000000000000 --- a/sysutils/screen49/files/screenrc.sample +++ /dev/null @@ -1,10 +0,0 @@ -startup_message off -defscrollback 5000 -termcapinfo xterm ti@:te@ -termcapinfo xterm-color ti@:te@ -hardstatus alwayslastline -hardstatus string '%{gk}[%{G}%H%{g}][%= %{wk}%?%-Lw%?%{=b kR}(%{W}%n*%f %t%?(%u)%?%{=b kR})%{= kw}%?%+Lw%?%?%= %{g}]%{=b C}[%m/%d/%y %C %A]%{W}' -vbell off -shell -$SHELL -logtstamp on -logtstamp after 1 diff --git a/sysutils/screen49/pkg-descr b/sysutils/screen49/pkg-descr deleted file mode 100644 index 7b753f95511d..000000000000 --- a/sysutils/screen49/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Screen is a full-screen window manager that multiplexes a physical terminal -between several processes (typically interactive shells). -Each virtual terminal provides the functions of a DEC VT100 terminal and, in -addition, several control functions from the ANSI X3.64 (ISO 6429) and ISO -2022 standards (e.g. insert/delete line and support for multiple character -sets). There is a scrollback history buffer for each virtual terminal and a -copy-and-paste mechanism that allows moving text regions between windows. diff --git a/sysutils/screen49/pkg-message b/sysutils/screen49/pkg-message deleted file mode 100644 index 899fc017b061..000000000000 --- a/sysutils/screen49/pkg-message +++ /dev/null @@ -1,11 +0,0 @@ -[ -{ type: install - message: <<EOM -As of GNU Screen 4.4.0: - -Note that there was fix to screen message structure field -responsible for $TERM handling, making it impossible -to attach to older versions. -EOM -} -] diff --git a/sysutils/screen49/pkg-plist b/sysutils/screen49/pkg-plist deleted file mode 100644 index e47f35430f9a..000000000000 --- a/sysutils/screen49/pkg-plist +++ /dev/null @@ -1,26 +0,0 @@ -bin/screen -%%MULTISUID%%bin/screen-4.9.1 -share/man/man1/screen.1.gz -%%DATADIR%%/utf8encodings/01 -%%DATADIR%%/utf8encodings/02 -%%DATADIR%%/utf8encodings/03 -%%DATADIR%%/utf8encodings/04 -%%DATADIR%%/utf8encodings/18 -%%DATADIR%%/utf8encodings/19 -%%DATADIR%%/utf8encodings/a1 -%%DATADIR%%/utf8encodings/bf -%%DATADIR%%/utf8encodings/c2 -%%DATADIR%%/utf8encodings/c3 -%%DATADIR%%/utf8encodings/c4 -%%DATADIR%%/utf8encodings/c6 -%%DATADIR%%/utf8encodings/c7 -%%DATADIR%%/utf8encodings/c8 -%%DATADIR%%/utf8encodings/cc -%%DATADIR%%/utf8encodings/cd -%%DATADIR%%/utf8encodings/d6 -@comment We always install the same screenrc it just depends on if we -@comment are installing the the one bundled with source, or the one from -@comment FILESDIR/screenrc.sample -@sample %%ETCDIR%%/screenrc.sample -%%EXAMPLESDIR%%/screenrc.sample-1 -%%EXAMPLESDIR%%/screenrc.sample-2 |