Sunday, January 31, 2021

misc/deco: -fno-common fix

Hi,

This fix has been taken once again from FreeBSD [0]. This builds and
works fine on amd64.

OK?

Charlène.


[0] https://github.com/freebsd/freebsd-ports/commit/4b6803fe


Index: Makefile
===================================================================
RCS file: /cvs/ports/misc/deco/Makefile,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 Makefile
--- Makefile 26 Jan 2020 11:14:32 -0000 1.27
+++ Makefile 31 Jan 2021 21:39:05 -0000
@@ -4,7 +4,7 @@ COMMENT= Demos Commander, a free Norton

DISTNAME= deco383
PKGNAME= deco-3.8.3
-REVISION= 1
+REVISION= 2
CATEGORIES= misc
MASTER_SITES= https://distfiles.sigtrap.nl/
EXTRACT_SUFX= .tgz
Index: patches/patch-env_h
===================================================================
RCS file: patches/patch-env_h
diff -N patches/patch-env_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-env_h 31 Jan 2021 21:39:05 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: env.h
+--- env.h.orig
++++ 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);
Index: patches/patch-scr_c
===================================================================
RCS file: /cvs/ports/misc/deco/patches/patch-scr_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-scr_c
--- patches/patch-scr_c 21 Mar 2002 09:59:48 -0000 1.1
+++ patches/patch-scr_c 31 Jan 2021 21:39:05 -0000
@@ -1,6 +1,19 @@
$OpenBSD: patch-scr_c,v 1.1 2002/03/21 09:59:48 form Exp $
---- scr.c.orig Tue Dec 29 22:57:11 1998
-+++ scr.c Thu Mar 21 15:31:17 2002
+
+Hunk #1: Fix -fno-common build failure.
+
+Index: scr.c
+--- scr.c.orig
++++ 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,
Index: patches/patch-tty_c
===================================================================
RCS file: patches/patch-tty_c
diff -N patches/patch-tty_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tty_c 31 Jan 2021 21:39:05 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix -fno-common build failure.
+
+Index: tty.c
+--- tty.c.orig
++++ tty.c
+@@ -82,7 +82,7 @@ static struct ltchars oldchars, newchars;
+ # define OXTABS TAB3
+

No comments:

Post a Comment