Fix whith -fno-common in FreeBSD 13

Lastest version of llvm introduced in
FreeBSD 13 has the flag -fno-common
enabled by default. Fix the issue.

Bump PORTREVISION

6 files changed, 174 insertions, 3 deletions

diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile
index 3ba763570b34..e53e271d7c6c 100644
--- a/x11-wm/wmii/Makefile
+++ b/x11-wm/wmii/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wmii
 DISTVERSION=	3.6	# this is stable version; for 3.9.x, use -devel port
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://dl.suckless.org/wmii/
 
@@ -16,11 +16,11 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libixp.so:devel/libixp
 RUN_DEPENDS=	dmenu:x11/dmenu
 
-CONFLICTS=	wmii-devel-[0-9]*
-
 USES=		xorg
 USE_XORG=	x11 xorgproto xt xext
 
+CONFLICTS=	wmii-devel-[0-9]*
+
 MAKE_ARGS=	PREFIX="${PREFIX}" MAN="${MANPREFIX}/man" \
 		INCLUDE="${LOCALBASE}/include" \
 		INCX11="-I${LOCALBASE}/include" \
diff --git a/x11-wm/wmii/files/patch-cmd_util.c b/x11-wm/wmii/files/patch-cmd_util.c
new file mode 100644
index 000000000000..37ad3f3c4aa9
--- /dev/null
+++ b/x11-wm/wmii/files/patch-cmd_util.c
@@ -0,0 +1,13 @@
+--- cmd/util.c.orig	2007-11-16 13:59:15 UTC
++++ cmd/util.c
+@@ -9,6 +9,10 @@
+ #include <util.h>
+ #include <fmt.h>
+ 
++char *argv0;
++void *__p;
++int __i;
++
+ typedef struct VFmt VFmt;
+ struct VFmt {
+ 	const char *fmt;
diff --git a/x11-wm/wmii/files/patch-cmd_wmii_area.c b/x11-wm/wmii/files/patch-cmd_wmii_area.c
new file mode 100644
index 000000000000..8f08f7f3edbd
--- /dev/null
+++ b/x11-wm/wmii/files/patch-cmd_wmii_area.c
@@ -0,0 +1,33 @@
+--- cmd/wmii/area.c.orig	2007-11-16 13:59:15 UTC
++++ cmd/wmii/area.c
+@@ -10,6 +10,30 @@
+ #include <string.h>
+ #include "fns.h"
+ 
++Display *display;
++Screen scr;
++struct Global def;
++WMScreen *screens, *screen;
++Client *client;
++View *view;
++Key *key;
++Divide *divs;
++Client c_magic;
++Client c_root;
++char buffer[8092];
++IxpServer srv;
++uint num_screens;
++uint valid_mask;
++uint num_lock_mask;
++Bool sel_screen;
++Image xor;
++Cursor cursor[CurLast];
++Image *broken;
++Bool starting;
++Bool verbose;
++char *user;
++char *execstr;
++
+ static void place_frame(Frame *f);
+ 
+ Client *
diff --git a/x11-wm/wmii/files/patch-cmd_wmii_dat.h b/x11-wm/wmii/files/patch-cmd_wmii_dat.h
new file mode 100644
index 000000000000..1a703f004db3
--- /dev/null
+++ b/x11-wm/wmii/files/patch-cmd_wmii_dat.h
@@ -0,0 +1,97 @@
+--- cmd/wmii/dat.h.orig	2007-11-16 13:59:15 UTC
++++ cmd/wmii/dat.h
+@@ -2,7 +2,6 @@
+  * See LICENSE file for license details.
+  */
+ 
+-#define _XOPEN_SOURCE 600
+ #define IXP_P9_STRUCTS
+ #define IXP_NO_P9_
+ #include <regexp9.h>
+@@ -194,7 +193,7 @@ struct Ruleset {
+ };
+ 
+ /* global variables */
+-struct {
++struct Global {
+ 	CTuple focuscolor;
+ 	CTuple normcolor;
+ 	Font *font;
+@@ -207,8 +206,10 @@ struct {
+ 	char grabmod[5];
+ 	ulong mod;
+ 	int colmode;
+-} def;
++};
+ 
++extern struct Global def;
++
+ enum {
+ 	BarLeft, BarRight
+ };
+@@ -223,40 +224,42 @@ struct WMScreen {
+ 
+ 	Rectangle r;
+ 	Rectangle brect;
+-} *screens, *screen;
++};
+ 
+-Client *client;
+-View *view;
+-Key *key;
+-Divide *divs;
+-Client c_magic;
+-Client c_root;
++extern WMScreen *screens, *screen;
+ 
+-Handlers framehandler;
++extern Client *client;
++extern View *view;
++extern Key *key;
++extern Divide *divs;
++extern Client c_magic;
++extern Client c_root;
+ 
+-char buffer[8092];
++extern Handlers framehandler;
+ 
++extern char buffer[8092];
++
+ /* IXP */
+-IxpServer srv;
+-Ixp9Srv p9srv;
++extern IxpServer srv;
++extern Ixp9Srv p9srv;
+ 
+ /* X11 */
+-uint num_screens;
+-uint valid_mask;
+-uint num_lock_mask;
+-Bool sel_screen;
++extern uint num_screens;
++extern uint valid_mask;
++extern uint num_lock_mask;
++extern Bool sel_screen;
+ 
+-Image xor;
++extern Image xor;
+ 
+-Cursor cursor[CurLast];
+-void (*handler[LASTEvent]) (XEvent *);
++extern Cursor cursor[CurLast];
++extern void (*handler[LASTEvent]) (XEvent *);
+ 
+ /* Misc */
+-Image *broken;
+-Bool starting;
+-Bool verbose;
+-char *user;
+-char *execstr;
++extern Image *broken;
++extern Bool starting;
++extern Bool verbose;
++extern char *user;
++extern char *execstr;
+ 
+ #define Debug if(verbose)
+ #define Dprint(...) do{ Debug fprint(2, __VA_ARGS__); }while(0)
diff --git a/x11-wm/wmii/files/patch-cmd_wmii_x11.h b/x11-wm/wmii/files/patch-cmd_wmii_x11.h
new file mode 100644
index 000000000000..453b2586fbd3
--- /dev/null
+++ b/x11-wm/wmii/files/patch-cmd_wmii_x11.h
@@ -0,0 +1,13 @@
+--- cmd/wmii/x11.h.orig	2020-10-17 20:50:09 UTC
++++ cmd/wmii/x11.h
+@@ -94,8 +94,8 @@ struct Font {
+ 	char *name;
+ };
+ 
+-Display *display;
+-Screen scr;
++extern Display *display;
++extern Screen scr;
+ 
+ extern Point ZP;
+ extern Rectangle ZR;
diff --git a/x11-wm/wmii/files/patch-include_util.h b/x11-wm/wmii/files/patch-include_util.h
new file mode 100644
index 000000000000..dbf85a773f5d
--- /dev/null
+++ b/x11-wm/wmii/files/patch-include_util.h
@@ -0,0 +1,15 @@
+--- include/util.h.orig	2007-11-16 13:59:15 UTC
++++ include/util.h
+@@ -37,9 +37,9 @@ char *str_nil(char *s);
+ int utflcpy(char *to, const char *from, int l);
+ uint strlcat(char *dst, const char *src, unsigned int siz);
+ 
+-char *argv0;
+-void *__p;
+-int __i;
++extern char *argv0;
++extern void *__p;
++extern int __i;
+ #undef ARGBEGIN
+ #undef ARGEND
+ #undef ARGF