Attachment 241427 Details for Bug 270779 – Diff for three patch files and Makefile

[patch] Diff for three patch files and Makefile

heyu2.diff (text/plain), 2.79 KB, created by mstowe on 2023-04-12 05:34:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mstowe

Created: 2023-04-12 05:34:10 UTC

Size: 2.79 KB

patch

obsolete

>diff -ruN heyu2.old/Makefile heyu2/Makefile
>--- heyu2.old/Makefile	2023-04-11 22:13:41.893387000 -0500
>+++ heyu2/Makefile	2023-04-12 00:16:45.450272000 -0500
>@@ -1,15 +1,13 @@
> PORTNAME=	heyu2
> PORTVERSION=	2.10
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	misc
> MASTER_SITES=	http://www.heyu.org/download/
> DISTNAME=	heyu-${PORTVERSION}
> 
>-MAINTAINER=	mstowe@chicago.us.mensa.org
>+MAINTAINER=	mstowe@baddomain.com
> COMMENT=	Control a CM11A interface from the command line
> WWW=		https://www.heyu.org/
>-
>-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: newsb
> 
> CONFLICTS=	heyu
> 
>diff -ruN heyu2.old/files/patch-relay_aux heyu2/files/patch-relay_aux
>--- heyu2.old/files/patch-relay_aux	1969-12-31 18:00:00.000000000 -0600
>+++ heyu2/files/patch-relay_aux	2023-04-12 00:14:54.816940000 -0500
>@@ -0,0 +1,11 @@
>+--- relay_aux.c	2012-05-01 05:04:46.000000000 -0500
>++++ ../../../heyu2/work/heyu-2.10/relay_aux.c	2023-04-12 00:07:18.211242000 -0500
>+@@ -74,7 +74,7 @@
>+ extern CONFIG config;
>+ extern CONFIG *configp;
>+ 
>+-char spoolfile[PATH_LEN + 1];
>++extern char spoolfile[PATH_LEN + 1];
>+ 
>+ extern int is_ring( void );
>+ int relay_ri_control( void );
>diff -ruN heyu2.old/files/patch-tty heyu2/files/patch-tty
>--- heyu2.old/files/patch-tty	1969-12-31 18:00:00.000000000 -0600
>+++ heyu2/files/patch-tty	2023-04-12 00:13:38.625654000 -0500
>@@ -0,0 +1,29 @@
>+--- tty.c	2023-04-11 22:28:41.871696000 -0500
>++++ ../../../heyu2/work/heyu-2.10/tty.c	2023-04-12 00:08:25.314627000 -0500
>+@@ -96,7 +96,7 @@
>+ 
>+ #ifndef SYSV
>+ #include <sgtty.h>
>+-struct sgttyb oldsb, newsb;
>++static struct sgttyb oldsb, newsb;
>+ void hangup();
>+ #else
>+ #ifndef POSIX
>+@@ -104,7 +104,7 @@
>+ #ifndef NCC
>+ #define NCC NCCS
>+ #endif
>+-struct termio oldsb, newsb;
>++static struct termio oldsb, newsb;
>+ #else
>+ #include <termios.h>
>+ #ifdef DARWIN
>+@@ -113,7 +113,7 @@
>+ #ifndef NCC
>+ #define NCC NCCS
>+ #endif
>+-struct termios oldsb, newsb;
>++static struct termios oldsb, newsb;
>+ #endif
>+ 
>+ #endif
>diff -ruN heyu2.old/files/patch-tty_aux heyu2/files/patch-tty_aux
>--- heyu2.old/files/patch-tty_aux	1969-12-31 18:00:00.000000000 -0600
>+++ heyu2/files/patch-tty_aux	2023-04-12 00:14:04.333839000 -0500
>@@ -0,0 +1,29 @@
>+--- tty_aux.c	2023-04-11 22:36:12.108198000 -0500
>++++ ../../../heyu2/work/heyu-2.10/tty_aux.c	2023-04-12 00:09:13.807913000 -0500
>+@@ -92,7 +92,7 @@
>+ 
>+ #ifndef SYSV
>+ #include <sgtty.h>
>+-struct sgttyb oldsb, newsb;
>++static struct sgttyb oldsb, newsb;
>+ void hangup();
>+ #else
>+ #ifndef POSIX
>+@@ -100,7 +100,7 @@
>+ #ifndef NCC
>+ #define NCC NCCS
>+ #endif
>+-struct termio oldsb, newsb;
>++static struct termio oldsb, newsb;
>+ #else
>+ #include <termios.h>
>+ #if defined(DARWIN) || defined(NETBSD)
>+@@ -109,7 +109,7 @@
>+ #ifndef NCC
>+ #define NCC NCCS
>+ #endif
>+-extern struct termios oldsb, newsb;
>++static struct termios oldsb, newsb;
>+ #endif
>+ 
>+ #endif

Actions: View | Diff

Attachments on bug 270779: 241427 | 241525 | 241687 | 242470