games/xkoules: Unbreak build with -fno-common

PR:	253128
Submitted by:	m.ne@gmx.net

9 files changed, 48 insertions, 28 deletions

diff --git a/games/xkoules/Makefile b/games/xkoules/Makefile
index 4de075534c80..2bc6b7e84b34 100644
--- a/games/xkoules/Makefile
+++ b/games/xkoules/Makefile
@@ -18,9 +18,6 @@ COMMENT=	Fast action arcade-style game for X Window
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_FreeBSD_13=	duplicate symbol: controls
-BROKEN_FreeBSD_14=	duplicate symbol: controls
-
 WRKSRC=		${WRKDIR}/${PORTNAME:S/x//}${PORTVERSION}
 
 USES=		imake xorg
diff --git a/games/xkoules/files/patch-Iconfig b/games/xkoules/files/patch-Iconfig
index bf693369aa9b..63cefd202195 100644
--- a/games/xkoules/files/patch-Iconfig
+++ b/games/xkoules/files/patch-Iconfig
@@ -1,5 +1,5 @@
---- ./Iconfig.orig	1998-03-04 21:29:05.000000000 +0100
-+++ ./Iconfig	2014-03-30 03:11:00.569385664 +0200
+--- Iconfig.orig	1998-03-04 20:29:05 UTC
++++ Iconfig
 @@ -34,9 +34,9 @@
    recomended for linux*/
  /*#define I386ASSEMBLY*/
diff --git a/games/xkoules/files/patch-Imakefile b/games/xkoules/files/patch-Imakefile
index c95e461a9819..d6670ed6892d 100644
--- a/games/xkoules/files/patch-Imakefile
+++ b/games/xkoules/files/patch-Imakefile
@@ -1,6 +1,6 @@
---- ./Imakefile.orig	1998-03-04 19:59:19.000000000 +0100
-+++ ./Imakefile	2014-03-30 03:11:00.569385664 +0200
-@@ -56,7 +56,7 @@
+--- Imakefile.orig	1998-03-04 18:59:19 UTC
++++ Imakefile
+@@ -56,7 +56,7 @@ INSTALLSOUND = True
  
  DEFINES = -DONLYANSI -DSOUND $(JOYSTICK1) $(NET) $(MITSHM1) $(HAVEUSLEEP1) $(SYSDEFS) $(JOYSTICK) -Ixlib\
  	$(NAMEDEF) $(ASMDEF)\
@@ -9,7 +9,7 @@
  	-DSOUNDDIR=\"$(SOUNDDIR)\" \
  	-DSOUNDDEV=\"$(SOUNDDEV)\"
  #endif
-@@ -84,9 +84,6 @@
+@@ -84,9 +84,6 @@ all::xkoules $(SOUNDSERVER)
  all::xkoules
  #endif
  
@@ -19,7 +19,7 @@
  ComplexProgramTarget(xkoules)
  
  
-@@ -97,19 +94,15 @@
+@@ -97,19 +94,15 @@ NormalProgramTarget($(SOUNDSERVER), $(SOUNDSERVER).o,,
  install:: $(PROGRAMS) $(SOUNDSERVER)
  	@echo "Koules directory is " $(KOULESDIR)
  	@:
@@ -43,7 +43,7 @@
  		echo "Copying sound files into directory " $(SOUNDDIR); \
  		cd ./sounds; set -x;					\
  		for file in *.raw; do                                   \
-@@ -125,19 +118,15 @@
+@@ -125,19 +118,15 @@ install:: $(PROGRAMS) $(SOUNDSERVER)
  install:: $(PROGRAMS) $(SOUNDSERVER)
  	@echo "Koules directory is " $(KOULESDIR)
  	@:
@@ -67,7 +67,7 @@
  		echo "Copying sound files into directory " $(SOUNDDIR); \
  		cd ./sounds; set -x;					\
  		for file in *.raw; do                                   \
-@@ -155,19 +144,15 @@
+@@ -155,19 +144,15 @@ install:: $(PROGRAMS) $(SOUNDSERVER)
  install:: $(PROGRAMS) $(SOUNDSERVER)
  	@echo "Koules directory is " $(KOULESDIR)
  	@:
diff --git a/games/xkoules/files/patch-koules.h b/games/xkoules/files/patch-koules.h
new file mode 100644
index 000000000000..36359582d7ab
--- /dev/null
+++ b/games/xkoules/files/patch-koules.h
@@ -0,0 +1,11 @@
+--- koules.h.orig	1998-03-04 18:59:19 UTC
++++ koules.h
+@@ -238,7 +238,7 @@ extern Point    point[MAXPOINT];
+ extern int      gameplan;
+ extern int      rotation[MAXROCKETS];
+ extern char     control[MAXROCKETS];
+-extern struct control controls[5];
++extern struct control controls[MAXROCKETS];
+ extern int      lastlevel, maxlevel;
+ #ifdef NETSUPPORT
+ extern int      client, server;
diff --git a/games/xkoules/files/patch-koules.sndsrv.freebsd.c b/games/xkoules/files/patch-koules.sndsrv.freebsd.c
index a5ee893517ba..c6869577e1c7 100644
--- a/games/xkoules/files/patch-koules.sndsrv.freebsd.c
+++ b/games/xkoules/files/patch-koules.sndsrv.freebsd.c
@@ -1,5 +1,5 @@
---- ./koules.sndsrv.freebsd.c.orig	1998-03-04 19:59:19.000000000 +0100
-+++ ./koules.sndsrv.freebsd.c	2014-03-30 03:11:00.579428909 +0200
+--- koules.sndsrv.freebsd.c.orig	1998-03-04 18:59:19 UTC
++++ koules.sndsrv.freebsd.c
 @@ -14,7 +14,7 @@
  #include <unistd.h>
  #include <fcntl.h>
diff --git a/games/xkoules/files/patch-server.c b/games/xkoules/files/patch-server.c
new file mode 100644
index 000000000000..951df7e76568
--- /dev/null
+++ b/games/xkoules/files/patch-server.c
@@ -0,0 +1,12 @@
+--- server.c.orig	1998-03-04 18:59:19 UTC
++++ server.c
+@@ -80,8 +80,7 @@ static long     sizes[MAXPACKET];
+ static long     isizes[MAXPACKET];
+ char            acceled[5];
+ #endif
+-struct control  controls[MAXROCKETS];
+-static unsigned char Clientmap[5];
++static unsigned char Clientmap[MAXROCKETS];
+ static int      Socket;
+ /*static int      tbreak; */
+ #define BUFFERSIZE 65536
diff --git a/games/xkoules/files/patch-xlib__inlstring.h b/games/xkoules/files/patch-xlib__inlstring.h
index 13cc8c9cfb7c..964c8633edba 100644
--- a/games/xkoules/files/patch-xlib__inlstring.h
+++ b/games/xkoules/files/patch-xlib__inlstring.h
@@ -1,6 +1,6 @@
---- ./xlib/inlstring.h.orig	1998-03-04 19:59:19.000000000 +0100
-+++ ./xlib/inlstring.h	2014-03-30 03:11:00.579428909 +0200
-@@ -238,12 +238,12 @@
+--- xlib/inlstring.h.orig	1998-03-04 18:59:19 UTC
++++ xlib/inlstring.h
+@@ -238,12 +238,12 @@ extern          __memcpyasm_regargs_aligned ();		/* nu
  static INLINE void *
  __memcpy_aligndest (void *dest, const void *src, int n)
  {
@@ -19,7 +19,7 @@
  				"
  				:
  				:"b"            (dest), "d" (src), "c" (n)
-@@ -255,13 +255,13 @@
+@@ -255,13 +255,13 @@ __memcpy_aligndest (void *dest, const void *src, int n
  static INLINE void *
  __memcpy_destaligned (void *dest, const void *src, int n)
  {
@@ -40,7 +40,7 @@
  				"
  				:
  				:"b"            (dest), "d" (src), "c" (n)
-@@ -273,13 +273,13 @@
+@@ -273,13 +273,13 @@ __memcpy_destaligned (void *dest, const void *src, int
  static INLINE void *
  __memcpy_balanced (void *dest, const void *src, int n)
  {
diff --git a/games/xkoules/files/patch-xlib__shmbitmap.c b/games/xkoules/files/patch-xlib__shmbitmap.c
index 1f9356b4d755..0a1e6de435b3 100644
--- a/games/xkoules/files/patch-xlib__shmbitmap.c
+++ b/games/xkoules/files/patch-xlib__shmbitmap.c
@@ -1,6 +1,6 @@
---- ./xlib/shmbitmap.c.orig	1998-03-04 19:59:19.000000000 +0100
-+++ ./xlib/shmbitmap.c	2014-03-30 03:11:00.579428909 +0200
-@@ -237,7 +237,7 @@
+--- xlib/shmbitmap.c.orig	1998-03-04 18:59:19 UTC
++++ xlib/shmbitmap.c
+@@ -237,7 +237,7 @@ ShmPutBitmap (int x, int y, int w, int h, void *_dp)
  #define __clipy1 0
  #undef __clipy2
  #define __clipy2 (MAPHEIGHT+19)
@@ -9,7 +9,7 @@
  static INLINE int
  muldiv64 (int CONST m1, int CONST m2, int CONST d)
  {
-@@ -333,7 +333,7 @@
+@@ -333,7 +333,7 @@ Line (int x1, int y1, int x2, int y2, int c)
  	  }
  	if (r1 & 1)
  	  {			/* left */
@@ -18,7 +18,7 @@
  	    y1 += muldiv64 (__clipx1 - x1, y2 - y1, x2 - x1);
  #else
  	    y1 += (long) (__clipx1 - x1) * (long) (y2 - y1) / (long) (x2 - x1);
-@@ -342,7 +342,7 @@
+@@ -342,7 +342,7 @@ Line (int x1, int y1, int x2, int y2, int c)
  	  }
  	else if (r1 & 2)
  	  {			/* right */
@@ -27,7 +27,7 @@
  	    y1 += muldiv64 (__clipx2 - x1, y2 - y1, x2 - x1);
  #else
  	    y1 += (long) (__clipx2 - x1) * (long) (y2 - y1) / (long) (x2 - x1);
-@@ -351,7 +351,7 @@
+@@ -351,7 +351,7 @@ Line (int x1, int y1, int x2, int y2, int c)
  	  }
  	else if (r1 & 4)
  	  {			/* top */
@@ -36,7 +36,7 @@
  	    x1 += muldiv64 (__clipy1 - y1, x2 - x1, y2 - y1);
  #else
  	    x1 += (long) (__clipy1 - y1) * (long) (x2 - x1) / (long) (y2 - y1);
-@@ -360,7 +360,7 @@
+@@ -360,7 +360,7 @@ Line (int x1, int y1, int x2, int y2, int c)
  	  }
  	else if (r1 & 8)
  	  {			/* bottom */
diff --git a/games/xkoules/files/patch-xlib__text.c b/games/xkoules/files/patch-xlib__text.c
index 60c1793ca8ce..fc9cd3a28dd6 100644
--- a/games/xkoules/files/patch-xlib__text.c
+++ b/games/xkoules/files/patch-xlib__text.c
@@ -1,5 +1,5 @@
---- ./xlib/text.c.orig	1998-03-04 19:59:19.000000000 +0100
-+++ ./xlib/text.c	2014-03-30 03:12:11.082033640 +0200
+--- xlib/text.c.orig	1998-03-04 18:59:19 UTC
++++ xlib/text.c
 @@ -4,6 +4,7 @@
  
  #ifdef MITSHM