From owner-svn-ports-head@freebsd.org Wed Jan 27 19:52:32 2021 Return-Path: Delivered-To: svn-ports-head@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 18C764E7CA1; Wed, 27 Jan 2021 19:52:32 +0000 (UTC) (envelope-from adridg@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 4DQvQS0FSKz3GsW; Wed, 27 Jan 2021 19:52:32 +0000 (UTC) (envelope-from adridg@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 EF5C3228BE; Wed, 27 Jan 2021 19:52:31 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 10RJqVma027178; Wed, 27 Jan 2021 19:52:31 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 10RJqVT3027176; Wed, 27 Jan 2021 19:52:31 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <202101271952.10RJqVT3027176@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Wed, 27 Jan 2021 19:52:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r563101 - in head/games/xinvaders: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/games/xinvaders: . files X-SVN-Commit-Revision: 563101 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jan 2021 19:52:32 -0000 Author: adridg Date: Wed Jan 27 19:52:31 2021 New Revision: 563101 URL: https://svnweb.freebsd.org/changeset/ports/563101 Log: Fix build of games/xinvaders on 13 and 14 There are symbols declared in vaders.h with `ext` as storage class qualifier. Those are either `extern` or (blank) depending on `MAIN` being defined. Some of them duplicate symbols that are defined in spacers.c, though. Those ought to be `extern` in all cases, rather than also defined in main.c (because the storage class qualifier is blank then). Reported by: antoine Modified: head/games/xinvaders/Makefile head/games/xinvaders/files/patch-vaders.h Modified: head/games/xinvaders/Makefile ============================================================================== --- head/games/xinvaders/Makefile Wed Jan 27 19:26:33 2021 (r563100) +++ head/games/xinvaders/Makefile Wed Jan 27 19:52:31 2021 (r563101) @@ -3,15 +3,13 @@ PORTNAME= xinvaders PORTVERSION= 2.1.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= SUNSITE/games/arcade/invaders MAINTAINER= ports@FreeBSD.org COMMENT= Shoot-em-up them nasty little bugs -BROKEN_FreeBSD_13= duplicate symbol: basedestroyed -BROKEN_FreeBSD_14= duplicate symbol: basedestroyed NO_CDROM= don't sell for profit USES= gettext xorg Modified: head/games/xinvaders/files/patch-vaders.h ============================================================================== --- head/games/xinvaders/files/patch-vaders.h Wed Jan 27 19:26:33 2021 (r563100) +++ head/games/xinvaders/files/patch-vaders.h Wed Jan 27 19:52:31 2021 (r563101) @@ -11,7 +11,7 @@ + int width, height; /* Size of window. */ + int scale; + Boolean debug; -+ + + /* Base info: */ + int basewait; /* Number of milliseconds to wait between */ + /* moving base. */ @@ -73,7 +73,7 @@ +#define defaultback app_data.defaultback +#define vaderfont app_data.vaderfont +#endif - ++ /* * Actual vaders definitions. */ @@ -85,7 +85,7 @@ ext int level; ext Display *dpy; -@@ -111,30 +178,17 @@ ext int basesleft; +@@ -111,54 +178,31 @@ ext int basesleft; /* Base info: */ @@ -96,7 +96,8 @@ -ext Pixel basepixel; -ext Pixel buildingpixel; - ext Boolean basedestroyed; /* TRUE if the base is non-existant */ +-ext Boolean basedestroyed; /* TRUE if the base is non-existant */ ++extern Boolean basedestroyed; /* TRUE if the base is non-existant */ /* Vader info: */ @@ -115,9 +116,13 @@ - /* moving spacers. */ ext int spacerappear; /* same, but for the interval between appearances */ - ext Boolean spacer_shown; /* Currnet_Spacer is something */ -@@ -144,21 +198,11 @@ ext int spacer_counter; /* number of cy +-ext Boolean spacer_shown; /* Currnet_Spacer is something */ +-ext int spacer_counter; /* number of cycles to create a spacer */ ++extern Boolean spacer_shown; /* Currnet_Spacer is something */ ++extern int spacer_counter; /* number of cycles to create a spacer */ + /* Shot info. */ + ext XtIntervalId shottimerid; ext XtIntervalId vshottimerid; -ext Pixel shotpixel; @@ -128,8 +133,10 @@ - /* once. */ -ext int maxvshots; /* How many shots are allowed to exist at */ - /* once. */ - ext int numshots; /* how many shots (from the base) there are right now. */ - ext int numvshots; /* how many shots (from vaders) there are right now. */ +-ext int numshots; /* how many shots (from the base) there are right now. */ +-ext int numvshots; /* how many shots (from vaders) there are right now. */ ++extern int numshots; /* how many shots (from the base) there are right now. */ ++extern int numvshots; /* how many shots (from vaders) there are right now. */ /* Score info */