Also dropping MAINTAINER, as I don't use this. OK?
Index: Makefile =================================================================== RCS file: /cvs/ports/cad/geda-gaf/Makefile,v retrieving revision 1.35 diff -u -p -r1.35 Makefile --- Makefile 12 Jul 2019 20:43:45 -0000 1.35 +++ Makefile 11 Feb 2021 16:17:09 -0000 @@ -4,9 +4,8 @@ COMMENT = suite of tools for electronic DISTNAME = geda-gaf-1.6.0 CATEGORIES = cad HOMEPAGE = http://wiki.geda-project.org/geda:gaf -MAINTAINER = Edd Barrett <e...@openbsd.org> -REVISION = 20 +REVISION = 21 SHARED_LIBS = geda 0.0 # 38.0 Index: patches/patch-gattrib_include_globals_h =================================================================== RCS file: patches/patch-gattrib_include_globals_h diff -N patches/patch-gattrib_include_globals_h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-gattrib_include_globals_h 11 Feb 2021 16:08:39 -0000 @@ -0,0 +1,54 @@ +$OpenBSD$ + +Fixes for -fno-common. + +Index: gattrib/include/globals.h +--- gattrib/include/globals.h.orig ++++ gattrib/include/globals.h +@@ -76,7 +76,7 @@ + * structs.h + */ + /*------------------------------------------------------------------*/ +-TOPLEVEL *pr_current; ++extern TOPLEVEL *pr_current; + + /*------------------------------------------------------------------*/ + /*! +@@ -85,7 +85,7 @@ TOPLEVEL *pr_current; + * callbacks. It is defined in structs.h + */ + /*------------------------------------------------------------------*/ +-SHEET_DATA *sheet_head; ++extern SHEET_DATA *sheet_head; + + /*------------------------------------------------------------------ + * GTKsheet includes: stuff for dealing with windows. +@@ -94,18 +94,18 @@ SHEET_DATA *sheet_head; + #define DEFAULT_SPACE 8 + #define NUM_SHEETS 3 /* Components, Nets, and Pins */ + +-GtkWidget *window; /* Main window */ +-GtkWidget *notebook; ++extern GtkWidget *window; /* Main window */ ++extern GtkWidget *notebook; + +-GtkSheet **sheets; /* These are the spreadsheet widgets themselves */ ++extern GtkSheet **sheets; /* These are the spreadsheet widgets themselves */ + +-GtkWidget **scrolled_windows; +-GtkWidget *entry; +-GtkWidget *location; +-GtkWidget *left_button; +-GtkWidget *center_button; +-GtkWidget *right_button; +-GtkWidget *label; ++extern GtkWidget **scrolled_windows; ++extern GtkWidget *entry; ++extern GtkWidget *location; ++extern GtkWidget *left_button; ++extern GtkWidget *center_button; ++extern GtkWidget *right_button; ++extern GtkWidget *label; + + /* command line switch settings */ + extern int verbose_mode; Index: patches/patch-gattrib_src_globals_c =================================================================== RCS file: patches/patch-gattrib_src_globals_c diff -N patches/patch-gattrib_src_globals_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-gattrib_src_globals_c 11 Feb 2021 16:15:49 -0000 @@ -0,0 +1,23 @@ +$OpenBSD$ + +Fixes for -fno-common. + +Index: gattrib/src/globals.c +--- gattrib/src/globals.c.orig ++++ gattrib/src/globals.c +@@ -49,3 +49,15 @@ int quiet_mode=FALSE; //!< Reflects the value of the + */ + void (*variable_set_func)() = i_vars_set; + ++TOPLEVEL *pr_current; ++SHEET_DATA *sheet_head; ++GtkWidget *window; ++GtkWidget *notebook; ++GtkSheet **sheets; ++GtkWidget **scrolled_windows; ++GtkWidget *entry; ++GtkWidget *location; ++GtkWidget *left_button; ++GtkWidget *center_button; ++GtkWidget *right_button; ++GtkWidget *label; -- Best Regards Edd Barrett http://www.theunixzoo.co.uk