Build tested.
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/awesome/Makefile,v
retrieving revision 1.112
diff -u -p -r1.112 Makefile
--- Makefile 1 Dec 2020 06:03:24 -0000 1.112
+++ Makefile 29 Jan 2021 15:37:25 -0000
@@ -5,7 +5,7 @@ COMMENT= highly configurable framework
V= 4.3
DISTNAME= awesome-${V}
CATEGORIES= x11
-REVISION= 0
+REVISION= 1
HOMEPAGE= https://awesomewm.org/
Index: patches/patch-common_lualib_c
===================================================================
RCS file: patches/patch-common_lualib_c
diff -N patches/patch-common_lualib_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-common_lualib_c 29 Jan 2021 15:37:25 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure. Taken from
+https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0
+
+Index: common/lualib.c
+--- common/lualib.c.orig
++++ common/lualib.c
+@@ -20,6 +20,8 @@
+ #include "common/lualib.h"
+ #include "luaa.h"
+
++lua_CFunction lualib_dofunction_on_error;
++
+ void luaA_checkfunction(lua_State *L, int idx)
+ {
+ if(!lua_isfunction(L, idx))
Index: patches/patch-common_lualib_h
===================================================================
RCS file: patches/patch-common_lualib_h
diff -N patches/patch-common_lualib_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-common_lualib_h 29 Jan 2021 15:37:25 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure. Taken from
+https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0
+
+Index: common/lualib.h
+--- common/lualib.h.orig
++++ common/lualib.h
+@@ -28,7 +28,7 @@
+ #include "common/util.h"
+
+ /** Lua function to call on dofunction() error */
+-lua_CFunction lualib_dofunction_on_error;
++extern lua_CFunction lualib_dofunction_on_error;
+
+ void luaA_checkfunction(lua_State *, int);
+ void luaA_checktable(lua_State *, int);
Index: patches/patch-luaa_c
===================================================================
RCS file: patches/patch-luaa_c
diff -N patches/patch-luaa_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-luaa_c 29 Jan 2021 15:37:25 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure. Taken from
+https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0
+
+Index: luaa.c
+--- luaa.c.orig
++++ luaa.c
+@@ -77,6 +77,8 @@ extern const struct luaL_Reg awesome_root_lib[];
+ extern const struct luaL_Reg awesome_mouse_methods[];
+ extern const struct luaL_Reg awesome_mouse_meta[];
+
++signal_array_t global_signals;
++
+ /** A call into the Lua code aborted with an error.
+ *
+ * This signal is used in the example configuration, @{05-awesomerc.md},
Index: patches/patch-luaa_h
===================================================================
RCS file: patches/patch-luaa_h
diff -N patches/patch-luaa_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-luaa_h 29 Jan 2021 15:37:25 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure. Taken from
+https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0
+
+Index: luaa.h
+--- luaa.h.orig
++++ luaa.h
+@@ -311,7 +311,7 @@ const char *luaA_find_config(xdgHandle *, const char *
+ bool luaA_parserc(xdgHandle *, const char *);
+
+ /** Global signals */
+-signal_array_t global_signals;
++extern signal_array_t global_signals;
+
+ int luaA_class_index_miss_property(lua_State *, lua_object_t *);
+ int luaA_class_newindex_miss_property(lua_State *, lua_object_t *);
Index: patches/patch-objects_button_c
===================================================================
RCS file: patches/patch-objects_button_c
diff -N patches/patch-objects_button_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-objects_button_c 29 Jan 2021 15:37:25 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure. Taken from
+https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0
+
+Index: objects/button.c
+--- objects/button.c.orig
++++ objects/button.c
+@@ -35,6 +35,8 @@
+
+ #include "button.h"
+
++lua_class_t button_class;
++
+ /** Button object.
+ *
+ * @tfield int button The mouse button number, or 0 for any button.
Index: patches/patch-objects_button_h
===================================================================
RCS file: patches/patch-objects_button_h
diff -N patches/patch-objects_button_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-objects_button_h 29 Jan 2021 15:37:25 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure. Taken from
+https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0
+
+Index: objects/button.h
+--- objects/button.h.orig
++++ objects/button.h
+@@ -39,7 +39,7 @@ typedef struct button_t
+ xcb_button_t button;
+ } button_t;
+
+-lua_class_t button_class;
++extern lua_class_t button_class;
+ LUA_OBJECT_FUNCS(button_class, button_t, button)
+ ARRAY_FUNCS(button_t *, button, DO_NOTHING)
+
Index: patches/patch-objects_client_c
===================================================================
RCS file: patches/patch-objects_client_c
diff -N patches/patch-objects_client_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-objects_client_c 29 Jan 2021 15:37:25 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure. Taken from
+https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0
+
+Index: objects/client.c
+--- objects/client.c.orig
++++ objects/client.c
+@@ -106,6 +106,8 @@
+ #include <xcb/shape.h>
+ #include <cairo-xcb.h>
+
++lua_class_t client_class;
++
+ /** Client class.
+ *
+ * This table allow to add more dynamic properties to the clients. For
example,
Index: patches/patch-objects_client_h
===================================================================
RCS file: patches/patch-objects_client_h
diff -N patches/patch-objects_client_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-objects_client_h 29 Jan 2021 15:37:25 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure. Taken from
+https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0
+
+Index: objects/client.h
+--- objects/client.h.orig
++++ objects/client.h
+@@ -192,7 +192,7 @@ struct client_t
+ ARRAY_FUNCS(client_t *, client, DO_NOTHING)
+
+ /** Client class */
+-lua_class_t client_class;
++extern lua_class_t client_class;
+
+ LUA_OBJECT_FUNCS(client_class, client_t, client)
+
Index: patches/patch-objects_drawin_c
===================================================================
RCS file: patches/patch-objects_drawin_c
diff -N patches/patch-objects_drawin_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-objects_drawin_c 29 Jan 2021 15:37:25 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure. Taken from
+https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0
+
+Index: objects/drawin.c
+--- objects/drawin.c.orig
++++ objects/drawin.c
+@@ -46,6 +46,8 @@
+ #include <cairo-xcb.h>
+ #include <xcb/shape.h>
+
++lua_class_t drawin_class;
++
+ /** Drawin object.
+ *
+ * @field border_width Border width.
Index: patches/patch-objects_drawin_h
===================================================================
RCS file: patches/patch-objects_drawin_h
diff -N patches/patch-objects_drawin_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-objects_drawin_h 29 Jan 2021 15:37:25 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure. Taken from
+https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0
+
+Index: objects/drawin.h
+--- objects/drawin.h.orig
++++ objects/drawin.h
+@@ -52,7 +52,7 @@ void luaA_drawin_systray_kickout(lua_State *);
+
+ void drawin_class_setup(lua_State *);
+
+-lua_class_t drawin_class;
++extern lua_class_t drawin_class;
+
+ #endif
+ // vim: filetype=c:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
Index: patches/patch-objects_key_c
===================================================================
RCS file: patches/patch-objects_key_c
diff -N patches/patch-objects_key_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-objects_key_c 29 Jan 2021 15:37:25 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Fix -fno-common build failure. Taken from
+https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0
+
+Index: objects/drawin.h
+Index: objects/key.c
+--- objects/key.c.orig
++++ objects/key.c
+@@ -43,6 +43,8 @@
+ #include <xkbcommon/xkbcommon.h>
+ #include <glib.h>
+
++lua_class_t key_class;
++
+ /** Key object.
+ *
+ * @tfield string key The key to trigger an event.
Index: patches/patch-objects_key_h
===================================================================
RCS file: patches/patch-objects_key_h
diff -N patches/patch-objects_key_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-objects_key_h 29 Jan 2021 15:37:25 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure. Taken from
+https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0
+
+Index: objects/key.h
+--- objects/key.h.orig
++++ objects/key.h
+@@ -36,7 +36,7 @@ typedef struct keyb_t
+ xcb_keycode_t keycode;
+ } keyb_t;
+
+-lua_class_t key_class;
++extern lua_class_t key_class;
+ LUA_OBJECT_FUNCS(key_class, keyb_t, key)
+ DO_ARRAY(keyb_t *, key, DO_NOTHING)
+
Index: patches/patch-objects_tag_c
===================================================================
RCS file: patches/patch-objects_tag_c
diff -N patches/patch-objects_tag_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-objects_tag_c 29 Jan 2021 15:37:25 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure. Taken from
+https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0
+
+Index: objects/tag.c
+--- objects/tag.c.orig
++++ objects/tag.c
+@@ -190,6 +190,8 @@
+ #include "ewmh.h"
+ #include "luaa.h"
+
++lua_class_t tag_class;
++
+ /**
+ * @signal request::select
+ */
Index: patches/patch-objects_tag_h
===================================================================
RCS file: patches/patch-objects_tag_h
diff -N patches/patch-objects_tag_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-objects_tag_h 29 Jan 2021 15:37:25 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure. Taken from
+https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0
+
+Index: objects/tag.h
+--- objects/tag.h.orig
++++ objects/tag.h
+@@ -46,7 +46,7 @@ struct tag
+ client_array_t clients;
+ };
+
+-lua_class_t tag_class;
++extern lua_class_t tag_class;
+ LUA_OBJECT_FUNCS(tag_class, tag_t, tag)
+
+ void tag_class_setup(lua_State *);
Index: patches/patch-objects_window_c
===================================================================
RCS file: patches/patch-objects_window_c
diff -N patches/patch-objects_window_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-objects_window_c 29 Jan 2021 15:37:25 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix -fno-common build failure. Taken from
+https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0
+
+Index: objects/window.c
+--- objects/window.c.orig
++++ objects/window.c
+@@ -59,6 +59,7 @@
+ #include "property.h"
+ #include "xwindow.h"
+
++lua_class_t window_class;
+ LUA_CLASS_FUNCS(window, window_class)
+
+ static xcb_window_t
Index: patches/patch-objects_window_h
===================================================================
RCS file: patches/patch-objects_window_h
diff -N patches/patch-objects_window_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-objects_window_h 29 Jan 2021 15:37:25 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Fix -fno-common build failure. Taken from
+https://github.com/awesomeWM/awesome/commit/d256d9055095f27a33696e0aeda4ee20ed4fb1a0
+
+Index: objects/window.h
+--- objects/window.h.orig
++++ objects/window.h
+@@ -80,7 +80,7 @@ typedef struct
+ WINDOW_OBJECT_HEADER
+ } window_t;
+
+-lua_class_t window_class;
++extern lua_class_t window_class;
+
+ void window_class_setup(lua_State *);
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/awesome/pkg/PLIST,v
retrieving revision 1.19
diff -u -p -r1.19 PLIST
--- pkg/PLIST 1 Dec 2020 06:03:24 -0000 1.19
+++ pkg/PLIST 29 Jan 2021 15:37:25 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.19 2020/12/01 06:03:24 rsadowski Exp $
+@sample ${SYSCONFDIR}/xdg/
+@sample ${SYSCONFDIR}/xdg/awesome/
@bin bin/awesome
bin/awesome-client
@man man/man1/awesome-client.1
@@ -307,8 +309,6 @@ share/doc/awesome/02-contributing.md
share/doc/awesome/LICENSE
share/examples/awesome/
share/examples/awesome/rc.lua
-@sample ${SYSCONFDIR}/xdg/
-@sample ${SYSCONFDIR}/xdg/awesome/
@sample ${SYSCONFDIR}/xdg/awesome/rc.lua
share/xsessions/
share/xsessions/awesome.desktop
