From owner-svn-ports-all@freebsd.org Thu Feb 11 13:42:56 2021
Return-Path: <owner-svn-ports-all@freebsd.org>
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 2AA68528887;
Thu, 11 Feb 2021 13:42:56 +0000 (UTC)
(envelope-from danfe@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 4DbyW40f6Dz3m7Z;
Thu, 11 Feb 2021 13:42:56 +0000 (UTC)
(envelope-from danfe@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 096AB11FBE;
Thu, 11 Feb 2021 13:42:56 +0000 (UTC)
(envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11BDgtwI091482;
Thu, 11 Feb 2021 13:42:55 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11BDgr5Q091472;
Thu, 11 Feb 2021 13:42:53 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <202102111342.11BDgr5Q091472@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Thu, 11 Feb 2021 13:42:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r564948 - in head: games/xqf games/xqf/files games/xrally
games/xrally/files games/xrick games/xrot games/xrot/files graphics/xfractint
graphics/xfractint/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: danfe
X-SVN-Commit-Paths: in head: games/xqf games/xqf/files games/xrally
games/xrally/files games/xrick games/xrot games/xrot/files graphics/xfractint
graphics/xfractint/files
X-SVN-Commit-Revision: 564948
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Feb 2021 13:42:56 -0000
Author: danfe
Date: Thu Feb 11 13:42:53 2021
New Revision: 564948
URL: https://svnweb.freebsd.org/changeset/ports/564948
Log:
Unbreak the build against modern compilers (Clang 11, GCC 10) which
require there is only one variable definition per each object file.
Added:
head/games/xqf/files/patch-src_filter.c (contents, props changed)
head/games/xqf/files/patch-src_filter.h (contents, props changed)
head/games/xrot/files/patch-title.c (contents, props changed)
head/graphics/xfractint/files/patch-unix_video.c (contents, props changed)
Modified:
head/games/xqf/Makefile
head/games/xrally/Makefile
head/games/xrally/files/patch-game.c
head/games/xrick/Makefile
head/games/xrot/Makefile
head/graphics/xfractint/Makefile
head/graphics/xfractint/files/patch-common__fractals.c
Modified: head/games/xqf/Makefile
==============================================================================
--- head/games/xqf/Makefile Thu Feb 11 13:34:21 2021 (r564947)
+++ head/games/xqf/Makefile Thu Feb 11 13:42:53 2021 (r564948)
@@ -10,9 +10,6 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Server browser for many popular 3D action games
-BROKEN_FreeBSD_13= duplicate symbol: current_server_filter
-BROKEN_FreeBSD_14= duplicate symbol: current_server_filter
-
RUN_DEPENDS= qstat:games/qstat
USES= gettext gmake gnome pkgconfig xorg
Added: head/games/xqf/files/patch-src_filter.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/xqf/files/patch-src_filter.c Thu Feb 11 13:42:53 2021 (r564948)
@@ -0,0 +1,10 @@
+--- src/filter.c.orig 2005-08-14 11:01:59 UTC
++++ src/filter.c
+@@ -144,6 +144,7 @@ static unsigned filter_current_time = 1;
+
+ unsigned server_filter_dialog_current_filter = 0;
+
++unsigned current_server_filter;
+
+ static GtkWidget *filter_option_menu;
+ static GtkWidget *filter_retries_spinner;
Added: head/games/xqf/files/patch-src_filter.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/xqf/files/patch-src_filter.h Thu Feb 11 13:42:53 2021 (r564948)
@@ -0,0 +1,10 @@
+--- src/filter.h.orig 2004-07-24 20:32:39 UTC
++++ src/filter.h
+@@ -89,7 +89,6 @@ extern unsigned char cur_filter;
+
+ extern GArray* server_filters;
+
+-unsigned int current_server_filter;
+ extern unsigned int current_server_filter;
+
+
Modified: head/games/xrally/Makefile
==============================================================================
--- head/games/xrally/Makefile Thu Feb 11 13:34:21 2021 (r564947)
+++ head/games/xrally/Makefile Thu Feb 11 13:42:53 2021 (r564948)
@@ -11,9 +11,6 @@ DISTNAME= ${PORTNAME}-1.1
MAINTAINER= ports@FreeBSD.org
COMMENT= Clone of the classic Rally X arcade game
-BROKEN_FreeBSD_13= duplicate symbol: radar
-BROKEN_FreeBSD_14= duplicate symbol: radar
-
WRKSRC= ${WRKDIR}/${PORTNAME}
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}
Modified: head/games/xrally/files/patch-game.c
==============================================================================
--- head/games/xrally/files/patch-game.c Thu Feb 11 13:34:21 2021 (r564947)
+++ head/games/xrally/files/patch-game.c Thu Feb 11 13:42:53 2021 (r564948)
@@ -1,6 +1,15 @@
---- game.c.orig 2013-10-18 03:58:23.000000000 +1100
-+++ game.c 2013-10-18 04:00:19.000000000 +1100
-@@ -59,7 +59,6 @@
+--- game.c.orig 2001-01-01 18:42:51 UTC
++++ game.c
+@@ -28,7 +28,7 @@
+
+ // Radar
+
+-radarStruct radar;
++extern radarStruct radar;
+
+ // Pixmaps
+ Pixmap *tile;
+@@ -59,7 +59,6 @@ extern bool ENDMAP;
extern int mapResult;
extern bool crashed;
extern aiStruct AI;
Modified: head/games/xrick/Makefile
==============================================================================
--- head/games/xrick/Makefile Thu Feb 11 13:34:21 2021 (r564947)
+++ head/games/xrick/Makefile Thu Feb 11 13:42:53 2021 (r564948)
@@ -1,4 +1,4 @@
-# Created by: David Siebörger <drs@rucus.ru.ac.za>
+# Created by: David Siebörger <drs@rucus.ru.ac.za>
# $FreeBSD$
PORTNAME= xrick
@@ -10,9 +10,6 @@ MASTER_SITES= http://www.bigorno.net/xrick/
MAINTAINER= ports@FreeBSD.org
COMMENT= Clone of Rick Dangerous
-BROKEN_FreeBSD_13= duplicate symbol: IMG_SPLASH
-BROKEN_FreeBSD_14= duplicate symbol: IMG_SPLASH
-
RESTRICTED= Copyright status of the graphics and sounds is uncertain
USES= gmake jpeg sdl tar:tgz
USE_SDL= sdl
@@ -24,6 +21,10 @@ post-patch:
@${REINPLACE_CMD} -e 's|sysarg_args_data = NULL|sysarg_args_data = "${PREFIX}/share/xrick/data.zip"|' ${WRKSRC}/src/sysarg.c
@${REINPLACE_CMD} 's|gcc|${CC}|; s|-g||; s|-O2|${CFLAGS}|' \
${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e '/IMG_SPLASH/s,^,extern ,' \
+ ${WRKSRC}/include/img.h
+ @${REINPLACE_CMD} -E '/WAV_(BOMBSHHT|BONUS|BOX|BULLET|JUMP|WALK);/ \
+ s,^,//,' ${WRKSRC}/src/game.c
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xrick ${STAGEDIR}${PREFIX}/bin
Modified: head/games/xrot/Makefile
==============================================================================
--- head/games/xrot/Makefile Thu Feb 11 13:34:21 2021 (r564947)
+++ head/games/xrot/Makefile Thu Feb 11 13:42:53 2021 (r564948)
@@ -16,13 +16,10 @@ MASTER_SITE_SUBDIR= VinePlus/1.1/JG-0.9.1/sources
MAINTAINER= ports@FreeBSD.org
COMMENT= Falling ball puzzle game for X
-BROKEN_FreeBSD_13= duplicate symbol: act
-BROKEN_FreeBSD_14= duplicate symbol: act
-
WRKSRC= ${WRKDIR}/xrot
USES= imake xorg
-USE_XORG= xpm
+USE_XORG= x11 xext xpm
ALL_TARGET= xrot
CFLAGS+= -Wno-return-type
Added: head/games/xrot/files/patch-title.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/xrot/files/patch-title.c Thu Feb 11 13:42:53 2021 (r564948)
@@ -0,0 +1,26 @@
+--- title.c.orig 1998-07-04 01:35:00 UTC
++++ title.c
+@@ -20,12 +20,12 @@ Pixmap p_title;
+ XImage *title_image;
+ char *tdata;
+
+-XEvent ev;
++extern XEvent ev;
+
+ Pixel *ti_col;
+ unsigned int ti_num;
+
+-XpmAttributes xpatt;
++extern XpmAttributes xpatt;
+
+ int torg_x, torg_y;
+ int t_oy;
+@@ -55,7 +55,7 @@ static char *keys[] = {
+ static int key_msg = 10;
+
+ #ifndef SIG_SET
+-struct sigaction act;
++extern struct sigaction act;
+ #endif
+
+ void title()
Modified: head/graphics/xfractint/Makefile
==============================================================================
--- head/graphics/xfractint/Makefile Thu Feb 11 13:34:21 2021 (r564947)
+++ head/graphics/xfractint/Makefile Thu Feb 11 13:42:53 2021 (r564948)
@@ -10,9 +10,6 @@ MASTER_SITES= http://www.fractint.org/ftp/current/linu
MAINTAINER= onemda@gmail.com
COMMENT= Unix port of FractInt
-BROKEN_FreeBSD_13= duplicate symbol: b_const
-BROKEN_FreeBSD_14= duplicate symbol: b_const
-
USES= gmake xorg
USE_XORG= x11 xft
Modified: head/graphics/xfractint/files/patch-common__fractals.c
==============================================================================
--- head/graphics/xfractint/files/patch-common__fractals.c Thu Feb 11 13:34:21 2021 (r564947)
+++ head/graphics/xfractint/files/patch-common__fractals.c Thu Feb 11 13:42:53 2021 (r564948)
@@ -1,6 +1,6 @@
---- common/fractals.c.orig 2011-05-08 11:47:58.000000000 -0500
-+++ common/fractals.c 2012-03-10 16:33:40.000000000 -0500
-@@ -43,7 +43,7 @@
+--- common/fractals.c.orig 2015-01-19 18:35:16 UTC
++++ common/fractals.c
+@@ -43,7 +43,7 @@ an appropriate setup, per_image, per_pixel, and orbit
#include <alloc.h>
#elif defined(__APPLE__)
#include <malloc/malloc.h>
@@ -9,3 +9,12 @@
#include <malloc.h>
#endif
/* see Fractint.c for a description of the "include" hierarchy */
+@@ -3437,7 +3437,7 @@ MandelbrotMix4fpFractal(void) /* from formula by Jim M
+ #undef K
+ #undef L
+
+-double b_const;
++extern double b_const;
+
+ int DivideBrot5Setup(void)
+ {
Added: head/graphics/xfractint/files/patch-unix_video.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/xfractint/files/patch-unix_video.c Thu Feb 11 13:42:53 2021 (r564948)
@@ -0,0 +1,20 @@
+--- unix/video.c.orig 2014-05-03 13:12:33 UTC
++++ unix/video.c
+@@ -11,7 +11,7 @@
+ * Copyright 1992 Ken Shirriff
+ */
+
+-WINDOW *curwin;
++extern WINDOW *curwin;
+
+ extern unsigned char *xgetfont (void);
+ extern int startdisk (void);
+@@ -44,7 +44,7 @@ int color_dark = 0; /* darkest color in palette */
+ int color_bright = 0; /* brightest color in palette */
+ int color_medium = 0; /* nearest to medbright grey in palette
+ Zoom-Box values (2K x 2K screens max) */
+-int boxcolor = 0; /* Zoom-Box color */
++extern int boxcolor; /* Zoom-Box color */
+ int reallyega = 0; /* 1 if its an EGA posing as a VGA */
+ int gotrealdac = 0; /* 1 if loaddac has a dacbox */
+ int rowcount = 0; /* row-counter for decoder and out_line */