svn commit: r525895 - in head/sysutils/screen: . files
Cy Schubert
cy at FreeBSD.org
Wed Feb 12 04:26:23 UTC 2020
Author: cy
Date: Wed Feb 12 04:26:22 2020
New Revision: 525895
URL: https://svnweb.freebsd.org/changeset/ports/525895
Log:
Update 4.7.0 --> 4.8.0
Deleted:
head/sysutils/screen/files/patch-extern.h
head/sysutils/screen/files/patch-fileio.c
head/sysutils/screen/files/patch-term.c
Modified:
head/sysutils/screen/Makefile
head/sysutils/screen/distinfo
head/sysutils/screen/files/patch-os.h
head/sysutils/screen/files/patch-termcap.c
Modified: head/sysutils/screen/Makefile
==============================================================================
--- head/sysutils/screen/Makefile Wed Feb 12 00:19:38 2020 (r525894)
+++ head/sysutils/screen/Makefile Wed Feb 12 04:26:22 2020 (r525895)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= screen
-PORTVERSION= 4.7.0
-PORTREVISION= 8
+PORTVERSION= 4.8.0
CATEGORIES= sysutils
MASTER_SITES= GNU \
ftp://ftp.gnu.org/gnu/screen/ \
Modified: head/sysutils/screen/distinfo
==============================================================================
--- head/sysutils/screen/distinfo Wed Feb 12 00:19:38 2020 (r525894)
+++ head/sysutils/screen/distinfo Wed Feb 12 04:26:22 2020 (r525895)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1570534280
-SHA256 (screen-4.7.0.tar.gz) = da775328fa783bd2a787d722014dbd99c6093effc11f337827604c2efc5d20c1
-SIZE (screen-4.7.0.tar.gz) = 854192
+TIMESTAMP = 1581479972
+SHA256 (screen-4.8.0.tar.gz) = 6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1
+SIZE (screen-4.8.0.tar.gz) = 854854
Modified: head/sysutils/screen/files/patch-os.h
==============================================================================
--- head/sysutils/screen/files/patch-os.h Wed Feb 12 00:19:38 2020 (r525894)
+++ head/sysutils/screen/files/patch-os.h Wed Feb 12 04:26:22 2020 (r525895)
@@ -14,15 +14,6 @@
# define utmp utmpx
# define getutent getutxent
# define getutid getutxid
-@@ -507,7 +509,7 @@
- */
-
- #ifndef TERMCAP_BUFSIZE
--# define TERMCAP_BUFSIZE 2048
-+# define TERMCAP_BUFSIZE 1023
- #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
Modified: head/sysutils/screen/files/patch-termcap.c
==============================================================================
--- head/sysutils/screen/files/patch-termcap.c Wed Feb 12 00:19:38 2020 (r525894)
+++ head/sysutils/screen/files/patch-termcap.c Wed Feb 12 04:26:22 2020 (r525895)
@@ -1,31 +1,6 @@
---- termcap.c.orig 2019-10-01 15:08:00.000000000 -0700
-+++ termcap.c 2019-10-28 19:37:41.586957000 -0700
-@@ -75,11 +75,10 @@
-
- char *extra_incap, *extra_outcap;
-
--static const char TermcapConst[] = "\\\n\
--\t:DO=\\E[%dB:LE=\\E[%dD:RI=\\E[%dC:UP=\\E[%dA:bs:bt=\\E[Z:\\\n\
--\t:cd=\\E[J:ce=\\E[K:cl=\\E[H\\E[J:cm=\\E[%i%d;%dH:ct=\\E[3g:\\\n\
--\t:do=^J:nd=\\E[C:pt:rc=\\E8:rs=\\Ec:sc=\\E7:st=\\EH:up=\\EM:\\\n\
--\t:le=^H:bl=^G:cr=^M:it#8:ho=\\E[H:nw=\\EE:ta=^I:is=\\E)0:";
-+static const char TermcapConst[] = "DO=\\E[%dB:LE=\\E[%dD:RI=\\E[%dC:\
-+UP=\\E[%dA:bs:bt=\\E[Z:cd=\\E[J:ce=\\E[K:cl=\\E[H\\E[J:cm=\\E[%i%d;%dH:\
-+ct=\\E[3g:do=^J:nd=\\E[C:pt:rc=\\E8:rs=\\Ec:sc=\\E7:st=\\EH:up=\\EM:\
-+le=^H:bl=^G:cr=^M:it#8:ho=\\E[H:nw=\\EE:ta=^I:is=\\E)0:";
-
- char *
- gettermcapstring(s)
-@@ -227,7 +226,7 @@
- (D_CKM && (InStr(D_CKM, "\033[M") || InStr(D_CKM, "\033[<"))))
- {
- D_CXT = 1;
-- kmapdef[0] = SaveStr(D_CKM);
-+ kmapdef[0] = D_CKM ? SaveStr(D_CKM) : NULL;
- }
- /* "be" seems to be standard for xterms... */
- if (D_CXT)
-@@ -362,11 +361,7 @@
+--- 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)
@@ -38,77 +13,3 @@
if (D_CE0 == 0)
D_CE0 = "\033(B";
D_AC = 0;
-@@ -827,21 +822,13 @@
- char *s;
- {
- register int n;
--
-- if (tcLineLen + (n = strlen(s)) > 55 && Termcaplen < TERMCAP_BUFSIZE - 4 - 1)
-- {
-- strcpy(Termcap + Termcaplen, "\\\n\t:");
-- Termcaplen += 4;
-- tcLineLen = 0;
-- }
-+ n=strlen(s);
- if (Termcaplen + n < TERMCAP_BUFSIZE - 1)
- {
- strcpy(Termcap + Termcaplen, s);
- Termcaplen += n;
- tcLineLen += n;
- }
-- else
-- Panic(0, "TERMCAP overflow - sorry.");
- }
-
- /*
-@@ -1077,6 +1064,12 @@
- {
- if (i >= T_KEYPAD) /* don't put keypad codes in TERMCAP */
- continue; /* - makes it too big */
-+#if (TERMCAP_BUF < 1024)
-+ if (i >= T_FEXTRA && i < T_BACKTAB) /* also skip extra vt220 keys */
-+ continue;
-+ if (i > T_BACKTAB && i < T_NAVIGATE) /* more vt220 keys */
-+ continue;
-+#endif
- if (i >= T_CURSOR && i < T_OCAPS)
- {
- act = &umtab[i - (T_CURSOR - T_OCAPS + T_CAPS)];
-@@ -1129,6 +1122,37 @@
- }
- debug("MakeTermcap: end\n");
- return Termcap;
-+}
-+
-+#define TERMCAP_MAX_WIDTH 63
-+void
-+DumpTermcap(aflag, f)
-+int aflag;
-+FILE *f;
-+{
-+ register const char *p, *pe;
-+ int n, col=0;
-+
-+ if ((p = index(MakeTermcap(aflag), '=')) == NULL)
-+ return;
-+ p++;
-+ debug1("DumpTermcap: '%s'\n", p);
-+ /* write termcap entry with wrapping */
-+ while((pe = index(p, ':')))
-+ {
-+ n = pe - p + 1;
-+ if((col > 8) && ((col + n) > TERMCAP_MAX_WIDTH))
-+ {
-+ fwrite("\\\n\t:", 1, 4, f);
-+ col = 8;
-+ }
-+ fwrite(p, 1, n, f);
-+ col += n;
-+ p = ++pe;
-+ }
-+ if(*p)
-+ fwrite(p, 1, strlen(p), f);
-+ fputc('\n', f);
- }
-
- static void
More information about the svn-ports-head
mailing list