Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Aug 2020 10:09:49 +0000 (UTC)
From:      Eugene Grosbein <eugen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r545519 - head/misc/deco/files
Message-ID:  <202008201009.07KA9nwc042581@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: eugen
Date: Thu Aug 20 10:09:48 2020
New Revision: 545519
URL: https://svnweb.freebsd.org/changeset/ports/545519

Log:
  misc/deco: fix build with -fno-common (clang 11 and gcc 10)
  
  PORTREVISION not bumped as it fixes build for FreeBSD 13.
  
  Reported by:	pkg-fallout

Added:
  head/misc/deco/files/patch-env.h   (contents, props changed)
  head/misc/deco/files/patch-tty.c   (contents, props changed)
Modified:
  head/misc/deco/files/patch-scr.c

Added: head/misc/deco/files/patch-env.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/deco/files/patch-env.h	Thu Aug 20 10:09:48 2020	(r545519)
@@ -0,0 +1,8 @@
+--- env.h.orig	1997-07-12 16:29:23 UTC
++++ env.h
+@@ -1,4 +1,4 @@
+-char **EnvVector;
++static char **EnvVector;
+ void EnvInit (char **env);
+ char *EnvGet (char *name);
+ void EnvPut (char *name, char *value);

Modified: head/misc/deco/files/patch-scr.c
==============================================================================
--- head/misc/deco/files/patch-scr.c	Thu Aug 20 10:06:45 2020	(r545518)
+++ head/misc/deco/files/patch-scr.c	Thu Aug 20 10:09:48 2020	(r545519)
@@ -1,6 +1,16 @@
-Index: scr.c
-@@ -167,7 +167,7 @@
+--- scr.c.orig	1998-12-29 16:57:11 UTC
++++ scr.c
+@@ -148,7 +148,7 @@ WINDOW VScreen;
+ int BlackWhite = 0;
+ int ColorMode = 1;
+ int GraphMode = 1;
+-int TtyUpperCase = 0;
++extern int TtyUpperCase;
  
+ static WINDOW curscr;
+ static scrool, rscrool;
+@@ -167,7 +167,7 @@ static char *KS, *KE;
+ 
  static char *CL, *CM, *SE, *SO, *TE, *TI, *VE, *VS,
  	*AL, *DL, *IS, *IF, *FS, *MD, *MH, *ME, *MR,
 -	*CF, *CB, *AF, *AB, *Sf, *Sb, *MF, *MB;
@@ -8,7 +18,7 @@ Index: scr.c
  static NF, NB;
  static char MS, C2;
  
-@@ -231,6 +231,7 @@
+@@ -231,6 +231,7 @@ struct CapTab outtab [] = {
  	{ "Cs", CAPSTR, 0, 0, 0, &Cs, },
  	{ "Ce", CAPSTR, 0, 0, 0, &Ce, },
  	{ "Ct", CAPSTR, 0, 0, 0, &Ct, },
@@ -16,7 +26,7 @@ Index: scr.c
  	{ { 0, 0, }, 0, 0, 0, 0, 0, },
  };
  
-@@ -413,6 +414,8 @@
+@@ -413,6 +414,8 @@ void VClose ()
  		tputs (TE);
  	if (KE)
  		tputs (KE);
@@ -25,7 +35,7 @@ Index: scr.c
  	VFlush ();
  	TtyReset ();
  }
-@@ -425,6 +428,8 @@
+@@ -425,6 +428,8 @@ void VRestore ()
  		tputs (VE);
  	if (KE)
  		tputs (KE);

Added: head/misc/deco/files/patch-tty.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/misc/deco/files/patch-tty.c	Thu Aug 20 10:09:48 2020	(r545519)
@@ -0,0 +1,11 @@
+--- tty.c.orig	1997-07-18 14:58:32 UTC
++++ tty.c
+@@ -82,7 +82,7 @@ static struct ltchars oldchars, newchars;
+ #   define OXTABS TAB3
+ #endif
+ 
+-int TtyUpperCase;
++int TtyUpperCase = 0;
+ 
+ #define NOCHAR 0
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008201009.07KA9nwc042581>