From owner-dev-commits-ports-main@freebsd.org Tue Jun 15 04:53:35 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 6A2BB65F1F0; Tue, 15 Jun 2021 04:53:35 +0000 (UTC) (envelope-from git@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 4G3wv32Y8Rz4XyN; Tue, 15 Jun 2021 04:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3FCD82219C; Tue, 15 Jun 2021 04:53:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15F4rZGO057569; Tue, 15 Jun 2021 04:53:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15F4rZKF057568; Tue, 15 Jun 2021 04:53:35 GMT (envelope-from git) Date: Tue, 15 Jun 2021 04:53:35 GMT Message-Id: <202106150453.15F4rZKF057568@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 5b4e16b26a12 - main - games/pacmanarena: unbreak the build in the -fno-common mode MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b4e16b26a1214e077376dacc664f57f3664f913 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jun 2021 04:53:35 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=5b4e16b26a1214e077376dacc664f57f3664f913 commit 5b4e16b26a1214e077376dacc664f57f3664f913 Author: Alexey Dokuchaev AuthorDate: 2021-06-15 04:52:36 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-06-15 04:52:47 +0000 games/pacmanarena: unbreak the build in the -fno-common mode Remove needless ``char *keyboard_map'' definition from the header file to unbreak the build against modern compilers, e.g. Clang 11 and GCC 10. PR: 256555 --- games/pacmanarena/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/games/pacmanarena/Makefile b/games/pacmanarena/Makefile index 0dfaa7415b8d..beadd8ccf28a 100644 --- a/games/pacmanarena/Makefile +++ b/games/pacmanarena/Makefile @@ -16,9 +16,6 @@ COMMENT= Pacman clone in full 3D with a few surprises LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_13= ld: error: duplicate symbol: keyboard_map -BROKEN_FreeBSD_14= ld: error: duplicate symbol: keyboard_map - WRKSRC= ${WRKDIR}/${PORTNAME:S/arena//} USES= gnome sdl @@ -39,6 +36,8 @@ post-patch: @${REINPLACE_CMD} -e 's|@prefix@|${DATADIR}|; \ s|@datadir@/pacman|${DATADIR}|' \ ${WRKSRC}/Makefile.in + @${REINPLACE_CMD} -e '/keyboard_map/,+1d' \ + ${WRKSRC}/include/input.h do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME:S/arena//} \