From owner-svn-ports-all@freebsd.org Mon Feb 1 17:44:58 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DF323530A34; Mon, 1 Feb 2021 17:44:58 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DTwLy61hkz4Tvb; Mon, 1 Feb 2021 17:44:58 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C18E11F884; Mon, 1 Feb 2021 17:44:58 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 111HiwYG047383; Mon, 1 Feb 2021 17:44:58 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 111HivUx047375; Mon, 1 Feb 2021 17:44:57 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <202102011744.111HivUx047375@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Mon, 1 Feb 2021 17:44:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r563595 - in head/games/xkoules: . files X-SVN-Group: ports-head X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: in head/games/xkoules: . files X-SVN-Commit-Revision: 563595 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Feb 2021 17:44:58 -0000 Author: fernape Date: Mon Feb 1 17:44:56 2021 New Revision: 563595 URL: https://svnweb.freebsd.org/changeset/ports/563595 Log: games/xkoules: Unbreak build with -fno-common PR: 253128 Submitted by: m.ne@gmx.net Added: head/games/xkoules/files/patch-koules.h (contents, props changed) head/games/xkoules/files/patch-server.c (contents, props changed) Modified: head/games/xkoules/Makefile head/games/xkoules/files/patch-Iconfig head/games/xkoules/files/patch-Imakefile head/games/xkoules/files/patch-koules.sndsrv.freebsd.c head/games/xkoules/files/patch-xlib__inlstring.h head/games/xkoules/files/patch-xlib__shmbitmap.c head/games/xkoules/files/patch-xlib__text.c Modified: head/games/xkoules/Makefile ============================================================================== --- head/games/xkoules/Makefile Mon Feb 1 17:44:24 2021 (r563594) +++ head/games/xkoules/Makefile Mon Feb 1 17:44:56 2021 (r563595) @@ -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 Modified: head/games/xkoules/files/patch-Iconfig ============================================================================== --- head/games/xkoules/files/patch-Iconfig Mon Feb 1 17:44:24 2021 (r563594) +++ head/games/xkoules/files/patch-Iconfig Mon Feb 1 17:44:56 2021 (r563595) @@ -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*/ Modified: head/games/xkoules/files/patch-Imakefile ============================================================================== --- head/games/xkoules/files/patch-Imakefile Mon Feb 1 17:44:24 2021 (r563594) +++ head/games/xkoules/files/patch-Imakefile Mon Feb 1 17:44:56 2021 (r563595) @@ -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) @: Added: head/games/xkoules/files/patch-koules.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xkoules/files/patch-koules.h Mon Feb 1 17:44:56 2021 (r563595) @@ -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; Modified: head/games/xkoules/files/patch-koules.sndsrv.freebsd.c ============================================================================== --- head/games/xkoules/files/patch-koules.sndsrv.freebsd.c Mon Feb 1 17:44:24 2021 (r563594) +++ head/games/xkoules/files/patch-koules.sndsrv.freebsd.c Mon Feb 1 17:44:56 2021 (r563595) @@ -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 #include Added: head/games/xkoules/files/patch-server.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/xkoules/files/patch-server.c Mon Feb 1 17:44:56 2021 (r563595) @@ -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 Modified: head/games/xkoules/files/patch-xlib__inlstring.h ============================================================================== --- head/games/xkoules/files/patch-xlib__inlstring.h Mon Feb 1 17:44:24 2021 (r563594) +++ head/games/xkoules/files/patch-xlib__inlstring.h Mon Feb 1 17:44:56 2021 (r563595) @@ -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) { Modified: head/games/xkoules/files/patch-xlib__shmbitmap.c ============================================================================== --- head/games/xkoules/files/patch-xlib__shmbitmap.c Mon Feb 1 17:44:24 2021 (r563594) +++ head/games/xkoules/files/patch-xlib__shmbitmap.c Mon Feb 1 17:44:56 2021 (r563595) @@ -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 */ Modified: head/games/xkoules/files/patch-xlib__text.c ============================================================================== --- head/games/xkoules/files/patch-xlib__text.c Mon Feb 1 17:44:24 2021 (r563594) +++ head/games/xkoules/files/patch-xlib__text.c Mon Feb 1 17:44:56 2021 (r563595) @@ -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