Hi,

FreeBSD has been creative while fixing it [0]. This fixes the build
with -fno-common. Runtime has been tested successfully on amd64 and
macppc.

I've found the hard way that it requires permissions fixing while
issueing update-patches, and, while here, let's move upstream to
dockapps.net and refresh WANTLIB. The distfile checksum did not change.

OK?

Charlène.


[0]
https://svnweb.freebsd.org/ports/head/games/wmtictactoe/Makefile?view=markup&pathrev=549081#l22


Index: Makefile
===================================================================
RCS file: /cvs/ports/games/wmtictactoe/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- Makefile    12 Jul 2019 20:46:26 -0000      1.19
+++ Makefile    4 Feb 2021 16:59:00 -0000
@@ -4,12 +4,18 @@ COMMENT=              wm-dockapp; TicTacToe game
 
 DISTNAME=              wmtictactoe-1.1-1
 PKGNAME=               wmtictactoe-1.1.1
-REVISION =             2
+REVISION=              3
+FIX_EXTRACT_PERMISSIONS=               Yes
+
 CATEGORIES=            games x11 x11/windowmaker
 
+HOMEPAGE=              https://www.dockapps.net/wmtictactoe
+
 # GPL
 PERMIT_PACKAGE=        Yes
-WANTLIB=               X11 Xext Xpm c xcb
+WANTLIB=               X11 Xext Xpm c
+
+MASTER_SITES=          https://www.dockapps.net/download/
 
 NO_TEST=               Yes
 
Index: patches/patch-wmgeneral_wmgeneral_c
===================================================================
RCS file: patches/patch-wmgeneral_wmgeneral_c
diff -N patches/patch-wmgeneral_wmgeneral_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-wmgeneral_wmgeneral_c 4 Feb 2021 16:59:00 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: wmgeneral/wmgeneral.c
+--- wmgeneral/wmgeneral.c.orig
++++ wmgeneral/wmgeneral.c
+@@ -65,6 +65,8 @@ char         *Geometry = "";
+ GC                    NormalGC;
+ XpmIcon               wmgen;
+ Pixmap                pixmask;
++Display         *display;
++Window          Root, iconwin, win;
+ 
+   /*****************/
+  /* Mouse Regions */
Index: patches/patch-wmgeneral_wmgeneral_h
===================================================================
RCS file: patches/patch-wmgeneral_wmgeneral_h
diff -N patches/patch-wmgeneral_wmgeneral_h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-wmgeneral_wmgeneral_h 4 Feb 2021 16:59:00 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Fix the build with -fno-common
+
+Index: wmgeneral/wmgeneral.h
+--- wmgeneral/wmgeneral.h.orig
++++ wmgeneral/wmgeneral.h
+@@ -36,8 +36,8 @@ typedef struct {
+  /* Global variable */
+ /*******************/
+ 
+-Display               *display;
+-Window          Root, iconwin, win;
++extern Display                *display;
++extern Window          Root, iconwin, win;
+ 
+ 
+   /***********************/
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/wmtictactoe/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   9 Feb 2001 13:02:38 -0000       1.1.1.1
+++ pkg/PLIST   4 Feb 2021 16:59:00 -0000
@@ -1,2 +1,2 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2001/02/09 13:02:38 wilfried Exp $
-bin/wmtictactoe
+@bin bin/wmtictactoe

Reply via email to